Update to 1.2b after a repocopy.

PR:		ports/45264
Submitted by:	Yoichi ASAI <yatt@msc.biglobe.ne.jp>

5 files changed, 136 insertions, 112 deletions

diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
index 9891380b2651..58cac4b8b9d3 100644
--- a/japanese/mozilla-jlp-devel/Makefile
+++ b/japanese/mozilla-jlp-devel/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	ja-mozilla-jlp
+# New ports collection makefile for:	ja-mozilla-jlp-devel
 # Date created:		02 Jul 2000
 # Whom:			Yoichi ASAI <yatt@msc.biglobe.ne.jp>
 #
@@ -6,25 +6,27 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.1
+PORTVERSION=	1.2b
 #PORTREVISION=	1
-PORTEPOCH=	1
+#PORTEPOCH=	1
 CATEGORIES=	japanese www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www2.starcat.ne.jp/~unha/jlp/
+MASTER_SITES=	http://www2.starcat.ne.jp/~unha/jlp/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	jlpmoz
 PKGNAMESUFFIX=	-jlp
-DISTNAME=	${PORTNAME}${PORTVERSION}-jajppack-kv0.8
-EXTRACT_SUFX=	.xpi
+DISTNAME=	${PORTNAME}${PORTVERSION}-jajppack-kv0.4.xpi \
+		1.2b_langenus.xpi 1.2b_regus.xpi
+EXTRACT_SUFX=	# none
 
 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-devel/regxpcom:${PORTSDIR}/www/mozilla-devel
+RUN_DEPENDS=	mozilla-devel:${PORTSDIR}/www/mozilla-devel \
 		${PKG_DBDIR}/ja-alias-fonts-1.0:${PORTSDIR}/japanese/alias-fonts
 
 WRKSRC=		${WRKDIR}/bin
 
+LATEST_LINK=	ja-mozilla-jlp-devel
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
 EXTRACT_BEFORE_ARGS=	-qo
@@ -43,33 +45,39 @@ LIBXPG4=	LD_PRELOAD=/usr/lib/libxpg4.so.2; export LD_PRELOAD
 post-extract:
 	${MKDIR} ${WRKSRC}/defaults/pref
 	${CP} ${FILESDIR}/unix.js ${WRKSRC}/defaults/pref
+	${RM} -r ${WRKSRC}/defaults/profile/US
 
 do-build:
 	${SED} -e "s^@PREFIX@^${PREFIX}^g" \
 	       -e "s^@LOCALENAME@^${LOCALENAME}^g" \
 	       -e "s^@LIBXPG4@^${LIBXPG4}^g" \
-	${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla
+	${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla-devel
 
 do-install:
-	(cd ${PREFIX}/lib/mozilla/chrome; \
+	(cd ${PREFIX}/lib/mozilla-devel/chrome; \
+	${MV} -f US.jar US.jar.orig; \
 	${MV} -f chrome.rdf chrome.rdf.orig; \
+	${MV} -f en-US.jar en-US.jar.orig; \
+	${MV} -f en-mac.jar en-mac.jar.orig; \
+	${MV} -f en-unix.jar en-unix.jar.orig; \
+	${MV} -f en-win.jar en-win.jar.orig; \
 	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
-	(cd ${PREFIX}/lib/mozilla/defaults/pref; \
+	(cd ${PREFIX}/lib/mozilla-devel/defaults/pref; \
 	${MV} -f unix.js unix.js.orig)
-	(cd ${PREFIX}/lib/mozilla/components; \
+	(cd ${PREFIX}/lib/mozilla-devel/components; \
 	${MV} -f xpti.dat ../xpti.dat.orig)
-	${MV} -f ${PREFIX}/bin/mozilla ${PREFIX}/bin/mozilla.orig
-	${INSTALL_SCRIPT} ${WRKDIR}/mozilla ${PREFIX}/bin
+	${MV} -f ${PREFIX}/bin/mozilla-devel ${PREFIX}/bin/mozilla-devel.orig
+	${INSTALL_SCRIPT} ${WRKDIR}/mozilla-devel ${PREFIX}/bin
 	(cd ${WRKDIR}/sp; ${TAR} -cf - *) | \
-	${TAR} -xf - -C ${PREFIX}/lib/mozilla/searchplugins
+	${TAR} -xf - -C ${PREFIX}/lib/mozilla-devel/searchplugins
 	(cd ${WRKDIR}/sp_nomac; ${TAR} -cf - *) | \
-	${TAR} -xf - -C ${PREFIX}/lib/mozilla/searchplugins
+	${TAR} -xf - -C ${PREFIX}/lib/mozilla-devel/searchplugins
 	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults) | \
-	${TAR} -xf - -C ${PREFIX}/lib/mozilla
-	(cd ${PREFIX}/lib/mozilla/chrome; \
+	${TAR} -xf - -C ${PREFIX}/lib/mozilla-devel
+	(cd ${PREFIX}/lib/mozilla-devel/chrome; \
 	${CP} installed-chrome.txt.orig installed-chrome.txt; \
 	${CAT} ${FILESDIR}/installed-chrome.txt >> installed-chrome.txt)
-	(cd ${PREFIX}/lib/mozilla; \
+	(cd ${PREFIX}/lib/mozilla-devel; \
 	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
 	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/mozilla-jlp-devel/distinfo b/japanese/mozilla-jlp-devel/distinfo
index a111cdc6164e..917d7b314b4d 100644
--- a/japanese/mozilla-jlp-devel/distinfo
+++ b/japanese/mozilla-jlp-devel/distinfo
@@ -1 +1,3 @@
-MD5 (mozilla1.1-jajppack-kv0.8.xpi) = 741b5ee203048b50853e68f0ec5e9395
+MD5 (mozilla1.2b-jajppack-kv0.4.xpi) = 5bcd0090f8b8e2d3f656e0bcda8b13c1
+MD5 (1.2b_langenus.xpi) = 9c67c41ecfe38f18bff053f1eaad501c
+MD5 (1.2b_regus.xpi) = a78b974551a2208f5330843b91abc736
diff --git a/japanese/mozilla-jlp-devel/files/mozilla.sh b/japanese/mozilla-jlp-devel/files/mozilla.sh
index 7e183ce1f581..b668c1aec294 100644
--- a/japanese/mozilla-jlp-devel/files/mozilla.sh
+++ b/japanese/mozilla-jlp-devel/files/mozilla.sh
@@ -3,5 +3,5 @@
 LANG=@LOCALENAME@; export LANG
 @LIBXPG4@
 
-cd @PREFIX@/lib/mozilla
+cd @PREFIX@/lib/mozilla-devel
 exec ./mozilla "$@"
diff --git a/japanese/mozilla-jlp-devel/files/unix.js b/japanese/mozilla-jlp-devel/files/unix.js
index 0cbac492bfb9..ae7592361387 100644
--- a/japanese/mozilla-jlp-devel/files/unix.js
+++ b/japanese/mozilla-jlp-devel/files/unix.js
@@ -67,6 +67,11 @@ pref("clipboard.autocopy", true);
 
 pref("browser.urlbar.clickSelectsAll", false);
 
+// Tab focus model bit field:
+// 1 focuses text controls, 2 focuses other form elements, 4 adds links.
+// Leave this at the default, 7, to match mozilla1.0-era user expectations.
+// pref("accessibility.tabfocus", 1);
+
 // override double-click word selection behavior.
 pref("layout.word_select.stop_at_punctuation", false);
 
diff --git a/japanese/mozilla-jlp-devel/pkg-plist b/japanese/mozilla-jlp-devel/pkg-plist
index c85b5b7a3f23..c135289bf89b 100644
--- a/japanese/mozilla-jlp-devel/pkg-plist
+++ b/japanese/mozilla-jlp-devel/pkg-plist
@@ -1,90 +1,99 @@
-@exec mv %D/bin/mozilla %D/bin/mozilla.orig
-@exec mv %D/lib/mozilla/chrome/chrome.rdf %D/lib/mozilla/chrome/chrome.rdf.orig
-@exec mv %D/lib/mozilla/chrome/installed-chrome.txt %D/lib/mozilla/chrome/installed-chrome.txt.orig
-@exec mv %D/lib/mozilla/defaults/pref/unix.js %D/lib/mozilla/defaults/pref/unix.js.orig
-@exec mv %D/lib/mozilla/components/xpti.dat %D/lib/mozilla/xpti.dat.orig
-bin/mozilla
-lib/mozilla/chrome/JP.jar
-lib/mozilla/chrome/chrome.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/components/xpti.dat
-lib/mozilla/defaults/pref/unix.js
-lib/mozilla/defaults/profile/JP/chrome/userChrome-example.css
-lib/mozilla/defaults/profile/JP/chrome/userContent-example.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/searchplugins/AllAboutJapan.png
-lib/mozilla/searchplugins/AllAboutJapan.src
-lib/mozilla/searchplugins/BiglobeSearch.png
-lib/mozilla/searchplugins/BiglobeSearch.src
-lib/mozilla/searchplugins/Bugzilla-Summary.png
-lib/mozilla/searchplugins/Bugzilla-Summary.src
-lib/mozilla/searchplugins/Bugzilla-jp-Summary.png
-lib/mozilla/searchplugins/Bugzilla-jp-Summary.src
-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/ImpressWatchJp.png
-lib/mozilla/searchplugins/ImpressWatchJp.src
-lib/mozilla/searchplugins/InfoseekJapan.png
-lib/mozilla/searchplugins/InfoseekJapan.src
-lib/mozilla/searchplugins/JavaHouse.png
-lib/mozilla/searchplugins/JavaHouse.src
-lib/mozilla/searchplugins/LYCOSJapan.png
-lib/mozilla/searchplugins/LYCOSJapan.src
-lib/mozilla/searchplugins/LYCOSJapan_auction.png
-lib/mozilla/searchplugins/LYCOSJapan_auction.src
-lib/mozilla/searchplugins/MozillaGrJp.png
-lib/mozilla/searchplugins/MozillaGrJp.src
-lib/mozilla/searchplugins/MycomPcWeb.png
-lib/mozilla/searchplugins/MycomPcWeb.src
-lib/mozilla/searchplugins/NikkeiJava.png
-lib/mozilla/searchplugins/NikkeiJava.src
-lib/mozilla/searchplugins/NikkeiLinux.png
-lib/mozilla/searchplugins/NikkeiLinux.src
-lib/mozilla/searchplugins/YahooJapan.png
-lib/mozilla/searchplugins/YahooJapan.src
-lib/mozilla/searchplugins/YahooJapan_auction.png
-lib/mozilla/searchplugins/YahooJapan_auction.src
-lib/mozilla/searchplugins/ZDNetJapan.png
-lib/mozilla/searchplugins/ZDNetJapan.src
-lib/mozilla/searchplugins/ascii_24.png
-lib/mozilla/searchplugins/ascii_24.src
-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/GoogleJapan.png
-lib/mozilla/searchplugins/GoogleJapan.src
-lib/mozilla/searchplugins/jpnic_rfc.png
-lib/mozilla/searchplugins/jpnic_rfc.src
-lib/mozilla/searchplugins/linux_24.png
-lib/mozilla/searchplugins/linux_24.src
-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/w3c.png
-lib/mozilla/searchplugins/w3c.src
-@unexec mv %D/bin/mozilla.orig %D/bin/mozilla
-@unexec mv %D/lib/mozilla/chrome/chrome.rdf.orig %D/lib/mozilla/chrome/chrome.rdf
-@unexec mv %D/lib/mozilla/chrome/installed-chrome.txt.orig %D/lib/mozilla/chrome/installed-chrome.txt
-@unexec mv %D/lib/mozilla/defaults/pref/unix.js.orig %D/lib/mozilla/defaults/pref/unix.js
-@unexec mv %D/lib/mozilla/xpti.dat.orig %D/lib/mozilla/components/xpti.dat
-@dirrm lib/mozilla/defaults/profile/JP/chrome
-@dirrm lib/mozilla/defaults/profile/JP
+@exec mv %D/bin/mozilla-devel %D/bin/mozilla-devel.orig
+@exec mv %D/lib/mozilla-devel/chrome/US.jar %D/lib/mozilla-devel/chrome/US.jar.orig
+@exec mv %D/lib/mozilla-devel/chrome/chrome.rdf %D/lib/mozilla-devel/chrome/chrome.rdf.orig
+@exec mv %D/lib/mozilla-devel/chrome/en-US.jar %D/lib/mozilla-devel/chrome/en-US.jar.orig
+@exec mv %D/lib/mozilla-devel/chrome/en-mac.jar %D/lib/mozilla-devel/chrome/en-mac.jar.orig
+@exec mv %D/lib/mozilla-devel/chrome/en-unix.jar %D/lib/mozilla-devel/chrome/en-unix.jar.orig
+@exec mv %D/lib/mozilla-devel/chrome/en-win.jar %D/lib/mozilla-devel/chrome/en-win.jar.orig
+@exec mv %D/lib/mozilla-devel/chrome/installed-chrome.txt %D/lib/mozilla-devel/chrome/installed-chrome.txt.orig
+@exec mv %D/lib/mozilla-devel/defaults/pref/unix.js %D/lib/mozilla-devel/defaults/pref/unix.js.orig
+@exec mv %D/lib/mozilla-devel/components/xpti.dat %D/lib/mozilla-devel/xpti.dat.orig
+bin/mozilla-devel
+lib/mozilla-devel/chrome/JP.jar
+lib/mozilla-devel/chrome/chrome.rdf
+lib/mozilla-devel/chrome/installed-chrome.txt
+lib/mozilla-devel/chrome/ja-JP.jar
+lib/mozilla-devel/chrome/ja-mac.jar
+lib/mozilla-devel/chrome/ja-unix.jar
+lib/mozilla-devel/chrome/ja-win.jar
+lib/mozilla-devel/components/xpti.dat
+lib/mozilla-devel/defaults/pref/unix.js
+lib/mozilla-devel/defaults/profile/JP/chrome/userChrome-example.css
+lib/mozilla-devel/defaults/profile/JP/chrome/userContent-example.css
+lib/mozilla-devel/defaults/profile/JP/bookmarks.html
+lib/mozilla-devel/defaults/profile/JP/localstore.rdf
+lib/mozilla-devel/defaults/profile/JP/mimeTypes.rdf
+lib/mozilla-devel/defaults/profile/JP/panels.rdf
+lib/mozilla-devel/defaults/profile/JP/search.rdf
+lib/mozilla-devel/searchplugins/AllAboutJapan.png
+lib/mozilla-devel/searchplugins/AllAboutJapan.src
+lib/mozilla-devel/searchplugins/BiglobeSearch.png
+lib/mozilla-devel/searchplugins/BiglobeSearch.src
+lib/mozilla-devel/searchplugins/Bugzilla-Summary.png
+lib/mozilla-devel/searchplugins/Bugzilla-Summary.src
+lib/mozilla-devel/searchplugins/Bugzilla-jp-Summary.png
+lib/mozilla-devel/searchplugins/Bugzilla-jp-Summary.src
+lib/mozilla-devel/searchplugins/CNETJapan.png
+lib/mozilla-devel/searchplugins/CNETJapan.src
+lib/mozilla-devel/searchplugins/ExciteJapan.png
+lib/mozilla-devel/searchplugins/ExciteJapan.src
+lib/mozilla-devel/searchplugins/FreeBSD_jp.png
+lib/mozilla-devel/searchplugins/FreeBSD_jp.src
+lib/mozilla-devel/searchplugins/Fresheye_Japan.gif
+lib/mozilla-devel/searchplugins/Fresheye_Japan.src
+lib/mozilla-devel/searchplugins/GooNeJp.png
+lib/mozilla-devel/searchplugins/GooNeJp.src
+lib/mozilla-devel/searchplugins/ImpressWatchJp.png
+lib/mozilla-devel/searchplugins/ImpressWatchJp.src
+lib/mozilla-devel/searchplugins/InfoseekJapan.png
+lib/mozilla-devel/searchplugins/InfoseekJapan.src
+lib/mozilla-devel/searchplugins/JavaHouse.png
+lib/mozilla-devel/searchplugins/JavaHouse.src
+lib/mozilla-devel/searchplugins/LYCOSJapan.png
+lib/mozilla-devel/searchplugins/LYCOSJapan.src
+lib/mozilla-devel/searchplugins/LYCOSJapan_auction.png
+lib/mozilla-devel/searchplugins/LYCOSJapan_auction.src
+lib/mozilla-devel/searchplugins/MozillaGrJp.png
+lib/mozilla-devel/searchplugins/MozillaGrJp.src
+lib/mozilla-devel/searchplugins/MycomPcWeb.png
+lib/mozilla-devel/searchplugins/MycomPcWeb.src
+lib/mozilla-devel/searchplugins/NikkeiJava.png
+lib/mozilla-devel/searchplugins/NikkeiJava.src
+lib/mozilla-devel/searchplugins/NikkeiLinux.png
+lib/mozilla-devel/searchplugins/NikkeiLinux.src
+lib/mozilla-devel/searchplugins/YahooJapan.png
+lib/mozilla-devel/searchplugins/YahooJapan.src
+lib/mozilla-devel/searchplugins/YahooJapan_auction.png
+lib/mozilla-devel/searchplugins/YahooJapan_auction.src
+lib/mozilla-devel/searchplugins/ZDNetJapan.png
+lib/mozilla-devel/searchplugins/ZDNetJapan.src
+lib/mozilla-devel/searchplugins/ascii_24.png
+lib/mozilla-devel/searchplugins/ascii_24.src
+lib/mozilla-devel/searchplugins/ascii_ghelp.png
+lib/mozilla-devel/searchplugins/ascii_ghelp.src
+lib/mozilla-devel/searchplugins/atmarkIT.png
+lib/mozilla-devel/searchplugins/atmarkIT.src
+lib/mozilla-devel/searchplugins/GoogleJapan.png
+lib/mozilla-devel/searchplugins/GoogleJapan.src
+lib/mozilla-devel/searchplugins/jpnic_rfc.png
+lib/mozilla-devel/searchplugins/jpnic_rfc.src
+lib/mozilla-devel/searchplugins/linux_24.png
+lib/mozilla-devel/searchplugins/linux_24.src
+lib/mozilla-devel/searchplugins/linux_JFJM.png
+lib/mozilla-devel/searchplugins/linux_JFJM.src
+lib/mozilla-devel/searchplugins/rakuten_auction.png
+lib/mozilla-devel/searchplugins/rakuten_auction.src
+lib/mozilla-devel/searchplugins/w3c.png
+lib/mozilla-devel/searchplugins/w3c.src
+@unexec mv %D/bin/mozilla-devel.orig %D/bin/mozilla-devel
+@unexec mv %D/lib/mozilla-devel/chrome/US.jar.orig %D/lib/mozilla-devel/chrome/US.jar
+@unexec mv %D/lib/mozilla-devel/chrome/chrome.rdf.orig %D/lib/mozilla-devel/chrome/chrome.rdf
+@unexec mv %D/lib/mozilla-devel/chrome/en-US.jar.orig %D/lib/mozilla-devel/chrome/en-US.jar
+@unexec mv %D/lib/mozilla-devel/chrome/en-mac.jar.orig %D/lib/mozilla-devel/chrome/en-mac.jar
+@unexec mv %D/lib/mozilla-devel/chrome/en-unix.jar.orig %D/lib/mozilla-devel/chrome/en-unix.jar
+@unexec mv %D/lib/mozilla-devel/chrome/en-win.jar.orig %D/lib/mozilla-devel/chrome/en-win.jar
+@unexec mv %D/lib/mozilla-devel/chrome/installed-chrome.txt.orig %D/lib/mozilla-devel/chrome/installed-chrome.txt
+@unexec mv %D/lib/mozilla-devel/defaults/pref/unix.js.orig %D/lib/mozilla-devel/defaults/pref/unix.js
+@unexec mv %D/lib/mozilla-devel/xpti.dat.orig %D/lib/mozilla-devel/components/xpti.dat
+@dirrm lib/mozilla-devel/defaults/profile/JP/chrome
+@dirrm lib/mozilla-devel/defaults/profile/JP