From nobody@FreeBSD.org  Sun May 25 20:28:28 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 32CD2E50
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 May 2014 20:28:28 +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 064C32EC5
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 May 2014 20:28:28 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PKSRhO051090
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 May 2014 20:28:27 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4PKSRFR051087;
	Sun, 25 May 2014 20:28:27 GMT
	(envelope-from nobody)
Message-Id: <201405252028.s4PKSRFR051087@cgiserv.freebsd.org>
Date: Sun, 25 May 2014 20:28:27 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/limesurvey
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: jmohacsi@bsd.hu

>Number:         190217
>Category:       ports
>Synopsis:       [patch] Add staging support to www/limesurvey
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          feedback
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 25 20:30:00 UTC 2014
>Closed-Date:    
>Last-Modified:  Mon May 26 08:00:01 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/limesurvey.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index 1321086..87219f6 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -21,7 +21,6 @@ GD_DESC=		Install PHP gd extension
 LDAP_DESC=		Install PHP LDAP extension
 ZIP_DESC=		Install PHP zip extension
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey#Make_sure_you_can_use_LimeSurvey_on_your_website
@@ -59,7 +58,7 @@ SUB_LIST=	PHPSURVEYORURL="${PHPSURVEYORURL}" \
 PHPSURVEYORDIR=	${WWWDOCROOT}/${PHPSURVEYORURL}
 
 do-install:
-	${MKDIR} "${WWWDIR}"
+	${MKDIR} "${STAGEDIR}${WWWDIR}"
 .if ${PORT_OPTIONS:MPGSQL}
 	${SED} -E \
 	  -e 's/^(\$$databasetype[[:space:]]*=[[:space:]]*'"')mysql('"'.*)$$/\1postgres\2/'	\
@@ -69,21 +68,22 @@ do-install:
 .else
 	${MV} "${WRKSRC}"/config.php "${WRKSRC}"/config.php-dist
 .endif
-	${TEST} -e "${WWWDIR}"/config.php || ${CP} -p "${WRKSRC}"/config.php-dist "${WRKSRC}"/config.php
-	@cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${WWWDIR}"
-	${MKDIR} "${WWWDIR}"/tmp
-	${CHOWN} -R "${WWWOWN}:${WWWGRP}" "${WWWDIR}"
-	${CHMOD} 755 "${WWWDIR}"/tmp
-	${CHMOD} 755 "${WWWDIR}"/templates
-	${CHMOD} 755 "${WWWDIR}"/upload
-	${CHOWN} -R 0 "${WWWDIR}"/admin
-	${CHMOD} -R go-w "${WWWDIR}"/admin
+	@cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${STAGEDIR}${WWWDIR}"
+	${MKDIR} "${STAGEDIR}${WWWDIR}"/tmp
+	${CHOWN} -R "${WWWOWN}:${WWWGRP}" "${STAGEDIR}${WWWDIR}"
+	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/tmp
+	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/templates
+	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/upload
+	${CHOWN} -R 0 "${STAGEDIR}${WWWDIR}"/admin
+	${CHMOD} -R go-w "${STAGEDIR}${WWWDIR}"/admin
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
-	@${FIND} -s -d ${WWWDIR} -type f -print | \
-		${SED} -e "s#${PREFIX}/##g" >> ${TMPPLIST}
-	@${FIND} -s -d ${WWWDIR} -type d  -print | \
-		${SED} -E -e "s#${PREFIX}/#@dirrm #g" >> ${TMPPLIST}
+	@${ECHO_CMD} "@owner www" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group www" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type f -print | \
+		${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d  -print | \
+		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dirrm #g" >> ${TMPPLIST}
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun May 25 20:30:04 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=190217 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun May 25 20:30:05 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: jmohacsi@bsd.hu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/190217: [patch] Add staging support to www/limesurvey
Date: Sun, 25 May 2014 20:30:05 UT

 Maintainer of www/limesurvey,
 
 Please note that PR ports/190217 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/190217
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Janos Mohacsi <jmohacsi@bsd.hu>
To: bug-followup@FreeBSD.org, joe@thrallingpenguin.com
Cc:  
Subject: Re: ports/190217: [patch] Add staging support to www/limesurvey
Date: Mon, 26 May 2014 09:51:57 +0200

 Approved.  Thanks for the patch.
         Janos Mohacsi
>Unformatted:
