diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2005-03-21 00:08:05 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2005-03-21 00:08:05 +0000 |
| commit | 9529a8acdc1ec2ca2d6f8c62df08b568226ee486 (patch) | |
| tree | bac08680d06b0ac07518e6c5d607cd41b8c039ec /www/tomcat7 | |
| parent | 7cd341218d611966bc3af58ebea46a62b5179f15 (diff) | |
| download | ports-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/tomcat7')
| -rw-r--r-- | www/tomcat7/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile index a3c1ad8262cf..3a4be620f700 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 |