10 files changed, 118 insertions, 76 deletions

diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index 9565b6d6c069..16123579081d 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTVERSION=	0.9.9
+#PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.ash.ne.jp/~mal/mozilla/ \
@@ -21,7 +21,7 @@ MAINTAINER=	yatt@msc.biglobe.ne.jp
 
 BUILD_DEPENDS=	${X11BASE}/lib/mozilla/regxpcom:${PORTSDIR}/www/mozilla
 RUN_DEPENDS=	mozilla:${PORTSDIR}/www/mozilla \
-		${PKG_DBDIR}/ja-bdf-fonts-1.0:${PORTSDIR}/japanese/bdf-fonts
+		${PKG_DBDIR}/ja-bdf-fonts-1.0_1:${PORTSDIR}/japanese/bdf-fonts
 
 WRKSRC=		${WRKDIR}/bin
 
@@ -51,9 +51,6 @@ 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/searchplugins; \
-	${MV} -f google.gif google.gif.orig; \
-	${MV} -f google.src google.src.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 22efc27babb3..0efa90f62cd1 100644
--- a/japanese/mozilla-jlp-devel/distinfo
+++ b/japanese/mozilla-jlp-devel/distinfo
@@ -1 +1 @@
-MD5 (mozilla0.9.8-jajppack-v1.0.xpi) = 96997d151de2bcdd8bdf5499c0d60e82
+MD5 (mozilla0.9.9-jajppack-v1.0.xpi) = 8cd6c2c6da0cc76189c9302b529c9df4
diff --git a/japanese/mozilla-jlp-devel/files/installed-chrome.txt b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
index 85ba138e4465..785aea0b1a5c 100644
--- a/japanese/mozilla-jlp-devel/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
@@ -11,6 +11,7 @@ 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/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/forms/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger-smime/
 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/
diff --git a/japanese/mozilla-jlp-devel/files/unix.js b/japanese/mozilla-jlp-devel/files/unix.js
index 8fe37ead339a..804b07a7b2e1 100644
--- a/japanese/mozilla-jlp-devel/files/unix.js
+++ b/japanese/mozilla-jlp-devel/files/unix.js
@@ -108,10 +108,13 @@ pref("print.print_color", true);
 pref("print.print_landscape", false);
 pref("print.print_paper_size", 0);
 
-// print_headerfooter_gap enables platforms to specify an extra "gap" in twips
-// between the H/F and the edge of the paper,  
+// Enables you to specify the gap from the edge of the paper to the margin
 // this is used by both Printing and Print Preview
-pref("print.print_headerfooter_gap", 60); // twips
+pref("print.print_edge_top", 4); // 1/100 of an inch
+pref("print.print_edge_left", 4); // 1/100 of an inch
+pref("print.print_edge_right", 4); // 1/100 of an inch
+pref("print.print_edge_bottom", 4); // 1/100 of an inch
+
 
 // print_extra_margin enables platforms to specify an extra gap or margin
 // around the content of the page for Print Preview only
@@ -222,6 +225,23 @@ pref("font.size.fixed.zh-TW", 16);
 // below a certian pixel size outline scaled fonts produce poor results
 pref("font.scale.outline.min",      6);
 
+// TrueType
+pref("font.FreeType2.enable", false);
+pref("font.freetype2.shared-library", "libfreetype.so.9");
+// if libfreetype was built without hinting compiled in
+// it is best to leave hinting off
+pref("font.FreeType2.autohinted", false);
+pref("font.FreeType2.unhinted", true);
+// below a certian pixel size anti-aliased fonts produce poor results
+pref("font.antialias.min",        10);
+pref("font.embedded_bitmaps.max", 1000000);
+pref("font.scale.tt_bitmap.dark_text.min", 64);
+pref("font.scale.tt_bitmap.dark_text.gain", "0.8");
+// sample prefs for TrueType font dirs
+//pref("font.directory.truetype.1", "/u/sam/tt_font");
+//pref("font.directory.truetype.2", "/u/sam/tt_font2");
+//pref("font.directory.truetype.3", "/u/sam/tt_font3");
+
 // below a certian pixel size anti-aliased bitmat scaled fonts 
 // produce poor results
 pref("font.scale.aa_bitmap.enable", true);
@@ -306,30 +326,37 @@ 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("printer.font.xprint.acceptfontpattern", ".*");
+//pref("print.xprint.font.acceptfontpattern", ".*");
 /* reject font if reject pattern matches it... */
-//pref("printer.font.xprint.rejectfontpattern", 
+//pref("print.xprint.font.rejectfontpattern", 
 //     "fname=-urw.*;scalable=false;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
 
-// ps font
-// this list is used by the postscript font
-// to enumerate the list of langGroups
-// there should be a call to get the
-// langGroups; see bug 75054
-pref("print.psnativefont.ar", "");
-pref("print.psnativefont.el", "");
-pref("print.psnativefont.he", "");
-pref("print.psnativefont.ja", "");
-pref("print.psnativefont.ko", "");
-pref("print.psnativefont.th", "");
-pref("print.psnativefont.tr", "");
-pref("print.psnativefont.x-baltic", "");
-pref("print.psnativefont.x-central-euro", "");
-pref("print.psnativefont.x-cyrillic", "");
-pref("print.psnativefont.x-unicode", "");
-pref("print.psnativefont.x-user-def", "");
-pref("print.psnativefont.x-western", "");
-pref("print.psnativefont.zh-CN", "");
-pref("print.psnativefont.zh-TW", "");
+/* 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
+ * there should be a call to get the
+ * langGroups; see bug 75054
+ */
+pref("print.postscript.nativefont.ar",             "");
+pref("print.postscript.nativefont.el",             "");
+pref("print.postscript.nativefont.he",             "");
+pref("print.postscript.nativefont.ja",             "");
+pref("print.postscript.nativefont.ko",             "");
+pref("print.postscript.nativefont.th",             "");
+pref("print.postscript.nativefont.tr",             "");
+pref("print.postscript.nativefont.x-baltic",       "");
+pref("print.postscript.nativefont.x-central-euro", "");
+pref("print.postscript.nativefont.x-cyrillic",     "");
+pref("print.postscript.nativefont.x-unicode",      "");
+pref("print.postscript.nativefont.x-user-def",     "");
+pref("print.postscript.nativefont.x-western",      "");
+pref("print.postscript.nativefont.zh-CN",          "");
+pref("print.postscript.nativefont.zh-TW",          "");
 
 pref("mail.signature_date", 0);
+// EOF.
diff --git a/japanese/mozilla-jlp-devel/pkg-plist b/japanese/mozilla-jlp-devel/pkg-plist
index 27836d6bd416..494702589783 100644
--- a/japanese/mozilla-jlp-devel/pkg-plist
+++ b/japanese/mozilla-jlp-devel/pkg-plist
@@ -2,8 +2,6 @@
 @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/searchplugins/google.gif %D/lib/mozilla/searchplugins/google.gif.orig
-@exec mv %D/lib/mozilla/searchplugins/google.src %D/lib/mozilla/searchplugins/google.src.orig
 bin/mozilla
 lib/mozilla/chrome/JP.jar
 lib/mozilla/chrome/chrome.rdf
@@ -68,8 +66,8 @@ 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/google.gif
-lib/mozilla/searchplugins/google.src
+lib/mozilla/searchplugins/GoogleJapan.png
+lib/mozilla/searchplugins/GoogleJapan.src
 lib/mozilla/searchplugins/jpnic_rfc.png
 lib/mozilla/searchplugins/jpnic_rfc.src
 lib/mozilla/searchplugins/linux_24.png
@@ -84,7 +82,5 @@ 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/searchplugins/google.gif.orig %D/lib/mozilla/searchplugins/google.gif
-@unexec mv %D/lib/mozilla/searchplugins/google.src.orig %D/lib/mozilla/searchplugins/google.src
 @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 9565b6d6c069..16123579081d 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTVERSION=	0.9.9
+#PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.ash.ne.jp/~mal/mozilla/ \
@@ -21,7 +21,7 @@ MAINTAINER=	yatt@msc.biglobe.ne.jp
 
 BUILD_DEPENDS=	${X11BASE}/lib/mozilla/regxpcom:${PORTSDIR}/www/mozilla
 RUN_DEPENDS=	mozilla:${PORTSDIR}/www/mozilla \
-		${PKG_DBDIR}/ja-bdf-fonts-1.0:${PORTSDIR}/japanese/bdf-fonts
+		${PKG_DBDIR}/ja-bdf-fonts-1.0_1:${PORTSDIR}/japanese/bdf-fonts
 
 WRKSRC=		${WRKDIR}/bin
 
@@ -51,9 +51,6 @@ 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/searchplugins; \
-	${MV} -f google.gif google.gif.orig; \
-	${MV} -f google.src google.src.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 22efc27babb3..0efa90f62cd1 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1 +1 @@
-MD5 (mozilla0.9.8-jajppack-v1.0.xpi) = 96997d151de2bcdd8bdf5499c0d60e82
+MD5 (mozilla0.9.9-jajppack-v1.0.xpi) = 8cd6c2c6da0cc76189c9302b529c9df4
diff --git a/japanese/mozilla-jlp/files/installed-chrome.txt b/japanese/mozilla-jlp/files/installed-chrome.txt
index 85ba138e4465..785aea0b1a5c 100644
--- a/japanese/mozilla-jlp/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp/files/installed-chrome.txt
@@ -11,6 +11,7 @@ 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/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/forms/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger-smime/
 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/
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 8fe37ead339a..804b07a7b2e1 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -108,10 +108,13 @@ pref("print.print_color", true);
 pref("print.print_landscape", false);
 pref("print.print_paper_size", 0);
 
-// print_headerfooter_gap enables platforms to specify an extra "gap" in twips
-// between the H/F and the edge of the paper,  
+// Enables you to specify the gap from the edge of the paper to the margin
 // this is used by both Printing and Print Preview
