Date: Tue, 18 Jun 2019 21:31:23 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504502 - in head/www/tomcat85: . files Message-ID: <201906182131.x5ILVNRu015631@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Jun 18 21:31:22 2019 New Revision: 504502 URL: https://svnweb.freebsd.org/changeset/ports/504502 Log: Update to 8.5.42. Submitted by: Владимир Друзенко <vvd@unislabs.com> (maintainer) Modified: head/www/tomcat85/Makefile head/www/tomcat85/distinfo head/www/tomcat85/files/patch-bin__daemon.sh Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Tue Jun 18 21:08:45 2019 (r504501) +++ head/www/tomcat85/Makefile Tue Jun 18 21:31:22 2019 (r504502) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 8.5.41 +PORTVERSION= 8.5.42 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 Modified: head/www/tomcat85/distinfo ============================================================================== --- head/www/tomcat85/distinfo Tue Jun 18 21:08:45 2019 (r504501) +++ head/www/tomcat85/distinfo Tue Jun 18 21:31:22 2019 (r504502) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558564268 -SHA256 (apache-tomcat-8.5.41.tar.gz) = 4f6b88d0c07ba3dc68779a01c3da6da0e4e8889df0c93000659d6da6166de293 -SIZE (apache-tomcat-8.5.41.tar.gz) = 9699102 +TIMESTAMP = 1560892311 +SHA256 (apache-tomcat-8.5.42.tar.gz) = e3bebd1ecfdf439dc54f9a6f72f8fb22f33324223337f040860fd0cdf95220b5 +SIZE (apache-tomcat-8.5.42.tar.gz) = 9711748 Modified: head/www/tomcat85/files/patch-bin__daemon.sh ============================================================================== --- head/www/tomcat85/files/patch-bin__daemon.sh Tue Jun 18 21:08:45 2019 (r504501) +++ head/www/tomcat85/files/patch-bin__daemon.sh Tue Jun 18 21:31:22 2019 (r504502) @@ -1,6 +1,6 @@ --- bin/daemon.sh.orig +++ bin/daemon.sh -@@ -113,12 +113,9 @@ +@@ -115,12 +115,9 @@ test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd` test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME" test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap @@ -15,10 +15,10 @@ fi # Set the default service-start wait time if necessary test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 -@@ -135,7 +132,7 @@ +@@ -137,7 +134,7 @@ # Add on extra jar files to CLASSPATH - test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:" + test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:" -CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar" +CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:%%JAVAJARDIR%%/commons-daemon.jar"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906182131.x5ILVNRu015631>