update to 0.9.1.

PR:		28199
Submitted by:	maintainer

5 files changed, 149 insertions, 107 deletions

diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 8939bbc1cc11..70d9f344ea39 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -5,18 +5,15 @@
 # $FreeBSD$
 #
 
-BROKEN=		"out of sync with mozilla(0.9.1)"
 PORTNAME=	mozilla
-PORTVERSION=	0.9
+PORTVERSION=	0.9.1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
-MASTER_SITES=	http://www.mozilla.gr.jp/tools/search/ \
-		http://www.mozilla.gr.jp/jlp/
+MASTER_SITES=	http://www.mozilla.gr.jp/jlp/
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	GoogleJapan.png GoogleJapan.src \
-		moz0.9-langfix.xpi ${JLP_SRC}
+DISTNAME=	${JLP_SRC}
 EXTRACT_SUFX=	# none
-EXTRACT_ONLY=	moz0.9-langfix.xpi ${JLP_SRC}
+EXTRACT_ONLY=	${JLP_SRC}
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
@@ -59,12 +56,6 @@ 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 ${WRKDIR}/sp
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/GoogleJapan.src ${WRKDIR}/sp
-	${MKDIR} ${WRKSRC}/chrome/comm; cd ${WRKSRC}/chrome/comm; \
-	${EXTRACT_CMD} ${WRKDIR}/comm.jar content/communicator/profile/selectLang.js
-	${MKDIR} ${WRKSRC}/chrome/toolkit; cd ${WRKSRC}/chrome/toolkit; \
-	${EXTRACT_CMD} ${WRKDIR}/toolkit.jar content/global/strres.js
 
 post-patch:
 	find ${WRKSRC} -name '*.orig' | xargs ${RM}
@@ -80,11 +71,15 @@ do-install:
 	${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 comm/content/communicator/profile/selectLang.js comm/content/communicator/profile/selectLang.js.orig; \
-	${MV} -f toolkit/content/global/strres.js toolkit/content/global/strres.js.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
 	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
 	${MV} -f all.js all.js.orig; ${MV} -f unix.js unix.js.orig)
+	(cd ${PREFIX}/lib/mozilla/defaults/profile; \
+	${MV} -f bookmarks.html bookmarks.html.orig; \
+	${MV} -f localstore.rdf localstore.rdf.orig; \
+	${MV} -f mimeTypes.rdf mimeTypes.rdf.orig; \
+	${MV} -f panels.rdf panels.rdf.orig; \
+	${MV} -f search.rdf search.rdf.orig)
 	(cd ${PREFIX}/lib/mozilla/searchplugins; \
 	${MV} -f google.gif google.gif.orig; \
 	${MV} -f google.src google.src.orig)
@@ -96,6 +91,12 @@ do-install:
 	${TAR} -xf - -C ${PREFIX}/lib/mozilla/searchplugins
 	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults) | \
 	${TAR} -xf - -C ${PREFIX}/lib/mozilla
+	(cd ${PREFIX}/lib/mozilla/defaults/profile; \
+	${CP} -p JP/bookmarks.html bookmarks.html; \
+	${CP} -p JP/localstore.rdf localstore.rdf; \
+	${CP} -p JP/mimeTypes.rdf mimeTypes.rdf; \
+	${CP} -p JP/panels.rdf panels.rdf; \
+	${CP} -p JP/search.rdf search.rdf)
 	(cd ${PREFIX}/lib/mozilla/chrome; \
 	${CP} installed-chrome.txt.orig installed-chrome.txt; \
 	${CAT} ${FILESDIR}/installed-chrome.txt >> installed-chrome.txt)
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index c6d4c97d429b..4204d59cb97b 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1,5 +1,2 @@
-MD5 (GoogleJapan.png) = 00018294ed1658ff7fac008fd3438284
-MD5 (GoogleJapan.src) = 29c279f055af9d0e3f894eecd06398f9
-MD5 (moz0.9-langfix.xpi) = a89fe8ea66bafe1c93e12e8fd580fb92
-MD5 (mozilla0.9-langjajp.xpi) = 7c493d37ff0856aa4ea584f3a820f3fb
-MD5 (mozilla0.9-regjp.xpi) = a0797b470ceeee786a4c4d6c42d155d0
+MD5 (mozilla0.9.1-langjajp.xpi) = 4ede45111d25623fd25a76a1aff8ffd2
+MD5 (mozilla0.9.1-regjp.xpi) = bf2a2cad4a89b3b243f1a91823c15f61
diff --git a/japanese/mozilla-jlp/files/all.js b/japanese/mozilla-jlp/files/all.js
index 8c9ce29997ae..7ebef0563285 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", "rv:0.9");
+pref("general.useragent.misc", "rv:0.9.1");
 
 pref("general.startup.browser",             true);
 pref("general.startup.mail",                false);
@@ -47,10 +47,10 @@ pref("browser.startup.homepage",	   "chrome://navigator-region/locale/region.pro
 pref("browser.startup.homepage_override.1", true);
 pref("browser.startup.autoload_homepage",   true);
 
-pref("browser.cache.disk_cache_size",       7680);
+pref("browser.cache.disk_cache_size",       50000);
 pref("browser.cache.enable",                true);
 pref("browser.cache.disk.enable",           true);
-pref("browser.cache.memory_cache_size",     1024);
+pref("browser.cache.memory_cache_size",     4096);
 pref("browser.cache.disk_cache_ssl",        false);
 pref("browser.cache.check_doc_frequency",   0);
 
@@ -83,6 +83,7 @@ pref("browser.toolbars.showbutton.search",  true);
 pref("accessibility.browsewithcaret", false);
 pref("accessibility.usetexttospeech", "");
 pref("accessibility.usebrailledisplay", "");
+pref("accessibility.accesskeycausesactivation", true);
 
 // Dialog modality issues
 pref("browser.prefWindowModal", true);
@@ -103,6 +104,11 @@ pref("browser.history.last_page_visited", "");
 pref("browser.history_expire_days", 9);
 pref("browser.sessionhistory.max_entries", 50);
 
+// Translation service
+pref("browser.translation.service", "http://cgi.netscape.com/cgi-bin/translate.cgi?AlisUI=simple_frames/ns_home&AlisTargetURI=");
+pref("browser.translation.serviceDomain", "teletranslator.com");
+  
+// Platform for Internet Content Selection
 pref("browser.PICS.ratings_enabled", false);
 pref("browser.PICS.pages_must_be_rated", false);
 pref("browser.PICS.disable_for_this_session", false);
@@ -143,78 +149,83 @@ pref("browser.search.defaultenginename", "chrome://navigator/locale/navigator.pr
 
 // 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");
-
-pref("capability.policy.default.domexception.code", "allAccess");
-pref("capability.policy.default.domexception.message", "allAccess");
-pref("capability.policy.default.domexception.name", "allAccess");
-pref("capability.policy.default.domexception.result", "allAccess");
-pref("capability.policy.default.domexception.tostring", "allAccess");
-
-pref("capability.policy.default.history.current.read", "UniversalBrowserRead");
-pref("capability.policy.default.history.next.read", "UniversalBrowserRead");
-pref("capability.policy.default.history.previous.read", "UniversalBrowserRead");
-pref("capability.policy.default.history.item.read", "UniversalBrowserRead");
-
-pref("capability.policy.default.location.hash.write", "allAccess");
-pref("capability.policy.default.location.host.write", "allAccess");
-pref("capability.policy.default.location.hostname.write", "allAccess");
-pref("capability.policy.default.location.href.write", "allAccess");
-pref("capability.policy.default.location.pathname.write", "allAccess");
-pref("capability.policy.default.location.port.write", "allAccess");
-pref("capability.policy.default.location.protocol.write", "allAccess");
-pref("capability.policy.default.location.search.write", "allAccess");
-
-pref("capability.policy.default.navigator.preference.read", "UniversalPreferencesRead");
-pref("capability.policy.default.navigator.preference.write", "UniversalPreferencesWrite");
-
-pref("capability.policy.default.windowinternal.blur", "allAccess");
-pref("capability.policy.default.windowinternal.close", "allAccess");
-pref("capability.policy.default.windowinternal.focus", "allAccess");
-pref("capability.policy.default.windowinternal.location.write", "allAccess");
-
+//pref("capability.policy.default.barprop.visible.set", "UniversalBrowserWrite");
+
+pref("capability.policy.default.DOMException.code", "allAccess");
+pref("capability.policy.default.DOMException.message", "allAccess");
+pref("capability.policy.default.DOMException.name", "allAccess");
+pref("capability.policy.default.DOMException.result", "allAccess");
+pref("capability.policy.default.DOMException.toString", "allAccess");
+
+pref("capability.policy.default.History.back", "allAccess");
+pref("capability.policy.default.History.current", "UniversalBrowserRead");
+pref("capability.policy.default.History.forward", "allAccess");
+pref("capability.policy.default.History.go", "allAccess");
+pref("capability.policy.default.History.item", "UniversalBrowserRead");
+pref("capability.policy.default.History.length", "UniversalBrowserRead");
+pref("capability.policy.default.History.next", "UniversalBrowserRead");
+pref("capability.policy.default.History.previous", "UniversalBrowserRead");
+pref("capability.policy.default.History.toString", "UniversalBrowserRead");
+
+pref("capability.policy.default.HTMLDocument.close", "allAccess");
+pref("capability.policy.default.HTMLDocument.open", "allAccess");
+pref("capability.policy.default.HTMLDocument.write", "allAccess");
+pref("capability.policy.default.HTMLDocument.writeln", "allAccess");
+
+pref("capability.policy.default.Location.hash.set", "allAccess");
+pref("capability.policy.default.Location.host.set", "allAccess");
+pref("capability.policy.default.Location.hostname.set", "allAccess");
+pref("capability.policy.default.Location.href.set", "allAccess");
+pref("capability.policy.default.Location.pathname.set", "allAccess");
+pref("capability.policy.default.Location.port.set", "allAccess");
+pref("capability.policy.default.Location.protocol.set", "allAccess");
+pref("capability.policy.default.Location.reload", "allAccess");
+pref("capability.policy.default.Location.replace", "allAccess");
+pref("capability.policy.default.Location.search.set", "allAccess");
+
+pref("capability.policy.default.Navigator.preference", "allAccess");
+pref("capability.policy.default.Navigator.preferenceinternal.get", "UniversalPreferencesRead");
+pref("capability.policy.default.Navigator.preferenceinternal.set", "UniversalPreferencesWrite");
+
+pref("capability.policy.default.Window.blur", "allAccess");
+pref("capability.policy.default.Window.close", "allAccess");
+pref("capability.policy.default.Window.closed", "allAccess");
+pref("capability.policy.default.Window.Components", "allAccess");
+pref("capability.policy.default.Window.document", "allAccess");
+pref("capability.policy.default.Window.focus", "allAccess");
+pref("capability.policy.default.Window.history", "allAccess");
+pref("capability.policy.default.Window.location", "allAccess");
 // window.openDialog is insecure and must be made inaccessible from web scripts - see bug 56009
-pref("capability.policy.default.windowinternal.opendialog", "noAccess");
-
-// Mailnews DOM restrictions - see bug 66938
-pref("capability.policy.mailnews.characterdata.data", "noAccess");
-pref("capability.policy.mailnews.characterdata.substringdata", "noAccess");
-pref("capability.policy.mailnews.element.getattribute", "noAccess");
-pref("capability.policy.mailnews.element.getattributenode", "noAccess");
-pref("capability.policy.mailnews.element.getattributenodens", "noAccess");
-pref("capability.policy.mailnews.element.getattributens", "noAccess");
-pref("capability.policy.mailnews.htmlanchorelement.href", "noAccess");
-pref("capability.policy.mailnews.htmlareaelement.href", "noAccess");
-pref("capability.policy.mailnews.htmlbaseelement.href", "noAccess");
-pref("capability.policy.mailnews.htmlblockquoteelement.cite", "noAccess");
-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.htmlelement.innerhtml", "noAccess");
-pref("capability.policy.mailnews.htmlimageelement.src", "noAccess");
-pref("capability.policy.mailnews.image.lowsrc", "noAccess");
-pref("capability.policy.mailnews.node.attributes", "noAccess");
-pref("capability.policy.mailnews.node.nodevalue", "noAccess");
-pref("capability.policy.mailnews.nsdocument.location", "noAccess");
-pref("capability.policy.mailnews.window.name.write", "noAccess");
-pref("capability.policy.mailnews.windowinternal.location", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.hash", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.host", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.hostname", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.pathname", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.port", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.protocol", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.search", "noAccess");
-pref("capability.policy.mailnews.nshtmlanchorelement.text", "noAccess");
-pref("capability.policy.mailnews.nshtmlareaelement.hash", "noAccess");
-pref("capability.policy.mailnews.nshtmlareaelement.host", "noAccess");
-pref("capability.policy.mailnews.nshtmlareaelement.hostname", "noAccess");
-pref("capability.policy.mailnews.nshtmlareaelement.pathname", "noAccess");
-pref("capability.policy.mailnews.nshtmlareaelement.port", "noAccess");
-pref("capability.policy.mailnews.nshtmlareaelement.protocol", "noAccess");
-pref("capability.policy.mailnews.nshtmlareaelement.search", "noAccess");
-pref("capability.policy.mailnews.range.tostring", "noAccess");
-pref("capability.policy.mailnews.sites", "mailbox: imap: news: pop: pop3:");
+pref("capability.policy.default.Window.openDialog", "noAccess");
+pref("capability.policy.default.Window.self", "allAccess");
+pref("capability.policy.default.Window.window", "allAccess");
+
+// Restrictions on the DOM for mail/news - see bug 66938
+pref("capability.policy.mailnews.DOMException.toString", "noAccess");;
+pref("capability.policy.mailnews.HTMLAnchorElement.hash", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.host", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.hostname", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.href", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.pathname", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.port", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.protocol", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.search", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.text", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.getAttribute", "noAccess");
+pref("capability.policy.mailnews.HTMLAnchorElement.attributes", "noAccess");
+pref("capability.policy.mailnews.HTMLDocument.location", "noAccess");
+pref("capability.policy.mailnews.HTMLDocument.domain", "noAccess");
+pref("capability.policy.mailnews.HTMLDocument.URL", "noAccess");
+pref("capability.policy.mailnews.Text.nodeValue", "noAccess");
+pref("capability.policy.mailnews.Text.data", "noAccess");
+pref("capability.policy.mailnews.Text.substringData", "noAccess");
+pref("capability.policy.mailnews.CDATASection.nodeValue", "noAccess");
+pref("capability.policy.mailnews.CDATASection.data", "noAccess");
+pref("capability.policy.mailnews.CDATASection.substringData", "noAccess");
+pref("capability.policy.mailnews.Range.toString", "noAccess");
+pref("capability.policy.mailnews.sites", "mailbox: imap: news:");
+pref("capability.policy.mailnews.Window.name.set", "noAccess");
+pref("capability.policy.mailnews.Window.location", "noAccess");
 
 pref("javascript.enabled",                  true);
 pref("javascript.allow.mailnews",           false);
@@ -229,9 +240,18 @@ pref("image.animation_mode",                "normal");
 
 pref("offline.startup_state",            0);
 pref("offline.send.unsent_messages",            0);
+pref("offline.download.download_messages",  0);
 pref("offline.prompt_synch_on_exit",            true);
 pref("offline.news.download.use_days",          0);
 
+// If there is ever a security firedrill that requires
+// us to block certian ports global, this is the pref 
+// to use.  Is is a comma delimited list of port numbers
+// for example:
+//   pref("network.security.ports.banned", "1,2,3,4,5");
+// prevents necko connecting to ports 1-5 unless the protocol
+// overrides.
+
 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
@@ -247,13 +267,17 @@ pref("network.http.keep-alive", true); // set it to false in case of problems
 pref("network.http.proxy.keep-alive", true );
 pref("network.http.keep-alive.timeout", 300);
 
-pref("network.http.max-connections",  8);
+pref("network.http.max-connections", 16);
+pref("network.http.max-connections-per-server", 8);
 pref("network.http.keep-alive.max-connections", 20); // max connections to be kept alive
 pref("network.http.keep-alive.max-connections-per-server", 8);
 
 pref("network.http.connect.timeout",  30);	// in seconds
 pref("network.http.request.timeout", 120);	// in seconds
 
+// Accept header
+pref("network.http.accept.default", "text/xml, application/xml, application/xhtml+xml, text/html;q=0.9, image/png, image/jpeg, image/gif;q=0.2, text/plain;q=0.8, text/css, */*;q=0.1");
+
 // Enable http compression: comment this out in case of problems with 1.1
 pref("network.http.accept-encoding" ,"gzip,deflate,compress,identity");
 
@@ -273,6 +297,10 @@ pref("network.http.pipelining.maxrequests" , 4);
 pref("network.http.proxy.ssl.connect",true);
 // </ruslan>
 
+// until the directory view has an owner
+// necko will produce html -- dougt
+pref("network.dir.generate_html", true);
+
 // sspitzer:  change this back to "news" when we get to beta.
 // for now, set this to news.mozilla.org because you can only
 // post to the server specified by this pref.
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 68adf6aeefea..4f5c951d004f 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -26,9 +26,10 @@ pref("mail.empty_trash", false);
 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_cache_size", 3000);
-pref("browser.cache.disk_cache_size", 5000);
+pref("browser.cache.memory_cache_size", 4096);
+pref("browser.cache.disk_cache_size", 50000);
 pref("browser.ncols", 0);
 pref("browser.installcmap", false);
 pref("browser.drag_out_of_frame_style", 1);
@@ -50,6 +51,9 @@ pref("middlemouse.scrollbarPosition", true);
 // Clipboard behavior
 pref("clipboard.autocopy", true);
 
+// keyboard Mode_switch workaround
+pref("keyboard.mode_switch.enable_workaround", true);
+
 // Most Unix people think modal pref windows are stupid:
 pref("browser.prefWindowModal", false);
 
@@ -140,8 +144,8 @@ pref("font.name.monospace.zh-CN", "isas-song ti-gb2312.1980-0");
 pref("font.min-size.variable.ja", 8);
 pref("font.min-size.fixed.ja", 8);
 
-pref("font.min-size.variable.ko", 16);
-pref("font.min-size.fixed.ko", 16);
+pref("font.min-size.variable.ko", 10);
+pref("font.min-size.fixed.ko", 10);
 
 pref("font.min-size.variable.zh-CN", 16);
 pref("font.min-size.fixed.zh-CN", 16);
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index 800ad811793f..ce0e4cd8b6a2 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -1,6 +1,4 @@
 @exec mv %D/bin/mozilla %D/bin/mozilla.orig
-@exec mv %D/lib/mozilla/chrome/comm/content/communicator/profile/selectLang.js %D/lib/mozilla/chrome/comm/content/communicator/profile/selectLang.js.orig
-@exec mv %D/lib/mozilla/chrome/toolkit/content/global/strres.js %D/lib/mozilla/chrome/toolkit/content/global/strres.js.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
@@ -9,6 +7,11 @@
 @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/defaults/profile/bookmarks.html %D/lib/mozilla/defaults/profile/bookmarks.html.orig
+@exec mv %D/lib/mozilla/defaults/profile/localstore.rdf %D/lib/mozilla/defaults/profile/localstore.rdf.orig
+@exec mv %D/lib/mozilla/defaults/profile/mimeTypes.rdf %D/lib/mozilla/defaults/profile/mimeTypes.rdf.orig
+@exec mv %D/lib/mozilla/defaults/profile/panels.rdf %D/lib/mozilla/defaults/profile/panels.rdf.orig
+@exec mv %D/lib/mozilla/defaults/profile/search.rdf %D/lib/mozilla/defaults/profile/search.rdf.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
@@ -16,8 +19,6 @@ 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/comm/content/communicator/profile/selectLang.js
-lib/mozilla/chrome/toolkit/content/global/strres.js
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/ja-JP.jar
 lib/mozilla/chrome/ja-mac.jar
@@ -27,11 +28,18 @@ lib/mozilla/chrome/user-locales.rdf
 lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/defaults/pref/all.js
 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/bookmarks.html
 lib/mozilla/defaults/profile/JP/localstore.rdf
 lib/mozilla/defaults/profile/JP/mimeTypes.rdf
 lib/mozilla/defaults/profile/JP/panels.rdf
 lib/mozilla/defaults/profile/JP/search.rdf
+lib/mozilla/defaults/profile/bookmarks.html
+lib/mozilla/defaults/profile/localstore.rdf
+lib/mozilla/defaults/profile/mimeTypes.rdf
+lib/mozilla/defaults/profile/panels.rdf
+lib/mozilla/defaults/profile/search.rdf
 lib/mozilla/searchplugins/AllAboutJapan.png
 lib/mozilla/searchplugins/AllAboutJapan.src
 lib/mozilla/searchplugins/BiglobeSearch.png
@@ -50,8 +58,6 @@ 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
@@ -82,6 +88,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/jpnic_rfc.png
 lib/mozilla/searchplugins/jpnic_rfc.src
 lib/mozilla/searchplugins/linux_24.png
@@ -97,13 +105,17 @@ lib/mozilla/searchplugins/w3c.src
 @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/comm/content/communicator/profile/selectLang.js.orig %D/lib/mozilla/chrome/comm/content/communicator/profile/selectLang.js
-@unexec mv %D/lib/mozilla/chrome/toolkit/content/global/strres.js.orig %D/lib/mozilla/chrome/toolkit/content/global/strres.js
 @unexec mv %D/lib/mozilla/chrome/user-locales.rdf.orig %D/lib/mozilla/chrome/user-locales.rdf
 @unexec mv %D/lib/mozilla/chrome/user-skins.rdf.orig %D/lib/mozilla/chrome/user-skins.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/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/defaults/profile/bookmarks.html.orig %D/lib/mozilla/defaults/profile/bookmarks.html
+@unexec mv %D/lib/mozilla/defaults/profile/localstore.rdf.orig %D/lib/mozilla/defaults/profile/localstore.rdf
+@unexec mv %D/lib/mozilla/defaults/profile/mimeTypes.rdf.orig %D/lib/mozilla/defaults/profile/mimeTypes.rdf
+@unexec mv %D/lib/mozilla/defaults/profile/panels.rdf.orig %D/lib/mozilla/defaults/profile/panels.rdf
+@unexec mv %D/lib/mozilla/defaults/profile/search.rdf.orig %D/lib/mozilla/defaults/profile/search.rdf
 @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