Stage www/phpbb3 and pass maintainership to submitter

Upgrade version from 3.0.11 => 3.0.12 while here

PR:		189963
Submitted by:	Marco Steinbach
Approved by:	former maintainer (Bo-Yi Wu)
Lotsa TLC:	marino

4 files changed, 88 insertions, 82 deletions

diff --git a/www/phpbb3/Makefile b/www/phpbb3/Makefile
index 78823d2ca77b..3a4d594bfce9 100644
--- a/www/phpbb3/Makefile
+++ b/www/phpbb3/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	phpbb
-PORTVERSION=	3.0.11
+PORTVERSION=	3.0.12
 CATEGORIES=	www
 MASTER_SITES=	https://www.phpbb.com/files/release/
-DISTNAME=	phpBB-${PORTVERSION}
 PKGNAMESUFFIX=	3
+DISTNAME=	phpBB-${PORTVERSION}
 
-MAINTAINER=	appleboy.tw@gmail.com
+MAINTAINER=	coco@executive-computing.de
 COMMENT=	PHP-based bulletin board / discussion forum system
 
 LICENSE=	GPLv2
@@ -19,13 +19,10 @@ CONFLICTS=	phpbb-tw-[0-9]* phpbb-devel-[0-9]* \
 USES=		tar:bzip2
 USE_PHP=	yes
 
-# The phpBB3 port supports a number of variables that may be tweaked at build
-# time.  Perform a "make options" to see more information on these variables.
-#
+OPTIONS_DEFINE=	DOCS
+
 WWWDOCROOT?=	www
 PHPBBURL?=	phpBB3
-#
-# End of user-configurable variables.
 
 WRKSRC=		${WRKDIR}/phpBB3
 NO_BUILD=	yes
@@ -35,34 +32,30 @@ SUB_LIST=	PHPBBURL="${PHPBBURL}" \
 
 PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-# Set custom variables:
-#
 PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
 PKGOPTS=	${FILESDIR}/pkg-opts
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 options:
-	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
-	@ ${CAT} ${PKGOPTS}
+	@${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
+	@${CAT} ${PKGOPTS}
 
 pre-everything::
 .if !defined(BATCH)
-	@ ${TEST} -r ${PKGOPTS} && \
+	@${TEST} -r ${PKGOPTS} && \
 	  (${ECHO_MSG} '-------------------------------------------------------------------------'; \
 	   ${ECHO_MSG} 'Perform a "make options" to see a list of available installation options.'; \
 	   ${ECHO_MSG} '-------------------------------------------------------------------------')
 .endif
 
 do-install:
-	@ 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:
-	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+.	if ${PORT_OPTIONS:MDOCS}
+		@${MKDIR} ${STAGEDIR}${DOCSDIR}
+		cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+.	endif
+	${MV} ${WRKSRC}/config.php ${WRKSRC}/config.php.sample
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PHPBBDIR}
 
 .include <bsd.port.mk>
diff --git a/www/phpbb3/distinfo b/www/phpbb3/distinfo
index 5c8c6a26696d..31e28b339fb9 100644
--- a/www/phpbb3/distinfo
+++ b/www/phpbb3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phpBB-3.0.11.tar.bz2) = b8c40b8cad58a458442bf04cb2632e350a76e7fb688e2820f8afd92887e751f2
-SIZE (phpBB-3.0.11.tar.bz2) = 1589870
+SHA256 (phpBB-3.0.12.tar.bz2) = 14f216807063017a0110c6b36f1e4c0131e0ba4c42322ec6be77392059a197a8
+SIZE (phpBB-3.0.12.tar.bz2) = 1600626
diff --git a/www/phpbb3/files/pkg-message.in b/www/phpbb3/files/pkg-message.in
index cd5e465dad12..ca2ddfcbfb9b 100644
--- a/www/phpbb3/files/pkg-message.in
+++ b/www/phpbb3/files/pkg-message.in
@@ -6,8 +6,8 @@ remote database) installed and configured, and you have to ensure that your
 PHP installation has been compiled with support for your database or
 database access method.  You have to create a database for phpBB3 to use,
 and ensure that this database may be accessed and changed by the user id
-under which your web server executes.  Further information on these
-installation procedures may be found in:
+under which your web server executes.  If you chose to install the
+documentation, further information may be found in:
 
   %%DOCSDIR%%/README.html
 
@@ -17,6 +17,6 @@ configure your installation of phpBB3:
   http://localhost/%%PHPBBURL%%/
 
 After configuring phpBB3 and ensuring that it is operational, you MUST
