From nobody@FreeBSD.org  Thu May 29 22:27:58 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 DC6C38D2
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 29 May 2014 22:27:58 +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 CA0B92ED9
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 29 May 2014 22:27:58 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TMRwmG074954
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 29 May 2014 22:27:58 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4TMRwlc074952;
	Thu, 29 May 2014 22:27:58 GMT
	(envelope-from nobody)
Message-Id: <201405292227.s4TMRwlc074952@cgiserv.freebsd.org>
Date: Thu, 29 May 2014 22:27:58 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/rnews
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         190394
>Category:       ports
>Synopsis:       [patch] Add staging support to www/rnews
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 29 22:30:00 UTC 2014
>Closed-Date:    
>Last-Modified:  Thu May 29 22:30:06 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/rnews.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/rnews/Makefile b/www/rnews/Makefile
index f9d5a86..fcce1e7 100644
--- a/www/rnews/Makefile
+++ b/www/rnews/Makefile
@@ -18,7 +18,6 @@ OPTIONS_DEFINE=	GD MYSQLSERVER DOCS
 OPTIONS_DEFAULT=	GD
 MYSQLSERVER_DESC=	Use MySQL-Server on localhost
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 USE_PHP=	mysql mbstring pcre xml iconv
@@ -41,42 +40,35 @@ PORTDOCS=	CHANGELOG INSTALL LICENSE README UPGRADE
 CONFIGS=	inc/config.php inc/config_user.php
 
 do-install:
-	@${FIND} -s ${WRKSRC} -type  d | ${SED} -e 's,^${WRKSRC},${WWWDIR},' \
+	@${FIND} -s ${WRKSRC} -type  d | ${SED} -e 's,^${WRKSRC},${STAGEDIR}${WWWDIR},' \
 		| ${XARGS} ${MKDIR}
-	${INSTALL_DATA} -v ${WRKSRC}/*.php ${WWWDIR}
-	${INSTALL_DATA} -v ${WRKSRC}/*.css ${WWWDIR}
-	${INSTALL_DATA} -v ${WRKSRC}/*.js ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/.htaccess ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/tmp/.htaccess ${WWWDIR}/tmp
-	${INSTALL_DATA} ${WRKSRC}/favicon.ico ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/help.html ${WWWDIR}
-	${INSTALL_DATA} -v ${WRKSRC}/img/*.gif ${WWWDIR}/img
-	${INSTALL_DATA} -v ${WRKSRC}/img/*.png ${WWWDIR}/img
-	${INSTALL_DATA} -v ${WRKSRC}/img/*.jpg ${WWWDIR}/img
-	( ${FIND} ${WRKSRC}/inc -type f -not -name config_user.php -a -not -name config.php; ${ECHO} ${WWWDIR}/inc ) \
+	${INSTALL_DATA} -v ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} -v ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} -v ${WRKSRC}/*.js ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/.htaccess ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/tmp/.htaccess ${STAGEDIR}${WWWDIR}/tmp
+	${INSTALL_DATA} ${WRKSRC}/favicon.ico ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/help.html ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} -v ${WRKSRC}/img/*.gif ${STAGEDIR}${WWWDIR}/img
+	${INSTALL_DATA} -v ${WRKSRC}/img/*.png ${STAGEDIR}${WWWDIR}/img
+	${INSTALL_DATA} -v ${WRKSRC}/img/*.jpg ${STAGEDIR}${WWWDIR}/img
+	( ${FIND} ${WRKSRC}/inc -type f -not -name config_user.php -a -not -name config.php; ${ECHO} ${STAGEDIR}${WWWDIR}/inc ) \
 		| ${XARGS} ${INSTALL_DATA} -v
-	${INSTALL_DATA} -v ${WRKSRC}/magpierss/*.inc ${WWWDIR}/magpierss
-	${INSTALL_DATA} ${WRKSRC}/magpierss/extlib/Snoopy.class.inc ${WWWDIR}/magpierss/extlib
-	${INSTALL_DATA} -v ${WRKSRC}/opml/*.opml ${WWWDIR}/opml
-	@${CHOWN} ${WWWOWN} ${WWWDIR}/magpierss/cache
-	@${CHOWN} ${WWWOWN} ${WWWDIR}/img/feeds
-	@${CHOWN} ${WWWOWN} ${WWWDIR}/tmp
+	${INSTALL_DATA} -v ${WRKSRC}/magpierss/*.inc ${STAGEDIR}${WWWDIR}/magpierss
+	${INSTALL_DATA} ${WRKSRC}/magpierss/extlib/Snoopy.class.inc ${STAGEDIR}${WWWDIR}/magpierss/extlib
+	${INSTALL_DATA} -v ${WRKSRC}/opml/*.opml ${STAGEDIR}${WWWDIR}/opml
+	@${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/magpierss/cache
+	@${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/img/feeds
+	@${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/tmp
 .for FILE in ${CONFIGS}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${WWWDIR}/${FILE}.sample
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${WWWDIR}/${FILE}.sample
 .endfor
 
 post-install:
-.for FILE in ${CONFIGS}
-. if !exists(${WWWDIR}/${FILE})
-	${INSTALL_DATA} ${WWWDIR}/${FILE}.sample ${WWWDIR}/${FILE}
-	@${CHOWN} ${WWWOWN} ${WWWDIR}/${FILE}
-	@${CHMOD} u+w ${WWWDIR}/${FILE}
-. endif
-.endfor
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for FILE in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 . endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/rnews/pkg-plist b/www/rnews/pkg-plist
index 2043184..80c7ca8 100644
--- a/www/rnews/pkg-plist
+++ b/www/rnews/pkg-plist
@@ -115,6 +115,7 @@
 @unexec if cmp -s %D/%%WWWDIR%%/inc/config_user.php.sample %D/%%WWWDIR%%/inc/config_user.php;  then /bin/rm -f %D/%%WWWDIR%%/inc/config_user.php; fi
 %%WWWDIR%%/inc/config_user.php.sample
 @unexec if [ $(ls %D/%%WWWDIR%%/img/feeds/|wc -w) -eq 0 ]; then /bin/rm -rf %D/%%WWWDIR%%/img/feeds;fi
+@dirrmtry %%WWWDIR%%/img/feeds
 @dirrm %%WWWDIR%%/img
 @dirrm %%WWWDIR%%/inc
 @dirrm %%WWWDIR%%/magpierss/cache


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu May 29 22:30:06 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=190394 
>Unformatted:
