update to 0.9.

PR:		27732
Submitted by:	maintainer

14 files changed, 226 insertions, 64 deletions

diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index 057ccea7ec9d..f6feb3a0b863 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -5,19 +5,17 @@
 # $FreeBSD$
 #
 
-BROKEN=		out of sync with mozilla
 PORTNAME=	mozilla
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.9
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.mozilla.gr.jp/tools/search/ \
 		http://www.mozilla.gr.jp/jlp/
 PKGNAMESUFFIX=	-jlp
 DISTNAME=	GoogleJapan.png GoogleJapan.src \
-		${JLP_SRC}
+		moz0.9-langfix.xpi ${JLP_SRC}
 EXTRACT_SUFX=	# none
-EXTRACT_ONLY=	${JLP_SRC}
+EXTRACT_ONLY=	moz0.9-langfix.xpi ${JLP_SRC}
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
@@ -38,7 +36,8 @@ MOZILLA_PORT=	${PORTSDIR}/www/mozilla+ipv6
 .else
 MOZILLA_PORT=	${PORTSDIR}/www/mozilla
 .endif
-JLP_SRC=	mozilla0.8.1-langjajp.xpi mozilla0.8.1-regjp.xpi
+JLP_SRC=	${PORTNAME}${PORTVERSION}-langjajp.xpi \
+		${PORTNAME}${PORTVERSION}-regjp.xpi
 
 .include <bsd.port.pre.mk>
 
@@ -61,6 +60,10 @@ post-extract:
 	${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}
@@ -76,6 +79,8 @@ 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)
diff --git a/japanese/mozilla-jlp-devel/distinfo b/japanese/mozilla-jlp-devel/distinfo
index 78152d46d854..c6d4c97d429b 100644
--- a/japanese/mozilla-jlp-devel/distinfo
+++ b/japanese/mozilla-jlp-devel/distinfo
@@ -1,4 +1,5 @@
 MD5 (GoogleJapan.png) = 00018294ed1658ff7fac008fd3438284
-MD5 (GoogleJapan.src) = 21c8dd268c4bb4f5a1f6e09377d0ea36
-MD5 (mozilla0.8.1-langjajp.xpi) = f67c3fd97470576fa7d3bf71045c75b6
-MD5 (mozilla0.8.1-regjp.xpi) = 204fa0271c6995d28737c9d289e30fcd
+MD5 (GoogleJapan.src) = 29c279f055af9d0e3f894eecd06398f9
+MD5 (moz0.9-langfix.xpi) = a89fe8ea66bafe1c93e12e8fd580fb92
+MD5 (mozilla0.9-langjajp.xpi) = 7c493d37ff0856aa4ea584f3a820f3fb
+MD5 (mozilla0.9-regjp.xpi) = a0797b470ceeee786a4c4d6c42d155d0
diff --git a/japanese/mozilla-jlp-devel/files/all.js b/japanese/mozilla-jlp-devel/files/all.js
index 66eaa94462e2..8c9ce29997ae 100644
--- a/japanese/mozilla-jlp-devel/files/all.js
+++ b/japanese/mozilla-jlp-devel/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.8.1");
+pref("general.useragent.misc", "rv:0.9");
 
 pref("general.startup.browser",             true);
 pref("general.startup.mail",                false);
@@ -42,7 +42,7 @@ pref("general.open_location.last_window_choice", 0);
 
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
 pref("browser.startup.page",                1);
-pref("browser.startup.homepage",	   "chrome://navigator/locale/navigator.properties");
+pref("browser.startup.homepage",	   "chrome://navigator-region/locale/region.properties");
 // "browser.startup.homepage_override" was for 4.x
 pref("browser.startup.homepage_override.1", true);
 pref("browser.startup.autoload_homepage",   true);
@@ -63,10 +63,16 @@ pref("browser.anchor_color",                "#0000EE");
 pref("browser.visited_color",               "#551A8B");
 pref("browser.underline_anchors",           true);
 
+pref("browser.display.use_focus_colors",    false);
+pref("browser.display.focus_background_color", "#117722");
+pref("browser.display.focus_text_color",     "#ffffff");
+pref("browser.display.focus_ring_width",     1);
+pref("browser.display.focus_ring_on_anything", false);
+
 pref("browser.chrome.toolbar_tips",         true);
 pref("browser.chrome.toolbar_style",        2);
 
-pref("browser.toolbars.showbutton.bookmarks", false);
+pref("browser.toolbars.showbutton.bookmarks", true);
 pref("browser.toolbars.showbutton.go",      false);
 pref("browser.toolbars.showbutton.home",    true);
 pref("browser.toolbars.showbutton.mynetscape", true);
@@ -85,7 +91,7 @@ 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.defaulturl", "chrome://navigator-region/locale/region.properties");
 pref("browser.search.opensidebarsearchpanel", true);
 pref("browser.search.last_search_category", "NC:SearchCategory?category=urn:search:category:1");
 pref("browser.search.mode", 0);
@@ -106,6 +112,12 @@ pref("browser.PICS.service.http___home_netscape_com_default_rating.s", 0);
 
 pref("browser.target_new_blocked", false);
 
+// loading and rendering of framesets and iframes
+pref("browser.frames.enabled", true);
+
+// view source
+pref("view_source.syntax_highlight", true);
+
 // gfx widgets
 pref("nglayout.widget.mode", 2);
 pref("nglayout.widget.gfxscrollbars", true);
@@ -126,6 +138,9 @@ pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
 pref("browser.related.disabledForDomains", "");
 pref("browser.goBrowsing.enabled", true);
 
+//Internet Search
+pref("browser.search.defaultenginename", "chrome://navigator/locale/navigator.properties");
+
 // 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");
@@ -153,20 +168,53 @@ 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.mailnews.sites", "mailbox: imap: news: pop: pop3:");
+// 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");
-
-// 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.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("javascript.enabled",                  true);
 pref("javascript.allow.mailnews",           false);
@@ -274,7 +322,7 @@ pref("imageblocker.enabled",                true);
 pref("intl.accept_languages",               "chrome://navigator/locale/navigator.properties");
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
 pref("intl.collationOption",                "chrome://navigator/locale/navigator.properties");
-
+pref("intl.menuitems.alwaysappendacceskeys","chrome://navigator/locale/navigator.properties");
 pref("intl.charsetmenu.browser.static",     "chrome://navigator/locale/navigator.properties");
 pref("intl.charsetmenu.browser.more1",      "chrome://navigator/locale/navigator.properties");
 pref("intl.charsetmenu.browser.more2",      "chrome://navigator/locale/navigator.properties");
diff --git a/japanese/mozilla-jlp-devel/files/installed-chrome.txt b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
index 95b8df62d3d6..a691112840c4 100644
--- a/japanese/mozilla-jlp-devel/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
@@ -1,18 +1,21 @@
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/editor-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/messenger-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/navigator-region/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/aim/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/communicator/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/editor/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/global/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/communicator/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/editor/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/navigator/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/aim/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/necko/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/wallet/
-locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/
+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/pipnss/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pippki/
 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/navigator-platform/
+locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/editor-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/messenger-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/navigator-region/
 locale,install,select,ja-JP
+locale,install,select,JP
diff --git a/japanese/mozilla-jlp-devel/files/unix.js b/japanese/mozilla-jlp-devel/files/unix.js
index 5b772184d8f5..68adf6aeefea 100644
--- a/japanese/mozilla-jlp-devel/files/unix.js
+++ b/japanese/mozilla-jlp-devel/files/unix.js
@@ -150,7 +150,24 @@ pref("font.min-size.variable.zh-TW", 16);
 pref("font.min-size.fixed.zh-TW", 16);
 
 // ps font
-pref("print.psnativecode.ja", "euc-jp");
-pref("print.psnativefont.ja", "Ryumin-Light-EUC-H");
+// 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", "");
 
 pref("mail.signature_date", 0);
diff --git a/japanese/mozilla-jlp-devel/pkg-descr b/japanese/mozilla-jlp-devel/pkg-descr
index 7e11f4950628..f4062e511717 100644
--- a/japanese/mozilla-jlp-devel/pkg-descr
+++ b/japanese/mozilla-jlp-devel/pkg-descr
@@ -2,7 +2,7 @@ Mozilla is an open-source web browser, designed for standards compliance,
 performance and portability.
 
 Mozilla Japanese Language Pack (JLP) Japanizes Mozilla GUI, which is
-provided by "Kazu" Yamamoto and Ryoichi Furukawa.
+provided by Kazu Yamamoto, Ryoichi Furukawa and MARUYAMA Tsukasa.
 
 WWW: http://www.mozilla.gr.jp/jlp/
 
diff --git a/japanese/mozilla-jlp-devel/pkg-plist b/japanese/mozilla-jlp-devel/pkg-plist
index 1994922f8c9f..800ad811793f 100644
--- a/japanese/mozilla-jlp-devel/pkg-plist
+++ b/japanese/mozilla-jlp-devel/pkg-plist
@@ -1,4 +1,6 @@
 @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
@@ -14,6 +16,8 @@ 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
@@ -86,12 +90,15 @@ lib/mozilla/searchplugins/linux_JFJM.png
 lib/mozilla/searchplugins/linux_JFJM.src
 lib/mozilla/searchplugins/rakuten_auction.png
 lib/mozilla/searchplugins/rakuten_auction.src
+lib/mozilla/searchplugins/search.rdf
 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/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
diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 057ccea7ec9d..f6feb3a0b863 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -5,19 +5,17 @@
 # $FreeBSD$
 #
 
-BROKEN=		out of sync with mozilla
 PORTNAME=	mozilla
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.9
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.mozilla.gr.jp/tools/search/ \
 		http://www.mozilla.gr.jp/jlp/
 PKGNAMESUFFIX=	-jlp
 DISTNAME=	GoogleJapan.png GoogleJapan.src \
-		${JLP_SRC}
+		moz0.9-langfix.xpi ${JLP_SRC}
 EXTRACT_SUFX=	# none
-EXTRACT_ONLY=	${JLP_SRC}
+EXTRACT_ONLY=	moz0.9-langfix.xpi ${JLP_SRC}
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
@@ -38,7 +36,8 @@ MOZILLA_PORT=	${PORTSDIR}/www/mozilla+ipv6
 .else
 MOZILLA_PORT=	${PORTSDIR}/www/mozilla
 .endif
-JLP_SRC=	mozilla0.8.1-langjajp.xpi mozilla0.8.1-regjp.xpi
+JLP_SRC=	${PORTNAME}${PORTVERSION}-langjajp.xpi \
+		${PORTNAME}${PORTVERSION}-regjp.xpi
 
 .include <bsd.port.pre.mk>
 
@@ -61,6 +60,10 @@ post-extract:
 	${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}
@@ -76,6 +79,8 @@ 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)
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index 78152d46d854..c6d4c97d429b 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1,4 +1,5 @@
 MD5 (GoogleJapan.png) = 00018294ed1658ff7fac008fd3438284
-MD5 (GoogleJapan.src) = 21c8dd268c4bb4f5a1f6e09377d0ea36
-MD5 (mozilla0.8.1-langjajp.xpi) = f67c3fd97470576fa7d3bf71045c75b6
-MD5 (mozilla0.8.1-regjp.xpi) = 204fa0271c6995d28737c9d289e30fcd
+MD5 (GoogleJapan.src) = 29c279f055af9d0e3f894eecd06398f9
+MD5 (moz0.9-langfix.xpi) = a89fe8ea66bafe1c93e12e8fd580fb92
+MD5 (mozilla0.9-langjajp.xpi) = 7c493d37ff0856aa4ea584f3a820f3fb
+MD5 (mozilla0.9-regjp.xpi) = a0797b470ceeee786a4c4d6c42d155d0
diff --git a/japanese/mozilla-jlp/files/all.js b/japanese/mozilla-jlp/files/all.js
index 66eaa94462e2..8c9ce29997ae 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.8.1");
+pref("general.useragent.misc", "rv:0.9");
 
 pref("general.startup.browser",             true);
 pref("general.startup.mail",                false);
@@ -42,7 +42,7 @@ pref("general.open_location.last_window_choice", 0);
 
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
 pref("browser.startup.page",                1);
-pref("browser.startup.homepage",	   "chrome://navigator/locale/navigator.properties");
+pref("browser.startup.homepage",	   "chrome://navigator-region/locale/region.properties");
 // "browser.startup.homepage_override" was for 4.x
 pref("browser.startup.homepage_override.1", true);
 pref("browser.startup.autoload_homepage",   true);
@@ -63,10 +63,16 @@ pref("browser.anchor_color",                "#0000EE");
 pref("browser.visited_color",               "#551A8B");
 pref("browser.underline_anchors",           true);
 
+pref("browser.display.use_focus_colors",    false);
+pref("browser.display.focus_background_color", "#117722");
+pref("browser.display.focus_text_color",     "#ffffff");
+pref("browser.display.focus_ring_width",     1);
+pref("browser.display.focus_ring_on_anything", false);
+
 pref("browser.chrome.toolbar_tips",         true);
 pref("browser.chrome.toolbar_style",        2);
 
-pref("browser.toolbars.showbutton.bookmarks", false);
+pref("browser.toolbars.showbutton.bookmarks", true);
 pref("browser.toolbars.showbutton.go",      false);
 pref("browser.toolbars.showbutton.home",    true);
 pref("browser.toolbars.showbutton.mynetscape", true);
@@ -85,7 +91,7 @@ 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.defaulturl", "chrome://navigator-region/locale/region.properties");
 pref("browser.search.opensidebarsearchpanel", true);
 pref("browser.search.last_search_category", "NC:SearchCategory?category=urn:search:category:1");
 pref("browser.search.mode", 0);
@@ -106,6 +112,12 @@ pref("browser.PICS.service.http___home_netscape_com_default_rating.s", 0);
 
 pref("browser.target_new_blocked", false);
 
+// loading and rendering of framesets and iframes
+pref("browser.frames.enabled", true);
+
+// view source
+pref("view_source.syntax_highlight", true);
+
 // gfx widgets
 pref("nglayout.widget.mode", 2);
 pref("nglayout.widget.gfxscrollbars", true);
@@ -126,6 +138,9 @@ pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
 pref("browser.related.disabledForDomains", "");
 pref("browser.goBrowsing.enabled", true);
 
+//Internet Search
+pref("browser.search.defaultenginename", "chrome://navigator/locale/navigator.properties");
+
 // 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");
@@ -153,20 +168,53 @@ 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.mailnews.sites", "mailbox: imap: news: pop: pop3:");
+// 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");
-
-// 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.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("javascript.enabled",                  true);
 pref("javascript.allow.mailnews",           false);
@@ -274,7 +322,7 @@ pref("imageblocker.enabled",                true);
 pref("intl.accept_languages",               "chrome://navigator/locale/navigator.properties");
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
 pref("intl.collationOption",                "chrome://navigator/locale/navigator.properties");
-
+pref("intl.menuitems.alwaysappendacceskeys","chrome://navigator/locale/navigator.properties");
 pref("intl.charsetmenu.browser.static",     "chrome://navigator/locale/navigator.properties");
 pref("intl.charsetmenu.browser.more1",      "chrome://navigator/locale/navigator.properties");
 pref("intl.charsetmenu.browser.more2",      "chrome://navigator/locale/navigator.properties");
diff --git a/japanese/mozilla-jlp/files/installed-chrome.txt b/japanese/mozilla-jlp/files/installed-chrome.txt
index 95b8df62d3d6..a691112840c4 100644
--- a/japanese/mozilla-jlp/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp/files/installed-chrome.txt
@@ -1,18 +1,21 @@
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/editor-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/messenger-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/navigator-region/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/aim/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/communicator/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/editor/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/global/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/communicator/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/editor/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/navigator/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/aim/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/necko/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/
 locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/wallet/
-locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/
+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/pipnss/
+locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pippki/
 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/navigator-platform/
+locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/editor-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/messenger-region/
+locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/navigator-region/
 locale,install,select,ja-JP
+locale,install,select,JP
diff --git a/japanese/mozilla-jlp/files/unix.js b/japanese/mozilla-jlp/files/unix.js
index 5b772184d8f5..68adf6aeefea 100644
--- a/japanese/mozilla-jlp/files/unix.js
+++ b/japanese/mozilla-jlp/files/unix.js
@@ -150,7 +150,24 @@ pref("font.min-size.variable.zh-TW", 16);
 pref("font.min-size.fixed.zh-TW", 16);
 
 // ps font
-pref("print.psnativecode.ja", "euc-jp");
-pref("print.psnativefont.ja", "Ryumin-Light-EUC-H");
+// 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", "");
 
 pref("mail.signature_date", 0);
diff --git a/japanese/mozilla-jlp/pkg-descr b/japanese/mozilla-jlp/pkg-descr
index 7e11f4950628..f4062e511717 100644
--- a/japanese/mozilla-jlp/pkg-descr
+++ b/japanese/mozilla-jlp/pkg-descr
@@ -2,7 +2,7 @@ Mozilla is an open-source web browser, designed for standards compliance,
 performance and portability.
 
 Mozilla Japanese Language Pack (JLP) Japanizes Mozilla GUI, which is
-provided by "Kazu" Yamamoto and Ryoichi Furukawa.
+provided by Kazu Yamamoto, Ryoichi Furukawa and MARUYAMA Tsukasa.
 
 WWW: http://www.mozilla.gr.jp/jlp/
 
diff --git a/japanese/mozilla-jlp/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index 1994922f8c9f..800ad811793f 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -1,4 +1,6 @@
 @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
@@ -14,6 +16,8 @@ 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
@@ -86,12 +90,15 @@ lib/mozilla/searchplugins/linux_JFJM.png
 lib/mozilla/searchplugins/linux_JFJM.src
 lib/mozilla/searchplugins/rakuten_auction.png
 lib/mozilla/searchplugins/rakuten_auction.src
+lib/mozilla/searchplugins/search.rdf
 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/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