8 files changed, 52 insertions, 36 deletions

diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index b8248fc297bf..897579008c41 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
+PORTVERSION=	1.0.1
 #PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
-MASTER_SITES=	http://www.ash.ne.jp/~mal/mozilla/ \
-		http://dev.jp/ \
-		${MASTER_SITE_SOURCEFORGE} \
-		http://ryuzi.dyndns.org/ \
-		ftp://takuomix.homeip.net/pub/jlp/ \
-		http://www.mozilla.gr.jp/jlp/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www2.starcat.ne.jp/~unha/jlp/
 MASTER_SITE_SUBDIR=	jlpmoz
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${PORTNAME}1.0-jajppack-2
+DISTNAME=	${PORTNAME}1.0.1rc1-jajppack-kv0.10
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
@@ -55,6 +51,8 @@ do-install:
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
 	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
 	${MV} -f unix.js unix.js.orig)
+	(cd ${PREFIX}/lib/mozilla/components; \
+	${MV} -f xpti.dat ../xpti.dat.orig)
 	${MV} -f ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
 	(cd ${WRKDIR}/sp; ${TAR} -cf - *) | \
diff --git a/japanese/mozilla-jlp-devel/distinfo b/japanese/mozilla-jlp-devel/distinfo
index 5a014b372653..604922aa4e9c 100644
--- a/japanese/mozilla-jlp-devel/distinfo
+++ b/japanese/mozilla-jlp-devel/distinfo
@@ -1 +1 @@
-MD5 (mozilla1.0-jajppack-2.xpi) = d8de7e42bd65ca5f93e049de1f3e43b6
+MD5 (mozilla1.0.1rc1-jajppack-kv0.10.xpi) = 2723cde02d4ea5f2c560a858215dcb2b
diff --git a/japanese/mozilla-jlp-devel/files/unix.js b/japanese/mozilla-jlp-devel/files/unix.js
index 97507a481c50..87f166093c6b 100644
--- a/japanese/mozilla-jlp-devel/files/unix.js
+++ b/japanese/mozilla-jlp-devel/files/unix.js
@@ -46,8 +46,6 @@ pref("browser.display.screen_resolution", 0); // System setting
 pref("browser.startup.license_accepted", "");
 pref("browser.cache.memory.capacity", 4096);
 pref("browser.cache.disk.capacity", 50000);
-pref("browser.ncols", 0);
-pref("browser.installcmap", false);
 pref("browser.drag_out_of_frame_style", 1);
 pref("mail.signature_file", "~/.signature");
 pref("mail.default_fcc", "~/nsmail/Sent");
@@ -325,16 +323,24 @@ pref("font.min-size.fixed.zh-TW", 10);
 //     "fname=-urw.*;scalable=false;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
 
 /* reject font if accept pattern does not match it... */
-//pref("print.xprint.font.acceptfontpattern", ".*");
-/* reject font if reject pattern matches it... */
-//pref("print.xprint.font.rejectfontpattern", 
-//     "fname=-urw.*;scalable=false;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
+pref("print.xprint.font.acceptfontpattern", ".*");
+/* reject font if reject pattern matches it...
+ * Current bans:
+ * - bug 148470 ("Ban "-dt-*" (bitmap!!) fonts from Xprint")
+ *   pattern="fname=-dt-.*;scalable=.*;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*"
+ */
+pref("print.xprint.font.rejectfontpattern", 
+     "fname=-dt-.*;scalable=.*;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
+
+/* Xprint print module prefs */
+pref("print.xprint.font.force_outline_scaled_fonts", true);
+pref("print.xprint.font.scale_bitmap_fonts_with_devscale", true);
 
 /* PostScript print module prefs */
 pref("print.postscript.paper_size",    "letter");
 pref("print.postscript.orientation",   "portrait");
 pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
-''
+
 /* PostScript print module font config
  * this list is used by the postscript font
  * to enumerate the list of langGroups
@@ -357,6 +363,9 @@ pref("print.postscript.nativefont.x-western",      "");
 pref("print.postscript.nativefont.zh-CN",          "");
 pref("print.postscript.nativefont.zh-TW",          "");
 
+// For the download dialog
+pref("browser.download.progressDnldDialog.enable_launch_reveal_buttons", false);
+
 pref("mail.signature_date", 0);
 
 // until bug #130581 is fixed, we need to override this on linux
diff --git a/japanese/mozilla-jlp-devel/pkg-plist b/japanese/mozilla-jlp-devel/pkg-plist
index 716afdb997fa..c85b5b7a3f23 100644
--- a/japanese/mozilla-jlp-devel/pkg-plist
+++ b/japanese/mozilla-jlp-devel/pkg-plist
@@ -2,6 +2,7 @@
 @exec mv %D/lib/mozilla/chrome/chrome.rdf %D/lib/mozilla/chrome/chrome.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
+@exec mv %D/lib/mozilla/components/xpti.dat %D/lib/mozilla/xpti.dat.orig
 bin/mozilla
 lib/mozilla/chrome/JP.jar
 lib/mozilla/chrome/chrome.rdf
@@ -10,6 +11,7 @@ lib/mozilla/chrome/ja-JP.jar
 lib/mozilla/chrome/ja-mac.jar
 lib/mozilla/chrome/ja-unix.jar
 lib/mozilla/chrome/ja-win.jar
+lib/mozilla/components/xpti.dat
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/profile/JP/chrome/userChrome-example.css
 lib/mozilla/defaults/profile/JP/chrome/userContent-example.css
@@ -67,8 +69,6 @@ lib/mozilla/searchplugins/ascii_ghelp.png
 lib/mozilla/searchplugins/ascii_ghelp.src
 lib/mozilla/searchplugins/atmarkIT.png
 lib/mozilla/searchplugins/atmarkIT.src
-lib/mozilla/searchplugins/eijiro.png
-lib/mozilla/searchplugins/eijiro.src
 lib/mozilla/searchplugins/GoogleJapan.png
 lib/mozilla/searchplugins/GoogleJapan.src
 lib/mozilla/searchplugins/jpnic_rfc.png
@@ -85,5 +85,6 @@ lib/mozilla/searchplugins/w3c.src
 @unexec mv %D/lib/mozilla/chrome/chrome.rdf.orig %D/lib/mozilla/chrome/chrome.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
+@unexec mv %D/lib/mozilla/xpti.dat.orig %D/lib/mozilla/components/xpti.dat
 @dirrm lib/mozilla/defaults/profile/JP/chrome
 @dirrm lib/mozilla/defaults/profile/JP
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index b8248fc297bf..897579008c41 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
+PORTVERSION=	1.0.1
 #PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
-MASTER_SITES=	http://www.ash.ne.jp/~mal/mozilla/ \
-		http://dev.jp/ \
-		${MASTER_SITE_SOURCEFORGE} \
-		http://ryuzi.dyndns.org/ \
-		ftp://takuomix.homeip.net/pub/jlp/ \
-		http://www.mozilla.gr.jp/jlp/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www2.starcat.ne.jp/~unha/jlp/
 MASTER_SITE_SUBDIR=	jlpmoz
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${PORTNAME}1.0-jajppack-2
+DISTNAME=	${PORTNAME}1.0.1rc1-jajppack-kv0.10
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
@@ -55,6 +51,8 @@ do-install:
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
 	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
 	${MV} -f unix.js unix.js.orig)
+	(cd ${PREFIX}/lib/mozilla/components; \
+	${MV} -f xpti.dat ../xpti.dat.orig)
 	${MV} -f ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
 	(cd ${WRKDIR}/sp; ${TAR} -cf - *) | \
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index 5a014b372653..604922aa4e9c 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1 +1 @@
-MD5 (mozilla1.0-jajppack-2.xpi) = d8de7e42bd65ca5f93e049de1f3e43b6
+MD5 (mozilla1.0.1rc1-jajppack-kv0.10.xpi) = 2723cde02d4ea5f2c560a858215dcb2b
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 97507a481c50..87f166093c6b 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -46,8 +46,6 @@ pref("browser.display.screen_resolution", 0); // System setting
 pref("browser.startup.license_accepted", "");
 pref("browser.cache.memory.capacity", 4096);
 pref("browser.cache.disk.capacity", 50000);
-pref("browser.ncols", 0);
-pref("browser.installcmap", false);
 pref("browser.drag_out_of_frame_style", 1);
 pref("mail.signature_file", "~/.signature");
 pref("mail.default_fcc", "~/nsmail/Sent");
@@ -325,16 +323,24 @@ pref("font.min-size.fixed.zh-TW", 10);
 //     "fname=-urw.*;scalable=false;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
 
 /* reject font if accept pattern does not match it... */
-//pref("print.xprint.font.acceptfontpattern", ".*");
-/* reject font if reject pattern matches it... */
-//pref("print.xprint.font.rejectfontpattern", 
-//     "fname=-urw.*;scalable=false;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
+pref("print.xprint.font.acceptfontpattern", ".*");
+/* reject font if reject pattern matches it...
+ * Current bans:
+ * - bug 148470 ("Ban "-dt-*" (bitmap!!) fonts from Xprint")
+ *   pattern="fname=-dt-.*;scalable=.*;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*"
+ */
+pref("print.xprint.font.rejectfontpattern", 
+     "fname=-dt-.*;scalable=.*;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
+
+/* Xprint print module prefs */
+pref("print.xprint.font.force_outline_scaled_fonts", true);
+pref("print.xprint.font.scale_bitmap_fonts_with_devscale", true);
 
 /* PostScript print module prefs */
 pref("print.postscript.paper_size",    "letter");
 pref("print.postscript.orientation",   "portrait");
 pref("print.postscript.print_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
-''
+
 /* PostScript print module font config
  * this list is used by the postscript font
  * to enumerate the list of langGroups
@@ -357,6 +363,9 @@ pref("print.postscript.nativefont.x-western",      "");
 pref("print.postscript.nativefont.zh-CN",          "");
 pref("print.postscript.nativefont.zh-TW",          "");
 
+// For the download dialog
+pref("browser.download.progressDnldDialog.enable_launch_reveal_buttons", false);
+
 pref("mail.signature_date", 0);
 
 // until bug #130581 is fixed, we need to override this on linux
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index 716afdb997fa..c85b5b7a3f23 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -2,6 +2,7 @@
 @exec mv %D/lib/mozilla/chrome/chrome.rdf %D/lib/mozilla/chrome/chrome.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
+@exec mv %D/lib/mozilla/components/xpti.dat %D/lib/mozilla/xpti.dat.orig
 bin/mozilla
 lib/mozilla/chrome/JP.jar
 lib/mozilla/chrome/chrome.rdf
@@ -10,6 +11,7 @@ lib/mozilla/chrome/ja-JP.jar
 lib/mozilla/chrome/ja-mac.jar
 lib/mozilla/chrome/ja-unix.jar
 lib/mozilla/chrome/ja-win.jar
+lib/mozilla/components/xpti.dat
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/profile/JP/chrome/userChrome-example.css
 lib/mozilla/defaults/profile/JP/chrome/userContent-example.css
@@ -67,8 +69,6 @@ lib/mozilla/searchplugins/ascii_ghelp.png
 lib/mozilla/searchplugins/ascii_ghelp.src
 lib/mozilla/searchplugins/atmarkIT.png
 lib/mozilla/searchplugins/atmarkIT.src
-lib/mozilla/searchplugins/eijiro.png
-lib/mozilla/searchplugins/eijiro.src
 lib/mozilla/searchplugins/GoogleJapan.png
 lib/mozilla/searchplugins/GoogleJapan.src
 lib/mozilla/searchplugins/jpnic_rfc.png
@@ -85,5 +85,6 @@ lib/mozilla/searchplugins/w3c.src
 @unexec mv %D/lib/mozilla/chrome/chrome.rdf.orig %D/lib/mozilla/chrome/chrome.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
+@unexec mv %D/lib/mozilla/xpti.dat.orig %D/lib/mozilla/components/xpti.dat
 @dirrm lib/mozilla/defaults/profile/JP/chrome
 @dirrm lib/mozilla/defaults/profile/JP