update to 0.8.

PR:		25509
Submitted by:	maintainer

6 files changed, 69 insertions, 222 deletions

diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index d20c79fb1a8a..193e25fa4b40 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -5,17 +5,17 @@
 # $FreeBSD$
 #
 
-BROKEN=		need to be updated
-
 PORTNAME=	mozilla
-PORTVERSION=	0.7
+PORTVERSION=	0.8
 PORTEPOCH=	1
 CATEGORIES=	japanese www
-MASTER_SITES=	http://www.mozilla.gr.jp/jlp/ \
-		http://mozilla.inmel.net/
+MASTER_SITES=	http://www.mozilla.gr.jp/tools/search/ \
+		http://www.mozilla.gr.jp/jlp/
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${PORTNAME}${PORTVERSION}-langjajp
+DISTNAME=	GoogleJapan.png GoogleJapan.src \
+		${JLP_SRC}
 EXTRACT_SUFX=	.xpi
+EXTRACT_ONLY=	${JLP_SRC}${EXTRACT_SUFX}
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
@@ -29,6 +29,8 @@ USE_X_PREFIX=	yes
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-qo
 
+JLP_SRC=	${PORTNAME}${PORTVERSION}-langjajp
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 400020
@@ -41,6 +43,11 @@ post-extract:
 	${MKDIR} ${WRKSRC}/defaults/pref
 	${CP} ${FILESDIR}/all.js ${WRKSRC}/defaults/pref
 	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/GoogleJapan.png ${WRKSRC}/searchplugins
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/GoogleJapan.src ${WRKSRC}/searchplugins
+
+post-patch:
+	find ${WRKSRC} -name '*.orig' | xargs ${RM}
 
 do-build:
 	${SED} -e "s;@PREFIX@;${PREFIX};g" \
@@ -56,6 +63,8 @@ do-install:
 	${MV} installed-chrome.txt installed-chrome.txt.orig)
 	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
 	${MV} all.js all.js.orig; ${MV} unix.js unix.js.orig)
+	(cd ${PREFIX}/lib/mozilla/searchplugins; \
+	${MV} google.gif google.gif.orig; ${MV} google.src google.src.orig)
 	${MV} ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
 	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults searchplugins) | \
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index 73a6db7b9650..61173a850866 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1 +1,3 @@
-MD5 (mozilla0.7-langjajp.xpi) = 7741a5b78da6e529dce0cb5fe6e782ad
+MD5 (GoogleJapan.png) = 00018294ed1658ff7fac008fd3438284
+MD5 (GoogleJapan.src) = 21c8dd268c4bb4f5a1f6e09377d0ea36
+MD5 (mozilla0.8-langjajp.xpi) = dba3f3655202bccb9ee8f84252867c4e
diff --git a/japanese/mozilla-jlp/files/all.js b/japanese/mozilla-jlp/files/all.js
index 088f700102a2..9e639b150087 100644
--- a/japanese/mozilla-jlp/files/all.js
+++ b/japanese/mozilla-jlp/files/all.js
@@ -28,7 +28,7 @@ pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search
 pref("keyword.URL", "http://keyword.netscape.com/keyword/");
 pref("keyword.enabled", true);
 pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
-pref("general.useragent.misc", "0.7");
+pref("general.useragent.misc", "0.8");
 
 pref("general.startup.browser",             true);
 pref("general.startup.mail",                false);
@@ -37,46 +37,33 @@ pref("general.startup.editor",              false);
 pref("general.startup.compose",             false);
 pref("general.startup.addressbook",         false);
 
-pref("general.always_load_images",          true);
-pref("general.always_load_movies",          true);
-pref("general.always_load_sounds",          true);
-pref("general.title_tips",                  true);
-
-pref("general.help_source.site",            1); // 0 = Netscape, 1 = installed, 2 = custom
-pref("general.help_source.url",             "");
-
-pref("general.fullcircle_enable",           true);
-pref("general.fullcircle_collect_ns_data",  false);
-
 pref("general.open_location.last_url",      "");
 
-pref("browser.enable_style_sheets",         true);
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
 pref("browser.startup.page",                1);     
 pref("browser.startup.homepage",	   "chrome://navigator/locale/navigator.properties");
 // "browser.startup.homepage_override" was for 4.x
 pref("browser.startup.homepage_override.1", true);
 pref("browser.startup.autoload_homepage",   true);
-pref("browser.startup.agreed_to_licence",   false);
-pref("browser.startup.license_version",     0);
-pref("browser.startup.default_window",      1); // start up browser
+
 pref("browser.cache.disk_cache_size",       7680);
 pref("browser.cache.enable",                true);
-pref("browser.cache.disk.enable",                true);
+pref("browser.cache.disk.enable",           true);
 pref("browser.cache.memory_cache_size",     1024);
 pref("browser.cache.disk_cache_ssl",        false);
+pref("browser.cache.check_doc_frequency",   0);
+
+pref("browser.display.use_document_fonts",  1);  // 0 = never, 1 = quick, 2 = always
+pref("browser.display.use_document_colors", true);
+pref("browser.display.use_system_colors",true);
 pref("browser.display.foreground_color",    "#000000");
 pref("browser.display.background_color",    "#C0C0C0");
 pref("browser.anchor_color",                "#0000EE");
 pref("browser.visited_color",               "#551A8B");
-pref("browser.chrome.show_directory_buttons",   true);
+pref("browser.underline_anchors",           true);
+
+pref("browser.chrome.toolbar_tips",         true);
 pref("browser.chrome.toolbar_style",        2);
-pref("browser.chrome.advanced_toolbar",     false);
-pref("browser.chrome.show_toolbar",         true);
-pref("browser.chrome.show_status_bar",      true);
-pref("browser.chrome.show_url_bar",         true);
-pref("browser.chrome.show_security_bar",    true);
-pref("browser.chrome.button_style",         0);
 
 pref("browser.toolbars.showbutton.bookmarks", false);
 pref("browser.toolbars.showbutton.go",      false);
@@ -86,71 +73,24 @@ pref("browser.toolbars.showbutton.net2phone", true);
 pref("browser.toolbars.showbutton.print",   true);
 pref("browser.toolbars.showbutton.search",  true);
 
-pref("browser.background_option",           0); // DEFAULT_BACKGROUND
-pref("browser.link_expiration",             9);
-pref("browser.cache.check_doc_frequency",   0);
-
-pref("browser.delay_images",                false);
-pref("browser.underline_anchors",           true);
-pref("browser.never_expire",                false);
-pref("browser.display_while_loading",       true);
-pref("browser.custom_link_color",           false);
-pref("browser.custom_visited_color",        false);
-pref("browser.custom_text_color",           false);
-pref("browser.display.use_document_colors", true);
-pref("browser.ldapfile_location",       "");
-pref("browser.print_background",            false);
-pref("browser.prefs_window.modeless",       false);
-pref("browser.prefs_window_rect",           "-1,-1,-1,-1");
-pref("browser.find_window_rect",            "-1,-1,-1,-1");
-pref("browser.bookmark_window_rect",        "-1,-1,-1,-1");
-pref("browser.download_window_rect",        "-1,-1,-1,-1");
-pref("browser.wfe.ignore_def_check",false);
-pref("browser.display.wfe.use_windows_colors",true);
-pref("browser.startup_mode",1);
-
 // Dialog modality issues
 pref("browser.prefWindowModal", true);
 pref("browser.show_about_as_stupid_modal_window", false);
 
+pref("browser.download.progressDnldDialog.keepAlive", false); // keep the dnload progress dialog up after dnload is complete
+
 // various default search settings
 pref("browser.search.defaulturl", "chrome://navigator/locale/navigator.properties");
 pref("browser.search.opensidebarsearchpanel", true);
 pref("browser.search.last_search_category", "NC:SearchCategory?category=urn:search:category:1");
 pref("browser.search.mode", 0);
 pref("browser.search.powermode", 0);
-pref("browser.search.use_double_clicks", false);
 pref("browser.urlbar.autocomplete.enabled", true);
 pref("browser.urlbar.clickSelectsAll",false);
 
-localDefPref("browser.bookmark_location",       "");
-localDefPref("browser.addressbook_location",    "");
-localDefPref("browser.socksfile_location",      "");
-localDefPref("browser.ldapfile_location",       "");
-
 pref("browser.history.last_page_visited", "");
 pref("browser.history_expire_days", 9);
-
-pref("browser.url_history.URL_1", "");
-pref("browser.url_history.URL_2", "");
-pref("browser.url_history.URL_3", "");
-pref("browser.url_history.URL_4", "");
-pref("browser.url_history.URL_5", "");
-pref("browser.url_history.URL_6", "");
-pref("browser.url_history.URL_7", "");
-pref("browser.url_history.URL_8", "");
-pref("browser.url_history.URL_9", "");
-pref("browser.url_history.URL_10", "");
-pref("browser.url_history.URL_11", "");
-pref("browser.url_history.URL_12", "");
-pref("browser.url_history.URL_13", "");
-pref("browser.url_history.URL_14", "");
-pref("browser.url_history.URL_15", "");
-
-pref("browser.uriloader", true); // turn new uri loading on by default
-
-pref("browser.personal_toolbar_button.min_chars", 15);
-pref("browser.personal_toolbar_button.max_chars", 30);
+pref("browser.sessionhistory.max_entries", 50);
 
 pref("browser.PICS.ratings_enabled", false);
 pref("browser.PICS.pages_must_be_rated", false);
@@ -159,6 +99,8 @@ pref("browser.PICS.reenable_for_this_session", false);
 pref("browser.PICS.service.http___home_netscape_com_default_rating.service_enabled", true);
 pref("browser.PICS.service.http___home_netscape_com_default_rating.s", 0);
 
+pref("browser.target_new_blocked", false);
+
 // gfx widgets
 pref("nglayout.widget.mode", 2);
 pref("nglayout.widget.gfxscrollbars", true);
@@ -176,18 +118,9 @@ pref("nglayout.debug.enable_xbl_forms", false);
 pref("browser.related.enabled", true);
 pref("browser.related.autoload", 1);  // 0 = Always, 1 = After first use, 2 = Never
 pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
-pref("browser.related.detailsProvider", "http://cgi.netscape.com/cgi-bin/rlcgi.cgi?URL=");
 pref("browser.related.disabledForDomains", "");
 pref("browser.goBrowsing.enabled", true);
 
-
-// The NavCenter preferences
-localDefPref("browser.navcenter.dockstyle", 1); // 1 = left, 2 = right, 3 = top, 4 = bottom
-localDefPref("browser.navcenter.docked.tree.visible", false);
-localDefPref("browser.navcenter.docked.selector.visible", true);
-localDefPref("browser.navcenter.docked.tree.width", 250); // Percent of parent window consumed by docked nav center
-localDefPref("browser.navcenter.floating.rect", "20, 20, 400, 600"); // Window dimensions when floating
-
 // Default Capability Preferences: Security-Critical! 
 // Editing these may create a security risk - be sure you know what you're doing
 pref("capability.policy.default.barprop.visible.write", "UniversalBrowserWrite");
