From nobody@FreeBSD.org  Sun May 25 21:05:20 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 755D98F0
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 May 2014 21:05:20 +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 62ECC21AE
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 May 2014 21:05:20 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4PL5KiA037978
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 25 May 2014 21:05:20 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4PL5Ka3037974;
	Sun, 25 May 2014 21:05:20 GMT
	(envelope-from nobody)
Message-Id: <201405252105.s4PL5Ka3037974@cgiserv.freebsd.org>
Date: Sun, 25 May 2014 21:05:20 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Add staging support to www/lionwiki
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         190225
>Category:       ports
>Synopsis:       [patch] Add staging support to www/lionwiki
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 25 21:10:00 UTC 2014
>Closed-Date:    
>Last-Modified:  Sun May 25 21:10: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/lionwiki.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/lionwiki/Makefile b/www/lionwiki/Makefile
index b67d7b3..2d888bb 100644
--- a/www/lionwiki/Makefile
+++ b/www/lionwiki/Makefile
@@ -17,21 +17,17 @@ ROOTFILES=	config.php index.php
 ROOTDIRS=	lang plugins templates var
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 post-patch:
 	(cd ${WRKSRC} && ${MV} config.php config.php.sample)
 
 do-install:
-	${MKDIR} ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/config.php.sample ${WWWDIR}/
-	if [ ! -f ${WWWDIR}/config.php ]; then \
-		${CP} -p ${WWWDIR}/config.php.sample ${WWWDIR}/config.php; \
-	fi
-	${INSTALL_DATA} ${WRKSRC}/index.php ${WWWDIR}/
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/config.php.sample ${STAGEDIR}${WWWDIR}/
+	${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR}/
 .for dirs in ${ROOTDIRS}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dirs} ${WWWDIR}/ )
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dirs} ${STAGEDIR}${WWWDIR}/ )
 .endfor
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 
 post-install:
 	${CAT} ${PKGMESSAGE}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun May 25 21:10:06 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=190225 
>Unformatted:
