View | Details | Raw Unified | Return to bug 230325 | Differences between
and this patch

Collapse All | Expand All

(-)www/tomcat85/files/patch-bin__daemon.sh (+26 lines)
Line 0 Link Here
1
--- bin/daemon.sh.orig
2
+++ bin/daemon.sh
3
@@ -113,12 +113,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
18
@@ -135,7 +132,7 @@
19
 
20
 # Add on extra jar files to CLASSPATH
21
 test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:"
22
-CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
23
+CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:%%JAVAJARDIR%%/commons-daemon.jar"
24
 
25
 test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
26
 test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp"
(-)www/tomcat85/Makefile (+2 lines)
Lines 45-50 Link Here
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; s|%%JAVAJARDIR%%|${JAVAJARDIR}|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

Return to bug 230325