3 files changed, 230 insertions, 233 deletions

diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index 578b18526c95..135c4ee5c3aa 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpbb
-PORTVERSION=	2.0.3
+PORTVERSION=	2.0.4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,11 +16,6 @@ MAINTAINER=	wjv@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/lib/php/System.php:${PORTSDIR}/www/mod_php4
 
-FORBIDDEN=	"Multiple security vulnerabilities in current version: " \
-		http://online.securityfocus.com/archive/1/307212 \
-		http://online.securityfocus.com/bid/6634 \
-		http://online.securityfocus.com/archive/1/302199
-
 # 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.
 #
@@ -43,13 +38,15 @@ PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 #
 PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
 PKGOPTS=	${FILESDIR}/pkg-opts
-EXCEPTFILES=	install.php upgrade.php update_to_${PORTVERSION:S/.//g}.php
+EXCEPTFILES=	${PREFIX}/${PHPBBDIR}/install/install.php \
+		${PREFIX}/${PHPBBDIR}/install/upgrade.php \
+		${PREFIX}/${PHPBBDIR}/install/update_to_${PORTVERSION:S/.//g}.php
 
 options:
 	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
 	@ ${CAT} ${PKGOPTS}
 
-post-extract:
+pre-everything::
 .if !defined(BATCH)
 	@ ${TEST} -r ${PKGOPTS} && \
 	  (${ECHO_MSG} '-------------------------------------------------------------------------'; \
@@ -81,8 +78,8 @@ do-install:
 	@ cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${DATADIR}/contrib
 
 post-install:
-	@ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \
-	  ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR}
+#	@ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \
+#	  ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR}
 .if !defined(NOPORTOCS)
 	@ ${MKDIR} ${DOCSDIR}
 	@ cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \! -name \*.bak \
diff --git a/www/phpbb/distinfo b/www/phpbb/distinfo
index 1621facc7238..51c1fdea9f9a 100644
--- a/www/phpbb/distinfo
+++ b/www/phpbb/distinfo
@@ -1 +1 @@
-MD5 (phpBB-2.0.3.tar.gz) = af3dec4f72c23e42dfede6023f2d620a
+MD5 (phpBB-2.0.4.tar.gz) = 1f3312f7c6b35995ffcbc689e2f55be0
diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist
index 8e7743a0235e..4f53935b23c4 100644
--- a/www/phpbb/pkg-plist
+++ b/www/phpbb/pkg-plist
@@ -1,121 +1,139 @@
 @unexec [ -s %D/%%PHPBBDIR%%/config.php ] || rm -f %D/%%PHPBBDIR%%/config.php
-%%PHPBBDIR%%/admin/admin_board.php
-%%PHPBBDIR%%/admin/admin_db_utilities.php
-%%PHPBBDIR%%/admin/admin_disallow.php
+%%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
+share/phpbb/update_to_204.php
+share/phpbb/upgrade.php
 %%PHPBBDIR%%/admin/admin_forum_prune.php
-%%PHPBBDIR%%/admin/admin_forumauth.php
-%%PHPBBDIR%%/admin/admin_forums.php
-%%PHPBBDIR%%/admin/admin_groups.php
 %%PHPBBDIR%%/admin/admin_mass_email.php
-%%PHPBBDIR%%/admin/admin_ranks.php
+%%PHPBBDIR%%/admin/admin_users.php
+%%PHPBBDIR%%/admin/admin_board.php
+%%PHPBBDIR%%/admin/pagestart.php
 %%PHPBBDIR%%/admin/admin_smilies.php
+%%PHPBBDIR%%/admin/page_header_admin.php
+%%PHPBBDIR%%/admin/admin_disallow.php
+%%PHPBBDIR%%/admin/admin_forums.php
 %%PHPBBDIR%%/admin/admin_styles.php
-%%PHPBBDIR%%/admin/admin_ug_auth.php
-%%PHPBBDIR%%/admin/admin_user_ban.php
-%%PHPBBDIR%%/admin/admin_users.php
-%%PHPBBDIR%%/admin/admin_words.php
 %%PHPBBDIR%%/admin/index.php
+%%PHPBBDIR%%/admin/admin_words.php
+%%PHPBBDIR%%/admin/admin_groups.php
 %%PHPBBDIR%%/admin/page_footer_admin.php
-%%PHPBBDIR%%/admin/page_header_admin.php
-%%PHPBBDIR%%/admin/pagestart.php
+%%PHPBBDIR%%/admin/admin_user_ban.php
+%%PHPBBDIR%%/admin/admin_forumauth.php
+%%PHPBBDIR%%/admin/admin_db_utilities.php
+%%PHPBBDIR%%/admin/admin_ranks.php
+%%PHPBBDIR%%/admin/admin_ug_auth.php
 %%PHPBBDIR%%/common.php
-%%PHPBBDIR%%/db/db2.php
-%%PHPBBDIR%%/db/index.htm
-%%PHPBBDIR%%/db/msaccess.php
 %%PHPBBDIR%%/db/mssql-odbc.php
+%%PHPBBDIR%%/db/oracle.php
 %%PHPBBDIR%%/db/mssql.php
-%%PHPBBDIR%%/db/mysql.php
 %%PHPBBDIR%%/db/mysql4.php
-%%PHPBBDIR%%/db/oracle.php
+%%PHPBBDIR%%/db/msaccess.php
+%%PHPBBDIR%%/db/index.htm
+%%PHPBBDIR%%/db/mysql.php
 %%PHPBBDIR%%/db/postgres7.php
-%%PHPBBDIR%%/db/schemas/index.htm
-%%PHPBBDIR%%/db/schemas/ms_access_primer.zip
-%%PHPBBDIR%%/db/schemas/mssql_basic.sql
-%%PHPBBDIR%%/db/schemas/mssql_schema.sql
-%%PHPBBDIR%%/db/schemas/mysql_basic.sql
-%%PHPBBDIR%%/db/schemas/mysql_schema.sql
-%%PHPBBDIR%%/db/schemas/postgres_basic.sql
-%%PHPBBDIR%%/db/schemas/postgres_schema.sql
+%%PHPBBDIR%%/db/db2.php
 %%PHPBBDIR%%/extension.inc
 %%PHPBBDIR%%/faq.php
 %%PHPBBDIR%%/groupcp.php
 %%PHPBBDIR%%/images/index.htm
-%%PHPBBDIR%%/images/smiles/icon_arrow.gif
-%%PHPBBDIR%%/images/smiles/icon_biggrin.gif
 %%PHPBBDIR%%/images/smiles/icon_confused.gif
+%%PHPBBDIR%%/images/smiles/icon_idea.gif
+%%PHPBBDIR%%/images/smiles/icon_biggrin.gif
 %%PHPBBDIR%%/images/smiles/icon_cool.gif
 %%PHPBBDIR%%/images/smiles/icon_cry.gif
+%%PHPBBDIR%%/images/smiles/icon_mrgreen.gif
+%%PHPBBDIR%%/images/smiles/icon_sad.gif
 %%PHPBBDIR%%/images/smiles/icon_eek.gif
-%%PHPBBDIR%%/images/smiles/icon_evil.gif
 %%PHPBBDIR%%/images/smiles/icon_exclaim.gif
+%%PHPBBDIR%%/images/smiles/icon_rolleyes.gif
+%%PHPBBDIR%%/images/smiles/icon_evil.gif
+%%PHPBBDIR%%/images/smiles/icon_wink.gif
+%%PHPBBDIR%%/images/smiles/icon_razz.gif
+%%PHPBBDIR%%/images/smiles/icon_twisted.gif
+%%PHPBBDIR%%/images/smiles/icon_mad.gif
 %%PHPBBDIR%%/images/smiles/icon_frown.gif
-%%PHPBBDIR%%/images/smiles/icon_idea.gif
 %%PHPBBDIR%%/images/smiles/icon_lol.gif
-%%PHPBBDIR%%/images/smiles/icon_mad.gif
-%%PHPBBDIR%%/images/smiles/icon_mrgreen.gif
-%%PHPBBDIR%%/images/smiles/icon_neutral.gif
+%%PHPBBDIR%%/images/smiles/icon_surprised.gif
 %%PHPBBDIR%%/images/smiles/icon_question.gif
-%%PHPBBDIR%%/images/smiles/icon_razz.gif
-%%PHPBBDIR%%/images/smiles/icon_redface.gif
-%%PHPBBDIR%%/images/smiles/icon_rolleyes.gif
-%%PHPBBDIR%%/images/smiles/icon_sad.gif
+%%PHPBBDIR%%/images/smiles/icon_neutral.gif
 %%PHPBBDIR%%/images/smiles/icon_smile.gif
-%%PHPBBDIR%%/images/smiles/icon_surprised.gif
-%%PHPBBDIR%%/images/smiles/icon_twisted.gif
-%%PHPBBDIR%%/images/smiles/icon_wink.gif
+%%PHPBBDIR%%/images/smiles/icon_redface.gif
+%%PHPBBDIR%%/images/smiles/icon_arrow.gif
 %%PHPBBDIR%%/images/spacer.gif
 @exec mkdir -p %B/avatars/upload
+%%PHPBBDIR%%/includes/usercp_register.php
+%%PHPBBDIR%%/includes/sessions.php
+%%PHPBBDIR%%/includes/functions_search.php
+%%PHPBBDIR%%/includes/functions_admin.php
+%%PHPBBDIR%%/includes/functions.php
 %%PHPBBDIR%%/includes/auth.php
+%%PHPBBDIR%%/includes/page_header.php
+%%PHPBBDIR%%/includes/usercp_sendpasswd.php
+%%PHPBBDIR%%/includes/emailer.php
+%%PHPBBDIR%%/includes/db.php
 %%PHPBBDIR%%/includes/bbcode.php
+%%PHPBBDIR%%/includes/usercp_avatar.php
 %%PHPBBDIR%%/includes/constants.php
-%%PHPBBDIR%%/includes/db.php
-%%PHPBBDIR%%/includes/emailer.php
-%%PHPBBDIR%%/includes/functions.php
-%%PHPBBDIR%%/includes/functions_admin.php
-%%PHPBBDIR%%/includes/functions_post.php
-%%PHPBBDIR%%/includes/functions_search.php
-%%PHPBBDIR%%/includes/functions_selects.php
-%%PHPBBDIR%%/includes/functions_validate.php
 %%PHPBBDIR%%/includes/index.htm
-%%PHPBBDIR%%/includes/page_header.php
 %%PHPBBDIR%%/includes/page_tail.php
-%%PHPBBDIR%%/includes/prune.php
-%%PHPBBDIR%%/includes/sessions.php
-%%PHPBBDIR%%/includes/smtp.php
-%%PHPBBDIR%%/includes/sql_parse.php
-%%PHPBBDIR%%/includes/template.php
 %%PHPBBDIR%%/includes/topic_review.php
+%%PHPBBDIR%%/includes/prune.php
 %%PHPBBDIR%%/includes/usercp_activate.php
-%%PHPBBDIR%%/includes/usercp_avatar.php
-%%PHPBBDIR%%/includes/usercp_email.php
-%%PHPBBDIR%%/includes/usercp_register.php
-%%PHPBBDIR%%/includes/usercp_sendpasswd.php
 %%PHPBBDIR%%/includes/usercp_viewprofile.php
+%%PHPBBDIR%%/includes/template.php
+%%PHPBBDIR%%/includes/functions_selects.php
+%%PHPBBDIR%%/includes/functions_validate.php
+%%PHPBBDIR%%/includes/sql_parse.php
+%%PHPBBDIR%%/includes/usercp_email.php
+%%PHPBBDIR%%/includes/functions_post.php
+%%PHPBBDIR%%/includes/smtp.php
 %%PHPBBDIR%%/index.php
-%%PHPBBDIR%%/language/index.htm
+%%PHPBBDIR%%/install/install.php
+%%PHPBBDIR%%/install/upgrade.php
+%%PHPBBDIR%%/install/schemas/mysql_basic.sql
+%%PHPBBDIR%%/install/schemas/ms_access_primer.zip
+%%PHPBBDIR%%/install/schemas/postgres_basic.sql
+%%PHPBBDIR%%/install/schemas/mssql_basic.sql
+%%PHPBBDIR%%/install/schemas/index.htm
+%%PHPBBDIR%%/install/schemas/postgres_schema.sql
+%%PHPBBDIR%%/install/schemas/mysql_schema.sql
+%%PHPBBDIR%%/install/schemas/mssql_schema.sql
+%%PHPBBDIR%%/install/update_to_204.php
+%%PHPBBDIR%%/install/index.htm
+%%PHPBBDIR%%/language/lang_english/lang_faq.php
 %%PHPBBDIR%%/language/lang_english/email/admin_activate.tpl
-%%PHPBBDIR%%/language/lang_english/email/admin_send_email.tpl
-%%PHPBBDIR%%/language/lang_english/email/admin_welcome_activated.tpl
-%%PHPBBDIR%%/language/lang_english/email/admin_welcome_inactive.tpl
-%%PHPBBDIR%%/language/lang_english/email/coppa_welcome_inactive.tpl
+%%PHPBBDIR%%/language/lang_english/email/topic_notify.tpl
 %%PHPBBDIR%%/language/lang_english/email/group_added.tpl
+%%PHPBBDIR%%/language/lang_english/email/privmsg_notify.tpl
 %%PHPBBDIR%%/language/lang_english/email/group_approved.tpl
-%%PHPBBDIR%%/language/lang_english/email/group_request.tpl
+%%PHPBBDIR%%/language/lang_english/email/user_welcome_inactive.tpl
 %%PHPBBDIR%%/language/lang_english/email/index.htm
-%%PHPBBDIR%%/language/lang_english/email/privmsg_notify.tpl
-%%PHPBBDIR%%/language/lang_english/email/profile_send_email.tpl
-%%PHPBBDIR%%/language/lang_english/email/topic_notify.tpl
+%%PHPBBDIR%%/language/lang_english/email/group_request.tpl
+%%PHPBBDIR%%/language/lang_english/email/admin_send_email.tpl
+%%PHPBBDIR%%/language/lang_english/email/user_welcome.tpl
 %%PHPBBDIR%%/language/lang_english/email/user_activate.tpl
+%%PHPBBDIR%%/language/lang_english/email/profile_send_email.tpl
+%%PHPBBDIR%%/language/lang_english/email/admin_welcome_inactive.tpl
 %%PHPBBDIR%%/language/lang_english/email/user_activate_passwd.tpl
-%%PHPBBDIR%%/language/lang_english/email/user_welcome.tpl
-%%PHPBBDIR%%/language/lang_english/email/user_welcome_inactive.tpl
-%%PHPBBDIR%%/language/lang_english/index.htm
+%%PHPBBDIR%%/language/lang_english/email/admin_welcome_activated.tpl
+%%PHPBBDIR%%/language/lang_english/email/coppa_welcome_inactive.tpl
 %%PHPBBDIR%%/language/lang_english/lang_admin.php
-%%PHPBBDIR%%/language/lang_english/lang_bbcode.php
-%%PHPBBDIR%%/language/lang_english/lang_faq.php
 %%PHPBBDIR%%/language/lang_english/lang_main.php
 %%PHPBBDIR%%/language/lang_english/search_stopwords.txt
+%%PHPBBDIR%%/language/lang_english/lang_bbcode.php
 %%PHPBBDIR%%/language/lang_english/search_synonyms.txt
+%%PHPBBDIR%%/language/lang_english/index.htm
+%%PHPBBDIR%%/language/index.htm
 %%PHPBBDIR%%/login.php
 %%PHPBBDIR%%/memberlist.php
 %%PHPBBDIR%%/modcp.php
@@ -123,202 +141,184 @@
 %%PHPBBDIR%%/privmsg.php
 %%PHPBBDIR%%/profile.php
 %%PHPBBDIR%%/search.php
-%%PHPBBDIR%%/templates/index.htm
-%%PHPBBDIR%%/templates/subSilver/admin/admin_message_body.tpl
+%%PHPBBDIR%%/templates/subSilver/viewtopic_body.tpl
+%%PHPBBDIR%%/templates/subSilver/simple_header.tpl
+%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_result.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_topic_review.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/smile_list_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_result_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/styles_list_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/auth_forum_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/auth_select_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/auth_ug_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/board_config_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/category_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/db_utils_backup_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_email_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/group_edit_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/db_utils_restore_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/disallow_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_admin_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_delete_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_result_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_select_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/group_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/group_select_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/index.htm
-%%PHPBBDIR%%/templates/subSilver/admin/index_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/index_frameset.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/index_navigate.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/page_footer.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/index_frameset.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/page_header.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/ranks_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/words_list_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/styles_exporter.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/category_edit_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/ranks_list_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/index.htm
 %%PHPBBDIR%%/templates/subSilver/admin/smile_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/smile_import_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/smile_list_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/styles_addnew_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/auth_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/admin_message_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/styles_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/styles_exporter.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/styles_list_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_avatar_gallery.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_ban_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/board_config_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/index_navigate.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/group_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/smile_import_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_select_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/user_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_email_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/user_select_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/index_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_admin_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_ban_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/words_edit_body.tpl
-%%PHPBBDIR%%/templates/subSilver/admin/words_list_body.tpl
-%%PHPBBDIR%%/templates/subSilver/agreement.tpl
-%%PHPBBDIR%%/templates/subSilver/bbcode.tpl
-%%PHPBBDIR%%/templates/subSilver/confirm_body.tpl
-%%PHPBBDIR%%/templates/subSilver/error_body.tpl
-%%PHPBBDIR%%/templates/subSilver/faq_body.tpl
-%%PHPBBDIR%%/templates/subSilver/formIE.css
-%%PHPBBDIR%%/templates/subSilver/groupcp_info_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/styles_addnew_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/ranks_edit_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_delete_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/forum_prune_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/user_avatar_gallery.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/auth_ug_body.tpl
+%%PHPBBDIR%%/templates/subSilver/admin/db_utils_backup_body.tpl
 %%PHPBBDIR%%/templates/subSilver/groupcp_pending_info.tpl
+%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_ballot.tpl
+%%PHPBBDIR%%/templates/subSilver/formIE.css
+%%PHPBBDIR%%/templates/subSilver/viewforum_body.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_move.tpl
+%%PHPBBDIR%%/templates/subSilver/viewonline_body.tpl
 %%PHPBBDIR%%/templates/subSilver/groupcp_user_body.tpl
-%%PHPBBDIR%%/templates/subSilver/images/cellpic.gif
+%%PHPBBDIR%%/templates/subSilver/search_username.tpl
+%%PHPBBDIR%%/templates/subSilver/groupcp_info_body.tpl
+%%PHPBBDIR%%/templates/subSilver/theme_info.cfg
+%%PHPBBDIR%%/templates/subSilver/bbcode.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_body.tpl
+%%PHPBBDIR%%/templates/subSilver/overall_footer.tpl
+%%PHPBBDIR%%/templates/subSilver/images/folder_sticky.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_new.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic1.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic2.jpg
 %%PHPBBDIR%%/templates/subSilver/images/cellpic3.gif
-%%PHPBBDIR%%/templates/subSilver/images/created_by.jpg
-%%PHPBBDIR%%/templates/subSilver/images/folder.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_announce.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_announce_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_big.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_hot.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_lock.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_lock_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_locked_big.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_new_big.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_new_hot.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_sticky.gif
-%%PHPBBDIR%%/templates/subSilver/images/folder_sticky_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_delete.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_latest_reply.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_faq.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_groups.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_login.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_members.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_message.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_profile.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_register.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_mini_search.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_minipost.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_minipost_new.gif
-%%PHPBBDIR%%/templates/subSilver/images/icon_newest_reply.gif
-%%PHPBBDIR%%/templates/subSilver/images/index.htm
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_aim.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_edit.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_email.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_icq_add.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_ip.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_msnm.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_pm.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_profile.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_quote.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_search.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_icq_add.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_www.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/reply.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_profile.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_yim.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/msg_newpost.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/post.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/msg_newpost.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_quote.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_email.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/reply-locked.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/reply.gif
-%%PHPBBDIR%%/templates/subSilver/images/logo_phpBB.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_edit.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_search.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_msnm.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_aim.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_minipost.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_members.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_search.gif
+%%PHPBBDIR%%/templates/subSilver/images/topic_move.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_message.gif
+%%PHPBBDIR%%/templates/subSilver/images/vote_rcap.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_faq.gif
+%%PHPBBDIR%%/templates/subSilver/images/msg_sentbox.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_latest_reply.gif
 %%PHPBBDIR%%/templates/subSilver/images/logo_phpBB_med.gif
 %%PHPBBDIR%%/templates/subSilver/images/msg_inbox.gif
+%%PHPBBDIR%%/templates/subSilver/images/topic_unlock.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_locked_big.gif
+%%PHPBBDIR%%/templates/subSilver/images/topic_lock.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_minipost_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_hot.gif
+%%PHPBBDIR%%/templates/subSilver/images/whosonline.gif
 %%PHPBBDIR%%/templates/subSilver/images/msg_outbox.gif
-%%PHPBBDIR%%/templates/subSilver/images/msg_savebox.gif
-%%PHPBBDIR%%/templates/subSilver/images/msg_sentbox.gif
-%%PHPBBDIR%%/templates/subSilver/images/spacer.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_big.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_sticky_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_new_hot.gif
+%%PHPBBDIR%%/templates/subSilver/images/vote_lcap.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_new_big.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_lock_new.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_profile.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_groups.gif
+%%PHPBBDIR%%/templates/subSilver/images/index.htm
+%%PHPBBDIR%%/templates/subSilver/images/logo_phpBB.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_newest_reply.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder.gif
+%%PHPBBDIR%%/templates/subSilver/images/cellpic.gif
 %%PHPBBDIR%%/templates/subSilver/images/topic_delete.gif
-%%PHPBBDIR%%/templates/subSilver/images/topic_lock.gif
-%%PHPBBDIR%%/templates/subSilver/images/topic_move.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_login.gif
+%%PHPBBDIR%%/templates/subSilver/images/created_by.jpg
+%%PHPBBDIR%%/templates/subSilver/images/folder_announce_new.gif
 %%PHPBBDIR%%/templates/subSilver/images/topic_split.gif
-%%PHPBBDIR%%/templates/subSilver/images/topic_unlock.gif
-%%PHPBBDIR%%/templates/subSilver/images/vote_lcap.gif
-%%PHPBBDIR%%/templates/subSilver/images/vote_rcap.gif
+%%PHPBBDIR%%/templates/subSilver/images/msg_savebox.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_announce.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_delete.gif
+%%PHPBBDIR%%/templates/subSilver/images/icon_mini_register.gif
 %%PHPBBDIR%%/templates/subSilver/images/voting_bar.gif
-%%PHPBBDIR%%/templates/subSilver/images/whosonline.gif
-%%PHPBBDIR%%/templates/subSilver/index.htm
-%%PHPBBDIR%%/templates/subSilver/index_body.tpl
-%%PHPBBDIR%%/templates/subSilver/install.tpl
-%%PHPBBDIR%%/templates/subSilver/jumpbox.tpl
-%%PHPBBDIR%%/templates/subSilver/login_body.tpl
+%%PHPBBDIR%%/templates/subSilver/images/spacer.gif
+%%PHPBBDIR%%/templates/subSilver/images/folder_lock.gif
+%%PHPBBDIR%%/templates/subSilver/profile_view_body.tpl
 %%PHPBBDIR%%/templates/subSilver/memberlist_body.tpl
+%%PHPBBDIR%%/templates/subSilver/agreement.tpl
+%%PHPBBDIR%%/templates/subSilver/search_results_posts.tpl
+%%PHPBBDIR%%/templates/subSilver/privmsgs_preview.tpl
+%%PHPBBDIR%%/templates/subSilver/error_body.tpl
+%%PHPBBDIR%%/templates/subSilver/index.htm
 %%PHPBBDIR%%/templates/subSilver/message_body.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_body.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_move.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_split.tpl
-%%PHPBBDIR%%/templates/subSilver/modcp_viewip.tpl
-%%PHPBBDIR%%/templates/subSilver/overall_footer.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_preview.tpl
 %%PHPBBDIR%%/templates/subSilver/overall_header.tpl
+%%PHPBBDIR%%/templates/subSilver/search_results_topics.tpl
 %%PHPBBDIR%%/templates/subSilver/posting_body.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_poll_body.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_preview.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_smilies.tpl
-%%PHPBBDIR%%/templates/subSilver/posting_topic_review.tpl
 %%PHPBBDIR%%/templates/subSilver/privmsgs_body.tpl
-%%PHPBBDIR%%/templates/subSilver/privmsgs_popup.tpl
-%%PHPBBDIR%%/templates/subSilver/privmsgs_preview.tpl
-%%PHPBBDIR%%/templates/subSilver/privmsgs_read_body.tpl
 %%PHPBBDIR%%/templates/subSilver/profile_add_body.tpl
-%%PHPBBDIR%%/templates/subSilver/profile_avatar_gallery.tpl
-%%PHPBBDIR%%/templates/subSilver/profile_send_email.tpl
-%%PHPBBDIR%%/templates/subSilver/profile_send_pass.tpl
-%%PHPBBDIR%%/templates/subSilver/profile_view_body.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_smilies.tpl
 %%PHPBBDIR%%/templates/subSilver/search_body.tpl
-%%PHPBBDIR%%/templates/subSilver/search_results_posts.tpl
-%%PHPBBDIR%%/templates/subSilver/search_results_topics.tpl
-%%PHPBBDIR%%/templates/subSilver/search_username.tpl
-%%PHPBBDIR%%/templates/subSilver/simple_footer.tpl
-%%PHPBBDIR%%/templates/subSilver/simple_header.tpl
+%%PHPBBDIR%%/templates/subSilver/index_body.tpl
+%%PHPBBDIR%%/templates/subSilver/profile_send_email.tpl
+%%PHPBBDIR%%/templates/subSilver/privmsgs_popup.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_split.tpl
+%%PHPBBDIR%%/templates/subSilver/posting_poll_body.tpl
 %%PHPBBDIR%%/templates/subSilver/subSilver.cfg
 %%PHPBBDIR%%/templates/subSilver/subSilver.css
-%%PHPBBDIR%%/templates/subSilver/theme_info.cfg
-%%PHPBBDIR%%/templates/subSilver/viewforum_body.tpl
-%%PHPBBDIR%%/templates/subSilver/viewonline_body.tpl
-%%PHPBBDIR%%/templates/subSilver/viewtopic_body.tpl
-%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_ballot.tpl
-%%PHPBBDIR%%/templates/subSilver/viewtopic_poll_result.tpl
+%%PHPBBDIR%%/templates/subSilver/profile_send_pass.tpl
+%%PHPBBDIR%%/templates/subSilver/faq_body.tpl
+%%PHPBBDIR%%/templates/subSilver/privmsgs_read_body.tpl
+%%PHPBBDIR%%/templates/subSilver/confirm_body.tpl
+%%PHPBBDIR%%/templates/subSilver/modcp_viewip.tpl
+%%PHPBBDIR%%/templates/subSilver/simple_footer.tpl
+%%PHPBBDIR%%/templates/subSilver/login_body.tpl
+%%PHPBBDIR%%/templates/subSilver/jumpbox.tpl
+%%PHPBBDIR%%/templates/subSilver/profile_avatar_gallery.tpl
+%%PHPBBDIR%%/templates/index.htm
 %%PHPBBDIR%%/viewforum.php
 %%PHPBBDIR%%/viewonline.php
 %%PHPBBDIR%%/viewtopic.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_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/doc/phpbb
+@unexec rmdir share/doc 2>/dev/null || true
 @dirrm share/phpbb/contrib
 @dirrm share/phpbb
-@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
-@dirrm %%PHPBBDIR%%/templates/subSilver/admin
+@unexec rmdir share 2>/dev/null || true
+@dirrm %%PHPBBDIR%%/admin
+@dirrm %%PHPBBDIR%%/db
+@dirrm %%PHPBBDIR%%/images/smiles
+@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/upload 2>/dev/null || true
+@unexec rmdir %D/%%PHPBBDIR%%/images/avatars 2>/dev/null || true
+@unexec rmdir %D/%%PHPBBDIR%%/images 2>/dev/null || true
+@dirrm %%PHPBBDIR%%/includes
+@dirrm %%PHPBBDIR%%/install/schemas
+@dirrm %%PHPBBDIR%%/install
 @dirrm %%PHPBBDIR%%/language/lang_english/email
 @dirrm %%PHPBBDIR%%/language/lang_english
-@dirrm %%PHPBBDIR%%/includes
-@dirrm %%PHPBBDIR%%/images/smiles
-@dirrm %%PHPBBDIR%%/db/schemas
-@dirrm %%PHPBBDIR%%/db
-@dirrm %%PHPBBDIR%%/admin
+@unexec rmdir %D/%%PHPBBDIR%%/language 2>/dev/null || true
+@dirrm %%PHPBBDIR%%/templates/subSilver/admin
+@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
 @unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver/images 2>/dev/null || true
 @unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver 2>/dev/null || true
 @unexec rmdir %D/%%PHPBBDIR%%/templates 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/language 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/upload 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images/avatars 2>/dev/null || true
-@unexec rmdir %D/%%PHPBBDIR%%/images 2>/dev/null || true
 @unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
-%%PORTDOCS%%@dirrm share/doc/phpbb