git: f2a2890320ba - main - www/tomcat110: Update 11.0.9 => 11.0.10

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Thu, 07 Aug 2025 09:00:28 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f2a2890320baed2eec9ac1a77d789cb8c025f120

commit f2a2890320baed2eec9ac1a77d789cb8c025f120
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-08-07 08:57:37 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-08-07 08:59:22 +0000

    www/tomcat110: Update 11.0.9 => 11.0.10
    
    Changelog:
    https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.10_(markt)
    
    Improve port.
    Refresh patch.
    
    MFH:    2025Q3
---
 www/tomcat110/Makefile                   | 32 +++++++++++++++++++-------------
 www/tomcat110/distinfo                   |  6 +++---
 www/tomcat110/files/patch-bin__daemon.sh |  6 +++---
 www/tomcat110/pkg-plist                  |  2 ++
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index 456591d6f0e9..d94198c607bd 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.9
+DISTVERSION=	11.0.10
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	110
@@ -18,6 +18,12 @@ CPE_VENDOR=	apache
 JAVA_VERSION=	17+
 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,27 +47,27 @@ 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
-	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
+	${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
+	(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/tomcat110/distinfo b/www/tomcat110/distinfo
index 27d6e423ea5e..6b753d5b9214 100644
--- a/www/tomcat110/distinfo
+++ b/www/tomcat110/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751700000
-SHA256 (apache-tomcat-11.0.9.tar.gz) = 62c562a3ad29dba3ea04f58ae31ebfc865cf2120335163fcf0fc03d426ed3a87
-SIZE (apache-tomcat-11.0.9.tar.gz) = 14109090
+TIMESTAMP = 1754520000
+SHA256 (apache-tomcat-11.0.10.tar.gz) = eb0e326c979df62ca2aaad228146a56a06323fd3a4ae8cfc34ff0d2de58a30d6
+SIZE (apache-tomcat-11.0.10.tar.gz) = 14130534
diff --git a/www/tomcat110/files/patch-bin__daemon.sh b/www/tomcat110/files/patch-bin__daemon.sh
index d43ad7ef1eb6..9b5aae66e4d6 100644
--- a/www/tomcat110/files/patch-bin__daemon.sh
+++ b/www/tomcat110/files/patch-bin__daemon.sh
@@ -1,6 +1,6 @@
---- bin/daemon.sh.orig
+--- bin/daemon.sh.orig	2025-07-31 16:29:14 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/tomcat110/pkg-plist b/www/tomcat110/pkg-plist
index f6ce17478f12..279e486cfa2e 100644
--- a/www/tomcat110/pkg-plist
+++ b/www/tomcat110/pkg-plist
@@ -600,6 +600,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
@@ -614,6 +615,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