From 9529a8acdc1ec2ca2d6f8c62df08b568226ee486 Mon Sep 17 00:00:00 2001
From: Herve Quiroz <hq@FreeBSD.org>
Date: Mon, 21 Mar 2005 00:08:05 +0000
Subject: - 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)
---
 www/jakarta-tomcat41/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'www/jakarta-tomcat41')

diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index 3f7e5f3b6da6..c5110f4b381d 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
 
-- 
cgit v1.2.3