From owner-svn-ports-head@freebsd.org Fri Feb 23 19:55:06 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86ECDF17609; Fri, 23 Feb 2018 19:55:06 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3754D74F55; Fri, 23 Feb 2018 19:55:06 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 322DA1B049; Fri, 23 Feb 2018 19:55:06 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1NJt6Pq033295; Fri, 23 Feb 2018 19:55:06 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NJt5q0033292; Fri, 23 Feb 2018 19:55:05 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201802231955.w1NJt5q0033292@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Fri, 23 Feb 2018 19:55:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462738 - in head/www/tomcat85: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/www/tomcat85: . files X-SVN-Commit-Revision: 462738 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Feb 2018 19:55:06 -0000 Author: lwhsu Date: Fri Feb 23 19:55:05 2018 New Revision: 462738 URL: https://svnweb.freebsd.org/changeset/ports/462738 Log: Update to 8.5.28 PR: 226145 Submitted by: vvd@unislabs.com (maintainer) Modified: head/www/tomcat85/Makefile head/www/tomcat85/distinfo head/www/tomcat85/files/tomcat85.in Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Fri Feb 23 19:51:27 2018 (r462737) +++ head/www/tomcat85/Makefile Fri Feb 23 19:55:05 2018 (r462738) @@ -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 Modified: head/www/tomcat85/distinfo ============================================================================== --- head/www/tomcat85/distinfo Fri Feb 23 19:51:27 2018 (r462737) +++ head/www/tomcat85/distinfo Fri Feb 23 19:55:05 2018 (r462738) @@ -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 Modified: head/www/tomcat85/files/tomcat85.in ============================================================================== --- head/www/tomcat85/files/tomcat85.in Fri Feb 23 19:51:27 2018 (r462737) +++ head/www/tomcat85/files/tomcat85.in Fri Feb 23 19:55:05 2018 (r462738) @@ -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 }