8 files changed, 22 insertions, 16 deletions

diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index 789a6232af78..7e41fdf981e6 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.4.r1
+#PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.mozilla.gr.jp/jlp/ \
@@ -34,8 +34,8 @@ MOZILLA_PORT=	${PORTSDIR}/www/mozilla+ipv6
 .else
 MOZILLA_PORT=	${PORTSDIR}/www/mozilla
 .endif
-JLP_SRC=	${PORTNAME}${PORTVERSION}-langjajp.xpi \
-		${PORTNAME}${PORTVERSION}-regjp.xpi
+JLP_SRC=	${PORTNAME}${PORTVERSION:R}-langjajp-RC1.xpi \
+		${PORTNAME}${PORTVERSION:R}-regjp-RC1.xpi
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/mozilla-jlp-devel/distinfo b/japanese/mozilla-jlp-devel/distinfo
index 0d67846938ac..049ad3f2e0d1 100644
--- a/japanese/mozilla-jlp-devel/distinfo
+++ b/japanese/mozilla-jlp-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla0.9.3-langjajp.xpi) = 2af98acd797f2e12aa841fc60987ade6
-MD5 (mozilla0.9.3-regjp.xpi) = feb6012031aae660d1863b136b1bb5e1
+MD5 (mozilla0.9.4-langjajp-RC1.xpi) = 3a34834693a30c9c9ea40212fa09a135
+MD5 (mozilla0.9.4-regjp-RC1.xpi) = 38593fee0a448a0c233d1ac0e92ced9d
diff --git a/japanese/mozilla-jlp-devel/files/installed-chrome.txt b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
index f71a652b57a1..70d26c383eb5 100644
--- a/japanese/mozilla-jlp-devel/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
@@ -6,13 +6,13 @@ locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/navigator/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/necko/
 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/help/
 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/chatzilla/
 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/
 locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
 locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/
 locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/editor-region/
diff --git a/japanese/mozilla-jlp-devel/files/unix.js b/japanese/mozilla-jlp-devel/files/unix.js
index 21db46541ff2..2427b16ad5c6 100644
--- a/japanese/mozilla-jlp-devel/files/unix.js
+++ b/japanese/mozilla-jlp-devel/files/unix.js
@@ -81,6 +81,9 @@ pref("applications.tn3270", "xterm -e tn3270 %h");
 pref("applications.rlogin", "xterm -e rlogin %h");
 pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
 pref("applications.tmp_dir", "/tmp");
+// Choose print module. Default is "auto" which selects Xprint module
+// if the XPSERVERLIST env var is set
+pref("print.print_method", 0); // 0=auto, 1=Xprint, 2=PostScript, 3=reserved
 // On Solaris/IRIX, this should be "lp"
 pref("print.print_command", "lpr");
 pref("print.print_reversed", false);
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 789a6232af78..7e41fdf981e6 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.4.r1
+#PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.mozilla.gr.jp/jlp/ \
@@ -34,8 +34,8 @@ MOZILLA_PORT=	${PORTSDIR}/www/mozilla+ipv6
 .else
 MOZILLA_PORT=	${PORTSDIR}/www/mozilla
 .endif
-JLP_SRC=	${PORTNAME}${PORTVERSION}-langjajp.xpi \
-		${PORTNAME}${PORTVERSION}-regjp.xpi
+JLP_SRC=	${PORTNAME}${PORTVERSION:R}-langjajp-RC1.xpi \
+		${PORTNAME}${PORTVERSION:R}-regjp-RC1.xpi
 
 .include <bsd.port.pre.mk>
 
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index 0d67846938ac..049ad3f2e0d1 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla0.9.3-langjajp.xpi) = 2af98acd797f2e12aa841fc60987ade6
-MD5 (mozilla0.9.3-regjp.xpi) = feb6012031aae660d1863b136b1bb5e1
+MD5 (mozilla0.9.4-langjajp-RC1.xpi) = 3a34834693a30c9c9ea40212fa09a135
+MD5 (mozilla0.9.4-regjp-RC1.xpi) = 38593fee0a448a0c233d1ac0e92ced9d
diff --git a/japanese/mozilla-jlp/files/installed-chrome.txt b/japanese/mozilla-jlp/files/installed-chrome.txt
index f71a652b57a1..70d26c383eb5 100644
--- a/japanese/mozilla-jlp/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp/files/installed-chrome.txt
@@ -6,13 +6,13 @@ locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/navigator/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/necko/
 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/help/
 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/chatzilla/
 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/
 locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
 locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/
 locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/editor-region/
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 21db46541ff2..2427b16ad5c6 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -81,6 +81,9 @@ pref("applications.tn3270", "xterm -e tn3270 %h");
 pref("applications.rlogin", "xterm -e rlogin %h");
 pref("applications.rlogin_with_user", "xterm -e rlogin %h -l %u");
 pref("applications.tmp_dir", "/tmp");
+// Choose print module. Default is "auto" which selects Xprint module
+// if the XPSERVERLIST env var is set
+pref("print.print_method", 0); // 0=auto, 1=Xprint, 2=PostScript, 3=reserved
 // On Solaris/IRIX, this should be "lp"
 pref("print.print_command", "lpr");
 pref("print.print_reversed", false);