diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/tomcat85/Makefile | 2 | ||||
| -rw-r--r-- | www/tomcat85/distinfo | 6 | ||||
| -rw-r--r-- | www/tomcat85/files/tomcat85.in | 18 |
3 files changed, 15 insertions, 11 deletions
diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile index e8162e463fa4..57c93c382f65 100644 --- a/www/tomcat85/Makefile +++ b/www/tomcat85/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 8.5.27 +PORTVERSION= 8.5.28 CATEGORIES= www java MASTER_SITES= APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 diff --git a/www/tomcat85/distinfo b/www/tomcat85/distinfo index c84dae277b13..3e6791344254 100644 --- a/www/tomcat85/distinfo +++ b/www/tomcat85/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516916282 -SHA256 (apache-tomcat-8.5.27.tar.gz) = ad78d0908a5dabf722cd378364ba02b1cbd58f3515ba2f1833f334bf6dcec448 -SIZE (apache-tomcat-8.5.27.tar.gz) = 9536557 +TIMESTAMP = 1519399345 +SHA256 (apache-tomcat-8.5.28.tar.gz) = f2da60969b942ef60d12bda2fab6580be18895e34e3dce0ddd70f0fdaaed1a07 +SIZE (apache-tomcat-8.5.28.tar.gz) = 9544774 diff --git a/www/tomcat85/files/tomcat85.in b/www/tomcat85/files/tomcat85.in index 021f45971cfc..d34efeaad692 100644 --- a/www/tomcat85/files/tomcat85.in +++ b/www/tomcat85/files/tomcat85.in @@ -14,8 +14,12 @@ # Set to "NO" by default. # Set it to "YES" to enable tomcat85 # -# tomcat85_catalina_base (str) +# tomcat85_catalina_home (str) # Set to "%%TOMCAT_HOME%%" by default. +# Set the CATALINA_HOME variable for the Tomcat process +# +# tomcat85_catalina_base (str) +# Set to "${catalina.home}" by default. # Set the CATALINA_BASE variable for the Tomcat process # # tomcat85_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 } |