aboutsummaryrefslogtreecommitdiff
path: root/www/jakarta-tomcat41
diff options
context:
space:
mode:
authorHerve Quiroz <hq@FreeBSD.org>2005-03-21 00:08:05 +0000
committerHerve Quiroz <hq@FreeBSD.org>2005-03-21 00:08:05 +0000
commit9529a8acdc1ec2ca2d6f8c62df08b568226ee486 (patch)
treebac08680d06b0ac07518e6c5d607cd41b8c039ec /www/jakarta-tomcat41
parent7cd341218d611966bc3af58ebea46a62b5179f15 (diff)
downloadports-9529a8acdc1ec2ca2d6f8c62df08b568226ee486.tar.gz
ports-9529a8acdc1ec2ca2d6f8c62df08b568226ee486.zip
- 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)
Notes
Notes: svn path=/head/; revision=131802
Diffstat (limited to 'www/jakarta-tomcat41')
-rw-r--r--www/jakarta-tomcat41/Makefile8
1 files changed, 4 insertions, 4 deletions
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