mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-28 01:06:17 +00:00
Code Issues Releases Activity

www/tomcat{85,9}: fix daemon.sh reference to jsvc

Browse Source 
PR:		230325
Submitted by:	VVD <vvd@unislabs.com> (maintainer)
Reported by:	Michael Osipov <michael.osipov@siemens.com>
This commit is contained in:
Steve Wills 2019-01-27 15:21:16 +00:00
parent 8dc6856f30
commit 32ea23abe7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=491357
4 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/tomcat85/Makefile
View File

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

26
www/tomcat85/files/patch-bin__daemon.sh Normal file
View File

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

3
www/tomcat9/Makefile
View File

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

26
www/tomcat9/files/patch-bin__daemon.sh Normal file
View File

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