@@ -218,57 +151,34 @@ pref("capability.policy.default.navigator.preference.write", "UniversalPreferenc
 pref("capability.policy.default.windowinternal.close", "allAccess");
 pref("capability.policy.default.windowinternal.location.write", "allAccess");
 
+pref("capability.policy.mailnews.sites", "mailbox: imap: news: pop: pop3:");
+
+pref("capability.policy.mailnews.domexception.tostring", "noAccess");
+pref("capability.policy.mailnews.htmldocument.domain", "noAccess");
+pref("capability.policy.mailnews.htmldocument.url", "noAccess");
+pref("capability.policy.mailnews.nsdocument.location", "noAccess");
+pref("capability.policy.mailnews.window.name.write", "noAccess");
+pref("capability.policy.mailnews.windowinternal.location", "noAccess");
+
 // window.openDialog is insecure and must be made inaccessible from web scripts - see bug 56009
 pref("capability.policy.default.windowinternal.opendialog", "noAccess");
 
-pref("capability.policy.mailnews.sites", "mailbox: imap: news: pop: pop3:");
-pref("capability.policy.mailnews.window.name", "noAccess");
-
-localDefPref("ghist.expires.pos",          4);
-localDefPref("ghist.expires.width",        1400);
-localDefPref("ghist.firstvisit.pos",       2);
-localDefPref("ghist.firstvisit.width",     1400);
-localDefPref("ghist.lastvisit.pos",        3);
-localDefPref("ghist.lastvisit.width",      1400);
-localDefPref("ghist.location.pos",         1);
-localDefPref("ghist.location.width",       2400);
-pref("ghist.show_value",           0);
-pref("ghist.sort_descending",      false);
-pref("ghist.sortby",               3);  // eGH_LastDateSort
-localDefPref("ghist.title.pos",            0);
-localDefPref("ghist.title.width",          2400);
-localDefPref("ghist.visiblecolumns",       6);
-localDefPref("ghist.visitcount.pos",       5);
-localDefPref("ghist.visitcount.width",     1000);
-localDefPref("ghist.window_rect",          "0,0,0,0");
-
 pref("javascript.enabled",                  true);
 pref("javascript.allow.mailnews",           false);
-pref("javascript.allow.signing",            true);
-pref("javascript.reflect_preferences",      false);     // for PE
-//pref("javascript.options.strict",           true);
+pref("javascript.options.strict",           false);
 
 // advanced prefs
 pref("advanced.always_load_images",         true);
 pref("security.enable_java",                 true);
 pref("css.allow",                           true);
 pref("advanced.mailftp",                    false);
+pref("image.animation_mode",                "normal");
 
 pref("offline.startup_state",            0);
 pref("offline.send.unsent_messages",            0);
 pref("offline.prompt_synch_on_exit",            true);
 pref("offline.news.download.use_days",          0);
 
-pref("network.dnsAttempt",              0);
-pref("network.tcptimeout",                  0);         // use default
-pref("network.tcpbufsize",                  0);         //
-pref("network.use_async_dns",               true);
-pref("network.dnsCacheExpiration",          900); // in seconds
-pref("network.enableUrlMatch",              true);
-pref("network.max_connections",             4);
-pref("network.speed_over_ui",               true);
-pref("network.file_sort_method",            0);     // NAME 0, TYPE 1, SIZE 2, DATE 3
-pref("network.ftp.passive",		    true);
 pref("network.hosts.smtp_server",           "mail");
 pref("network.hosts.pop_server",            "mail");
 pref("network.protocols.useSystemDefaults",   false); // set to true if user links should use system default handlers
@@ -338,7 +248,6 @@ pref("network.proxy.socks",                 "");
 pref("network.proxy.socks_port",            0);
 pref("network.proxy.no_proxies_on",         "");
 pref("network.online",                      true); //online/offline
-pref("network.prompt_at_startup",           false);//Ask me
 pref("network.accept_cookies",              0);     // 0 = Always, 1 = warn, 2 = never
 pref("network.foreign_cookies",             0); // 0 = Accept, 1 = Don't accept
 pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
@@ -346,21 +255,17 @@ pref("network.cookie.warnAboutCookies",     false);
 pref("signon.rememberSignons",              true);
 pref("network.sendRefererHeader",           2); // 0=don't send any, 1=send only on clicks, 2=send on image requests as well
 pref("network.enablePad",                   false); // Allow client to do proxy autodiscovery
-pref("network.padPacURL",                   ""); // The proxy autodiscovery url
 pref("converter.html2txt.structs",          true); // Output structured phrases (strong, em, code, sub, sup, b, i, u)
 pref("converter.html2txt.header_strategy",  1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention
 pref("wallet.captureForms",                 true);
 pref("wallet.notified",                     false);
-pref("wallet.fetchPatches",                 false);
 pref("wallet.TutorialFromMenu",             "chrome://navigator/locale/navigator.properties");
-pref("wallet.TutorialFromPrefs",            "chrome://navigator/locale/navigator.properties");
 pref("wallet.Server",                       "chrome://navigator/locale/navigator.properties");
 pref("wallet.Samples",                      "chrome://navigator/locale/navigator.properties");
 pref("wallet.version",                      "1");
 pref("wallet.enabled",                      true);
 pref("wallet.crypto",                       false);
 pref("imageblocker.enabled",                true);
-pref("messages.new_window",                 true); // ML obsolete; use mailnews.message_in_thread_window
 pref("intl.accept_languages",               "chrome://navigator/locale/navigator.properties");
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
 pref("intl.collationKeyAsCodePoint",        false);
@@ -422,46 +327,25 @@ pref("font.size.fixed.zh-CN", 16);
 pref("font.size.variable.zh-TW", 16);
 pref("font.size.fixed.zh-TW", 16);
 
-pref("browser.enable_webfonts",                 true);
-pref("browser.display.use_document_fonts",      1); // 0 = never, 1 = quick, 2 = always
-
 // -- folders (Mac: these are binary aliases.)
-localDefPref("browser.download_directory",      "");
 localDefPref("mail.signature_file",             "");
 localDefPref("mail.directory",                  "");
-localDefPref("mail.cc_file",                    "");
-localDefPref("news.cc_file",                    "");
 
-pref("news.fancy_listing",      true);      // obsolete
-pref("browser.wfe.show_value", 1);
-pref("browser.blink_allowed", true);
 pref("images.dither", "auto");
-pref("images.incremental_display", true);
-pref("network.wfe.use_async_dns", true);
-pref("network.wfe.tcp_connect_timeout",0);
 localDefPref("news.directory",                  "");
 localDefPref("security.directory",              "");
 
 pref("autoupdate.enabled",              true);
-pref("autoupdate.confirm_install",				false);
-pref("autoupdate.unsigned_jar_support",  false);
 
 pref("silentdownload.enabled",    true);
 pref("silentdownload.directory",  "");
 pref("silentdownload.range",      3000);
 pref("silentdownload.interval",  10000);
 
-
-pref("imap.io.mac.logging", false);
-
 pref("browser.editor.disabled", false);
 
 pref("spellchecker.dictionary", "");
 
-pref("mime.table.allow_add", true);
-pref("mime.table.allow_edit", true);
-pref("mime.table.allow_remove", true);
-
 pref("signed.applets.codebase_principal_support", false);
 pref("security.checkloaduri", true);
 pref("security.xpconnect.plugin.unrestricted", true);
@@ -475,11 +359,13 @@ pref("ui.key.menuAccessKeyFocuses", false);
 // Middle-mouse handling
 pref("middlemouse.paste", false);
 pref("middlemouse.openNewWindow", true);
+pref("middlemouse.contentLoadURL", false);
+pref("middlemouse.scrollbarPosition", false);
 
 // Clipboard behavior
 pref("clipboard.autocopy", false);
 
-/* 0=lines, 1=pages, 2=history , 3=text size */
+// 0=lines, 1=pages, 2=history , 3=text size
 pref("mousewheel.withnokey.action",0);
 pref("mousewheel.withnokey.numlines",1);	
 pref("mousewheel.withnokey.sysnumlines",true);
@@ -493,52 +379,10 @@ pref("mousewheel.withaltkey.action",2);
 pref("mousewheel.withaltkey.numlines",1);
 pref("mousewheel.withaltkey.sysnumlines",false);
 
-pref("middlemouse.scrollbarPosition", false);
-
 pref("profile.confirm_automigration",true);
 
 // Customizable toolbar stuff
 pref("custtoolbar.personal_toolbar_folder", "");
-pref("custtoolbar.has_toolbar_folder", true);
-pref("custtoolbar.Browser.Navigation_Toolbar.position", 0);
-pref("custtoolbar.Browser.Navigation_Toolbar.showing", true);
-pref("custtoolbar.Browser.Navigation_Toolbar.open", true);
-pref("custtoolbar.Browser.Location_Toolbar.position", 1);
-pref("custtoolbar.Browser.Location_Toolbar.showing", true);
-pref("custtoolbar.Browser.Location_Toolbar.open", true);
-pref("custtoolbar.Browser.Personal_Toolbar.position", 2);
-pref("custtoolbar.Browser.Personal_Toolbar.showing", true);
-pref("custtoolbar.Browser.Personal_Toolbar.open", true);
-pref("custtoolbar.Messenger.Navigation_Toolbar.position", 0);
-pref("custtoolbar.Messenger.Navigation_Toolbar.showing", true);
-pref("custtoolbar.Messenger.Navigation_Toolbar.open", true);
-pref("custtoolbar.Messenger.Location_Toolbar.position", 1);
-pref("custtoolbar.Messenger.Location_Toolbar.showing", true);
-pref("custtoolbar.Messenger.Location_Toolbar.open", true);
-pref("custtoolbar.Messages.Navigation_Toolbar.position", 0);
-pref("custtoolbar.Messages.Navigation_Toolbar.showing", true);
-pref("custtoolbar.Messages.Navigation_Toolbar.open", true);
-pref("custtoolbar.Messages.Location_Toolbar.position", 1);
-pref("custtoolbar.Messages.Location_Toolbar.showing", true);
-pref("custtoolbar.Messages.Location_Toolbar.open", true);
-pref("custtoolbar.Folders.Navigation_Toolbar.position", 0);
-pref("custtoolbar.Folders.Navigation_Toolbar.showing", true);
-pref("custtoolbar.Folders.Navigation_Toolbar.open", true);
-pref("custtoolbar.Folders.Location_Toolbar.position", 1);
-pref("custtoolbar.Folders.Location_Toolbar.showing", true);
-pref("custtoolbar.Folders.Location_Toolbar.open", true);
-pref("custtoolbar.Address_Book.Address_Book_Toolbar.position", 0);
-pref("custtoolbar.Address_Book.Address_Book_Toolbar.showing", true);
-pref("custtoolbar.Address_Book.Address_Book_Toolbar.open", true);
-pref("custtoolbar.Compose_Message.Message_Toolbar.position", 0);
-pref("custtoolbar.Compose_Message.Message_Toolbar.showing", true);
-pref("custtoolbar.Compose_Message.Message_Toolbar.open", true);
-pref("custtoolbar.Composer.Composition_Toolbar.position", 0);
-pref("custtoolbar.Composer.Composition_Toolbar.showing", true);
-pref("custtoolbar.Composer.Composition_Toolbar.open", true);
-pref("custtoolbar.Composer.Formatting_Toolbar.position", 1);
-pref("custtoolbar.Composer.Formatting_Toolbar.showing", true);
-pref("custtoolbar.Composer.Formatting_Toolbar.open", true);
 
 pref("sidebar.customize.all_panels.url", "http://sidebar-rdf.netscape.com/%LOCALE%/sidebar-rdf/%SIDEBAR_VERSION%/all-panels.rdf");
 pref("sidebar.customize.more_panels.url", "http://dmoz.org/Netscape/Sidebar/");
diff --git a/japanese/mozilla-jlp/files/patch-aa b/japanese/mozilla-jlp/files/patch-aa
new file mode 100644
index 000000000000..7cef229e087f
--- /dev/null
+++ b/japanese/mozilla-jlp/files/patch-aa
@@ -0,0 +1,10 @@
+--- defaults/profile/ja-JP/search.rdf.orig	Fri Feb 23 19:24:48 2001
++++ defaults/profile/ja-JP/search.rdf	Sun Mar  4 02:30:58 2001
+@@ -56,6 +56,7 @@
+     <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:ExciteJapan.src"/>

+     <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:Fresheye_Japan.src"/>

+     <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:GooNeJp.src"/>

++    <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:Google.src"/>

+     <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:InfoseekJapan.src"/>

+     <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:LYCOSJapan.src"/>

+     <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:YahooJapan.src"/>

diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 24b98d47078c..5b772184d8f5 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -20,18 +20,12 @@
  * Contributor(s): 
  */
 
-// The other platforms roll this all into "toolbar mode".
-pref("browser.chrome.toolbar_tips", true);
-pref("browser.chrome.show_menubar", true);
-
 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("mail.sort_by", 0);
-pref("news.sort_by", 0);
 pref("browser.startup.license_accepted", "");
 pref("browser.cache.memory_cache_size", 3000);
 pref("browser.cache.disk_cache_size", 5000);
@@ -42,7 +36,6 @@ 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("browser.startup.default_window", 0);
 pref("security.warn_accept_cookie", false);
 pref("editor.disable_spell_checker", false);
 pref("editor.dont_lock_spell_files", true);
@@ -50,15 +43,13 @@ 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);
 
-// Instead of "delay_images"
-pref("browser.autoload_images", true);
-
 // Most Unix people think modal pref windows are stupid:
 pref("browser.prefWindowModal", false);
 
@@ -87,14 +78,6 @@ pref("print.print_color", true);
 pref("print.print_landscape", false);
 pref("print.print_paper_size", 0);
 
-// Not sure what this one does...
-pref("browser.fancy_ftp", true);
-
-// Fortezza stuff
-pref("fortezza.toggle", 1);
-pref("fortezza.timeout", 30);
-
-
 // font names
 
 // ar
@@ -171,14 +154,3 @@ pref("print.psnativecode.ja", "euc-jp");
 pref("print.psnativefont.ja", "Ryumin-Light-EUC-H");
 
 pref("mail.signature_date", 0);
-
-// Outliner column defaults
-pref("mail.threadpane.messagepane_height", 400);
-
-pref("taskbar.x", -1);
-pref("taskbar.y", -1);
-pref("taskbar.floating", false);
-pref("taskbar.horizontal", false);
-pref("taskbar.ontop", false);
-pref("taskbar.button_style", -1);
-
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index f9890c7438e2..a5166d42c18f 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -7,6 +7,8 @@
 @exec mv %D/lib/mozilla/chrome/installed-chrome.txt %D/lib/mozilla/chrome/installed-chrome.txt.orig
 @exec mv %D/lib/mozilla/defaults/pref/all.js %D/lib/mozilla/defaults/pref/all.js.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/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
@@ -22,6 +24,8 @@ lib/mozilla/defaults/profile/ja-JP/localstore.rdf
 lib/mozilla/defaults/profile/ja-JP/mimeTypes.rdf
 lib/mozilla/defaults/profile/ja-JP/panels.rdf
 lib/mozilla/defaults/profile/ja-JP/search.rdf
+lib/mozilla/searchplugins/AllAboutJapan.png
+lib/mozilla/searchplugins/AllAboutJapan.src
 lib/mozilla/searchplugins/BiglobeSearch.png
 lib/mozilla/searchplugins/BiglobeSearch.src
 lib/mozilla/searchplugins/Bugzilla-Summary.png
@@ -32,10 +36,14 @@ lib/mozilla/searchplugins/CNETJapan.png
 lib/mozilla/searchplugins/CNETJapan.src
 lib/mozilla/searchplugins/ExciteJapan.png
 lib/mozilla/searchplugins/ExciteJapan.src
+lib/mozilla/searchplugins/FreeBSD_jp.png
+lib/mozilla/searchplugins/FreeBSD_jp.src
 lib/mozilla/searchplugins/Fresheye_Japan.gif
 lib/mozilla/searchplugins/Fresheye_Japan.src
 lib/mozilla/searchplugins/GooNeJp.png
 lib/mozilla/searchplugins/GooNeJp.src
+lib/mozilla/searchplugins/GoogleJapan.png
+lib/mozilla/searchplugins/GoogleJapan.src
 lib/mozilla/searchplugins/ImpressWatchJp.png
 lib/mozilla/searchplugins/ImpressWatchJp.src
 lib/mozilla/searchplugins/InfoseekJapan.png
@@ -85,4 +93,6 @@ lib/mozilla/searchplugins/w3c.src
 @unexec mv %D/lib/mozilla/chrome/installed-chrome.txt.orig %D/lib/mozilla/chrome/installed-chrome.txt
 @unexec mv %D/lib/mozilla/defaults/pref/all.js.orig %D/lib/mozilla/defaults/pref/all.js
 @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/ja-JP