Date: Mon, 19 May 2014 17:41:35 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189963: [patch] Add staging support to www/phpbb3 Message-ID: <201405191741.s4JHfZaO057358@cgiserv.freebsd.org> Resent-Message-ID: <201405191750.s4JHo0Wf078896@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189963
>Category: ports
>Synopsis: [patch] Add staging support to www/phpbb3
>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: Mon May 19 17:50: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/phpbb3.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/phpbb3/Makefile b/www/phpbb3/Makefile
index d8ea6e8..560bd9f 100644
--- a/www/phpbb3/Makefile
+++ b/www/phpbb3/Makefile
@@ -16,7 +16,7 @@ LICENSE= GPLv2
CONFLICTS= phpbb-tw-[0-9]* phpbb-devel-[0-9]* \
phpbb-[0-2]*
-USE_BZIP2= yes
+USES= tar:bzip2
USE_PHP= yes
# The phpBB3 port supports a number of variables that may be tweaked at build
@@ -35,7 +35,6 @@ SUB_LIST= PHPBBURL="${PHPBBURL}" \
PLIST_SUB+= PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-NO_STAGE= yes
# Set custom variables:
#
PHPBBDIR= ${WWWDOCROOT}/${PHPBBURL}
@@ -55,17 +54,17 @@ pre-everything::
.endif
do-install:
- @ cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${PHPBBDIR} "! -name config.php"
- @ [ -f ${PREFIX}/${PHPBBDIR}/config.php ] || ${TOUCH} ${PREFIX}/${PHPBBDIR}/config.php
- @ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR}
- @ ${CHMOD} -R 0755 ${PREFIX}/${PHPBBDIR}
+ @ cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PHPBBDIR} "! -name config.php"
+ @ [ -f ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php ] || ${TOUCH} ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php
+ @ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${PHPBBDIR}
+ @ ${CHMOD} -R 0755 ${STAGEDIR}${PREFIX}/${PHPBBDIR}
@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
${PHPBBDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
post-install:
.if !defined(NOPORTDOCS)
- @ ${MKDIR} ${DOCSDIR}
- @ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
+ @ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
.if !defined(BATCH)
@ ${CAT} ${PKGMESSAGE}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405191741.s4JHfZaO057358>