diff options
Diffstat (limited to 'www/tomcat101')
| -rw-r--r-- | www/tomcat101/Makefile | 34 | ||||
| -rw-r--r-- | www/tomcat101/distinfo | 6 | ||||
| -rw-r--r-- | www/tomcat101/files/patch-bin__daemon.sh | 6 | ||||
| -rw-r--r-- | www/tomcat101/pkg-plist | 2 |
4 files changed, 28 insertions, 20 deletions
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile index 4c5cd4682fba..ac346c70a01b 100644 --- a/www/tomcat101/Makefile +++ b/www/tomcat101/Makefile @@ -1,5 +1,5 @@ PORTNAME= tomcat -DISTVERSION= 10.1.43 +DISTVERSION= 10.1.44 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin PKGNAMESUFFIX= 101 @@ -18,6 +18,12 @@ CPE_VENDOR= apache JAVA_VERSION= 11+ USE_RC_SUBR= ${PKGBASE:C/-/_/} +EXTRACT_AFTER_ARGS= --exclude commons-daemon-native.tar.gz \ + --exclude commons-daemon.jar \ + --exclude tomcat-native.tar.gz \ + --exclude *.bat \ + --no-same-owner --no-same-permissions + NO_ARCH= yes NO_BUILD= yes SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \ @@ -41,28 +47,28 @@ TOMCAT_SUBDIR?= ${DISTNAME:R} TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} post-patch: - @${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh - @${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' \ + ${WRKSRC}/bin/daemon.sh + ${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete do-install: - @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs - @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed - @${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME} + ${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs \ + ${STAGEDIR}${TOMCAT_HOME}/endorsed + (cd ${WRKSRC} && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${TOMCAT_HOME} "! -name *\.sh" && \ + ${COPYTREE_BIN} bin ${STAGEDIR}${TOMCAT_HOME} "-name *\.sh") post-install: - @${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat - @(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\ - for f in $$(find . -type f -not -name '*.xsd'); do ${MV} $$f $$f.sample; done) + ${FIND} ${STAGEDIR}${TOMCAT_HOME}/conf -type f -not -name '*.xsd' -exec ${MV} {} {}.sample \; post-install-HOST_MANAGER-on: - @(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\ - for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \ + (cd ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager &&\ + for f in META-INF/context.xml WEB-INF/manager.xml WEB-INF/web.xml; do \ ${MV} $$f $$f.sample; done) post-install-MANAGER-on: - @(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\ - for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \ + (cd ${STAGEDIR}${TOMCAT_HOME}/webapps/manager &&\ + for f in META-INF/context.xml WEB-INF/web.xml; do \ ${MV} $$f $$f.sample; done) .include <bsd.port.mk> diff --git a/www/tomcat101/distinfo b/www/tomcat101/distinfo index 8c884c2c29f3..ce2764436425 100644 --- a/www/tomcat101/distinfo +++ b/www/tomcat101/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751700000 -SHA256 (apache-tomcat-10.1.43.tar.gz) = 859d15c7f0e08e543a925bf84728ee2166c710b14a62fbc9be7f58f17aa9675d -SIZE (apache-tomcat-10.1.43.tar.gz) = 14095194 +TIMESTAMP = 1754520000 +SHA256 (apache-tomcat-10.1.44.tar.gz) = e020c2fa8649f1de9abbc2ddce70dd61e997d0ed161ee02a30de4b221263be9c +SIZE (apache-tomcat-10.1.44.tar.gz) = 14115940 diff --git a/www/tomcat101/files/patch-bin__daemon.sh b/www/tomcat101/files/patch-bin__daemon.sh index d43ad7ef1eb6..63467bab6286 100644 --- a/www/tomcat101/files/patch-bin__daemon.sh +++ b/www/tomcat101/files/patch-bin__daemon.sh @@ -1,6 +1,6 @@ ---- bin/daemon.sh.orig +--- bin/daemon.sh.orig 2025-08-04 13:14:17 UTC +++ bin/daemon.sh -@@ -115,12 +115,9 @@ +@@ -114,12 +114,9 @@ test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap @@ -15,7 +15,7 @@ fi # Set the default service-start wait time if necessary test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 -@@ -137,7 +134,7 @@ +@@ -136,7 +133,7 @@ test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" # Add on extra jar files to CLASSPATH test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" diff --git a/www/tomcat101/pkg-plist b/www/tomcat101/pkg-plist index 1fae71f972e4..7e6528753669 100644 --- a/www/tomcat101/pkg-plist +++ b/www/tomcat101/pkg-plist @@ -605,6 +605,7 @@ %%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/web.xml.sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/css/manager.css %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg +%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/favicon.ico %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/tomcat.svg %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp %%MANAGER%%@sample %%T%%/webapps/manager/META-INF/context.xml.sample @@ -619,6 +620,7 @@ %%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample %%MANAGER%%%%T%%/webapps/manager/css/manager.css %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg +%%MANAGER%%%%T%%/webapps/manager/images/favicon.ico %%MANAGER%%%%T%%/webapps/manager/images/tomcat.svg %%MANAGER%%%%T%%/webapps/manager/index.jsp %%MANAGER%%%%T%%/webapps/manager/status.xsd |