From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 20 15:00:08 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6D5BA16A50F for ; Sun, 20 Mar 2005 15:00:08 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C567443D55 for ; Sun, 20 Mar 2005 15:00:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2KF074h009681 for ; Sun, 20 Mar 2005 15:00:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2KF07KS009680; Sun, 20 Mar 2005 15:00:07 GMT (envelope-from gnats) Resent-Date: Sun, 20 Mar 2005 15:00:07 GMT Resent-Message-Id: <200503201500.j2KF07KS009680@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kang Liu Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28BDF16A4CE for ; Sun, 20 Mar 2005 14:57:30 +0000 (GMT) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id D055843D2D for ; Sun, 20 Mar 2005 14:57:29 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j2KEvTQ3023436 for ; Sun, 20 Mar 2005 14:57:29 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id j2KEvT9p023435; Sun, 20 Mar 2005 14:57:29 GMT (envelope-from nobody) Message-Id: <200503201457.j2KEvT9p023435@www.freebsd.org> Date: Sun, 20 Mar 2005 14:57:29 GMT From: Kang Liu To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Subject: ports/79052: [maintainer] Fix patching problem in www/jakarta-tomcatX X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Mar 2005 15:00:08 -0000 >Number: 79052 >Category: ports >Synopsis: [maintainer] Fix patching problem in www/jakarta-tomcatX >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 20 15:00:07 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Kang Liu >Release: 5.3 >Organization: Beijing University of Technology >Environment: FreeBSD for.the.memory.of.smthbbs 5.3-STABLE >Description: The patches below will fix a patching problem in tomcat3,4,41,5. In addition, it will also add a undocumented patch-dependency on jakarta-tomcat4. >How-To-Repeat: >Fix: The patch for www/jakarta-tomcat41 is provided by des@freebsd.org , the others are similar to that patch. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/jakarta-tomcat5/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 19 Mar 2005 18:44:28 -0000 1.23 +++ Makefile 20 Mar 2005 13:34:51 -0000 @@ -13,6 +13,7 @@ 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 @@ .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 @@ 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 @@ .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 @@ -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 Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/jakarta-tomcat41/Makefile,v retrieving revision 1.60 diff -u -r1.60 Makefile --- Makefile 19 Mar 2005 18:44:28 -0000 1.60 +++ Makefile 20 Mar 2005 12:39:25 -0000 @@ -15,6 +15,7 @@ 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 @@ .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 @@ 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 @@ .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 @@ -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 Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/jakarta-tomcat3/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- Makefile 19 Mar 2005 18:44:28 -0000 1.48 +++ Makefile 20 Mar 2005 14:28:15 -0000 @@ -15,6 +15,8 @@ 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 @@ 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 @@ 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 @@ .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 @@ -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 Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/jakarta-tomcat4/Makefile,v retrieving revision 1.52 diff -u -r1.52 Makefile --- Makefile 19 Mar 2005 18:44:28 -0000 1.52 +++ Makefile 20 Mar 2005 14:49:03 -0000 @@ -26,7 +26,6 @@ .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 @@ 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 @@ .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 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: