Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Jun 2014 04:45:36 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359654 - head/www/phpbb3
Message-ID:  <201406280445.s5S4jaHK023102@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Sat Jun 28 04:45:36 2014
New Revision: 359654
URL: http://svnweb.freebsd.org/changeset/ports/359654
QAT: https://qat.redports.org/buildarchive/r359654/

Log:
  - Stage support
  
  PR:		189963

Modified:
  head/www/phpbb3/Makefile
  head/www/phpbb3/pkg-plist

Modified: head/www/phpbb3/Makefile
==============================================================================
--- head/www/phpbb3/Makefile	Sat Jun 28 04:44:35 2014	(r359653)
+++ head/www/phpbb3/Makefile	Sat Jun 28 04:45:36 2014	(r359654)
@@ -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,21 +54,15 @@ 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"
+	@ ${TOUCH} ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php.sample
+	@ ${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}
-
-.if !defined(BATCH)
-	@ ${CAT} ${PKGMESSAGE}
-.endif
-.endif
+	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/www/phpbb3/pkg-plist
==============================================================================
--- head/www/phpbb3/pkg-plist	Sat Jun 28 04:44:35 2014	(r359653)
+++ head/www/phpbb3/pkg-plist	Sat Jun 28 04:45:36 2014	(r359654)
@@ -966,8 +966,7 @@
 %%PHPBBDIR%%/viewonline.php
 %%PHPBBDIR%%/viewtopic.php
 %%PHPBBDIR%%/web.config
-@exec [ -f %D/%%PHPBBDIR%%/config.php ] || touch %D/%%PHPBBDIR%%/config.php
-@unexec [ -s %D/%%PHPBBDIR%%/config.php ] || rm -f %D/%%PHPBBDIR%%/config.php
+@sample %%PHPBBDIR%%/config.php.sample
 @dirrm %%PHPBBDIR%%/styles/subsilver2/theme/images
 @dirrm %%PHPBBDIR%%/styles/subsilver2/theme
 @dirrm %%PHPBBDIR%%/styles/subsilver2/template



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