Index: head/www/tomcat85/Makefile
===================================================================
--- head/www/tomcat85/Makefile	(revision 491356)
+++ head/www/tomcat85/Makefile	(revision 491357)
@@ -1,84 +1,87 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 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
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvd@unislabs.com
 COMMENT=	Open-source Java web server by Apache, 8.5.x branch
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_SUB=	T=${TOMCAT_SUBDIR} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}
 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
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
 
 post-install-MANAGER-on:
 	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
 
 post-install-DOCS-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/docs
 
 post-install-EXAMPLES-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/examples
 
 post-install-ROOT-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/ROOT
 
 .include <bsd.port.mk>
Index: head/www/tomcat85/files/patch-bin__daemon.sh
===================================================================
--- head/www/tomcat85/files/patch-bin__daemon.sh	(nonexistent)
+++ head/www/tomcat85/files/patch-bin__daemon.sh	(revision 491357)
@@ -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"

Property changes on: head/www/tomcat85/files/patch-bin__daemon.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/tomcat9/Makefile
===================================================================
--- head/www/tomcat9/Makefile	(revision 491356)
+++ head/www/tomcat9/Makefile	(revision 491357)
@@ -1,84 +1,87 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 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
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vvd@unislabs.com
 COMMENT=	Open-source Java web server by Apache, 9.0.x branch
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:devel/jakarta-commons-daemon
 
 USES=		cpe
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 USE_RC_SUBR=	${PKGBASE:C/-/_/}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_SUB=	T=${TOMCAT_SUBDIR} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 SUB_LIST=	TOMCAT_HOME=${TOMCAT_HOME} \
 		TOMCAT_USER=${WWWOWN} \
 		JAVA_HOME=${JAVA_HOME}
 
 OPTIONS_DEFINE=		HOST_MANAGER MANAGER DOCS EXAMPLES ROOT
 OPTIONS_DEFAULT=	HOST_MANAGER MANAGER ROOT
 OPTIONS_SUB=		yes
 
 DOCS_DESC=		Install Documentation web application
 EXAMPLES_DESC=		Install Examples web application
 HOST_MANAGER_DESC=	Install Host Manager application
 MANAGER_DESC=		Install Manager web application
 ROOT_DESC=		Install default ROOT web application
 
 TOMCAT_SUBDIR?=	${DISTNAME:R}
 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
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed
 	${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME}
 
 post-install:
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-on:
 	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
 
 post-install-MANAGER-on:
 	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
 		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
 
 post-install-DOCS-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/docs
 
 post-install-EXAMPLES-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/examples
 
 post-install-ROOT-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/ROOT
 
 .include <bsd.port.mk>
Index: head/www/tomcat9/files/patch-bin__daemon.sh
===================================================================
--- head/www/tomcat9/files/patch-bin__daemon.sh	(nonexistent)
+++ head/www/tomcat9/files/patch-bin__daemon.sh	(revision 491357)
@@ -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"

Property changes on: head/www/tomcat9/files/patch-bin__daemon.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property