3 files changed, 13 insertions, 18 deletions

diff --git a/chinese/firefox-zh_TW/Makefile b/chinese/firefox-zh_TW/Makefile
index dbfc05a12b58..b466a065093b 100644
--- a/chinese/firefox-zh_TW/Makefile
+++ b/chinese/firefox-zh_TW/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.5b
+PORTVERSION=	1.5c
 CATEGORIES=	chinese www
-MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/ \
-		ftp://bbs.ilc.edu.tw/chinsan/distfiles/
+MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/firefox/ \
+		ftp://chinsan2.twbbs.org/distfiles/firefox/
 PKGNAMESUFFIX=	-zh_TW
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Firefox Traditional Chinese(zh-TW) Language Pack
 
-BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
+BUILD_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 
-BROKEN=		Incorrect pkg-plist
-
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 FIREFOX=	${PORTNAME}
+WRKSRC=		${WRKDIR}/${FIREFOX}
 FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
-
 PLIST_SUB=	FIREFOX=${FIREFOX}
 
 .include <bsd.port.pre.mk>
@@ -34,9 +33,8 @@ PLIST_SUB=	FIREFOX=${FIREFOX}
 do-install:
 	@${ECHO_MSG} "===> Backup setting files..."
 	(cd ${FIREFOX_HOME}; \
-	${CP} -f browserconfig.properties browserconfig.properties.orig)
-	(cd ${FIREFOX_HOME}/chrome; \
-	${CP} -f en-US.manifest en-US.manifest.orig)
+	${CP} -f browserconfig.properties browserconfig.properties.orig; \
+	${CP} -f updater.ini updater.ini.orig)
 	(cd ${FIREFOX_HOME}/defaults/pref; \
 	${CP} -f firefox-l10n.js firefox-l10n.js.orig)
 	(cd ${FIREFOX_HOME}/defaults/profile; \
diff --git a/chinese/firefox-zh_TW/distinfo b/chinese/firefox-zh_TW/distinfo
index 293d1303a1b5..9870e505c571 100644
--- a/chinese/firefox-zh_TW/distinfo
+++ b/chinese/firefox-zh_TW/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-zh_TW.1.5b.tar.gz) = a5e948af53788bd6c243fe649ce9f00c
-SHA256 (firefox-zh_TW.1.5b.tar.gz) = aba6322813dc632f2338adaa778dad3283df5e58276cfdfd383541a5c8a81954
-SIZE (firefox-zh_TW.1.5b.tar.gz) = 148125
+MD5 (firefox-zh_TW/firefox-zh_TW.1.5c.tar.gz) = 604dd19e505664ed99b37974a498c808
+SHA256 (firefox-zh_TW/firefox-zh_TW.1.5c.tar.gz) = 6c10915fd347c522d95d01f17d56783179b6c9f1f5184b4188db1acb55224a7a
+SIZE (firefox-zh_TW/firefox-zh_TW.1.5c.tar.gz) = 139133
diff --git a/chinese/firefox-zh_TW/pkg-plist b/chinese/firefox-zh_TW/pkg-plist
index e07773899963..f892a7b2326b 100644
--- a/chinese/firefox-zh_TW/pkg-plist
+++ b/chinese/firefox-zh_TW/pkg-plist
@@ -1,16 +1,13 @@
 @exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.orig
-@exec mv %D/lib/%%FIREFOX%%/chrome/en-US.manifest %D/lib/%%FIREFOX%%/chrome/en-US.manifest.orig
+@exec mv %D/lib/%%FIREFOX%%/updater.ini %D/lib/%%FIREFOX%%/updater.ini.orig
 @exec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig
 @exec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig
 lib/%%FIREFOX%%/browserconfig.properties
 lib/%%FIREFOX%%/updater.ini
-lib/%%FIREFOX%%/chrome/chromelist.txt
-lib/%%FIREFOX%%/chrome/en-US.manifest
 lib/%%FIREFOX%%/chrome/zh-TW.jar
 lib/%%FIREFOX%%/chrome/zh-TW.manifest
 lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
 lib/%%FIREFOX%%/defaults/profile/bookmarks.html
-lib/%%FIREFOX%%/defaults/profile/user.js
 lib/%%FIREFOX%%/searchplugins/BahamutSearch.png
 lib/%%FIREFOX%%/searchplugins/BahamutSearch.src
 lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
@@ -38,6 +35,6 @@ lib/%%FIREFOX%%/searchplugins/yhbid_tw.src
 lib/%%FIREFOX%%/searchplugins/yahoo.stock.src
 lib/%%FIREFOX%%/searchplugins/yahoo.stock.png
 @unexec mv %D/lib/%%FIREFOX%%/browserconfig.properties.orig %D/lib/%%FIREFOX%%/browserconfig.properties
-@unexec mv %D/lib/%%FIREFOX%%/chrome/en-US.manifest.orig %D/lib/%%FIREFOX%%/chrome/en-US.manifest
+@unexec mv %D/lib/%%FIREFOX%%/updater.ini.orig %D/lib/%%FIREFOX%%/updater.ini
 @unexec mv %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js.orig %D/lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
 @unexec mv %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html.orig %D/lib/%%FIREFOX%%/defaults/profile/bookmarks.html