- Update to 1.5

- Take maintainership

Submitted by:	chinsan dot tw @ gmail.com

3 files changed, 14 insertions, 37 deletions

diff --git a/chinese/firefox-zh_CN/Makefile b/chinese/firefox-zh_CN/Makefile
index a0915a40ed70..1176dd26628c 100644
--- a/chinese/firefox-zh_CN/Makefile
+++ b/chinese/firefox-zh_CN/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_CN
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}b
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Firefox Simplified Chinese(zh-CN) 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_CN/distinfo b/chinese/firefox-zh_CN/distinfo
index 89b493fac5eb..9a12135a33a2 100644
--- a/chinese/firefox-zh_CN/distinfo
+++ b/chinese/firefox-zh_CN/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-zh_CN.1.0.6b.tar.gz) = 116d6fd4c0d4ada1161af83707f962e3
-SHA256 (firefox-zh_CN.1.0.6b.tar.gz) = 4187cdf4b38ef0038b90a68fb786bfe89e863dd591b61ffebe4bc2f87cbec4e5
-SIZE (firefox-zh_CN.1.0.6b.tar.gz) = 449525
+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
diff --git a/chinese/firefox-zh_CN/pkg-plist b/chinese/firefox-zh_CN/pkg-plist
index 738a5cf07ab6..50c2617a781a 100644
--- a/chinese/firefox-zh_CN/pkg-plist
+++ b/chinese/firefox-zh_CN/pkg-plist
@@ -1,26 +1,20 @@
 @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-CN.jar
+lib/%%FIREFOX%%/chrome/zh-CN.manifest
 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/baidu.src
 lib/%%FIREFOX%%/searchplugins/eBaycn.gif
 lib/%%FIREFOX%%/searchplugins/eBaycn.src
-lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
-lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
+lib/%%FIREFOX%%/searchplugins/freshports.png
+lib/%%FIREFOX%%/searchplugins/freshports.src
 @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