From owner-svn-ports-all@freebsd.org Sun Jan 27 15:21:18 2019 Return-Path: Delivered-To: svn-ports-all@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 4004214B033A; Sun, 27 Jan 2019 15:21:18 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D6B8B6DF0E; Sun, 27 Jan 2019 15:21:17 +0000 (UTC) (envelope-from swills@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 B10259C69; Sun, 27 Jan 2019 15:21:17 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0RFLH7n068637; Sun, 27 Jan 2019 15:21:17 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0RFLG6j068634; Sun, 27 Jan 2019 15:21:16 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201901271521.x0RFLG6j068634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 27 Jan 2019 15:21:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491357 - in head/www: tomcat85 tomcat85/files tomcat9 tomcat9/files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www: tomcat85 tomcat85/files tomcat9 tomcat9/files X-SVN-Commit-Revision: 491357 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D6B8B6DF0E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jan 2019 15:21:18 -0000 Author: swills Date: Sun Jan 27 15:21:16 2019 New Revision: 491357 URL: https://svnweb.freebsd.org/changeset/ports/491357 Log: www/tomcat{85,9}: fix daemon.sh reference to jsvc PR: 230325 Submitted by: VVD (maintainer) Reported by: Michael Osipov Added: head/www/tomcat85/files/patch-bin__daemon.sh (contents, props changed) head/www/tomcat9/files/patch-bin__daemon.sh (contents, props changed) Modified: head/www/tomcat85/Makefile (contents, props changed) head/www/tomcat9/Makefile (contents, props changed) Modified: head/www/tomcat85/Makefile ============================================================================== --- head/www/tomcat85/Makefile Sun Jan 27 15:14:56 2019 (r491356) +++ head/www/tomcat85/Makefile Sun Jan 27 15:21:16 2019 (r491357) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 8.5.35 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 85 @@ -45,6 +46,8 @@ TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} post-patch: @${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh + @${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete do-install: @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs Added: head/www/tomcat85/files/patch-bin__daemon.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/tomcat85/files/patch-bin__daemon.sh Sun Jan 27 15:21:16 2019 (r491357) @@ -0,0 +1,26 @@ +--- bin/daemon.sh.orig ++++ bin/daemon.sh +@@ -113,12 +113,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 +-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME ++# If not explicitly set, look for jsvc in %%PREFIX%% + if [ -z "$JSVC" ]; then +- JSVC="$CATALINA_BASE/bin/jsvc" +- if [ ! -x "$JSVC" ]; then +- JSVC="$CATALINA_HOME/bin/jsvc" +- fi ++ JSVC="%%PREFIX%%/bin/jsvc" + fi + # Set the default service-start wait time if necessary + test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 +@@ -135,7 +132,7 @@ + + # Add on extra jar files to 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" + + test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out" + test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp" Modified: head/www/tomcat9/Makefile ============================================================================== --- head/www/tomcat9/Makefile Sun Jan 27 15:14:56 2019 (r491356) +++ head/www/tomcat9/Makefile Sun Jan 27 15:21:16 2019 (r491357) @@ -3,6 +3,7 @@ PORTNAME= tomcat PORTVERSION= 9.0.13 +PORTREVISION= 1 CATEGORIES= www java MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin PKGNAMESUFFIX= 9 @@ -45,6 +46,8 @@ TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} post-patch: @${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh + @${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete do-install: @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs Added: head/www/tomcat9/files/patch-bin__daemon.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/tomcat9/files/patch-bin__daemon.sh Sun Jan 27 15:21:16 2019 (r491357) @@ -0,0 +1,26 @@ +--- bin/daemon.sh.orig ++++ bin/daemon.sh +@@ -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 +-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME ++# If not explicitly set, look for jsvc in %%PREFIX%% + if [ -z "$JSVC" ]; then +- JSVC="$CATALINA_BASE/bin/jsvc" +- if [ ! -x "$JSVC" ]; then +- JSVC="$CATALINA_HOME/bin/jsvc" +- fi ++ JSVC="%%PREFIX%%/bin/jsvc" + fi + # Set the default service-start wait time if necessary + test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10 +@@ -137,7 +134,7 @@ + + # Add on extra jar files to 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" + + test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out" + test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp"