From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 27 17:30:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FE1DDB7 for ; Tue, 27 May 2014 17:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CF3121B6 for ; Tue, 27 May 2014 17:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RHU0NN053586 for ; Tue, 27 May 2014 17:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4RHU0Tk053585; Tue, 27 May 2014 17:30:00 GMT (envelope-from gnats) Resent-Date: Tue, 27 May 2014 17:30:00 GMT Resent-Message-Id: <201405271730.s4RHU0Tk053585@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, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 966C0D16 for ; Tue, 27 May 2014 17:24:29 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8420A2174 for ; Tue, 27 May 2014 17:24:29 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RHOTFU063481 for ; Tue, 27 May 2014 17:24:29 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4RHOTZa063478; Tue, 27 May 2014 17:24:29 GMT (envelope-from nobody) Message-Id: <201405271724.s4RHOTZa063478@cgiserv.freebsd.org> Date: Tue, 27 May 2014 17:24:29 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190320: [patch] Add staging support to www/phpwebapp X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2014 17:30:00 -0000 >Number: 190320 >Category: ports >Synopsis: [patch] Add staging support to www/phpwebapp >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue May 27 17:30:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Joseph Benden >Release: FreeBSD 11 >Organization: >Environment: FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Adds staging support to www/phpwebapp. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/phpwebapp/Makefile b/www/phpwebapp/Makefile index 7a9f15b..2075153 100644 --- a/www/phpwebapp/Makefile +++ b/www/phpwebapp/Makefile @@ -14,14 +14,13 @@ WANT_PHP_WEB= yes NO_BUILD= yes PHPWEBAPP?= ${PREFIX}/www/data/web_app -NO_STAGE= yes do-install: - ${MKDIR} -p ${PREFIX}/www/data - ${CP} -R ${WRKSRC}/web_app/ ${PHPWEBAPP} - @${FIND} ${PHPWEBAPP} ! -type d | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${PHPWEBAPP} -type d | ${SORT} -r | \ - ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + ${MKDIR} -p ${STAGEDIR}${PREFIX}/www/data + ${CP} -R ${WRKSRC}/web_app/ ${STAGEDIR}${PHPWEBAPP} + @${FIND} ${STAGEDIR}${PHPWEBAPP} ! -type d | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${PHPWEBAPP} -type d | ${SORT} -r | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/www/data 2>/dev/null || true" >> ${TMPPLIST} .include >Release-Note: >Audit-Trail: >Unformatted: