4 files changed, 25 insertions, 39 deletions

diff --git a/chinese/firefox-zh_CN/Makefile b/chinese/firefox-zh_CN/Makefile
index e9af1117ecc8..db7799a15128 100644
--- a/chinese/firefox-zh_CN/Makefile
+++ b/chinese/firefox-zh_CN/Makefile
@@ -6,28 +6,26 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.5
+PORTVERSION=	1.5c
 CATEGORIES=	chinese www
-MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
+MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/firefox/ \
+		ftp://chinsan2.twbbs.org/distfiles/firefox/
 PKGNAMESUFFIX=	-zh_CN
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Firefox Simplified Chinese(zh-CN) Language Pack
 
-BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
+BUILD_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 
-BROKEN=		Unfetchable
-
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 FIREFOX=	${PORTNAME}
+WRKSRC=		${WRKDIR}/${FIREFOX}
 FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
-REGXPCOM=	${FIREFOX_HOME}/regxpcom
-FIREFOX_BIN=	${FIREFOX_HOME}/${PORTNAME}-bin
-
 PLIST_SUB=	FIREFOX=${FIREFOX}
 
 .include <bsd.port.pre.mk>
@@ -35,7 +33,8 @@ PLIST_SUB=	FIREFOX=${FIREFOX}
 do-install:
 	@${ECHO_MSG} "===> Backup setting files..."
 	(cd ${FIREFOX_HOME}; \
-	${CP} -f browserconfig.properties browserconfig.properties.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; \
@@ -45,11 +44,4 @@ do-install:
 	(cd ${WRKSRC}; ${TAR} -cf - *) | \
 	${TAR} -xf - -C ${FIREFOX_HOME}
 
-	@${ECHO_MSG} "===> Building Chrome's registry..."
-	(cd ${FIREFOX_HOME} || exit 1 ; \
-	./run-mozilla.sh ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. \
-		${REGXPCOM} || true ; \
-	./run-mozilla.sh ${FIREFOX_BIN} -register )
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/chinese/firefox-zh_CN/distinfo b/chinese/firefox-zh_CN/distinfo
index 9a12135a33a2..68ef552aba5b 100644
--- a/chinese/firefox-zh_CN/distinfo
+++ b/chinese/firefox-zh_CN/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-zh_CN.1.5.tar.gz) = bd1d96719ae56e5a2892383df54fe7ec
-SHA256 (firefox-zh_CN.1.5.tar.gz) = c456e236fc92b2b11e44a79d786c96083342ff75354228e203e2b14b134b5b70
-SIZE (firefox-zh_CN.1.5.tar.gz) = 141438
+MD5 (firefox-zh_CN/firefox-zh_CN.1.5c.tar.gz) = cae95a61b5442b16f37161055d6afc9b
+SHA256 (firefox-zh_CN/firefox-zh_CN.1.5c.tar.gz) = 13e8f33ad7625b01b23e9a23f64baa7ad2ede3a11bd83969675b3e03297da958
+SIZE (firefox-zh_CN/firefox-zh_CN.1.5c.tar.gz) = 142949
diff --git a/chinese/firefox-zh_CN/pkg-message b/chinese/firefox-zh_CN/pkg-message
deleted file mode 100644
index 19f39da52aa6..000000000000
--- a/chinese/firefox-zh_CN/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-********************************
-If your XIM wouldn't work properly, try to make a file
-
-"${HOME}/.mozilla/firefox/*.default/user.js"
-
-with below content;
---
-user_pref("xim.input_style", "over-the-spot")
---
-********************************
diff --git a/chinese/firefox-zh_CN/pkg-plist b/chinese/firefox-zh_CN/pkg-plist
index cc5c19388229..6c20a16ccf95 100644
--- a/chinese/firefox-zh_CN/pkg-plist
+++ b/chinese/firefox-zh_CN/pkg-plist
@@ -1,22 +1,26 @@
 @exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.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/zh-CN.jar
 lib/%%FIREFOX%%/chrome/zh-CN.manifest
-lib/%%FIREFOX%%/components/compreg.dat
-lib/%%FIREFOX%%/components/xpti.dat
 lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
 lib/%%FIREFOX%%/defaults/profile/bookmarks.html
-lib/%%FIREFOX%%/defaults/profile/user.js
-lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
-lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
-lib/%%FIREFOX%%/searchplugins/baidu.gif
+lib/%%FIREFOX%%/searchplugins/yahoo-cn.src
+lib/%%FIREFOX%%/searchplugins/google.src
+lib/%%FIREFOX%%/searchplugins/amazondotcom.src
 lib/%%FIREFOX%%/searchplugins/baidu.src
-lib/%%FIREFOX%%/searchplugins/eBaycn.gif
-lib/%%FIREFOX%%/searchplugins/eBaycn.src
-lib/%%FIREFOX%%/searchplugins/freshports.png
-lib/%%FIREFOX%%/searchplugins/freshports.src
+lib/%%FIREFOX%%/searchplugins/eBay-zh-CN.src
+lib/%%FIREFOX%%/searchplugins/taobao.src
+lib/%%FIREFOX%%/searchplugins/yahoo-cn.gif
+lib/%%FIREFOX%%/searchplugins/google.gif
+lib/%%FIREFOX%%/searchplugins/amazondotcom.png
+lib/%%FIREFOX%%/searchplugins/baidu.gif
+lib/%%FIREFOX%%/searchplugins/eBay-zh-CN.gif
+lib/%%FIREFOX%%/searchplugins/taobao.png
 @unexec mv %D/lib/%%FIREFOX%%/browserconfig.properties.orig %D/lib/%%FIREFOX%%/browserconfig.properties
+@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