Date: Tue, 20 May 2014 15:30:32 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190014: [patch] Add staging support to www/bblog Message-ID: <201405201530.s4KFUW7j050287@cgiserv.freebsd.org> Resent-Message-ID: <201405201540.s4KFe04f034081@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 190014
>Category: ports
>Synopsis: [patch] Add staging support to www/bblog
>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: Tue May 20 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/bblog.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/bblog/Makefile b/www/bblog/Makefile
index 93caa7c..aabd86d 100644
--- a/www/bblog/Makefile
+++ b/www/bblog/Makefile
@@ -27,7 +27,6 @@ OPTIONS_DEFINE= GD IMAGICK
OPTIONS_DEFAULT=GD
IMAGICK_DESC= ${IMAGEMAGICK_DESC}
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MGD}
@@ -44,18 +43,19 @@ pre-patch:
.endif
do-install:
- @${MKDIR} ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
- @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${BBLOGDIR}
- @${CHGRP} -R ${WWWGRP} ${PREFIX}/${BBLOGDIR}
- @${CHMOD} 755 ${PREFIX}/${BBLOGDIR}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
+ @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
+ @${CHGRP} -R ${WWWGRP} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
+ @${CHMOD} 755 ${STAGEDIR}${PREFIX}/${BBLOGDIR}
.for f in archives.php documentation.txt htaccess-cleanurls index.php item rss.php search.php section
- ${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/${BBLOGDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/${BBLOGDIR}
.endfor
- @${CP} -Rv ${WRKSRC}/* ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
- @${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/compiled_templates/
- @${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/
- @${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/favorites.xml
- @${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php
+ @${CP} -Rv ${WRKSRC}/* ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
+ @${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/compiled_templates/
+ @${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/
+ @${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/favorites.xml
+ @${CHMOD} 775 ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php
+ @${MV} ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php ${STAGEDIR}${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php.sample
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/www/bblog/pkg-plist b/www/bblog/pkg-plist
index 99ba39a..572c2c3 100644
--- a/www/bblog/pkg-plist
+++ b/www/bblog/pkg-plist
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
%%WWWDOCROOT%%/%%BBLOGURL%%/archives.php
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/bBlog_plugins/admin.comments.php
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/bBlog_plugins/admin.links.php
@@ -52,7 +54,9 @@
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/bblog.css
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/cache/favorites.xml
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/compiled_templates/this_file_is_here_so_the_directory_is_extracted
-%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php
+@unexec if cmp -s %D/%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php %D/%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php.sample; then rm -f %D/%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php; fi
+%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/config.php.sample
+@exec cp -n %D/%F %B/config.php
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/cp.css
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/docs/LICENCE.txt
%%WWWDOCROOT%%/%%BBLOGURL%%/bblog/docs/README.txt
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405201530.s4KFUW7j050287>