5 files changed, 85 insertions, 35 deletions

diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 24c70d134dc7..3ccd3db3d0e1 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,22 +6,22 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	0.9.8
+#PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.mozilla.gr.jp/jlp/ \
 		http://www.ash.ne.jp/~mal/mozilla/ \
 		http://dev.jp/
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${PORTNAME}${PORTVERSION}-jajppack-v02
+DISTNAME=	${PORTNAME}${PORTVERSION}-jajppack-v0.1
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
 BUILD_DEPENDS=	${X11BASE}/lib/mozilla/regxpcom:${MOZILLA_PORT}
 RUN_DEPENDS=	mozilla:${MOZILLA_PORT} \
-		${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
+		${PKG_DBDIR}/ja-bdf-fonts-1.0:${PORTSDIR}/japanese/bdf-fonts
 
 WRKSRC=		${WRKDIR}/bin
 
@@ -60,11 +60,7 @@ do-build:
 
 do-install:
 	(cd ${PREFIX}/lib/mozilla/chrome; \
-	${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 chrome.rdf chrome.rdf.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
 	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
 	${MV} -f unix.js unix.js.orig)
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index d83bf1d78f1b..3606ba3effb5 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1 +1 @@
-MD5 (mozilla0.9.6-jajppack-v02.xpi) = 525ebb67fb5bcc0ab5e6e1d2e433873b
+MD5 (mozilla0.9.8-jajppack-v0.1.xpi) = 1bb2055e7d2537098acf120ea889aa97
diff --git a/japanese/mozilla-jlp/files/installed-chrome.txt b/japanese/mozilla-jlp/files/installed-chrome.txt
index b8a8177073b3..85ba138e4465 100644
--- a/japanese/mozilla-jlp/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp/files/installed-chrome.txt
@@ -11,8 +11,10 @@ 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/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/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/inspector/
 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 911d5c9a24ff..8fe37ead339a 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Roland Mainz <roland.mainz@informatik.med.uni-giessen.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or 
@@ -99,16 +100,25 @@ 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_command", "lpr ${MOZ_PRINTER_NAME:+'-P'}${MOZ_PRINTER_NAME}");
+pref("print.printer_list", ""); // list of printers, seperated by spaces
 pref("print.print_reversed", false);
 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,  
+// this is used by both Printing and Print Preview
+pref("print.print_headerfooter_gap", 60); // twips
+
+// print_extra_margin enables platforms to specify an extra gap or margin
+// around the content of the page for Print Preview only
+pref("print.print_extra_margin", 0); // twips
+
+pref("print.whileInPrintPreview", false);
+
 pref("font.allow_double_byte_special_chars", true);
 // font names
 
@@ -122,9 +132,9 @@ pref("font.name.serif.he", "misc-fixed-iso8859-8");
 pref("font.name.sans-serif.he", "misc-fixed-iso8859-8");
 pref("font.name.monospace.he", "misc-fixed-iso8859-8");
 
-pref("font.name.serif.ja", "netscape-fixed-jisx0208.1983-0");
-pref("font.name.sans-serif.ja", "netscape-fixed-jisx0208.1983-0");
-pref("font.name.monospace.ja", "netscape-fixed-jisx0208.1983-0");
+pref("font.name.serif.ja", "alias-fixed-jisx0208.1983-0");
+pref("font.name.sans-serif.ja", "alias-fixed-jisx0208.1983-0");
+pref("font.name.monospace.ja", "alias-fixed-jisx0208.1983-0");
 
 pref("font.name.serif.ko", "daewoo-mincho-ksc5601.1987-0");
 pref("font.name.sans-serif.ko", "daewoo-mincho-ksc5601.1987-0");
@@ -209,28 +219,49 @@ pref("font.size.fixed.zh-CN", 16);
 pref("font.size.variable.zh-TW", 16);
 pref("font.size.fixed.zh-TW", 16);
 
-// below a certian pixel size scaled fonts produce poor results
+// below a certian pixel size outline scaled fonts produce poor results
 pref("font.scale.outline.min",      6);
+
+// below a certian pixel size anti-aliased bitmat scaled fonts 
+// produce poor results
+pref("font.scale.aa_bitmap.enable", true);
+pref("font.scale.aa_bitmap.always", false);
+pref("font.scale.aa_bitmap.min", 6);
+pref("font.scale.aa_bitmap.undersize", 80);
+pref("font.scale.aa_bitmap.oversize", 120);
+pref("font.scale.aa_bitmap.dark_text.min", 64);
+pref("font.scale.aa_bitmap.dark_text.gain", "0.5");
+pref("font.scale.aa_bitmap.light_text.min", 64);
+pref("font.scale.aa_bitmap.light_text.gain", "1.3");
+
 pref("font.scale.bitmap.min",       12);
 pref("font.scale.bitmap.undersize", 80);
 pref("font.scale.bitmap.oversize",  120);
 
-pref("font.scale.outline.min.ja",      8);
-pref("font.scale.bitmap.min.ja",       8);
+pref("font.scale.outline.min.ja",      10);
+pref("font.scale.aa_bitmap.min.ja",    12);
+pref("font.scale.aa_bitmap.always.ja", false);
+pref("font.scale.bitmap.min.ja",       16);
 pref("font.scale.bitmap.undersize.ja", 80);
 pref("font.scale.bitmap.oversize.ja",  120);
 
 pref("font.scale.outline.min.ko",      10);
+pref("font.scale.aa_bitmap.min.ko",    12);
+pref("font.scale.aa_bitmap.always.ko", false);
 pref("font.scale.bitmap.min.ko",       16);
 pref("font.scale.bitmap.undersize.ko", 80);
 pref("font.scale.bitmap.oversize.ko",  120);
 
 pref("font.scale.outline.min.zh-CN",      10);
+pref("font.scale.aa_bitmap.min.zh-CN",    12);
+pref("font.scale.aa_bitmap.always.zh-CN", false);
 pref("font.scale.bitmap.min.zh-CN",       16);
 pref("font.scale.bitmap.undersize.zh-CN", 80);
 pref("font.scale.bitmap.oversize.zh-CN",  120);
 
 pref("font.scale.outline.min.zh-TW",      10);
+pref("font.scale.aa_bitmap.min.zh-TW",    12);
+pref("font.scale.aa_bitmap.always.zh-TW", false);
 pref("font.scale.bitmap.min.zh-TW",       16);
 pref("font.scale.bitmap.undersize.zh-TW", 80);
 pref("font.scale.bitmap.oversize.zh-TW",  120);
@@ -249,6 +280,37 @@ pref("font.min-size.fixed.zh-CN", 10);
 pref("font.min-size.variable.zh-TW", 10);
 pref("font.min-size.fixed.zh-TW", 10);
 
+// X11 specific
+/* X11 font accept/reject patterns:
+ * Patterns have to match against strings like this:
+ * (boolean values can only be "true" or "false")
+ * "fname=.*;scalable=.*;outline_scaled=.*;xdisplay=.*;xdpy=%d;ydpy=%d;xdevice=.*"
+ * - fname     = X11 font name (string)
+ * - scalable  = is font scalable ? (boolean)
+ * - outline_scaled = is font an outline scaled font ? (boolean)
+ * - xdisplay  = X11 display name (like "host:0.0" (string)
+ * - xdpy      = X DPI (X screen resolution) (integer)
+ * - ydpy      = Y DPI (Y screen resolution) (integer)
+ * - xdevice   = "display" or "printer" (Xprint)
+ * Patterns use  the regular expressions described in the EXTENDED REGULAR
+ * EXPRESSIONS section of the regex(5) manual page.
+ * Note that prefs strings can always be concatenated via the '+'-operator,
+ * e.g. pref("font.x11.acceptfontpattern", "pattern1|" + 
+ *                                         "pattern2|" +
+ *                                         "pattern3");
+ */
+/* reject font if accept pattern does not match it... */
+//pref("font.x11.acceptfontpattern", ".*");
+/* reject font if reject pattern matches it... */
+//pref("font.x11.rejectfontpattern", 
+//     "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", ".*");
+/* reject font if reject pattern matches it... */
+//pref("printer.font.xprint.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
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index 80d796cfaff4..eb147997d49d 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -1,27 +1,20 @@
 @exec mv %D/bin/mozilla %D/bin/mozilla.orig
-@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-skins.rdf %D/lib/mozilla/chrome/user-skins.rdf.orig
+@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/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
+lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/installed-chrome.txt
 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/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/defaults/pref/unix.js
-lib/mozilla/defaults/profile/JP/chrome/userChrome.css
-lib/mozilla/defaults/profile/JP/chrome/userContent.css
+lib/mozilla/defaults/profile/JP/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/JP/chrome/userContent-example.css
 lib/mozilla/defaults/profile/JP/bookmarks.html
 lib/mozilla/defaults/profile/JP/localstore.rdf
 lib/mozilla/defaults/profile/JP/mimeTypes.rdf
@@ -90,10 +83,7 @@ lib/mozilla/searchplugins/rakuten_auction.src
 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-skins.rdf.orig %D/lib/mozilla/chrome/user-skins.rdf
+@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