Date: Mon, 19 May 2014 16:44:06 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189959: [patch] Add staging support to www/phpsysinfo Message-ID: <201405191644.s4JGi6u7032729@cgiserv.freebsd.org> Resent-Message-ID: <201405191650.s4JGo08L006067@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405191644.s4JGi6u7032729>