git: 14bd8c9e8fc8 - 2025Q2 - www/tomcat{9,101,110,-devel}: Improve apply JAVA 9+ specific start-up parameters

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Mon, 05 May 2025 14:18:45 UTC 
The branch 2025Q2 has been updated by vvd:

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

commit 14bd8c9e8fc8d8a9af353503cf638846c46a6491
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-05-05 13:56:27 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-05 14:18:36 +0000

    www/tomcat{9,101,110,-devel}: Improve apply JAVA 9+ specific start-up parameters
    
    after update jsvc form port devel/apache-commons-daemon
    
    PR:     286524
    MFH:    2025Q2
    (cherry picked from commit e778c134597a1b785aab8ac9ddbc1eacc403c7e1)
---
 www/tomcat-devel/Makefile              |  2 +-
 www/tomcat-devel/files/tomcat_devel.in | 10 +++++-----
 www/tomcat101/Makefile                 |  2 +-
 www/tomcat101/files/tomcat101.in       | 13 +++++++++++--
 www/tomcat110/Makefile                 |  2 +-
 www/tomcat110/files/tomcat110.in       | 10 +++++-----
 www/tomcat9/Makefile                   |  2 +-
 www/tomcat9/files/tomcat9.in           | 24 +++++++++++++++---------
 8 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index d140d367a371..d643c6982b9d 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
diff --git a/www/tomcat-devel/files/tomcat_devel.in b/www/tomcat-devel/files/tomcat_devel.in
index 89df00dd6075..c4de5de2f969 100644
--- a/www/tomcat-devel/files/tomcat_devel.in
+++ b/www/tomcat-devel/files/tomcat_devel.in
@@ -108,16 +108,16 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 
 extra_commands="reload"
 
-_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
-
-export JAVA_TOOL_OPTIONS="\
+#_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_tomcat_java9_opts="\
 	--add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
 	--add-opens=java.base/java.io=ALL-UNNAMED \
 	--add-opens=java.base/java.util=ALL-UNNAMED \
 	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
-	--enable-native-access=ALL-UNNAMED"
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
+_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}"
 
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index 5f3401c6b053..755b7bd76299 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	10.1.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	101
diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in
index ac405c2fc815..a60d0f5f3a18 100644
--- a/www/tomcat101/files/tomcat101.in
+++ b/www/tomcat101/files/tomcat101.in
@@ -109,14 +109,23 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 extra_commands="reload"
 
 _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
-
-export JAVA_TOOL_OPTIONS="\
+_tomcat_java9_opts="\
 	--add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
 	--add-opens=java.base/java.io=ALL-UNNAMED \
 	--add-opens=java.base/java.util=ALL-UNNAMED \
 	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
 	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
+_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts}"
+
+case "${_tomcat_java_version}" in
+	1[7-9]* | [2-9][0-9]* )
+		_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java17_opts}"
+		;;
+	*)
+		;;
+esac
 
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index fd6db53a3cb3..a35009afb7e2 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	110
diff --git a/www/tomcat110/files/tomcat110.in b/www/tomcat110/files/tomcat110.in
index b375c9a2d0ff..20ddc6672db2 100644
--- a/www/tomcat110/files/tomcat110.in
+++ b/www/tomcat110/files/tomcat110.in
@@ -108,16 +108,16 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 
 extra_commands="reload"
 
-_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
-
-export JAVA_TOOL_OPTIONS="\
+#_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_tomcat_java9_opts="\
 	--add-opens=java.base/java.lang=ALL-UNNAMED \
 	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
 	--add-opens=java.base/java.io=ALL-UNNAMED \
 	--add-opens=java.base/java.util=ALL-UNNAMED \
 	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
-	--enable-native-access=ALL-UNNAMED"
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
+_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}"
 
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 8b4efd75b3ea..6f5598aa5350 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	9.0.104
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9])(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	9
diff --git a/www/tomcat9/files/tomcat9.in b/www/tomcat9/files/tomcat9.in
index 21f4624e41e4..e807618d5c48 100644
--- a/www/tomcat9/files/tomcat9.in
+++ b/www/tomcat9/files/tomcat9.in
@@ -109,18 +109,24 @@ required_dirs="${_tomcat_catalina_tmpdir}"
 extra_commands="reload"
 
 _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
+_tomcat_java9_opts="\
+	--add-opens=java.base/java.lang=ALL-UNNAMED \
+	--add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
+	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+	--add-opens=java.base/java.io=ALL-UNNAMED \
+	--add-opens=java.base/java.util=ALL-UNNAMED \
+	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+_tomcat_java17_opts="--enable-native-access=ALL-UNNAMED"
 
 case "${_tomcat_java_version}" in
-	9* | [1-2][0-9]* )
+	1[7-9]* | [2-9][0-9]* )
 		_tomcat_endorsed_dirs_option=
-		export JAVA_TOOL_OPTIONS="\
-			--add-opens=java.base/java.lang=ALL-UNNAMED \
-			--add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
-			--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
-			--add-opens=java.base/java.io=ALL-UNNAMED \
-			--add-opens=java.base/java.util=ALL-UNNAMED \
-			--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
-			--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+		_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts} ${_tomcat_java17_opts}"
+		;;
+	9* | 1[0-6]* )
+		_tomcat_endorsed_dirs_option=
+		_tomcat_java_opts="${_tomcat_java_opts} ${_tomcat_java9_opts}"
 		;;
 	*)
 		_tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'"