4 files changed, 5 insertions, 395 deletions

diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index c73a4e7765ed..7d6c4256eff3 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.6
-PORTREVISION=	3
+PORTVERSION=	1.7
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www33.ocn.ne.jp/~snip/mozilla/jlp/ \
 		http://n.jpn.ph/mozilla/download/jlp/
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	moz${PORTVERSION}-langjajp-tm0.2.1
+DISTNAME=	moz${PORTVERSION}-langjajp-tm0.1
 EXTRACT_SUFX=	.xpi
 
 MAINTAINER=	fortune@n.jpn.ph
@@ -43,10 +43,6 @@ LOCALENAME=	ja_JP.EUC
 LIBXPG4=	LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
 .endif
 
-post-extract:
-	${MKDIR} ${WRKSRC}/defaults/pref
-	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref
-
 do-build:
 	${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \
 	       -e "s^%%LOCALBASE%%^${LOCALBASE}^g" \
@@ -59,8 +55,6 @@ do-install:
 	(cd ${PREFIX}/lib/${MOZILLA}/chrome; \
 	${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)
 	(cd ${PREFIX}/lib/${MOZILLA}/components; \
 	${MV} -f xpti.dat ../xpti.dat.orig)
 	${MV} -f ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/${MOZILLA}.orig
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index add093e8bbbe..9c01f7b2b536 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1,2 +1,2 @@
-MD5 (moz1.6-langjajp-tm0.2.1.xpi) = b7a60a95b2e4630d475f195b3a1473e9
-SIZE (moz1.6-langjajp-tm0.2.1.xpi) = 853934
+MD5 (moz1.7-langjajp-tm0.1.xpi) =  c42ab031971f36985131023a45c92396
+SIZE (moz1.7-langjajp-tm0.1.xpi) = 876553
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
deleted file mode 100644
index 3d26f26d4242..000000000000
--- a/japanese/mozilla-jlp/files/unix.js
+++ /dev/null
@@ -1,381 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * 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 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-pref("mail.empty_trash", false);
-
-// Handled differently under Mac/Windows
-pref("network.hosts.smtp_server", "localhost");
-pref("network.hosts.pop_server", "pop");
-pref("mail.check_new_mail", true);
-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.drag_out_of_frame_style", 1);
-pref("mail.signature_file", "~/.signature");
-pref("mail.default_fcc", "~/nsmail/Sent");
-pref("news.default_fcc", "~/nsmail/Sent");
-pref("mailnews.reply_with_extra_lines", 0);
-pref("security.warn_accept_cookie", false);
-pref("editor.disable_spell_checker", false);
-pref("editor.dont_lock_spell_files", true);
-pref("editor.singleLine.pasteNewlines", 0);
-
-// Middle-mouse handling
-pref("middlemouse.paste", true);
-pref("middlemouse.contentLoadURL", true);
-pref("middlemouse.openNewWindow", true);
-pref("middlemouse.scrollbarPosition", true);
-
-// Clipboard behavior
-pref("clipboard.autocopy", true);
-
-pref("browser.urlbar.clickSelectsAll", false);
-
-// Tab focus model bit field:
-// 1 focuses text controls, 2 focuses other form elements, 4 adds links.
-// Leave this at the default, 7, to match mozilla1.0-era user expectations.
-// pref("accessibility.tabfocus", 1);
-
-// Beep instead of playing sound in Linux, at least until nsISound is fixed:
-pref("accessibility.typeaheadfind.soundURL", "beep");
-
-// 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);
-
-// Most Unix people think modal pref windows are stupid:
-pref("browser.prefWindowModal", false);
-
-// turn off scrollbar snapping
-pref("slider.snapMultiplier", 0);
-
-// Unix only
-pref("mail.use_movemail", true);
-pref("mail.use_builtin_movemail", true);
-pref("mail.movemail_program", "");
-pref("mail.movemail_warn", false);
-pref("mail.sash_geometry", "");
-pref("news.cache_xover", false);
-pref("news.show_first_unread", false);
-pref("news.sash_geometry", "");
-pref("helpers.global_mime_types_file", "/etc/mime.types");
-pref("helpers.global_mailcap_file", "/etc/mailcap");
-pref("helpers.private_mime_types_file", "~/.mime.types");
-pref("helpers.private_mailcap_file", "~/.mailcap");
-pref("applications.telnet", "xterm -e telnet %h %p");
-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");
-// On Solaris/IRIX, this should be "lp"
-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);
-
-// 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_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
-pref("print.print_extra_margin", 0); // twips
-
-pref("print.whileInPrintPreview", false);
-
-pref("font.allow_double_byte_special_chars", true);
-// font names
-
-// ar
-
-pref("font.name.serif.el", "misc-fixed-iso8859-7");
-pref("font.name.sans-serif.el", "misc-fixed-iso8859-7");
-pref("font.name.monospace.el", "misc-fixed-iso8859-7");
-
-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", "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");
-pref("font.name.monospace.ko", "daewoo-mincho-ksc5601.1987-0");
-
-// th
-
-pref("font.name.serif.tr", "adobe-times-iso8859-9");
-pref("font.name.sans-serif.tr", "adobe-helvetica-iso8859-9");
-pref("font.name.monospace.tr", "adobe-courier-iso8859-9");
-
-pref("font.name.serif.x-baltic", "b&h-lucidux serif-iso8859-4");
-pref("font.name.sans-serif.x-baltic", "b&h-lucidux sans-iso8859-4");
-pref("font.name.monospace.x-baltic", "b&h-lucidux mono-iso8859-4");
-
-pref("font.name.serif.x-central-euro", "adobe-times-iso8859-2");
-pref("font.name.sans-serif.x-central-euro", "adobe-helvetica-iso8859-2");
-pref("font.name.monospace.x-central-euro", "adobe-courier-iso8859-2");
-
-pref("font.name.serif.x-cyrillic", "cronyx-times-koi8-r");
-pref("font.name.sans-serif.x-cyrillic", "cronyx-helvetica-koi8-r");
-pref("font.name.monospace.x-cyrillic", "cronyx-courier-koi8-r");
-
-pref("font.name.serif.x-unicode", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-unicode", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-unicode", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.x-user-def", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-user-def", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-user-def", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.x-western", "adobe-times-iso8859-1");
-pref("font.name.sans-serif.x-western", "adobe-helvetica-iso8859-1");
-pref("font.name.monospace.x-western", "adobe-courier-iso8859-1");
-
-pref("font.name.serif.zh-CN", "isas-song ti-gb2312.1980-0");
-pref("font.name.sans-serif.zh-CN", "isas-song ti-gb2312.1980-0");
-pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
-
-// zh-TW
-
-pref("font.default", "sans-serif");
-pref("font.size.variable.ar", 16);
-pref("font.size.fixed.ar", 12);
-
-pref("font.size.variable.el", 16);
-pref("font.size.fixed.el", 12);
-
-pref("font.size.variable.he", 16);
-pref("font.size.fixed.he", 12);
-
-pref("font.size.variable.ja", 14);
-pref("font.size.fixed.ja", 14);
-
-pref("font.size.variable.ko", 16);
-pref("font.size.fixed.ko", 16);
-
-pref("font.size.variable.th", 16);
-pref("font.size.fixed.th", 12);
-
-pref("font.size.variable.tr", 16);
-pref("font.size.fixed.tr", 12);
-
-pref("font.size.variable.x-baltic", 16);
-pref("font.size.fixed.x-baltic", 12);
-
-pref("font.size.variable.x-central-euro", 16);
-pref("font.size.fixed.x-central-euro", 12);
-
-pref("font.size.variable.x-cyrillic", 16);
-pref("font.size.fixed.x-cyrillic", 12);
-
-pref("font.size.variable.x-unicode", 16);
-pref("font.size.fixed.x-unicode", 12);
-
-pref("font.size.variable.x-western", 14);
-pref("font.size.fixed.x-western", 12);
-
-pref("font.size.variable.zh-CN", 16);
-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 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_font1");
-//pref("font.directory.truetype.2", "/u/sam/tt_font2");
-//pref("font.directory.truetype.3", "/u/sam/tt_font3");
-pref("font.FreeType2.printing", true);
-
-// 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",      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);
-
-// minimum font sizes
-
-pref("font.min-size.variable.ja", 8);
-pref("font.min-size.fixed.ja", 8);
-
-pref("font.min-size.variable.ko", 10);
-pref("font.min-size.fixed.ko", 10);
-
-pref("font.min-size.variable.zh-CN", 10);
-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("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);
-
-/* 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",          "");
-
-// 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
-pref("mail.compose.max_recycled_windows", 0);
-// EOF.
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index 97e683385bf0..30e7f94a323e 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -1,7 +1,6 @@
 @exec mv %D/bin/%%MOZILLA%% %D/bin/%%MOZILLA%%.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%%/components/xpti.dat %D/lib/%%MOZILLA%%/xpti.dat.orig
 bin/%%MOZILLA%%
 lib/%%MOZILLA%%/chrome/JP.jar
@@ -13,7 +12,6 @@ lib/%%MOZILLA%%/chrome/ja-unix.jar
 lib/%%MOZILLA%%/chrome/ja-win.jar
 lib/%%MOZILLA%%/components/xpti.dat
 lib/%%MOZILLA%%/defaults/messenger/JP/mailViews.dat
-lib/%%MOZILLA%%/defaults/pref/unix.js
 lib/%%MOZILLA%%/defaults/profile/JP/chrome/userChrome-example.css
 lib/%%MOZILLA%%/defaults/profile/JP/chrome/userChrome-example-euc.css
 lib/%%MOZILLA%%/defaults/profile/JP/chrome/userChrome-example-sjis.css
@@ -85,7 +83,6 @@ lib/%%MOZILLA%%/searchplugins/w3c.src
 @unexec mv %D/bin/%%MOZILLA%%.orig %D/bin/%%MOZILLA%%
 @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