diff options
Diffstat (limited to 'www/tomcat110')
| -rw-r--r-- | www/tomcat110/Makefile | 2 | ||||
| -rw-r--r-- | www/tomcat110/files/tomcat110.in | 10 |
2 files changed, 6 insertions, 6 deletions
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}' \ |