Date: Mon, 19 May 2014 17:30:10 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189962: [patch] Add staging support to www/phpbb Message-ID: <201405191730.s4JHUAta026529@cgiserv.freebsd.org> Resent-Message-ID: <201405191740.s4JHe1jS067016@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189962
>Category: ports
>Synopsis: [patch] Add staging support to www/phpbb
>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:40:01 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/phpbb.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index 33e2c50..e0b8c37 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
CONFLICTS= phpbb-tw-[0-9]*
-USE_BZIP2= yes
+USES= tar:bzip2
# The phpBB2 port supports a number of variables that may be tweaked at build
# time. Perform a "make options" to see more information on these variables.
@@ -24,7 +24,6 @@ PHPBBURL?= phpBB2
#
# End of user-configurable variables.
-NO_STAGE= yes
# Set/override/append to variables from bsd.port.mk:
#
WRKSRC= ${WRKDIR}/phpBB2
@@ -41,9 +40,9 @@ PLIST_SUB+= PHPBB_VER=${PHPBB_VER}
#
PHPBBDIR= ${WWWDOCROOT}/${PHPBBURL}
PKGOPTS= ${FILESDIR}/pkg-opts
-EXCEPTFILES= ${PREFIX}/${PHPBBDIR}/install/install.php \
- ${PREFIX}/${PHPBBDIR}/install/upgrade.php \
- ${PREFIX}/${PHPBBDIR}/install/update_to_latest.php
+EXCEPTFILES= ${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/install.php \
+ ${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/upgrade.php \
+ ${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/update_to_latest.php
options:
@ ${ECHO_MSG} "===> Build options for ${PKGNAME}:"
@@ -63,24 +62,24 @@ post-patch:
@${RM} -f `${FIND} ${WRKSRC} -name '*.orig'`
do-install:
- @ ${MKDIR} -m 0775 ${PREFIX}/${PHPBBDIR}
+ @ ${MKDIR} -m 0775 ${STAGEDIR}${PREFIX}/${PHPBBDIR}
@ cd ${WRKSRC} && ${FIND} * \( -name config.php \
${EXCEPTFILES:S/^/-o -name /} \
-o -name docs -a -prune -o -name contrib -a -prune \) -o -print \
- | ${TAR} cTf - - | ${TAR} xUCf ${PREFIX}/${PHPBBDIR} -
- @ ${TOUCH} ${PREFIX}/${PHPBBDIR}/config.php
- @ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR}
- @ ${MKDIR} ${DATADIR}/contrib
- @ cd ${WRKSRC} && ${INSTALL_DATA} ${EXCEPTFILES} ${DATADIR}
- @ cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${DATADIR}/contrib
+ | ${TAR} cTf - - | ${TAR} xUCf ${STAGEDIR}${PREFIX}/${PHPBBDIR} -
+ @ ${TOUCH} ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php
+ @ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${PHPBBDIR}
+ @ ${MKDIR} ${STAGEDIR}${DATADIR}/contrib
+ @ cd ${WRKSRC} && ${INSTALL_DATA} ${EXCEPTFILES} ${STAGEDIR}${DATADIR}
+ @ cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/contrib
post-install:
# @ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \
-# ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR}
+# ${EXCEPTFILES} ${STAGEDIR}${PREFIX}/${PHPBBDIR}
.if !defined(NOPORTDOCS)
- @ ${MKDIR} ${DOCSDIR}
+ @ ${MKDIR} ${STAGEDIR}${DOCSDIR}
@ cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \! -name \*.bak \
- \! -name COPYING -exec ${INSTALL_DATA} {} ${DOCSDIR} \;
+ \! -name COPYING -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \;
.if !defined(BATCH)
@ ${CAT} ${PKGMESSAGE}
.endif
diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist
index 4394352..8192774 100644
--- a/www/phpbb/pkg-plist
+++ b/www/phpbb/pkg-plist
@@ -305,7 +305,6 @@
@exec touch %B/config.php
@exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/doc
@dirrm %%DATADIR%%/contrib
@dirrm %%DATADIR%%
@dirrm %%PHPBBDIR%%/admin
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405191730.s4JHUAta026529>