Page MenuHomeFreeBSD
Files F109908401

D41054.diff
No OneTemporary
Actions

D41054.diff
View Options

diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -498,12 +498,9 @@
TINYXML_DESC?= XML parser support via TinyXML
TK_DESC?= Tk GUI toolkit support
TLS_DESC?= Secure network connection support via TLS
-TOMCAT6_DESC?= Tomcat 6.x support
-TOMCAT7_DESC?= Tomcat 7.x support
-TOMCAT8_DESC?= Tomcat 8.x support
-TOMCAT85_DESC?= Tomcat 8.5.x support
-TOMCAT9_DESC?= Tomcat 9.x support
-TOMCAT10_DESC?= Tomcat 10.x support
+TOMCAT85_DESC?= Use Tomcat 8.5.x
+TOMCAT9_DESC?= Use Tomcat 9.0.x
+TOMCAT101_DESC?= Use Tomcat 10.1.x
TOOLAME_DESC?= TooLAME MP2 audio encoder support
TREMOR_DESC?= Tremor audio decoder support
TTA_DESC?= TTA lossless audio format support
diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -39,18 +39,18 @@
OPTIONS_DEFINE= DOCS
OPTIONS_SINGLE= AS
-OPTIONS_SINGLE_AS= GLASSFISH TOMCAT10
-OPTIONS_DEFAULT= TOMCAT10
+OPTIONS_SINGLE_AS= GLASSFISH TOMCAT101
+OPTIONS_DEFAULT= TOMCAT101
GLASSFISH_DESC?= Glassfish support
GLASSFISH_VARS= WEBAPP_HOME=${LOCALBASE}/glassfish-5.1.0/glassfish
-TOMCAT10_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.1
+TOMCAT101_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.1
GLASSFISH_BUILD_DEPENDS=${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish
GLASSFISH_RUN_DEPENDS= ${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish
-TOMCAT10_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101
-TOMCAT10_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101
+TOMCAT101_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101
+TOMCAT101_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101
WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps
JARFILE= ${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${PORTVERSION}.jar
diff --git a/www/axis2/Makefile b/www/axis2/Makefile
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -18,22 +18,19 @@
NO_ARCH= yes
OPTIONS_SINGLE= AS
-OPTIONS_SINGLE_AS= TOMCAT7 TOMCAT85 TOMCAT9 TOMCAT10
+OPTIONS_SINGLE_AS= TOMCAT85 TOMCAT9 TOMCAT101
OPTIONS_DEFAULT= TOMCAT85
OPTIONS_DEFINE= EXAMPLES
-TOMCAT7_VARS= APPHOME=${LOCALBASE}/apache-tomcat-7.0
-TOMCAT7_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat7
-
TOMCAT85_VARS= APPHOME=${LOCALBASE}/apache-tomcat-8.5
TOMCAT85_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat85
TOMCAT9_VARS= APPHOME=${LOCALBASE}/apache-tomcat-9.0
TOMCAT9_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat9
-TOMCAT10_VARS= APPHOME=${LOCALBASE}/apache-tomcat-10.0
-TOMCAT10_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat10
+TOMCAT101_VARS= APPHOME=${LOCALBASE}/apache-tomcat-10.1
+TOMCAT101_RUN_DEPENDS+= ${APPHOME}/bin/bootstrap.jar:www/tomcat101
USE_JAVA= yes
SHAREOWN= www
diff --git a/www/madsonic/Makefile b/www/madsonic/Makefile
--- a/www/madsonic/Makefile
+++ b/www/madsonic/Makefile
@@ -44,7 +44,6 @@
JETTY8_DESC= Use Jetty 8.x
LAME_DESC= Depend on LAME for MP3 transcoding
MPC_DESC= Depend on mpcdec for MPC transcoding
-TOMCAT85_DESC= Use Tomcat 8.5.x
TRANSCODING_DESC= Transcoding support
VORBIS_DESC= Depend on oggenc/oggdec for Vorbis transcoding
XMP_DESC= Depend on XMP for module file transcoding

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 12, 1:43 AM (17 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16604228
Default Alt Text
D41054.diff (3 KB)

Event Timeline