Date: Thu, 22 Aug 2019 02:40:39 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509574 - in head/www/tomcat9: . files Message-ID: <201908220240.x7M2edPi058758@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Thu Aug 22 02:40:39 2019 New Revision: 509574 URL: https://svnweb.freebsd.org/changeset/ports/509574 Log: * Update to 9.0.24 * Support Java 9+ by not setting java.endorsed.dirs for those versions PR: 239892 Submitted by: vvd@unislabs.com (maintainer) Modified: head/www/tomcat9/Makefile head/www/tomcat9/distinfo head/www/tomcat9/files/tomcat9.in Modified: head/www/tomcat9/Makefile ============================================================================== --- head/www/tomcat9/Makefile Thu Aug 22 02:30:08 2019 (r509573) +++ head/www/tomcat9/Makefile Thu Aug 22 02:40:39 2019 (r509574) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 9.0.22 +PORTVERSION= 9.0.24 +PORTREVISION= 0 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 9 Modified: head/www/tomcat9/distinfo ============================================================================== --- head/www/tomcat9/distinfo Thu Aug 22 02:30:08 2019 (r509573) +++ head/www/tomcat9/distinfo Thu Aug 22 02:40:39 2019 (r509574) @@ -1,3 +1,3 @@ -TIMESTAMP = 1563135834 -SHA256 (apache-tomcat-9.0.22.tar.gz) = 86b30768f7674409dfe1091e0917637bfa3b1b699851112bef99b65673039168 -SIZE (apache-tomcat-9.0.22.tar.gz) = 10929702 +TIMESTAMP = 1566425345 +SHA256 (apache-tomcat-9.0.24.tar.gz) = 22064138e25f7ab899802804775259a156c06770535b8ce93856beba13dfcf6d +SIZE (apache-tomcat-9.0.24.tar.gz) = 10914435 Modified: head/www/tomcat9/files/tomcat9.in ============================================================================== --- head/www/tomcat9/files/tomcat9.in Thu Aug 22 02:30:08 2019 (r509573) +++ head/www/tomcat9/files/tomcat9.in Thu Aug 22 02:40:39 2019 (r509574) @@ -44,7 +44,7 @@ # # tomcat9_logging_config (str): # Set to "${catalina.base}/conf/logging.properties" by default. -# Set the JUL config file +# Set the JUL config file # # tomcat9_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}' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908220240.x7M2edPi058758>