- Update to 1.0.5

PR:		ports/83489
Submitted by:	chinsan <chinsan.tw@gmail.com> (maintainer)

4 files changed, 29 insertions, 61 deletions

diff --git a/chinese/firefox-zh_CN/Makefile b/chinese/firefox-zh_CN/Makefile
index 7730424f89b5..765712e73dff 100644
--- a/chinese/firefox-zh_CN/Makefile
+++ b/chinese/firefox-zh_CN/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	chinese www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/win32/xpi/
+MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
 PKGNAMESUFFIX=	-zh_CN
-DISTNAME=	zh-CN
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
 EXTRACT_SUFX=	.xpi
 
 # Maintainership available: drop me a line if interested :p
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Firefox Simplified Chinese(zh-CN) Language Pack
 
-BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/${FIREFOX}
-RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/${FIREFOX}
+BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
+RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
@@ -38,19 +37,20 @@ PLIST_SUB=	FIREFOX=${FIREFOX}
 
 do-install:
 	echo "===> Backup setting files..."
+	(cd ${FIREFOX_HOME}; \
+	${MV} -f browserconfig.properties browserconfig.properties.orig)
+	(cd ${FIREFOX_HOME}/defaults/pref; \
+	${MV} -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 chrome.rdf chrome.rdf.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
 
 	echo "===> Copying locale files..."
-	(cd ${WRKDIR}; ${TAR} -cf - chrome) | \
+	(cd ${WRKDIR}; ${TAR} -cf - *) | \
 	${TAR} -xf - -C ${FIREFOX_HOME}
 
-	echo "===> Copying locale setting file..."
-	(cd ${FIREFOX_HOME}/chrome; \
-	${CP} installed-chrome.txt.orig installed-chrome.txt; \
-	${CAT} ${FILESDIR}/installed-chrome.txt >> installed-chrome.txt)
-
 	echo "===> Cleaning Chrome's registry..."
 	${RM} -rf ${FIREFOX_HOME}/chrome/overlayinfo
 	${RM} -f ${FIREFOX_HOME}/chrome/*.rdf
diff --git a/chinese/firefox-zh_CN/distinfo b/chinese/firefox-zh_CN/distinfo
index c573ed722b9e..9480fdf5a1b2 100644
--- a/chinese/firefox-zh_CN/distinfo
+++ b/chinese/firefox-zh_CN/distinfo
@@ -1,2 +1,2 @@
-MD5 (zh-CN.xpi) = c6025c90aaa6ae5b555992f46f74085c
-SIZE (zh-CN.xpi) = 126728
+MD5 (firefox-zh_CN.1.0.5.xpi) = d010dac06fdb71924502e46270e392ef
+SIZE (firefox-zh_CN.1.0.5.xpi) = 132867
diff --git a/chinese/firefox-zh_CN/files/installed-chrome.txt b/chinese/firefox-zh_CN/files/installed-chrome.txt
deleted file mode 100644
index 9791179d143a..000000000000
--- a/chinese/firefox-zh_CN/files/installed-chrome.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-content,install,url,jar:resource:/chrome/comm.jar!/content/necko/
-content,install,url,jar:resource:/chrome/comm.jar!/content/xbl-marquee/
-content,install,url,jar:resource:/chrome/embed-sample.jar!/content/embed/
-locale,install,url,jar:resource:/chrome/embed-sample.jar!/locale/en-US/embed/
-skin,install,url,jar:resource:/chrome/embed-sample.jar!/skin/classic/embed/
-content,install,url,jar:resource:/chrome/pipnss.jar!/content/pipnss/
-content,install,url,jar:resource:/chrome/pippki.jar!/content/pippki/
-skin,install,select,classic/1.0
-content,install,url,jar:resource:/chrome/toolkit.jar!/content/global/
-content,install,url,jar:resource:/chrome/toolkit.jar!/content/global-platform/
-content,install,url,jar:resource:/chrome/toolkit.jar!/content/global-region/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/global/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/global-region/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/global-platform/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/necko/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/mozapps/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/passwordmgr/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/pippki/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/pipnss/
-content,install,url,jar:resource:/chrome/help.jar!/content/help/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/help/
-content,install,url,jar:resource:/chrome/toolkit.jar!/content/passwordmgr/
-content,install,url,jar:resource:/chrome/toolkit.jar!/content/mozapps/
-skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/communicator/
-skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/global/
-skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/mozapps/
-skin,install,url,jar:resource:/chrome/help.jar!/skin/classic/help/
-content,install,url,jar:resource:/chrome/comm.jar!/content/cookie/
-content,install,url,jar:resource:/chrome/comm.jar!/content/autoconfig/
-locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/autoconfig/
-content,install,url,jar:resource:/chrome/inspector.jar!/content/inspector/
-locale,install,url,jar:resource:/chrome/inspector.jar!/locale/en-US/inspector/
-skin,install,url,jar:resource:/chrome/inspector.jar!/skin/classic/inspector/
-skin,install,url,jar:resource:/chrome/inspector.jar!/skin/modern/inspector/
-content,install,url,jar:resource:/chrome/comm.jar!/content/p3p/
-locale,install,url,jar:resource:/chrome/en-US.jar!/locale/en-US/p3p/
-content,install,url,jar:resource:/chrome/browser.jar!/content/browser/
-content,install,url,jar:resource:/chrome/browser.jar!/content/browser-region/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/browser/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/browser-region/
-locale,install,url,jar:resource:/chrome/zh-CN.jar!/locale/cookie/
-content,install,url,jar:resource:/chrome/comm.jar!/content/communicator/
-skin,install,url,jar:resource:/chrome/classic.jar!/skin/classic/browser/
-locale,install,select,zh-CN
-locale,install,select,CN
diff --git a/chinese/firefox-zh_CN/pkg-plist b/chinese/firefox-zh_CN/pkg-plist
index b9136d553135..f9b8b813bb52 100644
--- a/chinese/firefox-zh_CN/pkg-plist
+++ b/chinese/firefox-zh_CN/pkg-plist
@@ -1,9 +1,22 @@
-@exec mv %D/bin/%%FIREFOX%% %D/bin/%%FIREFOX%%.orig
+@exec mv %D/lib/%%FIREFOX%%/browserconfig.properties %D/lib/%%FIREFOX%%/browserconfig.properties.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/chrome.rdf
 lib/%%FIREFOX%%/chrome/installed-chrome.txt
 lib/%%FIREFOX%%/chrome/zh-CN.jar
-@unexec mv %D/bin/%%FIREFOX%%.orig %D/bin/%%FIREFOX%%
+lib/%%FIREFOX%%/defaults/pref/firefox-l10n.js
+lib/%%FIREFOX%%/defaults/profile/bookmarks.html
+lib/%%FIREFOX%%/searchplugins/baidu.gif
+lib/%%FIREFOX%%/searchplugins/baidu.src
+lib/%%FIREFOX%%/searchplugins/eBaycn.gif
+lib/%%FIREFOX%%/searchplugins/eBaycn.src
+lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
+lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
+@unexec mv %D/lib/%%FIREFOX%%/browserconfig.properties.orig %D/lib/%%FIREFOX%%/browserconfig.properties
 @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