I remove the linux-netscape6 ports from ports/french, ports/german,

ports/japanese and ports/www.  In their place, I add corresponding netscape7
ports, after repo copies.  Now ports/www/netscape7 will no longer be a slave
port.  Instead it is the master port for the others.

The French, German, and Japanese ports now have AIM, because I had trouble
getting them to work without it.

I add a security warning to all these ports, about the "forward referrer" bug
(Mozilla bug 145579).

4 files changed, 45 insertions, 36 deletions

diff --git a/japanese/netscape7/Makefile b/japanese/netscape7/Makefile
index 0a578f11f269..dee232725ea2 100644
--- a/japanese/netscape7/Makefile
+++ b/japanese/netscape7/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	ja-linux-netscape6
+# New ports collection makefile for:	ja-netscape7
 # Date created:				2002-03-04
 # Whom:					trevor
 # based on the german/linux-netscape6 port by Thomas E. Zander
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	ja-
 PORTREVISION=	0
 CATEGORIES=	japanese www linux
 
-DISTFILES=	browser.xpi \
+DISTFILES=	AIM.xpi \
+		browser.xpi \
 		defljajp.xpi \
 		flash.xpi \
 		jre.xpi \
@@ -23,6 +24,6 @@ DISTFILES=	browser.xpi \
 		talkback.xpi \
 		xpcom.xpi
 
-NETSCAPE6_LANG=	japanese
+NETSCAPE_LANG=	japanese
 
-.include "../../www/linux-netscape6/Makefile"
+.include "../../www/netscape7/Makefile"
diff --git a/japanese/netscape7/distinfo b/japanese/netscape7/distinfo
index 612555aff5e7..4d75df8b237f 100644
--- a/japanese/netscape7/distinfo
+++ b/japanese/netscape7/distinfo
@@ -1,13 +1,14 @@
-MD5 (netscape6/japanese/6.2.3/browser.xpi) = c35f320fdf573df266c50e8e24cecbfc
-MD5 (netscape6/japanese/6.2.3/defljajp.xpi) = 92042cd9f44546eb04b1eb381d10512d
-MD5 (netscape6/japanese/6.2.3/flash.xpi) = d859b60eaa7cc503095228b48a5ce9a5
-MD5 (netscape6/japanese/6.2.3/jre.xpi) = c14a6a642d6592e60c40f000cbffbdcc
-MD5 (netscape6/japanese/6.2.3/langjajp.xpi) = 6d535863a5ee94fcd3f805bd84be7e51
-MD5 (netscape6/japanese/6.2.3/linux-netscape6-6.2.3-generated-files.tar.gz) = 8345bae84e99f264fd1ff9517f3b8128
-MD5 (netscape6/japanese/6.2.3/mail.xpi) = 065cb248b38fddc6378ee02714725560
-MD5 (netscape6/japanese/6.2.3/psm.xpi) = 97c6901cdc96ea0a311d2a5f439665c9
-MD5 (netscape6/japanese/6.2.3/regjp.xpi) = 3de2ba8dfc70d8776268cba145ec17c9
-MD5 (netscape6/japanese/6.2.3/regus.xpi) = 6b7a2786cc016ed62961ea7ba748cee2
-MD5 (netscape6/japanese/6.2.3/spellchecker.xpi) = 279493cd91fd1bf34f568ab7558e7c73
-MD5 (netscape6/japanese/6.2.3/talkback.xpi) = 72c45f4322d574ef9d3746bb7c07a656
-MD5 (netscape6/japanese/6.2.3/xpcom.xpi) = 0298012ec9fac8bc748a06c78fa82454
+MD5 (netscape7/japanese/7.0/AIM.xpi) = 0504089eb91a6a047b1ed0ee1af1abd2
+MD5 (netscape7/japanese/7.0/browser.xpi) = b2c20ce964369e05a45a57d4642bee33
+MD5 (netscape7/japanese/7.0/defljajp.xpi) = e010d9886d53a8ba1bdfa170ed6b653e
+MD5 (netscape7/japanese/7.0/flash.xpi) = 6e8547d6654430f268bdc61a8c251a33
+MD5 (netscape7/japanese/7.0/ja-linux-netscape7-7.0-generated-files.tar.gz) = 5d826663673a5f0e8028c5c66183278e
+MD5 (netscape7/japanese/7.0/jre.xpi) = bfb912644a0dfe310350c872f0f5fc23
+MD5 (netscape7/japanese/7.0/langjajp.xpi) = 8ec54ee2a4075c9783c9a4954b91cc34
+MD5 (netscape7/japanese/7.0/mail.xpi) = fed69cd5bc6db67f6936f369522a40e9
+MD5 (netscape7/japanese/7.0/psm.xpi) = 017e4a1146032bb5c1c5559335e662d4
+MD5 (netscape7/japanese/7.0/regjp.xpi) = 4a1f96fef353fd11f41b1a53985f5d60
+MD5 (netscape7/japanese/7.0/regus.xpi) = e394702833ddbae069a6486a867fbac8
+MD5 (netscape7/japanese/7.0/spellchecker.xpi) = 53028acfb5cde7b4de7cd8f83f4f1869
+MD5 (netscape7/japanese/7.0/talkback.xpi) = 511447c63e3f488d062ce81641aeaf4d
+MD5 (netscape7/japanese/7.0/xpcom.xpi) = a902c7cbe282968516ade1234ccf82fa
diff --git a/japanese/netscape7/pkg-message b/japanese/netscape7/pkg-message
index 858576075653..7531e1077bbd 100644
--- a/japanese/netscape7/pkg-message
+++ b/japanese/netscape7/pkg-message
@@ -1,7 +1,14 @@
-* WARNING *****************************************************************
-*    Users should back up their bookmark files (bookmarks.html).  There are
-* reports that this file can be clobbered the first time Netscape 6 is run.
-*    Problems may also exist when one launches Mozilla and Netscape 6
-* simultaneously.  Both use $HOME/.mozilla for preferences, but some
-* configuration files may be incompatible.
-***************************************************************************
+* WARNING **********************************************************************
+* This port has a security bug.  If a user enables Javascript, hostile Web     *
+* sites can track the URLs which the user visits after leaving the site.  Such *
+* URLs could contain passwords or other sensitive information.  To avoid this  *
+* bug, users can add the line:                                                 *
+*                                                                              *
+*       user_pref("capability.policy.default.Window.onunload", "noAccess");    *
+*                                                                              *
+* to their prefs.js files under ~/.mozilla/ (thanks to Sven Neuhaus for        *
+* reporting the bug, and to MadMaverick9 at Mozillazine for the work-around).  *
+*                                                                              *
+* See <URL:http://members.ping.de/~sven/mozbug/refcook.html> for a             *
+* demonstration and other work-arounds.                                        *
+********************************************************************************
diff --git a/japanese/netscape7/scripts/configure b/japanese/netscape7/scripts/configure
index 6d9024f31de5..c3512fa5bfc1 100644
--- a/japanese/netscape7/scripts/configure
+++ b/japanese/netscape7/scripts/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/japanese/netscape7/scripts/Attic/configure,v 1.2 2002-05-23 13:00:10 trevor Exp $
+# $FreeBSD: /tmp/pcvs/ports/japanese/netscape7/scripts/Attic/configure,v 1.3 2002-10-14 13:50:20 trevor Exp $
 
 echo ${WRKSRC}/components.conf
 if [ -f ${WRKSRC}/components.conf ]; then
@@ -15,16 +15,16 @@ if [ -z "${BATCH}" ]; then
 	--checklist "\n\
 Choose components of Netscape 6 to download and install. \n\
 Press the space bar to toggle selections." -1 -1 10 \
-"browser"	"Web browser (6592 kB)"				ON \
-"defljajp"	"Japanese/Japan profile defaults (26 kB)"	ON \
-"flash"		"Flash plugin (576 kB)"				ON \
-"jre"		"Java plugin (13808 kB)"			ON \
-"langjajp"	"Japanese/Japan language pack (624 kB)"		ON \
-"mail"		"e-mail and news (1824 kB)"			ON \
-"regjp"		"regional settings for Japan (54 kB)"		ON \
-"regus"		"regional settings for the USA (56 kB)"		ON \
-"spellchecker"	"spell-checker (544 kB)"			ON \
-"talkback"	"sends bug reports to Netscape staff (832 kB)"	ON \
+"browser"	"Web browser"				ON \
+"defljajp"	"Japanese/Japan profile defaults"	ON \
+"flash"		"Flash plugin"				ON \
+"jre"		"Java plugin (requires linux_base-6"	ON \
+"langjajp"	"Japanese/Japan language pack"		ON \
+"mail"		"e-mail and news"			ON \
+"regjp"		"regional settings for Japan"		ON \
+"regus"		"regional settings for the USA"		ON \
+"spellchecker"	"spell-checker"				ON \
+"talkback"	"sends bug reports to Netscape staff"	ON \
 2> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -46,7 +46,7 @@ esac
 echo "$choice" \
 	| sed -e "s/\"//g" \
 	| sed -e "s/mail/mail browser/g" \
-	| sed -e "s/browser/browser psm xpcom/g" \
+	| sed -e "s/browser/AIM browser psm xpcom/g" \
 	| sort -u \
 	| sed -e "s/ /.xpi /g" \
 	| sed -e "s/$/.xpi/g" \