-remove or rename the install/ directory from %%PREFIX%%/%%PHPBBDIR%%:
+remove or rename the install/ directory from %%PREFIX%%/%%PHPBBDIR%%.
 
 ----------------------------------------------------------------------------
diff --git a/www/phpbb3/pkg-plist b/www/phpbb3/pkg-plist
index 22220665fd0c..f459b23bd14e 100644
--- a/www/phpbb3/pkg-plist
+++ b/www/phpbb3/pkg-plist
@@ -1,3 +1,6 @@
+@group %%WWWGRP%%
+@owner %%WWWOWN%%
+@mode 0644
 %%PHPBBDIR%%/.htaccess
 %%PHPBBDIR%%/adm/images/arrow_down.gif
 %%PHPBBDIR%%/adm/images/arrow_left.gif
@@ -128,6 +131,7 @@
 %%PHPBBDIR%%/cache/.htaccess
 %%PHPBBDIR%%/cache/index.htm
 %%PHPBBDIR%%/common.php
+@sample %%PHPBBDIR%%/config.php.sample
 %%PHPBBDIR%%/cron.php
 %%PHPBBDIR%%/docs/AUTHORS
 %%PHPBBDIR%%/docs/CHANGELOG.html
@@ -329,6 +333,7 @@
 %%PHPBBDIR%%/includes/functions_compress.php
 %%PHPBBDIR%%/includes/functions_content.php
 %%PHPBBDIR%%/includes/functions_convert.php
+%%PHPBBDIR%%/includes/functions_database_helper.php
 %%PHPBBDIR%%/includes/functions_display.php
 %%PHPBBDIR%%/includes/functions_install.php
 %%PHPBBDIR%%/includes/functions_jabber.php
@@ -966,62 +971,70 @@
 %%PHPBBDIR%%/viewonline.php
 %%PHPBBDIR%%/viewtopic.php
 %%PHPBBDIR%%/web.config
-@sample %%PHPBBDIR%%/config.php.sample
-@dirrm %%PHPBBDIR%%/styles/subsilver2/theme/images
-@dirrm %%PHPBBDIR%%/styles/subsilver2/theme
-@dirrm %%PHPBBDIR%%/styles/subsilver2/template
-@dirrm %%PHPBBDIR%%/styles/subsilver2/imageset/en
-@dirrm %%PHPBBDIR%%/styles/subsilver2/imageset
-@dirrm %%PHPBBDIR%%/styles/subsilver2
-@dirrm %%PHPBBDIR%%/styles/prosilver/theme/images
-@dirrm %%PHPBBDIR%%/styles/prosilver/theme
-@dirrm %%PHPBBDIR%%/styles/prosilver/template
+@group %%WWWGRP%%
+@owner %%WWWOWN%%
+@mode 0755
+@dirrmtry %%PHPBBDIR%%/adm/images
+@dirrmtry %%PHPBBDIR%%/adm/style
+@dirrmtry %%PHPBBDIR%%/adm
+@mode 0777
+@dirrmtry %%PHPBBDIR%%/cache
+@dirrmtry %%PHPBBDIR%%/docs
+@mode 0755
+@dirrmtry %%PHPBBDIR%%/download
+@mode 0777
+@dirrmtry %%PHPBBDIR%%/files
+@mode 0755
+@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
+@mode 0777
+@dirrmtry %%PHPBBDIR%%/images/avatars/upload
+@mode 0755
+@dirrmtry %%PHPBBDIR%%/images/avatars
+@dirrm %%PHPBBDIR%%/images/icons/misc
+@dirrm %%PHPBBDIR%%/images/icons/smile
+@dirrm %%PHPBBDIR%%/images/icons
+@dirrm %%PHPBBDIR%%/images/ranks
+@dirrm %%PHPBBDIR%%/images/smilies
+@dirrmtry %%PHPBBDIR%%/images/upload_icons
+@dirrmtry %%PHPBBDIR%%/images
+@dirrm %%PHPBBDIR%%/includes/acm
+@dirrm %%PHPBBDIR%%/includes/acp/info
+@dirrm %%PHPBBDIR%%/includes/acp
+@dirrm %%PHPBBDIR%%/includes/auth
+@dirrm %%PHPBBDIR%%/includes/captcha/plugins
+@dirrm %%PHPBBDIR%%/includes/captcha
+@dirrm %%PHPBBDIR%%/includes/db
+@dirrm %%PHPBBDIR%%/includes/diff
+@dirrm %%PHPBBDIR%%/includes/hooks
+@dirrm %%PHPBBDIR%%/includes/mcp/info
+@dirrm %%PHPBBDIR%%/includes/mcp
+@dirrm %%PHPBBDIR%%/includes/questionnaire
+@dirrm %%PHPBBDIR%%/includes/search
+@dirrm %%PHPBBDIR%%/includes/ucp/info
+@dirrm %%PHPBBDIR%%/includes/ucp
+@dirrm %%PHPBBDIR%%/includes/utf/data
+@dirrm %%PHPBBDIR%%/includes/utf
+@dirrm %%PHPBBDIR%%/includes
+@dirrm %%PHPBBDIR%%/install/convertors
+@dirrm %%PHPBBDIR%%/install/schemas
+@dirrm %%PHPBBDIR%%/install
+@dirrm %%PHPBBDIR%%/language/en/acp
+@dirrm %%PHPBBDIR%%/language/en/email
+@dirrm %%PHPBBDIR%%/language/en/mods
+@dirrm %%PHPBBDIR%%/language/en
+@dirrm %%PHPBBDIR%%/language
+@dirrm %%PHPBBDIR%%/store
 @dirrm %%PHPBBDIR%%/styles/prosilver/imageset/en
 @dirrm %%PHPBBDIR%%/styles/prosilver/imageset
