From nobody@FreeBSD.org  Tue May 20 23:49:02 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 B916291F
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 23:49:02 +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 A75962058
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 23:49:02 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KNn2N2012179
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 20 May 2014 23:49:02 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KNn2Ol012178;
	Tue, 20 May 2014 23:49:02 GMT
	(envelope-from nobody)
Message-Id: <201405202349.s4KNn2Ol012178@cgiserv.freebsd.org>
Date: Tue, 20 May 2014 23:49:02 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/e107
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         190042
>Category:       ports
>Synopsis:       [patch] Add staging support to www/e107
>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 23:50:00 UTC 2014
>Closed-Date:    Thu May 22 14:23:54 UTC 2014
>Last-Modified:  Thu May 22 14:30: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/e107.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/e107/Makefile b/www/e107/Makefile
index 155a609..8efd438 100644
--- a/www/e107/Makefile
+++ b/www/e107/Makefile
@@ -13,7 +13,6 @@ COMMENT=	A content management system written in PHP
 USE_PHP=	mysql xml
 WRKSRC=		${WRKDIR}/e107
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 NO_BUILD=	yes
@@ -35,9 +34,9 @@ pre-install:
 	@${FIND} -s -d ${WRKSRC} -type d | ${SED} "s#${WRKSRC}#@dirrm ${E107DIR}#g" >> ${PLIST}
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${CHMOD} -R 755 ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
 
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
 		>> ${TMPPLIST}


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

http://www.freebsd.org/cgi/query-pr.cgi?pr=190042 
State-Changed-From-To: open->closed 
State-Changed-By: wen 
State-Changed-When: Thu May 22 14:23:53 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

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

 Author: wen
 Date: Thu May 22 14:23:43 2014
 New Revision: 354852
 URL: http://svnweb.freebsd.org/changeset/ports/354852
 QAT: https://qat.redports.org/buildarchive/r354852/
 
 Log:
   - Stage support [1]
   - Pet portlint
   
   PR:		190042 [1]
   Submitted by:	Joseph Benden <joe@thrallingpenguin.com> [1]
 
 Modified:
   head/www/e107/Makefile
 
 Modified: head/www/e107/Makefile
 ==============================================================================
 --- head/www/e107/Makefile	Thu May 22 14:21:30 2014	(r354851)
 +++ head/www/e107/Makefile	Thu May 22 14:23:43 2014	(r354852)
 @@ -8,14 +8,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
  DISTNAME=	${PORTNAME}_${PORTVERSION}_full
  
  MAINTAINER=	wen@FreeBSD.org
 -COMMENT=	A content management system written in PHP
 +COMMENT=	Content management system written in PHP
  
  USE_PHP=	mysql xml
  WRKSRC=		${WRKDIR}/e107
  
 -NO_STAGE=	yes
 -.include <bsd.port.pre.mk>
 -
  NO_BUILD=	yes
  PLIST=		${WRKDIR}/plist
  SUB_FILES=	pkg-message
 @@ -35,16 +32,16 @@ pre-install:
  	@${FIND} -s -d ${WRKSRC} -type d | ${SED} "s#${WRKSRC}#@dirrm ${E107DIR}#g" >> ${PLIST}
  
  do-install:
 -	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
 -	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 -	@${CHMOD} -R 755 ${WWWDIR}
 +	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 +	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 +	@${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}
  
 -	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' \
 +	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}' \
  		>> ${TMPPLIST}
 -	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' \
 +	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${STAGEDIR}${WWWDIR}' \
  		>> ${TMPPLIST}
  
  post-install:
  	@${CAT} ${PKGMESSAGE}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 _______________________________________________
 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:
