From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 28 15:40: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 E312580A for ; Wed, 28 May 2014 15:40: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 C024B2400 for ; Wed, 28 May 2014 15:40: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 s4SFe0w2068499 for ; Wed, 28 May 2014 15:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4SFe0af068461; Wed, 28 May 2014 15:40:00 GMT (envelope-from gnats) Resent-Date: Wed, 28 May 2014 15:40:00 GMT Resent-Message-Id: <201405281540.s4SFe0af068461@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 3716D775 for ; Wed, 28 May 2014 15:35:22 +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 1A2CA23B5 for ; Wed, 28 May 2014 15:35:22 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SFZLqM056399 for ; Wed, 28 May 2014 15:35:21 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4SFZLZc056398; Wed, 28 May 2014 15:35:21 GMT (envelope-from nobody) Message-Id: <201405281535.s4SFZLZc056398@cgiserv.freebsd.org> Date: Wed, 28 May 2014 15:35:21 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190347: [patch] Add staging support to www/pivotx 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: Wed, 28 May 2014 15:40:01 -0000 >Number: 190347 >Category: ports >Synopsis: [patch] Add staging support to www/pivotx >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: Wed May 28 15:40: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/pivotx. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/pivotx/Makefile b/www/pivotx/Makefile index 633ca64..256ede7 100644 --- a/www/pivotx/Makefile +++ b/www/pivotx/Makefile @@ -18,7 +18,6 @@ LICENSE= GPLv2 PORTDOCS= LICENSE.txt README.txt PORTEXAMPLES= example.htaccess example.web.config -NO_STAGE= yes # Requirements: # http://book.pivotx.net/index.php?page=app-e#anchor-determining-if-your-server-meets-pivotxs-requirements @@ -79,41 +78,24 @@ post-patch: @cd '${WRKSRC}' && ${FIND} . -type f -name '*.orig' -delete do-install: - @if ${TEST} -e '${TEMP_DIFF}'; then ${RM} -f '${TEMP_DIFF}'; fi - @${TOUCH} '${TEMP_DIFF}' -.for DIR in ${USEREDITABLEDIRS} - @if ${TEST} -d '${WWWDIR}/${DIR}'; then \ - cd '${WRKSRC}/${DIR}' && { ${DIFF} -auwr . '${WWWDIR}/${DIR}' | ${EGREP} -v -e '^Only[[:space:]]+in[[:space:]]' >>'${TEMP_DIFF}' || ${TRUE}; } \ - fi -.endfor - @if ${TEST} -s '${TEMP_DIFF}'; then \ - ${ECHO} '*******************************************************'; \ - ${ECHO} 'CAUTION CAUTION CAUTION CAUTION CAUTION CAUTION CAUTION'; \ - ${ECHO} '*******************************************************'; \ - ${ECHO} 'Output of diff: ${TEMP_DIFF}'; \ - ${ECHO}; \ - ${ECHO} 'Installer will *OVERWRITE* files on ${WWWDIR}'; \ - ${ECHO} 'Press ctrl-C *now* to backup them manually.'; \ - sleep 7; \ - fi .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} '${DOCSDIR}' + @${MKDIR} '${STAGEDIR}${DOCSDIR}' .for FILES in ${PORTDOCS} - @${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${DOCSDIR}' + @${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${STAGEDIR}${DOCSDIR}' .endfor .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} '${EXAMPLESDIR}' + @${MKDIR} '${STAGEDIR}${EXAMPLESDIR}' .for FILES in ${PORTEXAMPLES} - @${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${EXAMPLESDIR}' + @${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${STAGEDIR}${EXAMPLESDIR}' .endfor .endif - @${MKDIR} '${WWWDIR}' - @cd '${WRKSRC}' && ${COPYTREE_SHARE} . '${WWWDIR}' + @${MKDIR} '${STAGEDIR}${WWWDIR}' + @cd '${WRKSRC}' && ${COPYTREE_SHARE} . '${STAGEDIR}${WWWDIR}' .for DIR in ${WRITABLEDIRS} - @${CHOWN} -R '${WWWOWN}:${WWWGRP}' '${WWWDIR}/${DIR}' - @${FIND} '${WWWDIR}/${DIR}' -type d -print0 | ${XARGS} -0 ${CHMOD} u=rwx,go=rx - @${FIND} '${WWWDIR}/${DIR}' -type f -print0 | ${XARGS} -0 ${CHMOD} u=rw,go=r + @${CHOWN} -R '${WWWOWN}:${WWWGRP}' '${STAGEDIR}${WWWDIR}/${DIR}' + @${FIND} '${STAGEDIR}${WWWDIR}/${DIR}' -type d -print0 | ${XARGS} -0 ${CHMOD} u=rwx,go=rx + @${FIND} '${STAGEDIR}${WWWDIR}/${DIR}' -type f -print0 | ${XARGS} -0 ${CHMOD} u=rw,go=r .endfor post-install: diff --git a/www/pivotx/pkg-plist b/www/pivotx/pkg-plist index c09f1bd..d1ecb6b 100644 --- a/www/pivotx/pkg-plist +++ b/www/pivotx/pkg-plist @@ -1,3 +1,5 @@ +@owner www +@group www %%WWWDIR%%/images/index.html %%WWWDIR%%/index.php %%WWWDIR%%/pivotx/ajaxhelper.php >Release-Note: >Audit-Trail: >Unformatted: