Date: Fri, 23 Feb 2018 19:56:01 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462739 - in head/www/tomcat9: . files Message-ID: <201802231956.w1NJu14P033471@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Fri Feb 23 19:56:01 2018 New Revision: 462739 URL: https://svnweb.freebsd.org/changeset/ports/462739 Log: Update to 9.0.5 PR: 226146 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 Fri Feb 23 19:55:05 2018 (r462738) +++ head/www/tomcat9/Makefile Fri Feb 23 19:56:01 2018 (r462739) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 9.0.4 +PORTVERSION= 9.0.5 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 Fri Feb 23 19:55:05 2018 (r462738) +++ head/www/tomcat9/distinfo Fri Feb 23 19:56:01 2018 (r462739) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516917011 -SHA256 (apache-tomcat-9.0.4.tar.gz) = 791529a4289d3d5356f8f93afcfa0ee20f4b31e454be650f1dd469524ebfa1fc -SIZE (apache-tomcat-9.0.4.tar.gz) = 9471519 +TIMESTAMP = 1519397136 +SHA256 (apache-tomcat-9.0.5.tar.gz) = 2677380fca68e5fa6263b4abf9646d39821156f03341fdb511fac23b16972786 +SIZE (apache-tomcat-9.0.5.tar.gz) = 9475699 Modified: head/www/tomcat9/files/tomcat9.in ============================================================================== --- head/www/tomcat9/files/tomcat9.in Fri Feb 23 19:55:05 2018 (r462738) +++ head/www/tomcat9/files/tomcat9.in Fri Feb 23 19:56:01 2018 (r462739) @@ -14,8 +14,12 @@ # Set to "NO" by default. # Set it to "YES" to enable tomcat9 # -# tomcat9_catalina_base (str) +# tomcat9_catalina_home (str) # Set to "%%TOMCAT_HOME%%" by default. +# Set the CATALINA_HOME variable for the Tomcat process +# +# tomcat9_catalina_base (str) +# Set to "${catalina.home}" by default. # Set the CATALINA_BASE variable for the Tomcat process # # tomcat9_catalina_tmpdir (str) @@ -87,8 +91,8 @@ load_rc_config "${name}" eval "${rcvar}=\${${rcvar}:-'NO'}" eval "_tomcat_java_home=\${${name}_java_home:-'%%JAVA_HOME%%'}" eval "_tomcat_catalina_user=\${${name}_catalina_user:-'%%TOMCAT_USER%%'}" -eval "_tomcat_catalina_home='%%TOMCAT_HOME%%'" -eval "_tomcat_catalina_base=\${${name}_catalina_base:-'%%TOMCAT_HOME%%'}" +eval "_tomcat_catalina_home=\${${name}_catalina_home:-'%%TOMCAT_HOME%%'}" +eval "_tomcat_catalina_base=\${${name}_catalina_base:-'${_tomcat_catalina_home}'}" eval "_tomcat_catalina_tmpdir=\${${name}_catalina_tmpdir:-'${_tomcat_catalina_base}/temp'}" eval "_tomcat_stdout=\${${name}_stdout:-'${_tomcat_catalina_base}/logs/catalina.out'}" eval "_tomcat_stderr=\${${name}_stderr:-'&1'}" @@ -116,11 +120,11 @@ command_args="-java-home '${_tomcat_java_home}' \ -wait ${_tomcat_wait} \ -outfile '${_tomcat_stdout}' \ -errfile '${_tomcat_stderr}' \ - -classpath '%%TOMCAT_HOME%%/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:%%TOMCAT_HOME%%/bin/tomcat-juli.jar${_tomcat_classpath}' \ + -classpath '${_tomcat_catalina_home}/bin/bootstrap.jar:%%LOCALBASE%%/share/java/classes/commons-daemon.jar:${_tomcat_catalina_home}/bin/tomcat-juli.jar${_tomcat_classpath}' \ -Djava.util.logging.manager=${_tomcat_logging_manager} \ -Djava.util.logging.config.file='${_tomcat_logging_config}' \ ${_tomcat_java_opts} \ - -Djava.endorsed.dirs='%%TOMCAT_HOME%%/endorsed' \ + -Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed' \ -Dcatalina.home='${_tomcat_catalina_home}' \ -Dcatalina.base='${_tomcat_catalina_base}' \ -Djava.io.tmpdir='${_tomcat_catalina_tmpdir}' \ @@ -133,8 +137,8 @@ tomcat_prestart() { if [ -r "${_tomcat_catalina_base}/bin/setenv.sh" ]; then . "${_tomcat_catalina_base}/bin/setenv.sh" - elif [ -r "%%TOMCAT_HOME%%/bin/setenv.sh" ]; then - . "%%TOMCAT_HOME%%/bin/setenv.sh" + elif [ -r "${_tomcat_catalina_home}/bin/setenv.sh" ]; then + . "${_tomcat_catalina_home}/bin/setenv.sh" fi }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802231956.w1NJu14P033471>