Date: Thu, 22 May 2014 15:34:48 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190114: [patch] Add staging support to www/geeklog Message-ID: <201405221534.s4MFYmEn007925@cgiserv.freebsd.org> Resent-Message-ID: <201405221540.s4MFe12t040391@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190114
>Category: ports
>Synopsis: [patch] Add staging support to www/geeklog
>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: Thu May 22 15:40:01 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/geeklog.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index 7bceb50..a1563a6 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -16,24 +16,20 @@ USE_MYSQL= yes
NO_BUILD= yes
USE_PHP= yes
-NO_STAGE= yes
do-install:
- @${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 555 -d ${WWWDIR}
+ @${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 555 -d ${STAGEDIR}${WWWDIR}
@(cd ${WRKSRC} && \
- ${COPYTREE_SHARE} \* ${WWWDIR} "! -name db-config.php \
+ ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR} "! -name db-config.php \
-or -name siteconfig.php")
- @if [ ! -f ${WWWDIR}/db-config.php ]; then \
- ${INSTALL_DATA} ${WRKSRC}/db-config.php ${WWWDIR}/db-config.php; \
- fi
- @if [ ! -f ${WWWDIR}/public_html/siteconfig.php ]; then \
- {INSTALL_DATA} ${WRKSRC}/public_html/siteconfig.php \
- ${WWWDIR}/public_html/siteconfig.php; \
- fi
+ @${INSTALL_DATA} ${WRKSRC}/db-config.php ${STAGEDIR}${WWWDIR}/db-config.php.sample;
+ @${INSTALL_DATA} ${WRKSRC}/public_html/siteconfig.php \
+ ${STAGEDIR}${WWWDIR}/public_html/siteconfig.php.sample
+ @${RM} ${STAGEDIR}${WWWDIR}/public_html/siteconfig.php
post-install:
- @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+ @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
.for i in db-config.php error.log siteconfig.php geeklog.rss
- @${FIND} ${WWWDIR} -name ${i} | ${XARGS} ${CHMOD} 755
+ @${FIND} ${STAGEDIR}${WWWDIR} -name ${i} | ${XARGS} ${CHMOD} 755
.endfor
@${CAT} ${PKGMESSAGE}
diff --git a/www/geeklog/pkg-plist b/www/geeklog/pkg-plist
index 745b1f5..d3cbb34 100644
--- a/www/geeklog/pkg-plist
+++ b/www/geeklog/pkg-plist
@@ -1,5 +1,9 @@
-@unexec if [ "`md5 -q %D/%%WWWDIR%%/db-config.php`" = "e152b8b4ebd7e8b5bf05c9466f618bfa" ]; then rm -f %D/%%WWWDIR%%/db-config.php; fi
-@unexec if [ "`md5 -q %D/%%WWWDIR%%/public_html/siteconfig.php`" = "a713c0e73d143db728d350010f7cf289" ]; then rm -f %D/%%WWWDIR%%/public_html/siteconfig.php; fi
+@unexec if cmp -s %D/%%WWWDIR%%/db-config.php %D/%%WWWDIR%%/db-config.php.sample; then rm -f %D/%%WWWDIR%%/db-config.php; fi
+%%WWWDIR%%/db-config.php.sample
+@exec cp -n %D/%F %B/db-config.php
+@unexec if cmp -s %D/%%WWWDIR%%/public_html/siteconfig.php %D/%%WWWDIR%%/public_html/siteconfig.php.sample; then rm -f %D/%%WWWDIR%%/public_html/siteconfig.php; fi
+%%WWWDIR%%/public_html/siteconfig.php.sample
+@exec cp -n %D/%F %B/siteconfig.php
%%WWWDIR%%/INSTALL
%%WWWDIR%%/backups/README
%%WWWDIR%%/data/README
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405221534.s4MFYmEn007925>