+@dirrm %%PHPBBDIR%%/styles/prosilver/template
+@dirrm %%PHPBBDIR%%/styles/prosilver/theme/images
+@dirrm %%PHPBBDIR%%/styles/prosilver/theme
 @dirrm %%PHPBBDIR%%/styles/prosilver
+@dirrm %%PHPBBDIR%%/styles/subsilver2/imageset/en
+@dirrm %%PHPBBDIR%%/styles/subsilver2/imageset
+@dirrm %%PHPBBDIR%%/styles/subsilver2/template
+@dirrm %%PHPBBDIR%%/styles/subsilver2/theme/images
+@dirrm %%PHPBBDIR%%/styles/subsilver2/theme
+@dirrm %%PHPBBDIR%%/styles/subsilver2
 @dirrm %%PHPBBDIR%%/styles
-@dirrm %%PHPBBDIR%%/store
-@dirrm %%PHPBBDIR%%/language/en/mods
-@dirrm %%PHPBBDIR%%/language/en/email
-@dirrm %%PHPBBDIR%%/language/en/acp
-@dirrm %%PHPBBDIR%%/language/en
-@dirrm %%PHPBBDIR%%/language
-@dirrm %%PHPBBDIR%%/install/schemas
-@dirrm %%PHPBBDIR%%/install/convertors
-@dirrm %%PHPBBDIR%%/install
-@dirrm %%PHPBBDIR%%/includes/utf/data
-@dirrm %%PHPBBDIR%%/includes/utf
-@dirrm %%PHPBBDIR%%/includes/ucp/info
-@dirrm %%PHPBBDIR%%/includes/ucp
-@dirrm %%PHPBBDIR%%/includes/search
-@dirrm %%PHPBBDIR%%/includes/questionnaire
-@dirrm %%PHPBBDIR%%/includes/mcp/info
-@dirrm %%PHPBBDIR%%/includes/mcp
-@dirrm %%PHPBBDIR%%/includes/hooks
-@dirrm %%PHPBBDIR%%/includes/diff
-@dirrm %%PHPBBDIR%%/includes/db
-@dirrm %%PHPBBDIR%%/includes/captcha/plugins
-@dirrm %%PHPBBDIR%%/includes/captcha
-@dirrm %%PHPBBDIR%%/includes/auth
-@dirrm %%PHPBBDIR%%/includes/acp/info
-@dirrm %%PHPBBDIR%%/includes/acp
-@dirrm %%PHPBBDIR%%/includes/acm
-@dirrm %%PHPBBDIR%%/includes
-@dirrmtry %%PHPBBDIR%%/images/upload_icons
-@dirrm %%PHPBBDIR%%/images/smilies
-@dirrm %%PHPBBDIR%%/images/ranks
-@dirrm %%PHPBBDIR%%/images/icons/smile
-@dirrm %%PHPBBDIR%%/images/icons/misc
-@dirrm %%PHPBBDIR%%/images/icons
-@dirrmtry %%PHPBBDIR%%/images/avatars/upload
-@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
-@dirrmtry %%PHPBBDIR%%/images/avatars
-@dirrmtry %%PHPBBDIR%%/images
-@dirrm %%PHPBBDIR%%/files
-@dirrm %%PHPBBDIR%%/download
-@dirrm %%PHPBBDIR%%/docs
-@dirrm %%PHPBBDIR%%/cache
-@dirrm %%PHPBBDIR%%/adm/style
-@dirrm %%PHPBBDIR%%/adm/images
-@dirrm %%PHPBBDIR%%/adm
 @dirrmtry %%PHPBBDIR%%