From nobody@FreeBSD.org  Mon May 19 16:44:07 2014
Return-Path: <nobody@FreeBSD.org>
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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/phpsysinfo
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: walt@relnor.com

>Number:         189959
>Category:       ports
>Synopsis:       [patch] Add staging support to www/phpsysinfo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          feedback
>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:  Mon May 19 17:00:00 UTC 2014
>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 <bsd.port.pre.mk>
 
-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:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon May 19 16:50:03 UTC 2014 
Responsible-Changed-Why:  
swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189959 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon May 19 16:50:05 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189959 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: walt@relnor.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/189959: [patch] Add staging support to www/phpsysinfo
Date: Mon, 19 May 2014 16:50:04 UT

 Maintainer of www/phpsysinfo,
 
 Please note that PR ports/189959 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189959
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
>Unformatted:
