- Update to 1.5b

- fix some compatible bug with www/firefox version 1.5

PR:		ports/90998
Submitted by:	maintainer

4 files changed, 13 insertions, 26 deletions

diff --git a/chinese/firefox-zh_TW/Makefile b/chinese/firefox-zh_TW/Makefile
index 4322b80493d9..613dbf1adcb6 100644
--- a/chinese/firefox-zh_TW/Makefile
+++ b/chinese/firefox-zh_TW/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.5
+PORTVERSION=	1.5b
 CATEGORIES=	chinese www
-MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
+MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/ \
+		ftp://bbs.ilc.edu.tw/chinsan/distfiles/
 PKGNAMESUFFIX=	-zh_TW
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
 
@@ -23,8 +24,6 @@ NO_BUILD=	yes
 
 FIREFOX=	${PORTNAME}
 FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
-REGXPCOM=	${FIREFOX_HOME}/regxpcom
-FIREFOX_BIN=	${FIREFOX_HOME}/${PORTNAME}-bin
 
 PLIST_SUB=	FIREFOX=${FIREFOX}
 
@@ -34,6 +33,8 @@ 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)
 	(cd ${FIREFOX_HOME}/defaults/pref; \
 	${CP} -f firefox-l10n.js firefox-l10n.js.orig)
 	(cd ${FIREFOX_HOME}/defaults/profile; \
@@ -43,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_TW/distinfo b/chinese/firefox-zh_TW/distinfo
index d4df175c1af3..293d1303a1b5 100644
--- a/chinese/firefox-zh_TW/distinfo
+++ b/chinese/firefox-zh_TW/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-zh_TW.1.5.tar.gz) = c419dd2e75ad78c6b43a3936f5654afc
-SHA256 (firefox-zh_TW.1.5.tar.gz) = 710cd5332be0297bb0216eebb8e0940f5e840ef1a8a600d13fd3c2b46d71f55f
-SIZE (firefox-zh_TW.1.5.tar.gz) = 144995
+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
diff --git a/chinese/firefox-zh_TW/pkg-message b/chinese/firefox-zh_TW/pkg-message
deleted file mode 100644
index 19f39da52aa6..000000000000
--- a/chinese/firefox-zh_TW/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_TW/pkg-plist b/chinese/firefox-zh_TW/pkg-plist
index 984e1951d4c4..e07773899963 100644
--- a/chinese/firefox-zh_TW/pkg-plist
+++ b/chinese/firefox-zh_TW/pkg-plist
@@ -1,11 +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%%/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%%/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
@@ -36,5 +38,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%%/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