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).

15 files changed, 58 insertions, 671 deletions

diff --git a/french/Makefile b/french/Makefile
index c10be399b501..1dadc1be4096 100644
--- a/french/Makefile
+++ b/french/Makefile
@@ -8,7 +8,7 @@
     SUBDIR += cups-lpr
     SUBDIR += ispell
     SUBDIR += kde3-i18n
-    SUBDIR += linux-netscape6
+    SUBDIR += netscape7
     SUBDIR += ooodict-fr_FR
     SUBDIR += openoffice
     SUBDIR += php_doc
diff --git a/french/linux-netscape6/Makefile b/french/linux-netscape6/Makefile
deleted file mode 100644
index c626ce4cfa22..000000000000
--- a/french/linux-netscape6/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	fr-linux-netscape6
-# Date created:				2002-03-04
-# Whom:					trevor
-# based on the german/linux-netscape6 port by Thomas E. Zander
-#
-# $FreeBSD$
-#
-
-PKGNAMEPREFIX?=	fr-
-PORTREVISION=	0
-CATEGORIES=	french www linux
-
-DISTFILES=	browser.xpi \
-		deflfrfr.xpi \
-		flash.xpi \
-		jre.xpi \
-		langfrfr.xpi \
-		mail.xpi \
-		psm.xpi \
-		regfr.xpi \
-		regus.xpi \
-		spellchecker.xpi \
-		talkback.xpi \
-		xpcom.xpi
-
-NETSCAPE6_LANG=	french
-
-.include "../../www/linux-netscape6/Makefile"
diff --git a/french/linux-netscape6/distinfo b/french/linux-netscape6/distinfo
deleted file mode 100644
index 83bb92f7a964..000000000000
--- a/french/linux-netscape6/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-MD5 (netscape6/french/6.2.3/browser.xpi) = fa7d7c4fd4bfed37f642b615f6c329be
-MD5 (netscape6/french/6.2.3/deflfrfr.xpi) = 4c0f536a85f2930f7f7e3ceec0a1b5fb
-MD5 (netscape6/french/6.2.3/flash.xpi) = d859b60eaa7cc503095228b48a5ce9a5
-MD5 (netscape6/french/6.2.3/jre.xpi) = c14a6a642d6592e60c40f000cbffbdcc
-MD5 (netscape6/french/6.2.3/langfrfr.xpi) = f3529196011353aa6f58b3c7d963ae38
-MD5 (netscape6/french/6.2.3/mail.xpi) = 6b2dd32082fe7a721b8064d1141624a7
-MD5 (netscape6/french/6.2.3/psm.xpi) = 2e65c54ed4dc9c037e69705f6f4a6a22
-MD5 (netscape6/french/6.2.3/regfr.xpi) = 2b141f64b69e65285151321483bbd5d8
-MD5 (netscape6/french/6.2.3/regus.xpi) = 6b7a2786cc016ed62961ea7ba748cee2
-MD5 (netscape6/french/6.2.3/spellchecker.xpi) = 75722c13a746d299f38163be78bc2456
-MD5 (netscape6/french/6.2.3/talkback.xpi) = 72c45f4322d574ef9d3746bb7c07a656
-MD5 (netscape6/french/6.2.3/xpcom.xpi) = 0298012ec9fac8bc748a06c78fa82454
-MD5 (netscape6/french/6.2.3/linux-netscape6-6.2.3-generated-files.tar.gz) = 8345bae84e99f264fd1ff9517f3b8128
diff --git a/french/linux-netscape6/files/all-locales.rdf b/french/linux-netscape6/files/all-locales.rdf
deleted file mode 100644
index 78bf7783fda4..000000000000
--- a/french/linux-netscape6/files/all-locales.rdf
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:locale:fr-FR:help"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/help/">
-    <c:package resource="urn:mozilla:package:help"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:global-platform"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-unix.jar!/locale/fr-FR/global-platform/">
-    <c:package resource="urn:mozilla:package:global-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:FR:messenger-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/FR.jar!/locale/FR/messenger-region/">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:communicator-platform"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-unix.jar!/locale/fr-FR/communicator-platform/">
-    <c:package resource="urn:mozilla:package:communicator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:global"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/global/">
-    <c:package resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:FR:navigator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/FR.jar!/locale/FR/navigator-region/">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:content-packs"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/content-packs/">
-    <c:package resource="urn:mozilla:package:content-packs"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:editor-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/editor-region/">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:communicator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/communicator-region/">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:pippki"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/pippki/">
-    <c:package resource="urn:mozilla:package:pippki"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US"
-                   c:displayName="US Region"
-                   c:localeType="region"
-                   c:author="mozilla.org"
-                   c:name="US"
-                   c:previewURL="http://www.mozilla.org/locales/US.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:US:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR"
-                   c:displayName="Français (France)"
-                   c:author="mozilla.org"
-                   c:name="fr-FR"
-                   c:previewURL="http://www.mozilla.org/locales/fr-FR.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:fr-FR:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:necko"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/necko/">
-    <c:package resource="urn:mozilla:package:necko"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:navigator"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/navigator/">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:navigator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/navigator-region/">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:communicator"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/communicator/">
-    <c:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:mozldap"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/mozldap/">
-    <c:package resource="urn:mozilla:package:mozldap"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:FR:editor-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/FR.jar!/locale/FR/editor-region/">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:messenger-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/messenger-region/">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:pipnss"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/pipnss/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:pipnss"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:global-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/global-region/">
-    <c:package resource="urn:mozilla:package:global-region"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:FR:packages">
-    <RDF:li resource="urn:mozilla:locale:FR:global-region"/>
-    <RDF:li resource="urn:mozilla:locale:FR:communicator-region"/>
-    <RDF:li resource="urn:mozilla:locale:FR:editor-region"/>
-    <RDF:li resource="urn:mozilla:locale:FR:messenger-region"/>
-    <RDF:li resource="urn:mozilla:locale:FR:navigator-region"/>
-  </RDF:Seq>
-  <RDF:Seq about="urn:mozilla:locale:US:packages">
-    <RDF:li resource="urn:mozilla:locale:US:global-region"/>
-    <RDF:li resource="urn:mozilla:locale:US:communicator-region"/>
-    <RDF:li resource="urn:mozilla:locale:US:editor-region"/>
-    <RDF:li resource="urn:mozilla:locale:US:messenger-region"/>
-    <RDF:li resource="urn:mozilla:locale:US:navigator-region"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:FR:global-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/FR.jar!/locale/FR/global-region/">
-    <c:package resource="urn:mozilla:package:global-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:navigator-platform"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-unix.jar!/locale/fr-FR/navigator-platform/">
-    <c:package resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:wallet"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/wallet/">
-    <c:package resource="urn:mozilla:package:wallet"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:fr-FR"/>
-    <RDF:li resource="urn:mozilla:locale:FR"/>
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:FR:communicator-region"
-                   c:baseURL="jar:resource:/chrome/FR.jar!/locale/FR/communicator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:cookie"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/cookie/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:cookie"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:FR"
-                   c:displayName="Region France"
-                   c:localeType="region"
-                   c:author="mozilla.org"
-                   c:name="FR"
-                   c:previewURL="http://www.mozilla.org/locales/FR.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:FR:packages"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:fr-FR:packages">
-    <RDF:li resource="urn:mozilla:locale:fr-FR:global"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:communicator"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:messenger"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:editor"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:navigator"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:mozldap"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:necko"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:cookie"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:wallet"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:content-packs"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:help"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:pipnss"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:pippki"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:global-platform"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:communicator-platform"/>
-    <RDF:li resource="urn:mozilla:locale:fr-FR:navigator-platform"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:messenger"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/messenger/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:fr-FR:editor"
-                   c:baseURL="jar:resource:/chrome/fr-FR.jar!/locale/fr-FR/editor/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/french/linux-netscape6/files/all-packages.rdf b/french/linux-netscape6/files/all-packages.rdf
deleted file mode 100644
index 31e03c519ede..000000000000
--- a/french/linux-netscape6/files/all-packages.rdf
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:package:mozldap"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/mozldap/"
-                   c:locType="install"
-                   c:displayName="MozLDAP"
-                   c:author="mozilla.org"
-                   c:name="mozldap"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:navigator"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/navigator/"
-                   c:locType="install"
-                   c:displayName="Navigator"
-                   c:author="mozilla.org"
-                   c:name="navigator"
-                   c:localeVersion="0.9.4"
-                   c:skinVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:communicator-platform"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/communicator-platform/"
-                   c:locType="install"
-                   c:displayName="Platform Specific Bindings"
-                   c:author="mozilla.org"
-                   c:name="communicator-platform"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:communicator-region"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/communicator-region/"
-                   c:locType="install"
-                   c:author="mozilla.org"
-                   c:name="communicator-region"
-                   c:localeVersion="0.9.4" />
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:global-platform"/>
-    <RDF:li resource="urn:mozilla:package:communicator-platform"/>
-    <RDF:li resource="urn:mozilla:package:navigator-platform"/>
-    <RDF:li resource="urn:mozilla:package:global-region"/>
-    <RDF:li resource="urn:mozilla:package:communicator-region"/>
-    <RDF:li resource="urn:mozilla:package:editor-region"/>
-    <RDF:li resource="urn:mozilla:package:navigator-region"/>
-    <RDF:li resource="urn:mozilla:package:global"/>
-    <RDF:li resource="urn:mozilla:package:cookie"/>
-    <RDF:li resource="urn:mozilla:package:wallet"/>
-    <RDF:li resource="urn:mozilla:package:content-packs"/>
-    <RDF:li resource="urn:mozilla:package:communicator"/>
-    <RDF:li resource="urn:mozilla:package:editor"/>
-    <RDF:li resource="urn:mozilla:package:navigator"/>
-    <RDF:li resource="urn:mozilla:package:mozldap"/>
-    <RDF:li resource="urn:mozilla:package:necko"/>
-    <RDF:li resource="urn:mozilla:package:help"/>
-    <RDF:li resource="urn:mozilla:package:messenger"/>
-    <RDF:li resource="urn:mozilla:package:messenger-region"/>
-    <RDF:li resource="urn:mozilla:package:pippki"/>
-    <RDF:li resource="urn:mozilla:package:pipnss"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:package:global-platform"
-                   c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global-platform/"
-                   c:locType="install"
-                   c:displayName="Platform Specific"
-                   c:author="mozilla.org"
-                   c:name="global-platform"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:messenger"
-                   c:baseURL="jar:resource:/chrome/messenger.jar!/content/messenger/"
-                   c:locType="install"
-                   c:displayName="Messenger"
-                   c:author="mozilla.org"
-                   c:name="messenger"
-                   c:localeVersion="0.9.4"
-                   c:skinVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:navigator-region"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/navigator-region/"
-                   c:locType="install"
-                   c:author="mozilla.org"
-                   c:name="navigator-region"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:cookie"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/cookie/"
-                   c:locType="install"
-                   c:displayName="Cookie Manager"
-                   c:author="mozilla.org"
-                   c:name="cookie"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:navigator-platform"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/navigator-platform/"
-                   c:locType="install"
-                   c:displayName="UNIX Bindings"
-                   c:author="mozilla.org"
-                   c:name="navigator-platform"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:help"
-                   c:baseURL="jar:resource:/chrome/help.jar!/content/help/"
-                   c:locType="install"
-                   c:displayName="Mozilla Help Viewer"
-                   c:author="netscape.com"
-                   c:name="help"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:global"
-                   c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global/"
-                   c:locType="install"
-                   c:displayName="Toolkit"
-                   c:author="mozilla.org"
-                   c:name="global"
-                   c:localeVersion="0.9.4"
-                   c:skinVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:communicator"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/communicator/"
-                   c:locType="install"
-                   c:displayName="Communicator Shared"
-                   c:author="mozilla.org"
-                   c:name="communicator"
-                   c:localeVersion="0.9.4"
-                   c:skinVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:messenger-region"
-                   c:baseURL="jar:resource:/chrome/messenger.jar!/content/messenger-region/"
-                   c:locType="install"
-                   c:author="mozilla.org"
-                   c:name="messenger-region"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:global-region"
-                   c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global-region/"
-                   c:locType="install"
-                   c:displayName="Contenu regional France"
-                   c:author="mozilla.org"
-                   c:name="global-region"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:necko"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/necko/"
-                   c:locType="install"
-                   c:displayName="Necko"
-                   c:author="mozilla.org"
-                   c:name="necko"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:editor"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/editor/"
-                   c:locType="install"
-                   c:displayName="Editor"
-                   c:author="mozilla.org"
-                   c:name="editor"
-                   c:localeVersion="0.9.4"
-                   c:skinVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:content-packs"
-                   c:baseURL="jar:resource:/chrome/content-packs.jar!/content/content-packs/"
-                   c:locType="install"
-                   c:displayName="Content Pack Switching"
-                   c:author="mozilla.org"
-                   c:name="content-packs"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:editor-region"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/editor-region/"
-                   c:locType="install"
-                   c:author="mozilla.org"
-                   c:name="editor-region"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:pipnss"
-                   c:baseURL="jar:resource:/chrome/pipnss.jar!/content/pipnss/"
-                   c:locType="install"
-                   c:displayName="pipnss"
-                   c:author="PSM Team"
-                   c:name="pipnss"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:wallet"
-                   c:baseURL="jar:resource:/chrome/comm.jar!/content/wallet/"
-                   c:locType="install"
-                   c:displayName="Form Manager"
-                   c:author="mozilla.org"
-                   c:name="wallet"
-                   c:localeVersion="0.9.4" />
-  <RDF:Description about="urn:mozilla:package:pippki"
-                   c:baseURL="jar:resource:/chrome/pippki.jar!/content/pippki/"
-                   c:locType="install"
-                   c:displayName="pippki"
-                   c:author="PSM Team"
-                   c:name="pippki"
-                   c:localeVersion="0.9.4" />
-</RDF:RDF>
diff --git a/french/linux-netscape6/files/all-skins.rdf b/french/linux-netscape6/files/all-skins.rdf
deleted file mode 100644
index 77449b268400..000000000000
--- a/french/linux-netscape6/files/all-skins.rdf
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:c="http://www.mozilla.org/rdf/chrome#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:skin:modern/1.0"
-                   c:displayName="Modern"
-                   c:author="Netscape"
-                   c:description="C'est le thème par défaut pour Netscape 6. Appliquez ce thème si vous souhaitez rétablir le paramètre original."
-                   c:name="modern/1.0"
-                   c:accessKey="M"
-                   c:image="jar:resource:/chrome/modern.jar!/skin/modern/global/preview.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:skin:modern/1.0:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:communicator"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/communicator/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:modern/1.0:editor"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/editor/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:navigator"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/navigator/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:editor"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/editor/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:skin:modern/1.0:packages">
-    <RDF:li resource="urn:mozilla:skin:modern/1.0:communicator"/>
-    <RDF:li resource="urn:mozilla:skin:modern/1.0:editor"/>
-    <RDF:li resource="urn:mozilla:skin:modern/1.0:global"/>
-    <RDF:li resource="urn:mozilla:skin:modern/1.0:messenger"/>
-    <RDF:li resource="urn:mozilla:skin:modern/1.0:navigator"/>
-  </RDF:Seq>
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:modern/1.0"/>
-    <RDF:li resource="urn:mozilla:skin:classic/1.0"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:skin:modern/1.0:communicator"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/communicator/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:modern/1.0:messenger"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/messenger/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:global"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/global/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:modern/1.0:navigator"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/navigator/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0"
-                   c:displayName="Classic"
-                   c:accessKey="C"
-                   c:author="mozilla.org"
-                   c:description="Ce thème reprend l'apparence familière des versions précédentes de Netscape pour le système d'exploitation Windows."
-                   c:name="classic/1.0"
-                   c:image="jar:resource:///chrome/classic.jar!/skin/classic/global/preview.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:skin:classic/1.0:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:messenger"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/messenger/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0:communicator"/>
-    <RDF:li resource="urn:mozilla:skin:classic/1.0:editor"/>
-    <RDF:li resource="urn:mozilla:skin:classic/1.0:global"/>
-    <RDF:li resource="urn:mozilla:skin:classic/1.0:messenger"/>
-    <RDF:li resource="urn:mozilla:skin:classic/1.0:navigator"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:skin:modern/1.0:global"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/global/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/french/linux-netscape6/pkg-comment b/french/linux-netscape6/pkg-comment
deleted file mode 100644
index 741ddc6f5b18..000000000000
--- a/french/linux-netscape6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux Netscape 6 suite (French)
diff --git a/french/linux-netscape6/pkg-descr b/french/linux-netscape6/pkg-descr
deleted file mode 100644
index 14c09d53ef2e..000000000000
--- a/french/linux-netscape6/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-Ceci est la suite du navigateur Netscape, avec éditeur de pages HTML et lecteur
-de courrier électronique et de nouvelles.  L'utilisation de la version pour Linux
-permet utiliser des plugins pour Linux.  Les plugins Java et de Macromedia, les
-localisations France et Etats-Unis, le gestionnaire de sécurité, le correcteur
-orthographique et l'analyseur de problèmes sont disponibles dans ce port.  Le
-messager instantané d'AOL est omis (veuillez voir le port ports/net/aim).
-
-Pour l'usage avec le plugin Java, linux_base-61 ou linux_base-62
-(pas linux_base-7) sont recommandés.
-
-WWW: http://home.netscape.com/fr/browsers/6/
-
-This is a Linux version of the Netscape suite (Web browser, HTML editor, mail
-user agent and news reader).  Using the Linux version on FreeBSD allows use of
-Linux versions of plugins.  Many plugins are available as Linux binaries.  The
-Sun Java and Macromedia Flash plugins, the French and U.S. regional packs,
-personal security manager, spell-checker, and talkback are available in this
-port.  AOL Instant Messenger is omitted (see ports/net/aim).
-
-For use with the Java plugin, linux_base-61 or linux_base-62 are
-recommended (not linux_base-7).
-
-WWW:  http://wp.netscape.com/fr/browsers/6/
diff --git a/french/linux-netscape6/pkg-message b/french/linux-netscape6/pkg-message
deleted file mode 100644
index c244adada440..000000000000
--- a/french/linux-netscape6/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-* 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.
-
-* AVERTISSEMENT ***************************************************************
-*    Les utilisateurs devraient sauvegarder leurs fichiers de signet
-* (bookmarks.html).  Il y a eu des rapports signalant que ce fichier peut
-* être détruit la première fois Netscape 6 est exécuté.
-*    Il peut également y avoir des problèmes quand on lance Mozilla et Netscape
-* simultanément.  Tous les deux utilisent $$HOME/.mozilla pour les préférences,
-* mais certains des fichiers de configuration peut être incompatibles.
-*******************************************************************************
diff --git a/french/linux-netscape6/scripts/configure b/french/linux-netscape6/scripts/configure
deleted file mode 100644
index 3fe028707716..000000000000
--- a/french/linux-netscape6/scripts/configure
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-echo ${WRKSRC}/components.conf
-if [ -f ${WRKSRC}/components.conf ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ -z "${BATCH}" ]; then
-
-/usr/bin/dialog --title "Netscape 6 Sélection composants" --clear \
-	--checklist "\n\
-
-Choisissez les composants que vous souhaitez télécharger et installer. \n\
-Appuyez sur la barre d'espace pour basculer entre les états \n\
-sélectionné et désélectionné." -1 -1 10 \
-"browser"	"navigateur (6576 ko)"					ON \
-"deflfrfr"	"profil français par défaut (26 ko)"		ON \
-"flash"		"plugin Flash (576 ko)"					ON \
-"jre"		"plugin Java (13808 ko)"				ON \
-"langfrfr"	"locale français (592 ko)"		ON \
-"mail"		"lecteur de courrier et de nouvelles (1824 ko)"	ON \
-"regfr"		"configurations régionales pour la France (54 ko)"	ON \
-"regus"		"configurations régionales pour les Etats-Unis (56 ko)"	ON \
-"spellchecker"	"vérificateur d'orthographe (832 ko)"		ON \
-"talkback"	"analyseur de problèmes (envoi à Netscape) (832 ko)"	ON \
-2> /tmp/checklist.tmp.$$
-
-retval=$?
-
-choice=`cat /tmp/checklist.tmp.$$`
-rm -f /tmp/checklist.tmp.$$
-
-case $retval in
-	0)	if [ -z "$choice" ]; then
-			echo "Aucune sélection"
-			exit 1;
-	fi
-	;;
-	1)	echo "Annulation demandée."
-		exit 1
-	;;
-esac
-
-echo "$choice" \
-	| sed -e "s/\"//g" \
-	| sed -e "s/mail/mail browser/g" \
-	| sed -e "s/browser/browser psm xpcom/g" \
-	| sort -u \
-	| sed -e "s/ /.xpi /g" \
-	| sed -e "s/$/.xpi/g" \
-	| perl -pi -e "s/ /\n/g" \
-	> ${WRKSRC}/components.conf
-fi
diff --git a/french/netscape7/Makefile b/french/netscape7/Makefile
index c626ce4cfa22..198b7d8cce19 100644
--- a/french/netscape7/Makefile
+++ b/french/netscape7/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	fr-linux-netscape6
+# New ports collection makefile for:	fr-netscape7
 # Date created:				2002-03-04
 # Whom:					trevor
 # based on the german/linux-netscape6 port by Thomas E. Zander
@@ -7,10 +7,10 @@
 #
 
 PKGNAMEPREFIX?=	fr-
-PORTREVISION=	0
 CATEGORIES=	french www linux
 
-DISTFILES=	browser.xpi \
+DISTFILES=	AIM.xpi \
+		browser.xpi \
 		deflfrfr.xpi \
 		flash.xpi \
 		jre.xpi \
@@ -23,6 +23,6 @@ DISTFILES=	browser.xpi \
 		talkback.xpi \
 		xpcom.xpi
 
-NETSCAPE6_LANG=	french
+NETSCAPE_LANG=	french
 
-.include "../../www/linux-netscape6/Makefile"
+.include "../../www/netscape7/Makefile"
diff --git a/french/netscape7/distinfo b/french/netscape7/distinfo
index 83bb92f7a964..56fbe08970c4 100644
--- a/french/netscape7/distinfo
+++ b/french/netscape7/distinfo
@@ -1,13 +1,14 @@
-MD5 (netscape6/french/6.2.3/browser.xpi) = fa7d7c4fd4bfed37f642b615f6c329be
-MD5 (netscape6/french/6.2.3/deflfrfr.xpi) = 4c0f536a85f2930f7f7e3ceec0a1b5fb
-MD5 (netscape6/french/6.2.3/flash.xpi) = d859b60eaa7cc503095228b48a5ce9a5
-MD5 (netscape6/french/6.2.3/jre.xpi) = c14a6a642d6592e60c40f000cbffbdcc
-MD5 (netscape6/french/6.2.3/langfrfr.xpi) = f3529196011353aa6f58b3c7d963ae38
-MD5 (netscape6/french/6.2.3/mail.xpi) = 6b2dd32082fe7a721b8064d1141624a7
-MD5 (netscape6/french/6.2.3/psm.xpi) = 2e65c54ed4dc9c037e69705f6f4a6a22
-MD5 (netscape6/french/6.2.3/regfr.xpi) = 2b141f64b69e65285151321483bbd5d8
-MD5 (netscape6/french/6.2.3/regus.xpi) = 6b7a2786cc016ed62961ea7ba748cee2
-MD5 (netscape6/french/6.2.3/spellchecker.xpi) = 75722c13a746d299f38163be78bc2456
-MD5 (netscape6/french/6.2.3/talkback.xpi) = 72c45f4322d574ef9d3746bb7c07a656
-MD5 (netscape6/french/6.2.3/xpcom.xpi) = 0298012ec9fac8bc748a06c78fa82454
-MD5 (netscape6/french/6.2.3/linux-netscape6-6.2.3-generated-files.tar.gz) = 8345bae84e99f264fd1ff9517f3b8128
+MD5 (netscape7/french/7.0/AIM.xpi) = 4bfb3208df43c77ab4c940051e1e77d8
+MD5 (netscape7/french/7.0/browser.xpi) = 4a9adb4c8f6185da096c075a3054de6a
+MD5 (netscape7/french/7.0/deflfrfr.xpi) = 4577626b7fb485ed2861922489fcccd6
+MD5 (netscape7/french/7.0/flash.xpi) = 6e8547d6654430f268bdc61a8c251a33
+MD5 (netscape7/french/7.0/fr-linux-netscape7-7.0-generated-files.tar.gz) = bfffe9599c34a5dcb42635b81986387d
+MD5 (netscape7/french/7.0/jre.xpi) = bfb912644a0dfe310350c872f0f5fc23
+MD5 (netscape7/french/7.0/langfrfr.xpi) = 720f8972985c2c40883916b691b9241d
+MD5 (netscape7/french/7.0/mail.xpi) = 7a1f3900575c8dc87fa47ba7ce17eddf
+MD5 (netscape7/french/7.0/psm.xpi) = 017e4a1146032bb5c1c5559335e662d4
+MD5 (netscape7/french/7.0/regfr.xpi) = 1a20876029f58546304619d3bb203dd2
+MD5 (netscape7/french/7.0/regus.xpi) = e394702833ddbae069a6486a867fbac8
+MD5 (netscape7/french/7.0/spellchecker.xpi) = 31608b629789cda976be13196de6c34f
+MD5 (netscape7/french/7.0/talkback.xpi) = 511447c63e3f488d062ce81641aeaf4d
+MD5 (netscape7/french/7.0/xpcom.xpi) = a902c7cbe282968516ade1234ccf82fa
diff --git a/french/netscape7/pkg-descr b/french/netscape7/pkg-descr
index 14c09d53ef2e..402bc288bbd0 100644
--- a/french/netscape7/pkg-descr
+++ b/french/netscape7/pkg-descr
@@ -1,23 +1,21 @@
-Ceci est la suite du navigateur Netscape, avec éditeur de pages HTML et lecteur
-de courrier électronique et de nouvelles.  L'utilisation de la version pour Linux
-permet utiliser des plugins pour Linux.  Les plugins Java et de Macromedia, les
-localisations France et Etats-Unis, le gestionnaire de sécurité, le correcteur
-orthographique et l'analyseur de problèmes sont disponibles dans ce port.  Le
-messager instantané d'AOL est omis (veuillez voir le port ports/net/aim).
+Ceci est la suite du navigateur Netscape, avec messager instantané d'AOL,
+éditeur de pages HTML et lecteur de courrier électronique et de nouvelles.
+L'utilisation de la version pour Linux permet utiliser des plugins pour Linux.
+Les plugins Java et de Macromedia, les localisations France et Etats-Unis, le
+gestionnaire de sécurité, le correcteur orthographique et l'analyseur de
+problèmes sont disponibles dans ce port.  
 
 Pour l'usage avec le plugin Java, linux_base-61 ou linux_base-62
 (pas linux_base-7) sont recommandés.
 
-WWW: http://home.netscape.com/fr/browsers/6/
-
-This is a Linux version of the Netscape suite (Web browser, HTML editor, mail
-user agent and news reader).  Using the Linux version on FreeBSD allows use of
-Linux versions of plugins.  Many plugins are available as Linux binaries.  The
-Sun Java and Macromedia Flash plugins, the French and U.S. regional packs,
-personal security manager, spell-checker, and talkback are available in this
-port.  AOL Instant Messenger is omitted (see ports/net/aim).
+This is a Linux version of the Netscape suite (AOL Instant Messenger, Web
+browser, HTML editor, mail user agent and news reader).  Using the Linux
+version on FreeBSD allows use of Linux versions of plugins.  Many plugins are
+available as Linux binaries.  The Sun Java and Macromedia Flash plugins, the
+French and U.S. regional packs, personal security manager, spell-checker, and
+talkback are available in this port.
 
 For use with the Java plugin, linux_base-61 or linux_base-62 are
 recommended (not linux_base-7).
 
-WWW:  http://wp.netscape.com/fr/browsers/6/
+WWW:  http://channels.netscape.com/ns/browsers/
diff --git a/french/netscape7/pkg-message b/french/netscape7/pkg-message
index c244adada440..7531e1077bbd 100644
--- a/french/netscape7/pkg-message
+++ b/french/netscape7/pkg-message
@@ -1,15 +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.
-
-* AVERTISSEMENT ***************************************************************
-*    Les utilisateurs devraient sauvegarder leurs fichiers de signet
-* (bookmarks.html).  Il y a eu des rapports signalant que ce fichier peut
-* être détruit la première fois Netscape 6 est exécuté.
-*    Il peut également y avoir des problèmes quand on lance Mozilla et Netscape
-* simultanément.  Tous les deux utilisent $$HOME/.mozilla pour les préférences,
-* mais certains des fichiers de configuration peut être incompatibles.
-*******************************************************************************
+* 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/french/netscape7/scripts/configure b/french/netscape7/scripts/configure
index 3fe028707716..a5e89ae5ce37 100644
--- a/french/netscape7/scripts/configure
+++ b/french/netscape7/scripts/configure
@@ -17,16 +17,16 @@ if [ -z "${BATCH}" ]; then
 Choisissez les composants que vous souhaitez télécharger et installer. \n\
 Appuyez sur la barre d'espace pour basculer entre les états \n\
 sélectionné et désélectionné." -1 -1 10 \
-"browser"	"navigateur (6576 ko)"					ON \
-"deflfrfr"	"profil français par défaut (26 ko)"		ON \
-"flash"		"plugin Flash (576 ko)"					ON \
-"jre"		"plugin Java (13808 ko)"				ON \
-"langfrfr"	"locale français (592 ko)"		ON \
-"mail"		"lecteur de courrier et de nouvelles (1824 ko)"	ON \
-"regfr"		"configurations régionales pour la France (54 ko)"	ON \
-"regus"		"configurations régionales pour les Etats-Unis (56 ko)"	ON \
-"spellchecker"	"vérificateur d'orthographe (832 ko)"		ON \
-"talkback"	"analyseur de problèmes (envoi à Netscape) (832 ko)"	ON \
+"browser"	"navigateur"						ON \
+"deflfrfr"	"profil français par défaut"			ON \
+"flash"		"plugin Flash"						ON \
+"jre"		"plugin Java"						ON \
+"langfrfr"	"locale français"					ON \
+"mail"		"lecteur de courrier et de nouvelles"			ON \
+"regfr"		"configurations régionales pour la France"		ON \
+"regus"		"configurations régionales pour les Etats-Unis"	ON \
+"spellchecker"	"vérificateur d'orthographe"				ON \
+"talkback"	"analyseur de problèmes (envoi à Netscape)"	ON \
 2> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -48,7 +48,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" \