Attachment #199644 for bug #230325

Lines 45-50 Link Here

(-)www/tomcat9/Makefile (+2 lines)
45		45
46	post-patch:	46	post-patch:
47	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz	47	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
		48	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/bin/daemon.sh
		49	@${FIND} ${WRKSRC} -name '.bak' -delete -o -name '.orig' -delete
48		50
49	do-install:	51	do-install:
50	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs	52	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs




--- 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

Return to bug 230325

Line 0 Link Here

(-)www/tomcat9/files/patch-bin__daemon.sh (+17 lines)
	1	--- bin/daemon.sh.orig
	2	+++ bin/daemon.sh
	3	@@ -115,12 +115,9 @@
	4	test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
	5	test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
	6	test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
	7	-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME
	8	+# If not explicitly set, look for jsvc in %%PREFIX%%
	9	if [ -z "$JSVC" ]; then
	10	- JSVC="$CATALINA_BASE/bin/jsvc"
	11	- if [ ! -x "$JSVC" ]; then
	12	- JSVC="$CATALINA_HOME/bin/jsvc"
	13	- fi
	14	+ JSVC="%%PREFIX%%/bin/jsvc"
	15	fi
	16	# Set the default service-start wait time if necessary
	17	test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10