- Fix a patching problem in Tomcat ports

- Add a patch-dependency on jakarta-tomcat4

PR:		79052
Submitted by:	maintainer
Obtained from:	des (for jakarta-tomcat41)

9 files changed, 36 insertions, 36 deletions

diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index 0c785338dc5..9db4a6179cf 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -15,6 +15,8 @@ MASTER_SITE_SUBDIR=	tomcat-3/v${PORTVERSION}/bin
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, stable 3.x branch
 
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
+
 .if !defined(NOPORTDOCS)
 MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
@@ -25,7 +27,6 @@ NO_BUILD=	YES
 LATEST_LINK=	${APP_SHORTNAME}
 
 MAJOR_VER=	${PORTVERSION:R:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
@@ -49,7 +50,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	lib/tomcat.jar
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
@@ -77,7 +78,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
 	-e "/%%APP_TITLE%%/s//${APP_TITLE}/g" \
@@ -100,7 +101,7 @@ post-patch:
 	-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index f7816d4e703..6a6ec0b2eb9 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -26,7 +26,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
@@ -53,7 +52,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${FILESDIR}/daemonctl.c \
 		${FILESDIR}/daemonctl.1 \
 		${FILESDIR}/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
@@ -85,7 +84,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -111,7 +110,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index 3f7e5f3b6da..c5110f4b381 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
 
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
@@ -25,7 +26,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
@@ -52,7 +52,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
@@ -84,7 +84,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -110,7 +110,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
index a3c1ad8262c..3a4be620f70 100644
--- a/www/jakarta-tomcat5/Makefile
+++ b/www/jakarta-tomcat5/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
@@ -23,7 +24,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Jakarta Tomcat
@@ -49,7 +49,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
@@ -82,7 +82,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -108,7 +108,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile
index a3c1ad8262c..3a4be620f70 100644
--- a/www/jakarta-tomcat55/Makefile
+++ b/www/jakarta-tomcat55/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
@@ -23,7 +24,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Jakarta Tomcat
@@ -49,7 +49,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
@@ -82,7 +82,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -108,7 +108,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index 3f7e5f3b6da..c5110f4b381 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	tomcat-4/v${PORTVERSION}/bin
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, stable 4.1.x branch
 
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
 NO_BUILD=	YES
@@ -25,7 +26,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
@@ -52,7 +52,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 CONF_EXT=	sample
 PLIST_SUB+=	CONF_EXT=${CONF_EXT}
@@ -84,7 +84,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -110,7 +110,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index a3c1ad8262c..3a4be620f70 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
@@ -23,7 +24,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Jakarta Tomcat
@@ -49,7 +49,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
@@ -82,7 +82,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -108,7 +108,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index a3c1ad8262c..3a4be620f70 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
@@ -23,7 +24,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Jakarta Tomcat
@@ -49,7 +49,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
@@ -82,7 +82,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -108,7 +108,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index a3c1ad8262c..3a4be620f70 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	tomcat-5/v${PORTVERSION}/bin
 
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	Open-source Java web server by Apache, 5.0.x branch
+PATCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/jakarta-tomcat4:pre-everything
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
@@ -23,7 +24,6 @@ MAN1=	${CONTROL_SCRIPT_NAME}.1
 .endif
 
 MAJOR_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION:R}
 LOG_DIR=	${APP_HOME}/logs
 APP_TITLE=	Jakarta Tomcat
@@ -49,7 +49,7 @@ PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 REPLACE_FILES=	${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.c \
 		${PORTSDIR}/www/jakarta-tomcat4/files/daemonctl.1 \
 		${PORTSDIR}/www/jakarta-tomcat4/files/startup.sh \
-		${WRKSRC}/conf/server.xml
+		conf/server.xml
 JAR_FILE=	bin/bootstrap.jar
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} WWWOWN=${USER} WWWGRP=${GROUP}
 LATEST_LINK=	${APP_SHORTNAME}
@@ -82,7 +82,7 @@ post-patch:
 
 .for f in ${REPLACE_FILES}
 	@${ECHO_MSG} -n ">> Customizing `basename $f`..."
-	@${SED} \
+	@(cd ${WRKSRC} && ${SED} \
 	-e "/%%AJP_1_3_PORT%%/s//${AJP_1_3_PORT}/g" \
 	-e "/%%APP_HOME%%/s//${APP_HOME:S/\//\\\//g}/g" \
 	-e "/%%APP_SHORTNAME%%/s//${APP_SHORTNAME}/g" \
@@ -108,7 +108,7 @@ post-patch:
 	-e "/%%STOP_TIMEOUT%%/s//${STOP_TIMEOUT}/g" \
 	-e "/%%USER%%/s//${USER}/g" \
 	-e "/%%WARP_PORT%%/s//${WARP_PORT}/g" \
-	$f > ${WRKDIR}/`basename $f`
+	$f > ${WRKDIR}/`basename $f`)
 	@${ECHO_MSG} " [ DONE ]"
 .endfor