diff options
author | hq <hq@FreeBSD.org> | 2005-03-21 08:08:05 +0800 |
---|---|---|
committer | hq <hq@FreeBSD.org> | 2005-03-21 08:08:05 +0800 |
commit | 22b916971db08ec8bbfaf28aaa068dcd78234a62 (patch) | |
tree | 2ec5ad92f11d30a6d2b2cb24c308d079c90bbb78 /www/jakarta-tomcat3 | |
parent | a5b76d8073559a26479098c53be639d16682a046 (diff) | |
download | freebsd-ports-gnome-22b916971db08ec8bbfaf28aaa068dcd78234a62.tar.gz freebsd-ports-gnome-22b916971db08ec8bbfaf28aaa068dcd78234a62.tar.zst freebsd-ports-gnome-22b916971db08ec8bbfaf28aaa068dcd78234a62.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)
Diffstat (limited to 'www/jakarta-tomcat3')
-rw-r--r-- | www/jakarta-tomcat3/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile index 0c785338dc5a..9db4a6179cfc 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 |