5 files changed, 73 insertions, 62 deletions

diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index ac5a581e3e92..e91192c7935c 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	phpbb
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,23 +19,30 @@ RUN_DEPENDS=	${LOCALBASE}/lib/php/System.php:${PORTSDIR}/www/mod_php4
 # 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.
 #
+WWWDOCROOT?=	www/data
+PHPBBURL?=	phpBB2
+WWWOWN?=	www
+WWWGRP?=	www
+#
+# End of user-configurable variables.
+
+# Set/override/append to variables from bsd.port.mk:
+#
 WRKSRC=		${WRKDIR}/phpBB2
 NO_BUILD=	yes
-CPIO=		cpio --quiet -pdum -R
-WWWDOCROOT=	www/data
-PHPBBURL=	phpBB2
-PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
-WWWOWN=		www
-WWWGRP=		www
+USE_REINPLACE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+
+# Set custom variables:
+#
+PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
 PKGOPTS=	${FILESDIR}/pkg-opts
-PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN}
-EXCEPTFILES=	install.php upgrade.php update_to_FINAL.php
+EXCEPTFILES=	install.php upgrade.php update_to_${PORTVERSION:S/.//g}.php
 
 options:
 	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
-	@ ${PERL} -ne '/^#/ || /^\s/ && print || \
-	  print sprintf "* %s [%s]\n  %s", split(/\|/)' ${PKGOPTS}
+	@ ${CAT} ${PKGOPTS}
 
 post-extract:
 .if !defined(BATCH)
@@ -47,36 +53,35 @@ post-extract:
 .endif
 
 post-patch:
-	@ ${PERL} -pi.orig -e "s#\.\./templates#/${PHPBBURL}/templates#" \
+	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBBURL}/templates#" \
 	  ${WRKSRC}/docs/*.html
 
 post-configure:
-	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
-	  -e 's#%%DOCSDIR%%#${DOCSDIR}#g' \
-	  -e 's#%%PHPBBURL%%#${PHPBBURL}#g' \
-	  -e 's#%%PHPBBDIR%%#${PHPBBDIR}#g' pkg-message > \
-	  ${PKGMESSAGE}
+	@ ${SED} \
+	  -e 's#%%PREFIX%%#${PREFIX}#g' -e 's#%%DOCSDIR%%#${DOCSDIR}#g' \
+	  -e 's#%%PHPBBURL%%#${PHPBBURL}#g' -e 's#%%PHPBBDIR%%#${PHPBBDIR}#g' \
+	  -e 's#%%DATADIR%%#${DATADIR}#g' \
+	  -e 's#%%DELETEFILES%%#${EXCEPTFILES}#g' pkg-message > ${PKGMESSAGE}
 
 do-install:
 	@ ${MKDIR} -m 0775 ${PREFIX}/${PHPBBDIR}
-	@ ${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR}
-	@ cd ${WRKSRC} && find * \( -name config.php \
-	  ${EXCEPTFILES:S/^/-o -name /} -o -name docs -a -prune \) \
-	  -o -print | ${CPIO} ${WWWOWN}:${WWWGRP} ${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} ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR}/config.php
-	@ ${MKDIR} ${DATADIR}
+	@ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR}
+	@ ${MKDIR} ${DATADIR}/contrib
 	@ cd ${WRKSRC} && ${INSTALL_DATA} ${EXCEPTFILES} ${DATADIR}
+	@ cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${DATADIR}/contrib
 
 post-install:
 	@ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \
 	  ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR}
 .if !defined(NOPORTOCS)
 	@ ${MKDIR} ${DOCSDIR}
-.for docfile in AUTHORS FAQ.html INSTALL.html README.html \
-                coding-guidelines.txt codingstandards.htm
-	@ ${INSTALL_DATA} ${WRKSRC}/docs/${docfile} ${DOCSDIR}
-.endfor
+	@ cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \! -name \*.bak \
+	  \! -name COPYING -exec ${INSTALL_DATA} {} ${DOCSDIR} \;
 .if !defined(BATCH)
 	@ ${CAT} ${PKGMESSAGE}
 .endif
diff --git a/www/phpbb/distinfo b/www/phpbb/distinfo
index 3f74b407a2cd..1621facc7238 100644
--- a/www/phpbb/distinfo
+++ b/www/phpbb/distinfo
@@ -1 +1 @@
-MD5 (phpBB-2.0.0.tar.gz) = 3147f8c10f89e58c7bcc7cc304c111ff
+MD5 (phpBB-2.0.3.tar.gz) = af3dec4f72c23e42dfede6023f2d620a
diff --git a/www/phpbb/files/pkg-opts b/www/phpbb/files/pkg-opts
index c3a754a8b0e8..9d25a45069c4 100644
--- a/www/phpbb/files/pkg-opts
+++ b/www/phpbb/files/pkg-opts
@@ -1,12 +1,22 @@
-# Variable|Default value|Short description
-# 	Multi-line/long description (optional).
-# 	Multi-line/long description lines must start with whitespace!
-#
-WWWDOCROOT|www/data|The DocumentRoot of your webserver under ${LOCALBASE}
-PHPBBURL|phpBB2|The base URL of phpBB2 on your webserver
-	phpBB2 will be installed under ${LOCALBASE}/${WWWDOCROOT}/${PHPBBURL},
-	and will be visible as http://localhost/${PHPBBURL}/
-WWWOWN|www|The user ID under which your webserver executes
-	It is recommended that you do not change this option.
-WWWGRP|www|The group ID under which your webserver executes
-	It is recommended that you do not change this option.
+
+* WWWDOCROOT [www/data]
+  The DocumentRoot of your webserver under ${PREFIX}
+
+* PHPBBURL [phpBB2]
+  The base URL of phpBB2 on your webserver
+
+    phpBB2 will be installed under ${PREFIX}/${WWWDOCROOT}/${PHPBBURL},
+    and will be visible as http://<hostname>/${PHPBBURL}/
+
+* WWWOWN [www]
+  The user ID under which your webserver executes
+
+    It is recommended that you do not change this option unless you're
+    REALLY sure what you're doing.
+
+* WWWGRP [www]
+  The group ID under which your webserver executes
+
+    It is recommended that you do not change this option unless you're
+    REALLY sure what you're doing.
+
diff --git a/www/phpbb/pkg-message b/www/phpbb/pkg-message
index de2ae4256745..60318669704d 100644
--- a/www/phpbb/pkg-message
+++ b/www/phpbb/pkg-message
@@ -17,9 +17,11 @@ configure your installation of phpBB2:
   http://localhost/%%PHPBBURL%%/
 
 After configuring phpBB2 and ensuring that it is operational, you MUST
-delete the following three files manually for security purposes:
+delete the following files manually for security purposes from
+%%PREFIX%%/%%PHPBBDIR%%:
 
-  %%PREFIX%%/%%PHPBBDIR%%/install.php
-  %%PREFIX%%/%%PHPBBDIR%%/upgrade.php
-  %%PREFIX%%/%%PHPBBDIR%%/update_to_FINAL.php
+  %%DELETEFILES%%
+
+Duplicates of these files have been installed to %%DATADIR%%.
+%%DATADIR%%/contrib contains contributed software for phpBB2.
 ----------------------------------------------------------------------------
diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist
index 719ebb6d9e62..7a1dd46f7ce7 100644
--- a/www/phpbb/pkg-plist
+++ b/www/phpbb/pkg-plist
@@ -19,14 +19,6 @@
 %%PHPBBDIR%%/admin/page_header_admin.php
 %%PHPBBDIR%%/admin/pagestart.php
 %%PHPBBDIR%%/common.php
-%%PHPBBDIR%%/contrib/README.html
-%%PHPBBDIR%%/contrib/attachments.zip
-%%PHPBBDIR%%/contrib/card_ban_system.zip
-%%PHPBBDIR%%/contrib/guest_lang.zip
-%%PHPBBDIR%%/contrib/last_visit.zip
-%%PHPBBDIR%%/contrib/male_female.zip
-%%PHPBBDIR%%/contrib/template_db_cache.php
-%%PHPBBDIR%%/contrib/template_file_cache.php
 %%PHPBBDIR%%/db/db2.php
 %%PHPBBDIR%%/db/index.htm
 %%PHPBBDIR%%/db/msaccess.php
@@ -42,16 +34,11 @@
 %%PHPBBDIR%%/db/schemas/mssql_schema.sql
 %%PHPBBDIR%%/db/schemas/mysql_basic.sql
 %%PHPBBDIR%%/db/schemas/mysql_schema.sql
-%%PHPBBDIR%%/db/schemas/oracle_basic.sql
-%%PHPBBDIR%%/db/schemas/oracle_schema.sql
-%%PHPBBDIR%%/db/schemas/oracle_triggers.sql
 %%PHPBBDIR%%/db/schemas/postgres_basic.sql
 %%PHPBBDIR%%/db/schemas/postgres_schema.sql
 %%PHPBBDIR%%/extension.inc
 %%PHPBBDIR%%/faq.php
 %%PHPBBDIR%%/groupcp.php
-%%PHPBBDIR%%/images/avatars/index.htm
-%%PHPBBDIR%%/images/avatars/uploads/index.htm
 %%PHPBBDIR%%/images/index.htm
 %%PHPBBDIR%%/images/smiles/icon_arrow.gif
 %%PHPBBDIR%%/images/smiles/icon_biggrin.gif
@@ -77,6 +64,7 @@
 %%PHPBBDIR%%/images/smiles/icon_twisted.gif
 %%PHPBBDIR%%/images/smiles/icon_wink.gif
 %%PHPBBDIR%%/images/spacer.gif
+@exec mkdir -p %B/avatars/upload
 %%PHPBBDIR%%/includes/auth.php
 %%PHPBBDIR%%/includes/bbcode.php
 %%PHPBBDIR%%/includes/constants.php
@@ -292,22 +280,29 @@
 %%PHPBBDIR%%/viewforum.php
 %%PHPBBDIR%%/viewonline.php
 %%PHPBBDIR%%/viewtopic.php
-@exec touch %B/config.php && chown %%WWWOWN%% %B/config.php
+@exec touch %B/config.php
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
 %%PORTDOCS%%share/doc/phpbb/AUTHORS
+%%PORTDOCS%%share/doc/phpbb/CHANGELOG.html
 %%PORTDOCS%%share/doc/phpbb/FAQ.html
 %%PORTDOCS%%share/doc/phpbb/INSTALL.html
 %%PORTDOCS%%share/doc/phpbb/README.html
 %%PORTDOCS%%share/doc/phpbb/coding-guidelines.txt
 %%PORTDOCS%%share/doc/phpbb/codingstandards.htm
+share/phpbb/contrib/README.html
+share/phpbb/contrib/dbinformer.php
+share/phpbb/contrib/template_db_cache.php
+share/phpbb/contrib/template_file_cache.php
 share/phpbb/install.php
 @exec install -c -o %%WWWOWN%% %D/%F %D/%%PHPBBDIR%%
 @unexec rm -f %D/%%PHPBBDIR%%/%f 2>/dev/null || true
-share/phpbb/update_to_FINAL.php
+share/phpbb/update_to_203.php
 @exec install -c -o %%WWWOWN%% %D/%F %D/%%PHPBBDIR%%
 @unexec rm -f %D/%%PHPBBDIR%%/%f 2>/dev/null || true
 share/phpbb/upgrade.php
 @exec install -c -o %%WWWOWN%% %D/%F %D/%%PHPBBDIR%%
 @unexec rm -f %D/%%PHPBBDIR%%/%f 2>/dev/null || true
+@dirrm share/phpbb/contrib
 @dirrm share/phpbb
 @dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
 @dirrm %%PHPBBDIR%%/templates/subSilver/images
@@ -319,12 +314,11 @@ share/phpbb/upgrade.php
 @dirrm %%PHPBBDIR%%/language
 @dirrm %%PHPBBDIR%%/includes
 @dirrm %%PHPBBDIR%%/images/smiles
-@dirrm %%PHPBBDIR%%/images/avatars/uploads
+@dirrm %%PHPBBDIR%%/images/avatars/upload
 @dirrm %%PHPBBDIR%%/images/avatars
 @dirrm %%PHPBBDIR%%/images
 @dirrm %%PHPBBDIR%%/db/schemas
 @dirrm %%PHPBBDIR%%/db
-@dirrm %%PHPBBDIR%%/contrib
 @dirrm %%PHPBBDIR%%/admin
 @unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || true
 %%PORTDOCS%%@dirrm share/doc/phpbb