Date: Sun, 27 Jan 2019 15:21:16 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> 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 Message-ID: <201901271521.x0RFLG6j068634@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <vvd@unislabs.com> (maintainer) Reported by: Michael Osipov <michael.osipov@siemens.com> 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901271521.x0RFLG6j068634>