mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00
Code Issues Releases Activity

* Support Java 9+ by not setting java.endorsed.dirs for those versions

Browse Source 
PR:		239892
Submitted by:	vvd@unislabs.com (maintainer)
This commit is contained in:
Greg Lewis 2019-08-22 02:46:31 +00:00
parent 25f6f8d7cc
commit c26d95257d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=509575
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/tomcat85/Makefile
View File

@ -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

15
www/tomcat85/files/tomcat85.in
View File

@ -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 @@ 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}'`
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 @@ command_args="-java-home '${_tomcat_java_home}' \
-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}' \