-pref("print.print_headerfooter_gap", 60); // twips
+pref("print.print_edge_top", 4); // 1/100 of an inch
+pref("print.print_edge_left", 4); // 1/100 of an inch
+pref("print.print_edge_right", 4); // 1/100 of an inch
+pref("print.print_edge_bottom", 4); // 1/100 of an inch
+
 
 // print_extra_margin enables platforms to specify an extra gap or margin
 // around the content of the page for Print Preview only
@@ -222,6 +225,23 @@ pref("font.size.fixed.zh-TW", 16);
 // below a certian pixel size outline scaled fonts produce poor results
 pref("font.scale.outline.min",      6);
 
+// TrueType
+pref("font.FreeType2.enable", false);
+pref("font.freetype2.shared-library", "libfreetype.so.9");
+// if libfreetype was built without hinting compiled in
+// it is best to leave hinting off
+pref("font.FreeType2.autohinted", false);
+pref("font.FreeType2.unhinted", true);
+// below a certian pixel size anti-aliased fonts produce poor results
+pref("font.antialias.min",        10);
+pref("font.embedded_bitmaps.max", 1000000);
+pref("font.scale.tt_bitmap.dark_text.min", 64);
+pref("font.scale.tt_bitmap.dark_text.gain", "0.8");
+// sample prefs for TrueType font dirs
+//pref("font.directory.truetype.1", "/u/sam/tt_font");
+//pref("font.directory.truetype.2", "/u/sam/tt_font2");
+//pref("font.directory.truetype.3", "/u/sam/tt_font3");
+
 // below a certian pixel size anti-aliased bitmat scaled fonts 
 // produce poor results
 pref("font.scale.aa_bitmap.enable", true);
@@ -306,30 +326,37 @@ 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("printer.font.xprint.acceptfontpattern", ".*");
+//pref("print.xprint.font.acceptfontpattern", ".*");
 /* reject font if reject pattern matches it... */
-//pref("printer.font.xprint.rejectfontpattern", 
+//pref("print.xprint.font.rejectfontpattern", 
 //     "fname=-urw.*;scalable=false;outline_scaled=false;xdisplay=.*;xdpy=.*;ydpy=.*;xdevice=.*");
 
-// ps font
-// this list is used by the postscript font
-// to enumerate the list of langGroups
-// there should be a call to get the
-// langGroups; see bug 75054
-pref("print.psnativefont.ar", "");
-pref("print.psnativefont.el", "");
-pref("print.psnativefont.he", "");
-pref("print.psnativefont.ja", "");
-pref("print.psnativefont.ko", "");
-pref("print.psnativefont.th", "");
-pref("print.psnativefont.tr", "");
-pref("print.psnativefont.x-baltic", "");
-pref("print.psnativefont.x-central-euro", "");
-pref("print.psnativefont.x-cyrillic", "");
-pref("print.psnativefont.x-unicode", "");
-pref("print.psnativefont.x-user-def", "");
-pref("print.psnativefont.x-western", "");
-pref("print.psnativefont.zh-CN", "");
-pref("print.psnativefont.zh-TW", "");
+/* 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
+ * there should be a call to get the
+ * langGroups; see bug 75054
+ */
+pref("print.postscript.nativefont.ar",             "");
+pref("print.postscript.nativefont.el",             "");
+pref("print.postscript.nativefont.he",             "");
+pref("print.postscript.nativefont.ja",             "");
+pref("print.postscript.nativefont.ko",             "");
+pref("print.postscript.nativefont.th",             "");
+pref("print.postscript.nativefont.tr",             "");
+pref("print.postscript.nativefont.x-baltic",       "");
+pref("print.postscript.nativefont.x-central-euro", "");
+pref("print.postscript.nativefont.x-cyrillic",     "");
+pref("print.postscript.nativefont.x-unicode",      "");
+pref("print.postscript.nativefont.x-user-def",     "");
+pref("print.postscript.nativefont.x-western",      "");
+pref("print.postscript.nativefont.zh-CN",          "");
+pref("print.postscript.nativefont.zh-TW",          "");
 
 pref("mail.signature_date", 0);
+// EOF.
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index 27836d6bd416..494702589783 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -2,8 +2,6 @@
 @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/searchplugins/google.gif %D/lib/mozilla/searchplugins/google.gif.orig
-@exec mv %D/lib/mozilla/searchplugins/google.src %D/lib/mozilla/searchplugins/google.src.orig
 bin/mozilla
 lib/mozilla/chrome/JP.jar
 lib/mozilla/chrome/chrome.rdf
@@ -68,8 +66,8 @@ 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/google.gif
-lib/mozilla/searchplugins/google.src
+lib/mozilla/searchplugins/GoogleJapan.png
+lib/mozilla/searchplugins/GoogleJapan.src
 lib/mozilla/searchplugins/jpnic_rfc.png
 lib/mozilla/searchplugins/jpnic_rfc.src
 lib/mozilla/searchplugins/linux_24.png
@@ -84,7 +82,5 @@ 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/searchplugins/google.gif.orig %D/lib/mozilla/searchplugins/google.gif
-@unexec mv %D/lib/mozilla/searchplugins/google.src.orig %D/lib/mozilla/searchplugins/google.src
 @dirrm lib/mozilla/defaults/profile/JP/chrome
 @dirrm lib/mozilla/defaults/profile/JP