6 files changed, 30 insertions, 70 deletions

diff --git a/japanese/firefox-ja/Makefile b/japanese/firefox-ja/Makefile
index 403a1ed3790e..e4831e91ce57 100644
--- a/japanese/firefox-ja/Makefile
+++ b/japanese/firefox-ja/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	japanese www
 MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
 PKGNAMESUFFIX=	-ja_JP
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}b
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Firefox Japanese(ja-JP) Language Pack
 
 BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
@@ -22,11 +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}
@@ -36,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/japanese/firefox-ja/distinfo b/japanese/firefox-ja/distinfo
index 3ffbc15a725c..eda364d1f2de 100644
--- a/japanese/firefox-ja/distinfo
+++ b/japanese/firefox-ja/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-ja_JP.1.0.6b.tar.gz) = bbd98e5466795ec9efde646eb71580e5
-SHA256 (firefox-ja_JP.1.0.6b.tar.gz) = 07a2fed56cae55ca4cdfe756ee95be2983f63ab9b49b26db1d84dfe8eb463c20
-SIZE (firefox-ja_JP.1.0.6b.tar.gz) = 491532
+MD5 (firefox-ja_JP.1.5.tar.gz) = 872f372a2a5dc894a4d2a5aa7bf5ff2d
+SHA256 (firefox-ja_JP.1.5.tar.gz) = f2d40ded1aac1907a4d0ee3819d4ae0365334a0cbea43fa03d613b209d29c5f7
+SIZE (firefox-ja_JP.1.5.tar.gz) = 180408
diff --git a/japanese/firefox-ja/pkg-plist b/japanese/firefox-ja/pkg-plist
index bb7a954ea3fb..d33ef8159620 100644
--- a/japanese/firefox-ja/pkg-plist
+++ b/japanese/firefox-ja/pkg-plist
@@ -1,14 +1,11 @@
 @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/ja-JP.jar
+lib/%%FIREFOX%%/chrome/ja.jar
+lib/%%FIREFOX%%/chrome/ja.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
@@ -16,6 +13,8 @@ lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
 lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
 lib/%%FIREFOX%%/searchplugins/amazon-ja.png
 lib/%%FIREFOX%%/searchplugins/amazon-ja.src
+lib/%%FIREFOX%%/searchplugins/freshports.png
+lib/%%FIREFOX%%/searchplugins/freshports.src
 lib/%%FIREFOX%%/searchplugins/google-ja.gif
 lib/%%FIREFOX%%/searchplugins/google-ja.src
 lib/%%FIREFOX%%/searchplugins/google_news.gif
@@ -31,8 +30,5 @@ lib/%%FIREFOX%%/searchplugins/wni.src
 lib/%%FIREFOX%%/searchplugins/yahoo-ja.png
 lib/%%FIREFOX%%/searchplugins/yahoo-ja.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
diff --git a/japanese/firefox-ja_JP/Makefile b/japanese/firefox-ja_JP/Makefile
index 403a1ed3790e..e4831e91ce57 100644
--- a/japanese/firefox-ja_JP/Makefile
+++ b/japanese/firefox-ja_JP/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	japanese www
 MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
 PKGNAMESUFFIX=	-ja_JP
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}b
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	Firefox Japanese(ja-JP) Language Pack
 
 BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
@@ -22,11 +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}
@@ -36,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/japanese/firefox-ja_JP/distinfo b/japanese/firefox-ja_JP/distinfo
index 3ffbc15a725c..eda364d1f2de 100644
--- a/japanese/firefox-ja_JP/distinfo
+++ b/japanese/firefox-ja_JP/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-ja_JP.1.0.6b.tar.gz) = bbd98e5466795ec9efde646eb71580e5
-SHA256 (firefox-ja_JP.1.0.6b.tar.gz) = 07a2fed56cae55ca4cdfe756ee95be2983f63ab9b49b26db1d84dfe8eb463c20
-SIZE (firefox-ja_JP.1.0.6b.tar.gz) = 491532
+MD5 (firefox-ja_JP.1.5.tar.gz) = 872f372a2a5dc894a4d2a5aa7bf5ff2d
+SHA256 (firefox-ja_JP.1.5.tar.gz) = f2d40ded1aac1907a4d0ee3819d4ae0365334a0cbea43fa03d613b209d29c5f7
+SIZE (firefox-ja_JP.1.5.tar.gz) = 180408
diff --git a/japanese/firefox-ja_JP/pkg-plist b/japanese/firefox-ja_JP/pkg-plist
index bb7a954ea3fb..d33ef8159620 100644
--- a/japanese/firefox-ja_JP/pkg-plist
+++ b/japanese/firefox-ja_JP/pkg-plist
@@ -1,14 +1,11 @@
 @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/ja-JP.jar
+lib/%%FIREFOX%%/chrome/ja.jar
+lib/%%FIREFOX%%/chrome/ja.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
@@ -16,6 +13,8 @@ lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.png
 lib/%%FIREFOX%%/searchplugins/FreeBSD_PR.src
 lib/%%FIREFOX%%/searchplugins/amazon-ja.png
 lib/%%FIREFOX%%/searchplugins/amazon-ja.src
+lib/%%FIREFOX%%/searchplugins/freshports.png
+lib/%%FIREFOX%%/searchplugins/freshports.src
 lib/%%FIREFOX%%/searchplugins/google-ja.gif
 lib/%%FIREFOX%%/searchplugins/google-ja.src
 lib/%%FIREFOX%%/searchplugins/google_news.gif
@@ -31,8 +30,5 @@ lib/%%FIREFOX%%/searchplugins/wni.src
 lib/%%FIREFOX%%/searchplugins/yahoo-ja.png
 lib/%%FIREFOX%%/searchplugins/yahoo-ja.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