- Update to 1.5

- Take maintainership

PR:		ports/90626
Submitted by:	chinsan dot tw @gmail.com

3 files changed, 34 insertions, 35 deletions

diff --git a/chinese/firefox-zh_TW/Makefile b/chinese/firefox-zh_TW/Makefile
index b868ba6ac954..4322b80493d9 100644
--- a/chinese/firefox-zh_TW/Makefile
+++ b/chinese/firefox-zh_TW/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	chinese www
 MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
 PKGNAMESUFFIX=	-zh_TW
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}b
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Firefox Traditional Chinese(zh-TW) Language Pack
 
 BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
@@ -22,12 +21,9 @@ RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
-BROKEN="Does not work with Firefox 1.5"
-
 FIREFOX=	${PORTNAME}
 FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
 REGXPCOM=	${FIREFOX_HOME}/regxpcom
-REGCHROME=	${FIREFOX_HOME}/regchrome
 FIREFOX_BIN=	${FIREFOX_HOME}/${PORTNAME}-bin
 
 PLIST_SUB=	FIREFOX=${FIREFOX}
@@ -37,33 +33,20 @@ PLIST_SUB=	FIREFOX=${FIREFOX}
 do-install:
 	@${ECHO_MSG} "===> Backup setting files..."
 	(cd ${FIREFOX_HOME}; \
-	${MV} -f browserconfig.properties browserconfig.properties.orig)
+	${CP} -f browserconfig.properties browserconfig.properties.orig)
 	(cd ${FIREFOX_HOME}/defaults/pref; \
-	${MV} -f firefox-l10n.js firefox-l10n.js.orig)
+	${CP} -f firefox-l10n.js firefox-l10n.js.orig)
 	(cd ${FIREFOX_HOME}/defaults/profile; \
-	${MV} -f bookmarks.html bookmarks.html.orig)
-	(cd ${FIREFOX_HOME}/chrome; \
-	${MV} -f browser.jar browser.jar.orig; \
-	${MV} -f chrome.rdf chrome.rdf.orig; \
-	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
+	${CP} -f bookmarks.html bookmarks.html.orig)
 
 	@${ECHO_MSG} "===> Copying locale files..."
 	(cd ${WRKSRC}; ${TAR} -cf - *) | \
 	${TAR} -xf - -C ${FIREFOX_HOME}
 
-	@${ECHO_MSG} "===> Cleaning Chrome's registry..."
-	${RM} -rf ${FIREFOX_HOME}/chrome/overlayinfo
-	${RM} -f ${FIREFOX_HOME}/chrome/*.rdf
-	${MKDIR} ${FIREFOX_HOME}/chrome/overlayinfo
-	${RM} -f ${FIREFOX_HOME}/component.reg
-	${RM} -rf ${FIREFOX_HOME}/extensions
-
 	@${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 ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. \
-		${REGCHROME} || true ; \
 	./run-mozilla.sh ${FIREFOX_BIN} -register )
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/chinese/firefox-zh_TW/distinfo b/chinese/firefox-zh_TW/distinfo
index d9a6577fe47f..d4df175c1af3 100644
--- a/chinese/firefox-zh_TW/distinfo
+++ b/chinese/firefox-zh_TW/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-zh_TW.1.0.6b.tar.gz) = 8c2b83035d440bb8267b9f664bab2bc6
-SHA256 (firefox-zh_TW.1.0.6b.tar.gz) = 72a4d7d3b471e45c02c58d41cd0d00df2b0385335018964ffc370a4892f54308
-SIZE (firefox-zh_TW.1.0.6b.tar.gz) = 400175
+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
diff --git a/chinese/firefox-zh_TW/pkg-plist b/chinese/firefox-zh_TW/pkg-plist
index 438ae2359cd2..6695227c69c9 100644
--- a/chinese/firefox-zh_TW/pkg-plist
+++ b/chinese/firefox-zh_TW/pkg-plist
@@ -1,22 +1,38 @@
 @exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.orig
-@exec mv %D/lib/%%FIREFOX%%/chrome/browser.jar %D/lib/%%FIREFOX%%/chrome/browser.jar.orig
-@exec mv %D/lib/%%FIREFOX%%/chrome/chrome.rdf %D/lib/%%FIREFOX%%/chrome/chrome.rdf.orig
-@exec mv %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt.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%%/chrome/browser.jar
-lib/%%FIREFOX%%/chrome/chrome.rdf
-lib/%%FIREFOX%%/chrome/installed-chrome.txt
 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
 lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
+lib/%%FIREFOX%%/searchplugins/Giga_Cdict.png
+lib/%%FIREFOX%%/searchplugins/Giga_Cdict.src
+lib/%%FIREFOX%%/searchplugins/chineseidioms.png
+lib/%%FIREFOX%%/searchplugins/chineseidioms.src
+lib/%%FIREFOX%%/searchplugins/edudict.gif
+lib/%%FIREFOX%%/searchplugins/edudict.src
+lib/%%FIREFOX%%/searchplugins/findbook.png
+lib/%%FIREFOX%%/searchplugins/findbook.src
+lib/%%FIREFOX%%/searchplugins/freshports.png
+lib/%%FIREFOX%%/searchplugins/freshports.src
+lib/%%FIREFOX%%/searchplugins/php.png
+lib/%%FIREFOX%%/searchplugins/php.src
+lib/%%FIREFOX%%/searchplugins/rexchendict.gif
+lib/%%FIREFOX%%/searchplugins/rexchendict.src
+lib/%%FIREFOX%%/searchplugins/wretch-album.png
+lib/%%FIREFOX%%/searchplugins/wretch-album.src
+lib/%%FIREFOX%%/searchplugins/xuite-album.png
+lib/%%FIREFOX%%/searchplugins/xuite-album.src
+lib/%%FIREFOX%%/searchplugins/yhbid_tw.gif
+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/browser.jar.orig %D/lib/%%FIREFOX%%/chrome/browser.jar
-@unexec mv %D/lib/%%FIREFOX%%/chrome/chrome.rdf.orig %D/lib/%%FIREFOX%%/chrome/chrome.rdf
-@unexec mv %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt.orig %D/lib/%%FIREFOX%%/chrome/installed-chrome.txt
 @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