diff -uN www/tomcat9.orig/Makefile www/tomcat9/Makefile
--- www/tomcat9.orig/Makefile
+++ www/tomcat9/Makefile
@@ -45,6 +45,8 @@
 
 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' ${WRKSRC}/bin/daemon.sh
+	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
diff -uN www/tomcat9.orig/files/patch-bin__daemon.sh www/tomcat9/files/patch-bin__daemon.sh
--- www/tomcat9.orig/files/patch-bin__daemon.sh
+++ www/tomcat9/files/patch-bin__daemon.sh
@@ -0,0 +1,17 @@
+--- 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