From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 19 16:50: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 9A059C05 for ; Mon, 19 May 2014 16:50: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 7679B2DFA for ; Mon, 19 May 2014 16:50: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 s4JGo0KH006068 for ; Mon, 19 May 2014 16:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4JGo08L006067; Mon, 19 May 2014 16:50:00 GMT (envelope-from gnats) Resent-Date: Mon, 19 May 2014 16:50:00 GMT Resent-Message-Id: <201405191650.s4JGo08L006067@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 [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 276B973E for ; Mon, 19 May 2014 16:44:07 +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 150722DA9 for ; Mon, 19 May 2014 16:44:07 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JGi6EV032730 for ; Mon, 19 May 2014 16:44:06 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4JGi6u7032729; Mon, 19 May 2014 16:44:06 GMT (envelope-from nobody) Message-Id: <201405191644.s4JGi6u7032729@cgiserv.freebsd.org> Date: Mon, 19 May 2014 16:44:06 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189959: [patch] Add staging support to www/phpsysinfo 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: Mon, 19 May 2014 16:50:00 -0000 >Number: 189959 >Category: ports >Synopsis: [patch] Add staging support to www/phpsysinfo >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: Mon May 19 16:50: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/phpsysinfo. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile index f176d21..48dc984 100644 --- a/www/phpsysinfo/Makefile +++ b/www/phpsysinfo/Makefile @@ -22,21 +22,14 @@ WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message -NO_STAGE= yes .include -post-install: - @if [ ! -f ${WWWDIR}/config.php ]; then \ - ${CP} -p ${WWWDIR}/config.php ${WWWDIR}/config.php.bak ; \ - fi - do-install: - ${MKDIR} ${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} cd ${WRKSRC}; ${FIND} . \ - | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - ${CHMOD} -R ${BINMODE} ${WWWDIR} - ${FIND} ${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} - ${CP} ${WWWDIR}/config.php.new ${WWWDIR}/config.php + | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + ${CHMOD} -R ${BINMODE} ${STAGEDIR}${WWWDIR} + ${FIND} ${STAGEDIR}${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} .if !defined(BATCH) @ ${CAT} ${PKGMESSAGE} diff --git a/www/phpsysinfo/pkg-plist b/www/phpsysinfo/pkg-plist index 1381577..d05ef9c 100644 --- a/www/phpsysinfo/pkg-plist +++ b/www/phpsysinfo/pkg-plist @@ -2,8 +2,9 @@ %%WWWDIR%%/ChangeLog %%WWWDIR%%/README %%WWWDIR%%/README_PLUGIN -%%WWWDIR%%/config.php +@unexec if cmp -s %D/%%WWWDIR%%/config.php.new %D/%%WWWDIR%%/config.php; then rm -f %D/%%WWWDIR%%/config.php; fi %%WWWDIR%%/config.php.new +@exec if [ ! -f %D/%%WWWDIR%%/config.php ] ; then cp -p %D/%F %B/config.php; fi %%WWWDIR%%/data/ModelTranslation.txt %%WWWDIR%%/data/distros.ini %%WWWDIR%%/gfx/ajaxLoader.gif >Release-Note: >Audit-Trail: >Unformatted: