From nobody@FreeBSD.org  Tue May 20 18:12:24 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 08CC1B70
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 18:12:24 +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 CFE41211E
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 18:12:23 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KICNev029619
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 18:12:23 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KICNLw029614;
	Tue, 20 May 2014 18:12:23 GMT
	(envelope-from nobody)
Message-Id: <201405201812.s4KICNLw029614@cgiserv.freebsd.org>
Date: Tue, 20 May 2014 18:12:23 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/cmsmadesimple
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         190026
>Category:       ports
>Synopsis:       [patch] Add staging support to www/cmsmadesimple
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 20 18:20:00 UTC 2014
>Closed-Date:    Thu May 22 09:39:32 UTC 2014
>Last-Modified:  Thu May 22 09:40:00 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/cmsmadesimple.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/cmsmadesimple/Makefile b/www/cmsmadesimple/Makefile
index 14e61c2..7c2a519 100644
--- a/www/cmsmadesimple/Makefile
+++ b/www/cmsmadesimple/Makefile
@@ -25,23 +25,22 @@ CMS_FILES=	favicon_cms.ico fileloc.php include.php \
 WRITABLE_DIRS=	tmp tmp/templates_c tmp/cache \
 		uploads uploads/images modules
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 post-extract:
 	@cd ${WRKSRC} && ${RM} -f config.php
 
 do-install:
 .for i in ${CMS_DIRS}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}
 .endfor
 .for i in ${CMS_FILES}
-	@cd ${WRKSRC} && ${CP} ${i} ${WWWDIR}/${i}
+	@cd ${WRKSRC} && ${CP} ${i} ${STAGEDIR}${WWWDIR}/${i}
 .endfor
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${CHMOD} -R 755 ${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
 
-	@if [ ! -f ${WWWDIR}/config.php ]; then \
-	${TOUCH} ${WWWDIR}/config.php ; fi
+	@if [ ! -f ${STAGEDIR}${WWWDIR}/config.php ]; then \
+	${TOUCH} ${STAGEDIR}${WWWDIR}/config.php ; fi
 
 post-install:
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
@@ -50,12 +49,12 @@ post-install:
 		>> ${TMPPLIST}
 
 .for i in ${WRITABLE_DIRS}
-	@${CHMOD} 775 ${WWWDIR}/${i}
+	@${CHMOD} 775 ${STAGEDIR}${WWWDIR}/${i}
 	@${ECHO_CMD} '@exec ${CHMOD} 775 ${WWWDIR}/${i}' \
 		>> ${TMPPLIST}
 .endfor
 
-	@${CHMOD} 666 ${WWWDIR}/config.php
+	@${CHMOD} 666 ${STAGEDIR}${WWWDIR}/config.php
 	@${ECHO_CMD} '@exec ${CHMOD} 666 ${WWWDIR}/config.php' \
 		>> ${TMPPLIST}
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wen 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue May 20 18:20:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=190026 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu May 22 09:39:31 UTC 2014 
State-Changed-Why:  
y 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/190026: commit references a PR
Date: Thu, 22 May 2014 09:39:50 +0000 (UTC)

 Author: miwi
 Date: Thu May 22 09:39:46 2014
 New Revision: 354812
 URL: http://svnweb.freebsd.org/changeset/ports/354812
 QAT: https://qat.redports.org/buildarchive/r354812/
 
 Log:
   - Stage support
   
   PR:		190026
   Submitted by:	Joseph Benden <joe@thrallingpenguin.com>
 
 Modified:
   head/www/cmsmadesimple/Makefile
 
 Modified: head/www/cmsmadesimple/Makefile
 ==============================================================================
 --- head/www/cmsmadesimple/Makefile	Thu May 22 09:38:56 2014	(r354811)
 +++ head/www/cmsmadesimple/Makefile	Thu May 22 09:39:46 2014	(r354812)
 @@ -25,23 +25,22 @@ CMS_FILES=	favicon_cms.ico fileloc.php i
  WRITABLE_DIRS=	tmp tmp/templates_c tmp/cache \
  		uploads uploads/images modules
  
 -NO_STAGE=	yes
  .include <bsd.port.pre.mk>
  post-extract:
  	@cd ${WRKSRC} && ${RM} -f config.php
  
  do-install:
  .for i in ${CMS_DIRS}
 -	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
 +	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}
  .endfor
  .for i in ${CMS_FILES}
 -	@cd ${WRKSRC} && ${CP} ${i} ${WWWDIR}/${i}
 +	@cd ${WRKSRC} && ${CP} ${i} ${STAGEDIR}${WWWDIR}/${i}
  .endfor
 -	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 -	@${CHMOD} -R 755 ${WWWDIR}
 +	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 +	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
  
 -	@if [ ! -f ${WWWDIR}/config.php ]; then \
 -	${TOUCH} ${WWWDIR}/config.php ; fi
 +	@if [ ! -f ${STAGEDIR}${WWWDIR}/config.php ]; then \
 +	${TOUCH} ${STAGEDIR}${WWWDIR}/config.php ; fi
  
  post-install:
  	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
 @@ -50,12 +49,12 @@ post-install:
  		>> ${TMPPLIST}
  
  .for i in ${WRITABLE_DIRS}
 -	@${CHMOD} 775 ${WWWDIR}/${i}
 +	@${CHMOD} 775 ${STAGEDIR}${WWWDIR}/${i}
  	@${ECHO_CMD} '@exec ${CHMOD} 775 ${WWWDIR}/${i}' \
  		>> ${TMPPLIST}
  .endfor
  
 -	@${CHMOD} 666 ${WWWDIR}/config.php
 +	@${CHMOD} 666 ${STAGEDIR}${WWWDIR}/config.php
  	@${ECHO_CMD} '@exec ${CHMOD} 666 ${WWWDIR}/config.php' \
  		>> ${TMPPLIST}
  
 _______________________________________________
 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:
