Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 May 2014 14:34:26 GMT
From:      Joseph Benden <joe@thrallingpenguin.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/190371: [patch] Add staging support to www/punbb
Message-ID:  <201405291434.s4TEYQar038251@cgiserv.freebsd.org>
Resent-Message-ID: <201405291440.s4TEe0af019809@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         190371
>Category:       ports
>Synopsis:       [patch] Add staging support to www/punbb
>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:   Thu May 29 14:40: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/punbb.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/punbb/Makefile b/www/punbb/Makefile
index 08cf2da..dcf071e 100644
--- a/www/punbb/Makefile
+++ b/www/punbb/Makefile
@@ -24,14 +24,13 @@ SUB_FILES=	pkg-message
 
 NO_BUILD=	yes
 USE_PHP=	yes
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 OPTIONS_DEFINE=	LANGUAGE_PACK EXTRAS
 OPTIONS_DEFAULT=	LANGUAGE_PACK EXTRAS
 LANGUAGE_PACK_DESC=	Install language packs
 EXTRAS_DESC=		Install all plugins available
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLANGUAGE_PACK}
@@ -111,22 +110,22 @@ PLIST_SUB+=	PLUGINS="@comment "
 .endif
 
 do-install:
-	@cd ${WRKSRC}/upload && ${COPYTREE_SHARE} . ${WWWDIR}
+	@cd ${WRKSRC}/upload && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 
 .for i in ${LANGFILES}
-	${UNZIP_CMD} -o ${DISTDIR}/${i} -d ${WWWDIR}/lang -x '*/.DS_Store' -x '*/._.DS_Store'
+	${UNZIP_CMD} -o ${DISTDIR}/${i} -d ${STAGEDIR}${WWWDIR}/lang -x '*/.DS_Store' -x '*/._.DS_Store'
 .endfor
 
 .for i in ${PLUGINS}
-	${UNZIP_CMD} -o ${DISTDIR}/${i} -d ${WWWDIR}/plugins
+	${UNZIP_CMD} -o ${DISTDIR}/${i} -d ${STAGEDIR}${WWWDIR}/plugins
 .endfor
 
 .if !defined(NOPORTEXAMPLES)
-	@${INSTALL} -d ${EXAMPLESDIR}
-	cd ${WRKSRC}/extras && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/extras && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
 
 post-install:


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405291434.s4TEYQar038251>