6 files changed, 129 insertions, 37 deletions

diff --git a/japanese/mozilla-jlp/Makefile b/japanese/mozilla-jlp/Makefile
index 193e25fa4b40..c3dc06acb412 100644
--- a/japanese/mozilla-jlp/Makefile
+++ b/japanese/mozilla-jlp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.8
+PORTVERSION=	0.8.1
 PORTEPOCH=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.mozilla.gr.jp/tools/search/ \
@@ -14,13 +14,13 @@ MASTER_SITES=	http://www.mozilla.gr.jp/tools/search/ \
 PKGNAMESUFFIX=	-jlp
 DISTNAME=	GoogleJapan.png GoogleJapan.src \
 		${JLP_SRC}
-EXTRACT_SUFX=	.xpi
-EXTRACT_ONLY=	${JLP_SRC}${EXTRACT_SUFX}
+EXTRACT_SUFX=	# none
+EXTRACT_ONLY=	${JLP_SRC}
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
 
-BUILD_DEPENDS=	${X11BASE}/lib/mozilla/regxpcom:${PORTSDIR}/www/mozilla
-RUN_DEPENDS=	mozilla:${PORTSDIR}/www/mozilla \
+BUILD_DEPENDS=	${X11BASE}/lib/mozilla/regxpcom:${MOZILLA_PORT}
+RUN_DEPENDS=	mozilla:${MOZILLA_PORT} \
 		${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
 WRKSRC=		${WRKDIR}/bin
@@ -29,7 +29,12 @@ USE_X_PREFIX=	yes
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-qo
 
-JLP_SRC=	${PORTNAME}${PORTVERSION}-langjajp
+.if defined(MOZILLA_IPV6)
+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
 
 .include <bsd.port.pre.mk>
 
@@ -39,12 +44,20 @@ MOZILLA_SH=	mozilla.noxpg4
 MOZILLA_SH=	mozilla.xpg4
 .endif
 
+# forcing define this until www/mozilla comes up to date.
+MOZILLA_IPV6=	yes
+
+#pre-fetch:
+#	@${ECHO} ""
+#	@${ECHO} "If you need IPv6 compliant mozilla, define \"MOZILLA_IPV6\"."
+#	@${ECHO} ""
+
 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
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/GoogleJapan.png ${WRKDIR}/sp
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/GoogleJapan.src ${WRKDIR}/sp
 
 post-patch:
 	find ${WRKSRC} -name '*.orig' | xargs ${RM}
@@ -55,19 +68,22 @@ do-build:
 
 do-install:
 	(cd ${PREFIX}/lib/mozilla/chrome; \
-	${MV} all-locales.rdf all-locales.rdf.orig; \
-	${MV} all-packages.rdf all-packages.rdf.orig; \
-	${MV} all-skins.rdf all-skins.rdf.orig; \
-	${MV} user-locales.rdf user-locales.rdf.orig; \
-	${MV} user-skins.rdf user-skins.rdf.orig; \
-	${MV} installed-chrome.txt installed-chrome.txt.orig)
+	${MV} -f all-locales.rdf all-locales.rdf.orig; \
+	${MV} -f all-packages.rdf all-packages.rdf.orig; \
+	${MV} -f all-skins.rdf all-skins.rdf.orig; \
+	${MV} -f user-locales.rdf user-locales.rdf.orig; \
+	${MV} -f user-skins.rdf user-skins.rdf.orig; \
+	${MV} -f 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)
+	${MV} -f all.js all.js.orig; ${MV} -f 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
+	${MV} -f google.gif google.gif.orig; \
+	${MV} -f google.src google.src.orig)
+	${MV} -f ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
-	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults searchplugins) | \
+	(cd ${WRKDIR}/sp; ${TAR} -cf - *) | \
+	${TAR} -xf - -C ${PREFIX}/lib/mozilla/searchplugins
+	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults) | \
 	${TAR} -xf - -C ${PREFIX}/lib/mozilla
 	(cd ${PREFIX}/lib/mozilla/chrome; \
 	${CP} installed-chrome.txt.orig installed-chrome.txt; \
diff --git a/japanese/mozilla-jlp/distinfo b/japanese/mozilla-jlp/distinfo
index 61173a850866..821e1181081d 100644
--- a/japanese/mozilla-jlp/distinfo
+++ b/japanese/mozilla-jlp/distinfo
@@ -1,3 +1,4 @@
 MD5 (GoogleJapan.png) = 00018294ed1658ff7fac008fd3438284
 MD5 (GoogleJapan.src) = 21c8dd268c4bb4f5a1f6e09377d0ea36
-MD5 (mozilla0.8-langjajp.xpi) = dba3f3655202bccb9ee8f84252867c4e
+MD5 (mozilla0.8.1-langjajp.xpi) = f67c3fd97470576fa7d3bf71045c75b6
+MD5 (mozilla0.8.1-regjp.xpi) = dc9130145e024f98e9e289e783f7e932
diff --git a/japanese/mozilla-jlp/files/all.js b/japanese/mozilla-jlp/files/all.js
index 9e639b150087..66eaa94462e2 100644
--- a/japanese/mozilla-jlp/files/all.js
+++ b/japanese/mozilla-jlp/files/all.js
@@ -17,10 +17,10 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
+ * Contributor(s):
  */
 
-// SYNTAX HINTS:  dashes are delimiters.  Use underscores instead. 
+// SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
 //  The first character after a period must be alphabetic.
 
 pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search=");
@@ -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");
+pref("general.useragent.misc", "0.8.1");
 
 pref("general.startup.browser",             true);
 pref("general.startup.mail",                false);
@@ -38,9 +38,10 @@ pref("general.startup.compose",             false);
 pref("general.startup.addressbook",         false);
 
 pref("general.open_location.last_url",      "");
+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.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);
@@ -73,6 +74,10 @@ pref("browser.toolbars.showbutton.net2phone", true);
 pref("browser.toolbars.showbutton.print",   true);
 pref("browser.toolbars.showbutton.search",  true);
 
+pref("accessibility.browsewithcaret", false);
+pref("accessibility.usetexttospeech", "");
+pref("accessibility.usebrailledisplay", "");
+
 // Dialog modality issues
 pref("browser.prefWindowModal", true);
 pref("browser.show_about_as_stupid_modal_window", false);
@@ -268,7 +273,7 @@ pref("wallet.crypto",                       false);
 pref("imageblocker.enabled",                true);
 pref("intl.accept_languages",               "chrome://navigator/locale/navigator.properties");
 pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
-pref("intl.collationKeyAsCodePoint",        false);
+pref("intl.collationOption",                "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");
@@ -355,6 +360,7 @@ pref("security.xpconnect.plugin.unrestricted", true);
 pref("ui.key.accelKey", 17);
 pref("ui.key.menuAccessKey", 18);
 pref("ui.key.menuAccessKeyFocuses", false);
+pref("ui.key.saveLink.shift", true); // true = shift, false = meta
 
 // Middle-mouse handling
 pref("middlemouse.paste", false);
@@ -388,5 +394,58 @@ pref("sidebar.customize.all_panels.url", "http://sidebar-rdf.netscape.com/%LOCAL
 pref("sidebar.customize.more_panels.url", "http://dmoz.org/Netscape/Sidebar/");
 
 pref("prefs.converted-to-utf8",false);
-
-pref("browser.throbber.url","chrome://navigator/locale/navigator.properties");
+// --------------------------------------------------
+// IBMBIDI 
+// --------------------------------------------------
+//
+// ------------------
+//  Text Direction
+// ------------------
+// 1 = directionLTRBidi *
+// 2 = directionRTLBidi
+pref("bidi.direction", 1);
+// ------------------
+//  Text Type
+// ------------------
+// 1 = charsettexttypeBidi *
+// 2 = logicaltexttypeBidi
+// 3 = visualtexttypeBidi
+pref("bidi.texttype", 1);
+// ------------------
+//  Controls Text Mode
+// ------------------
+// 1 = logicalcontrolstextmodeBidiCmd
+// 2 = visiualcontrolstextmodeBidi
+// 3 = containercontrolstextmodeBidi *
+pref("bidi.controlstextmode", 1);
+// ------------------
+//  Clipboard Text Mode
+// ------------------
+//  1 = logicalclipboardtextmodeBidi
+// 2 = visiualclipboardtextmodeBidi
+// 3 = sourceclipboardtextmodeBidi *
+pref("bidi.clipboardtextmode", 3);
+// ------------------
+//  Numeral Style
+// ------------------
+// 1 = regularcontextnumeralBidi *
+// 2 = hindicontextnumeralBidi
+// 3 = arabicnumeralBidi
+// 4 = hindinumeralBidi
+pref("bidi.numeral", 1);
+// ------------------
+//  Support Mode
+// ------------------
+// 1 = mozillaBidisupport *
+// 2 = OsBidisupport
+// 3 = disableBidisupport
+pref("bidi.support", 1);
+// ------------------
+//  Charset Mode
+// ------------------
+// 1 = doccharactersetBidi *
+// 2 = defaultcharactersetBidi
+pref("bidi.characterset", 1);
+
+
+pref("browser.throbber.url","chrome://navigator-region/locale/region.properties");
diff --git a/japanese/mozilla-jlp/files/installed-chrome.txt b/japanese/mozilla-jlp/files/installed-chrome.txt
index cd77fe03e6fe..95b8df62d3d6 100644
--- a/japanese/mozilla-jlp/files/installed-chrome.txt
+++ b/japanese/mozilla-jlp/files/installed-chrome.txt
@@ -1,6 +1,18 @@
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/global/
+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/messenger/
+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/messenger/
 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/necko/
+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-unix.jar!/locale/ja-JP/global-platform/
+locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/navigator-platform/
 locale,install,select,ja-JP
diff --git a/japanese/mozilla-jlp/files/patch-aa b/japanese/mozilla-jlp/files/patch-aa
index 7cef229e087f..72c2570f93d5 100644
--- a/japanese/mozilla-jlp/files/patch-aa
+++ b/japanese/mozilla-jlp/files/patch-aa
@@ -1,10 +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
+--- defaults/profile/JP/search.rdf.orig	Fri Feb 23 19:24:48 2001
++++ defaults/profile/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:GoogleJapan.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/pkg-plist b/japanese/mozilla-jlp/pkg-plist
index a5166d42c18f..1994922f8c9f 100644
--- a/japanese/mozilla-jlp/pkg-plist
+++ b/japanese/mozilla-jlp/pkg-plist
@@ -10,20 +10,24 @@
 @exec mv %D/lib/mozilla/searchplugins/google.gif %D/lib/mozilla/searchplugins/google.gif.orig
 @exec mv %D/lib/mozilla/searchplugins/google.src %D/lib/mozilla/searchplugins/google.src.orig
 bin/mozilla
+lib/mozilla/chrome/JP.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/ja-JP.jar
+lib/mozilla/chrome/ja-mac.jar
+lib/mozilla/chrome/ja-unix.jar
+lib/mozilla/chrome/ja-win.jar
 lib/mozilla/chrome/user-locales.rdf
 lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/unix.js
-lib/mozilla/defaults/profile/ja-JP/bookmarks.html
-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/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/searchplugins/AllAboutJapan.png
 lib/mozilla/searchplugins/AllAboutJapan.src
 lib/mozilla/searchplugins/BiglobeSearch.png
@@ -95,4 +99,4 @@ lib/mozilla/searchplugins/w3c.src
 @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
+@dirrm lib/mozilla/defaults/profile/JP