From nobody@FreeBSD.org  Tue May 20 15:30:32 2014
Return-Path: <nobody@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 663B023E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 15:30:32 +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 549692144
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 15:30:32 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KFUWtQ050290
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 15:30:32 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KFUW7j050287;
	Tue, 20 May 2014 15:30:32 GMT
	(envelope-from nobody)
Message-Id: <201405201530.s4KFUW7j050287@cgiserv.freebsd.org>
Date: Tue, 20 May 2014 15:30:32 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/bblog
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         190014
>Category:       ports
>Synopsis:       [patch] Add staging support to www/bblog
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 20 15:40:00 UTC 2014
>Closed-Date:    Sun May 25 05:11:33 UTC 2014
>Last-Modified:  Sun May 25 05:20:05 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/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:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue May 20 15:40:07 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=190014 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sun May 25 05:11:32 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/190014: commit references a PR
Date: Sun, 25 May 2014 05:10:25 +0000 (UTC)

 Author: miwi
 Date: Sun May 25 05:10:20 2014
 New Revision: 355111
 URL: http://svnweb.freebsd.org/changeset/ports/355111
 QAT: https://qat.redports.org/buildarchive/r355111/
 
 Log:
   - Stage support
   
   PR:		190014
   Submitted by:	Joseph Benden <joe@thrallingpenguin.com
 
 Modified:
   head/www/bblog/Makefile
   head/www/bblog/pkg-plist
 
 Modified: head/www/bblog/Makefile
 ==============================================================================
 --- head/www/bblog/Makefile	Sun May 25 05:09:50 2014	(r355110)
 +++ head/www/bblog/Makefile	Sun May 25 05:10:20 2014	(r355111)
 @@ -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}
 
 Modified: head/www/bblog/pkg-plist
 ==============================================================================
 --- head/www/bblog/pkg-plist	Sun May 25 05:09:50 2014	(r355110)
 +++ head/www/bblog/pkg-plist	Sun May 25 05:10:20 2014	(r355111)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
