5 files changed, 13 insertions, 14 deletions

diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index b0a5cb0a65da..f43bda9c7f10 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 #PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
@@ -14,9 +14,8 @@ MASTER_SITES=	http://www.mozilla.gr.jp/jlp/ \
 		http://www.ash.ne.jp/~mal/mozilla/ \
 		http://dev.jp/
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${JLP_SRC}
-EXTRACT_SUFX=	# none
-EXTRACT_ONLY=	${JLP_SRC}
+DISTNAME=	${PORTNAME}${PORTVERSION}-jajppack-v01a
+EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
@@ -35,8 +34,6 @@ MOZILLA_PORT=	${PORTSDIR}/www/mozilla+ipv6
 .else
 MOZILLA_PORT=	${PORTSDIR}/www/mozilla
 .endif
-JLP_SRC=	${PORTNAME}${PORTVERSION}-langjajp-v1.0.xpi \
-		${PORTNAME}${PORTVERSION}-regjp-v1.0.xpi
 
 .include <bsd.port.pre.mk>
 
@@ -47,7 +44,7 @@ MOZILLA_SH=	mozilla.xpg4
 .endif
 
 .if !defined(MOZILLA_IPV6)
-pre-fetch:
+pre-everything:
 	@${ECHO} ""
 	@${ECHO} "If you need IPv6 compliant mozilla, define \"MOZILLA_IPV6\"."
 	@${ECHO} ""
@@ -57,9 +54,6 @@ post-extract:
 	${MKDIR} ${WRKSRC}/defaults/pref
 	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref
 
-post-patch:
-	find ${WRKSRC} -name '*.orig' | xargs ${RM}
-
 do-build:
 	${SED} -e "s;@PREFIX@;${PREFIX};g" \
 	${FILESDIR}/${MOZILLA_SH} > ${WRKDIR}/mozilla
@@ -69,6 +63,7 @@ do-install:
 	${MV} -f all-locales.rdf all-locales.rdf.orig; \
 	${MV} -f all-packages.rdf all-packages.rdf.orig; \
 	${MV} -f all-skins.rdf all-skins.rdf.orig; \
+	${MV} -f user-locales.rdf user-locales.rdf.orig; \
 	${MV} -f user-skins.rdf user-skins.rdf.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
 	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index d27531826139..72dac22dc753 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1,2 +1 @@
-MD5 (mozilla0.9.5-langjajp-v1.0.xpi) = 89bc9a58946a0086ce88e5ffb773fdfd
-MD5 (mozilla0.9.5-regjp-v1.0.xpi) = 61c09ded8a70e2294c68a902f7b13da2
+MD5 (mozilla0.9.6-jajppack-v01a.xpi) = 4b500e2a8cc17e0434bf4ca05b154720
diff --git a/japanese/mozilla-jlp/files/installed-chrome.txt b/japanese/mozilla-jlp/files/installed-chrome.txt
index b5f2573a6e03..b8a8177073b3 100644
--- a/japanese/mozilla-jlp/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp/files/installed-chrome.txt
@@ -8,10 +8,11 @@ locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/wallet/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pipnss/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pippki/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/help/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/content-packs/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/help/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/mozldap/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/chatzilla/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/venkman/
 locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/global-platform/
 locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/
 locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/navigator-platform/
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 85bb929d9da9..911d5c9a24ff 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -68,6 +68,9 @@ pref("clipboard.autocopy", true);
 
 pref("browser.urlbar.clickSelectsAll", false);
 
+// override double-click word selection behavior.
+pref("layout.word_select.stop_at_punctuation", false);
+
 // autocomplete keyboard grab workaround
 pref("autocomplete.grab_during_popup", true);
 pref("autocomplete.ungrab_during_mode_switch", true);
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index e1107d9102d9..a27347d0f484 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -2,6 +2,7 @@
 @exec mv %D/lib/mozilla/chrome/all-locales.rdf %D/lib/mozilla/chrome/all-locales.rdf.orig
 @exec mv %D/lib/mozilla/chrome/all-packages.rdf %D/lib/mozilla/chrome/all-packages.rdf.orig
 @exec mv %D/lib/mozilla/chrome/all-skins.rdf %D/lib/mozilla/chrome/all-skins.rdf.orig
+@exec mv %D/lib/mozilla/chrome/user-locales.rdf %D/lib/mozilla/chrome/user-locales.rdf.orig
 @exec mv %D/lib/mozilla/chrome/user-skins.rdf %D/lib/mozilla/chrome/user-skins.rdf.orig
 @exec mv %D/lib/mozilla/chrome/installed-chrome.txt %D/lib/mozilla/chrome/installed-chrome.txt.orig
 @exec mv %D/lib/mozilla/defaults/pref/unix.js %D/lib/mozilla/defaults/pref/unix.js.orig
@@ -87,13 +88,13 @@ lib/mozilla/searchplugins/linux_JFJM.png
 lib/mozilla/searchplugins/linux_JFJM.src
 lib/mozilla/searchplugins/rakuten_auction.png
 lib/mozilla/searchplugins/rakuten_auction.src
-lib/mozilla/searchplugins/search.rdf
 lib/mozilla/searchplugins/w3c.png
 lib/mozilla/searchplugins/w3c.src
 @unexec mv %D/bin/mozilla.orig %D/bin/mozilla
 @unexec mv %D/lib/mozilla/chrome/all-locales.rdf.orig %D/lib/mozilla/chrome/all-locales.rdf
 @unexec mv %D/lib/mozilla/chrome/all-packages.rdf.orig %D/lib/mozilla/chrome/all-packages.rdf
 @unexec mv %D/lib/mozilla/chrome/all-skins.rdf.orig %D/lib/mozilla/chrome/all-skins.rdf
+@unexec mv %D/lib/mozilla/chrome/user-locales.rdf.orig %D/lib/mozilla/chrome/user-locales.rdf
 @unexec mv %D/lib/mozilla/chrome/user-skins.rdf.orig %D/lib/mozilla/chrome/user-skins.rdf
 @unexec mv %D/lib/mozilla/chrome/installed-chrome.txt.orig %D/lib/mozilla/chrome/installed-chrome.txt
 @unexec mv %D/lib/mozilla/defaults/pref/unix.js.orig %D/lib/mozilla/defaults/pref/unix.js