Attachment 206652 Details for Bug 239892 – Java 9+ support in tomcat85

[patch] Java 9+ support in tomcat85

tomcat85.diff (text/plain), 1.58 KB, created by Vladimir Druzenko on 2019-08-18 03:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2019-08-18 03:00:01 UTC

Size: 1.58 KB

patch

obsolete

>diff -ur www/tomcat85.orig/Makefile www/tomcat85/Makefile
>--- www/tomcat85.orig/Makefile
>+++ www/tomcat85/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	tomcat
> PORTVERSION=	8.5.43
>+PORTREVISION=	1
> CATEGORIES=	www java
> MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
> PKGNAMESUFFIX=	85
>diff -ur www/tomcat85.orig/files/tomcat85.in www/tomcat85/files/tomcat85.in
>--- www/tomcat85.orig/files/tomcat85.in
>+++ www/tomcat85/files/tomcat85.in
>@@ -44,7 +44,7 @@
> #
> # tomcat85_logging_config (str):
> #   Set to "${catalina.base}/conf/logging.properties" by default.
>-#   Set the JUL config file 
>+#   Set the JUL config file
> #
> # tomcat85_java_home (str):
> #   Set to "%%JAVA_HOME%%" by default.
>@@ -111,6 +111,17 @@
> 
> extra_commands="reload"
> 
>+_tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | head -1 | sed -e 's/[^"][^"]*\"$[^\"]*$\".*/\1/'`
>+
>+case "${_tomcat_java_version}" in
>+	9* | 1[0-9]* )
>+		_tomcat_endorsed_dirs_option=
>+		;;
>+	*)
>+		_tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'"
>+		;;
>+esac
>+
> command="%%LOCALBASE%%/bin/jsvc"
> command_args="-java-home '${_tomcat_java_home}' \
> 	-server \
>@@ -124,7 +135,7 @@
> 	-Djava.util.logging.manager=${_tomcat_logging_manager} \
> 	-Djava.util.logging.config.file='${_tomcat_logging_config}' \
> 	${_tomcat_java_opts} \
>-	-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed' \
>+	${_tomcat_endorsed_dirs_option} \
> 	-Dcatalina.home='${_tomcat_catalina_home}' \
> 	-Dcatalina.base='${_tomcat_catalina_base}' \
> 	-Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \

Flags:

vvd: maintainer-approval+

Actions: View | Diff

Attachments on bug 239892: 206601 | 206651 | 206652 | 206767 | 206768