4 files changed, 8 insertions, 22 deletions

diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index 1f9f1ce48736..c64771fde2c5 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	phpbb
-PORTVERSION=	2.0.20
+PORTVERSION=	2.0.21
 CATEGORIES=	chinese www
 MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/ \
 		ftp://chinsan2.twbbs.org/distfiles/
 PKGNAMESUFFIX=	-tw
-DISTNAME=	phpBB-${PORTVERSION}
+DISTNAME=	phpBB-tw-${PORTVERSION}
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	The Traditional Chinese version of phpBB
@@ -19,6 +19,7 @@ COMMENT=	The Traditional Chinese version of phpBB
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
 
 CONFLICTS=	phpbb-[0-9]*
+USE_DOS2UNIX=	yes
 
 # Get HOSTNAME
 .if exists(/sbin/sysctl)
diff --git a/chinese/phpbb-tw/distinfo b/chinese/phpbb-tw/distinfo
index c40be2d04410..0636f6accb47 100644
--- a/chinese/phpbb-tw/distinfo
+++ b/chinese/phpbb-tw/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpBB-2.0.20.tar.gz) = 897066bef29732fdf6cf97905ef96542
-SHA256 (phpBB-2.0.20.tar.gz) = d13deacb0cee3dd6db4813f630aac98927097d75ed742c76b5af7d0c8bf1dc2d
-SIZE (phpBB-2.0.20.tar.gz) = 654954
+MD5 (phpBB-tw-2.0.21.tar.gz) = d8189b577925125e1fc4206d68203b7a
+SHA256 (phpBB-tw-2.0.21.tar.gz) = 221e9e76480fd059eb2d4cc56600f591a54d992a4b821002d6a8ce29400260fc
+SIZE (phpBB-tw-2.0.21.tar.gz) = 620058
diff --git a/chinese/phpbb-tw/files/patch-includes-sessions.php b/chinese/phpbb-tw/files/patch-includes-sessions.php
deleted file mode 100644
index a84aa2f04322..000000000000
--- a/chinese/phpbb-tw/files/patch-includes-sessions.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- includes/sessions.php.orig	Sat May 14 05:04:00 2005
-+++ includes/sessions.php	Sun May 15 18:53:48 2005
-@@ -167,7 +167,7 @@
- 		$sql = "INSERT INTO " . SESSIONS_TABLE . "
- 			(session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in, session_admin)
- 			VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login, $admin)";
--		if ( !$db->sql_query($sql) )
-+		if ( $user_id != ANONYMOUS && !$db->sql_query($sql) )
- 		{
- 			message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql);
- 		}
diff --git a/chinese/phpbb-tw/pkg-plist b/chinese/phpbb-tw/pkg-plist
index 2ab71ad74415..28c37a640499 100644
--- a/chinese/phpbb-tw/pkg-plist
+++ b/chinese/phpbb-tw/pkg-plist
@@ -139,8 +139,6 @@
 %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_bbcode.php
 %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_faq.php
 %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_main.php
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/search_stopwords.txt
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/search_synonyms.txt
 %%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
@@ -180,6 +178,7 @@
 %%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/confirm_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/db_utils_backup_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/db_utils_restore_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/disallow_body.tpl
@@ -223,7 +222,6 @@
 %%PHPBBDIR%%/templates/subSilver/groupcp_info_body.tpl
 %%PHPBBDIR%%/templates/subSilver/groupcp_pending_info.tpl
 %%PHPBBDIR%%/templates/subSilver/groupcp_user_body.tpl
-%%PHPBBDIR%%/templates/subSilver/images/Thumbs.db
 %%PHPBBDIR%%/templates/subSilver/images/cellpic.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic1.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic2.jpg
@@ -256,7 +254,6 @@
 %%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_chinese_traditional_taiwan/Thumbs.db
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_aim.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_edit.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_email.gif
@@ -273,7 +270,6 @@
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/post.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/reply-locked.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/reply.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_english/Thumbs.db
 %%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
@@ -378,5 +374,5 @@
 @dirrmtry %%PHPBBDIR%%/templates/subSilver/images
 @dirrmtry %%PHPBBDIR%%/templates/subSilver
 @dirrmtry %%PHPBBDIR%%/templates
-@unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
+@dirrmtry %%PHPBBDIR%% || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
 @dirrmtry www/data