From owner-freebsd-ports-bugs@FreeBSD.ORG  Wed May 21 23:00:00 2014
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 91480FD2
 for <freebsd-ports-bugs@smarthost.ysv.freebsd.org>;
 Wed, 21 May 2014 23:00:00 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6E5772A98
 for <freebsd-ports-bugs@smarthost.ysv.freebsd.org>;
 Wed, 21 May 2014 23:00:00 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LN00Je045960
 for <freebsd-ports-bugs@freefall.freebsd.org>; Wed, 21 May 2014 23:00:00 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4LN0016045958;
 Wed, 21 May 2014 23:00:00 GMT (envelope-from gnats)
Resent-Date: Wed, 21 May 2014 23:00:00 GMT
Resent-Message-Id: <201405212300.s4LN0016045958@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
 Joseph Benden <joe@thrallingpenguin.com>
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 6FEB8F02
 for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 May 2014 22:51:30 +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 5E0DB2A36
 for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 May 2014 22:51:30 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
 by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4LMpUBo078222
 for <freebsd-gnats-submit@FreeBSD.org>; Wed, 21 May 2014 22:51:30 GMT
 (envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
 by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4LMpUXt078219;
 Wed, 21 May 2014 22:51:30 GMT (envelope-from nobody)
Message-Id: <201405212251.s4LMpUXt078219@cgiserv.freebsd.org>
Date: Wed, 21 May 2014 22:51:30 GMT
From: Joseph Benden <joe@thrallingpenguin.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Subject: ports/190093: [patch] Add staging support to www/fswiki
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 May 2014 23:00:00 -0000


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

>Fix:


Patch attached with submission follows:

diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile
index 4701fff..e80c39e 100644
--- a/www/fswiki/Makefile
+++ b/www/fswiki/Makefile
@@ -17,22 +17,21 @@ RUN_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode \
 USES=		perl5 zip
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 post-extract:
 	${SED} -e 's|__DATADIR__|${DATADIR}|' ${FILESDIR}/setup.sh \
 		>${WRKSRC}/setup.sh
 
 do-install:
-	-${MKDIR} ${DATADIR}
+	-${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}; \
 	for d in `${FIND} * -type d`; do \
-		${MKDIR} ${DATADIR}/$${d}; \
+		${MKDIR} ${STAGEDIR}${DATADIR}/$${d}; \
 	done
 	cd ${WRKSRC}; \
 	for i in `${FIND} . -type f | ${GREP} -v .orig`; do \
-		${INSTALL_DATA} $${i} ${DATADIR}/$${i}; \
+		${INSTALL_DATA} $${i} ${STAGEDIR}${DATADIR}/$${i}; \
 	done
-	${INSTALL_SCRIPT} ${WRKSRC}/wiki.cgi ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/wiki.cgi ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/setup.sh ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: