6 files changed, 26 insertions, 20 deletions

diff --git a/japanese/firefox-ja/Makefile b/japanese/firefox-ja/Makefile
index 6dda8f12d742..98959e42a348 100644
--- a/japanese/firefox-ja/Makefile
+++ b/japanese/firefox-ja/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
 PKGNAMESUFFIX=	-ja_JP
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}b
 
 # Maintainership available: drop me a line if interested :p
 MAINTAINER=	chinsan.tw@gmail.com
@@ -20,9 +21,7 @@ BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
 RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 
 USE_X_PREFIX=	yes
-USE_ZIP=	yes
 NO_BUILD=	yes
-EXTRACT_BEFORE_ARGS=	-qo
 
 FIREFOX=	${PORTNAME}
 FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
@@ -35,7 +34,7 @@ PLIST_SUB=	FIREFOX=${FIREFOX}
 .include <bsd.port.pre.mk>
 
 do-install:
-	echo "===> Backup setting files..."
+	@${ECHO_MSG} "===> Backup setting files..."
 	(cd ${FIREFOX_HOME}; \
 	${MV} -f browserconfig.properties browserconfig.properties.orig)
 	(cd ${FIREFOX_HOME}/defaults/pref; \
@@ -43,21 +42,22 @@ do-install:
 	(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)
 
-	echo "===> Copying locale files..."
-	(cd ${WRKDIR}; ${TAR} -cf - *) | \
+	@${ECHO_MSG} "===> Copying locale files..."
+	(cd ${WRKSRC}; ${TAR} -cf - *) | \
 	${TAR} -xf - -C ${FIREFOX_HOME}
 
-	echo "===> Cleaning Chrome's registry..."
+	@${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 "===> Building Chrome's registry..."
+	@${ECHO_MSG} "===> Building Chrome's registry..."
 	(cd ${FIREFOX_HOME} || exit 1 ; \
 	./run-mozilla.sh ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. \
 		${REGXPCOM} || true ; \
diff --git a/japanese/firefox-ja/distinfo b/japanese/firefox-ja/distinfo
index a5b97bfc5a2a..6b975d8434f6 100644
--- a/japanese/firefox-ja/distinfo
+++ b/japanese/firefox-ja/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-ja_JP.1.0.6.zip) = e18925483f0084186b41570808e84f6b
-SIZE (firefox-ja_JP.1.0.6.zip) = 180757
+MD5 (firefox-ja_JP.1.0.6b.tar.gz) = bbd98e5466795ec9efde646eb71580e5
+SIZE (firefox-ja_JP.1.0.6b.tar.gz) = 491532
diff --git a/japanese/firefox-ja/pkg-plist b/japanese/firefox-ja/pkg-plist
index f01610ab7a9f..bb7a954ea3fb 100644
--- a/japanese/firefox-ja/pkg-plist
+++ b/japanese/firefox-ja/pkg-plist
@@ -1,9 +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
@@ -29,6 +31,7 @@ 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
diff --git a/japanese/firefox-ja_JP/Makefile b/japanese/firefox-ja_JP/Makefile
index 6dda8f12d742..98959e42a348 100644
--- a/japanese/firefox-ja_JP/Makefile
+++ b/japanese/firefox-ja_JP/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	firefox
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/firefox/
 PKGNAMESUFFIX=	-ja_JP
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}.${PORTVERSION}b
 
 # Maintainership available: drop me a line if interested :p
 MAINTAINER=	chinsan.tw@gmail.com
@@ -20,9 +21,7 @@ BUILD_DEPENDS=	${X11BASE}/lib/${FIREFOX}/regxpcom:${PORTSDIR}/www/firefox
 RUN_DEPENDS=	${FIREFOX}:${PORTSDIR}/www/firefox
 
 USE_X_PREFIX=	yes
-USE_ZIP=	yes
 NO_BUILD=	yes
-EXTRACT_BEFORE_ARGS=	-qo
 
 FIREFOX=	${PORTNAME}
 FIREFOX_HOME=	${PREFIX}/lib/${FIREFOX}
@@ -35,7 +34,7 @@ PLIST_SUB=	FIREFOX=${FIREFOX}
 .include <bsd.port.pre.mk>
 
 do-install:
-	echo "===> Backup setting files..."
+	@${ECHO_MSG} "===> Backup setting files..."
 	(cd ${FIREFOX_HOME}; \
 	${MV} -f browserconfig.properties browserconfig.properties.orig)
 	(cd ${FIREFOX_HOME}/defaults/pref; \
@@ -43,21 +42,22 @@ do-install:
 	(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)
 
-	echo "===> Copying locale files..."
-	(cd ${WRKDIR}; ${TAR} -cf - *) | \
+	@${ECHO_MSG} "===> Copying locale files..."
+	(cd ${WRKSRC}; ${TAR} -cf - *) | \
 	${TAR} -xf - -C ${FIREFOX_HOME}
 
-	echo "===> Cleaning Chrome's registry..."
+	@${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 "===> Building Chrome's registry..."
+	@${ECHO_MSG} "===> Building Chrome's registry..."
 	(cd ${FIREFOX_HOME} || exit 1 ; \
 	./run-mozilla.sh ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. \
 		${REGXPCOM} || true ; \
diff --git a/japanese/firefox-ja_JP/distinfo b/japanese/firefox-ja_JP/distinfo
index a5b97bfc5a2a..6b975d8434f6 100644
--- a/japanese/firefox-ja_JP/distinfo
+++ b/japanese/firefox-ja_JP/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-ja_JP.1.0.6.zip) = e18925483f0084186b41570808e84f6b
-SIZE (firefox-ja_JP.1.0.6.zip) = 180757
+MD5 (firefox-ja_JP.1.0.6b.tar.gz) = bbd98e5466795ec9efde646eb71580e5
+SIZE (firefox-ja_JP.1.0.6b.tar.gz) = 491532
diff --git a/japanese/firefox-ja_JP/pkg-plist b/japanese/firefox-ja_JP/pkg-plist
index f01610ab7a9f..bb7a954ea3fb 100644
--- a/japanese/firefox-ja_JP/pkg-plist
+++ b/japanese/firefox-ja_JP/pkg-plist
@@ -1,9 +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
@@ -29,6 +31,7 @@ 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