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, 53 insertions, 728 deletions

diff --git a/german/Makefile b/german/Makefile
index 77a15418a1f3..88d38c11b57c 100644
--- a/german/Makefile
+++ b/german/Makefile
@@ -12,8 +12,8 @@
     SUBDIR += ispell-neu
     SUBDIR += kde3-i18n
     SUBDIR += linux-eagle
-    SUBDIR += linux-netscape6
     SUBDIR += manpages
+    SUBDIR += netscape7
     SUBDIR += ooodict-de_CH
     SUBDIR += ooodict-de_DE
     SUBDIR += openoffice
diff --git a/german/linux-netscape6/Makefile b/german/linux-netscape6/Makefile
deleted file mode 100644
index 8e3d83cc37c1..000000000000
--- a/german/linux-netscape6/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: de-linux-netscape6
-# Date created:			28 Feb 2002
-# Whom:				Thomas E. Zander <riggs@rrr.de>
-# based on the www/linux-netscape6 port
-#
-# $FreeBSD$
-#
-
-PKGNAMEPREFIX?=	de-
-PORTREVISION=	0
-CATEGORIES=	german www linux
-
-DISTFILES=	browser.xpi \
-		defldede.xpi \
-		flash.xpi \
-		jre.xpi \
-		langdede.xpi \
-		mail.xpi \
-		psm.xpi \
-		regde.xpi \
-		regfr.xpi \
-		regus.xpi \
-		spellchecker.xpi \
-		talkback.xpi \
-		xpcom.xpi
-
-MAINTAINER=	riggs@rrr.de
-
-NETSCAPE6_LANG=	german
-
-.include "../../www/linux-netscape6/Makefile"
diff --git a/german/linux-netscape6/distinfo b/german/linux-netscape6/distinfo
deleted file mode 100644
index ef4d4e518bec..000000000000
--- a/german/linux-netscape6/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-MD5 (netscape6/german/6.2.3/browser.xpi) = 40764d48428814752ade9dce0cd0a699
-MD5 (netscape6/german/6.2.3/defldede.xpi) = 2f275a69dec3b8dd4c1e2ba67892d38b
-MD5 (netscape6/german/6.2.3/flash.xpi) = d859b60eaa7cc503095228b48a5ce9a5
-MD5 (netscape6/german/6.2.3/jre.xpi) = c14a6a642d6592e60c40f000cbffbdcc
-MD5 (netscape6/german/6.2.3/langdede.xpi) = 0ae0321023bac4037f6f109aef40394e
-MD5 (netscape6/german/6.2.3/mail.xpi) = 6a231b5fbd1491a0e0b66d8335bc2b4d
-MD5 (netscape6/german/6.2.3/psm.xpi) = 5e99a0d5e3ddf98a3051e78c206e06dd
-MD5 (netscape6/german/6.2.3/regde.xpi) = 03402eee3e4ef82daef66f034d3bd64f
-MD5 (netscape6/german/6.2.3/regfr.xpi) = 5f719ef06d38de912e094b7f16169cef
-MD5 (netscape6/german/6.2.3/regus.xpi) = 6b7a2786cc016ed62961ea7ba748cee2
-MD5 (netscape6/german/6.2.3/spellchecker.xpi) = 24b5a79c8d529a47cae22e635fd572cd
-MD5 (netscape6/german/6.2.3/talkback.xpi) = 72c45f4322d574ef9d3746bb7c07a656
-MD5 (netscape6/german/6.2.3/xpcom.xpi) = 0298012ec9fac8bc748a06c78fa82454
-MD5 (netscape6/german/6.2.3/linux-netscape6-6.2.3-generated-files.tar.gz) = 8345bae84e99f264fd1ff9517f3b8128
diff --git a/german/linux-netscape6/files/all-locales.rdf b/german/linux-netscape6/files/all-locales.rdf
deleted file mode 100644
index 5c5ff08226bf..000000000000
--- a/german/linux-netscape6/files/all-locales.rdf
+++ /dev/null
@@ -1,263 +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:de-DE:content-packs"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/content-packs/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:content-packs"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:mozldap"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/mozldap/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:mozldap"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE"
-                   c:displayName="Deutsch (Deutschland)"
-                   c:author="mozilla.org"
-                   c:name="de-DE"
-                   c:previewURL="http://www.mozilla.org/locales/de-DE.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:de-DE:packages"/>
-  </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:navigator-region"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/navigator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:editor-region"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/editor-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:aim-region"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/aim-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:aim-region"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:FR:packages">
-    <RDF:li resource="urn:mozilla:locale:FR:aim-region"/>
-    <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:DE:packages">
-    <RDF:li resource="urn:mozilla:locale:DE:aim-region"/>
-    <RDF:li resource="urn:mozilla:locale:DE:global-region"/>
-    <RDF:li resource="urn:mozilla:locale:DE:communicator-region"/>
-    <RDF:li resource="urn:mozilla:locale:DE:editor-region"/>
-    <RDF:li resource="urn:mozilla:locale:DE:messenger-region"/>
-    <RDF:li resource="urn:mozilla:locale:DE:navigator-region"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:de-DE:pippki"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/pippki/">
-    <c:package resource="urn:mozilla:package:pippki"/>
-  </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:Description about="urn:mozilla:locale:US:communicator-region"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/communicator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:communicator"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/communicator/">
-    <c:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:DE"
-                   c:displayName="Region Deutschland"
-                   c:localeType="region"
-                   c:author="mozilla.org"
-                   c:name="DE"
-                   c:previewURL="http://www.mozilla.org/locales/DE.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:DE:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:DE:aim-region"
-                   c:baseURL="jar:resource:/chrome/DE.jar!/locale/DE/aim-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:aim-region"/>
-  </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:de-DE:wallet"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/wallet/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:wallet"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:necko"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/necko/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:necko"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:US:messenger-region"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/messenger-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:cookie"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/cookie/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:cookie"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:messenger"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/messenger/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:de-DE:packages">
-    <RDF:li resource="urn:mozilla:locale:de-DE:global"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:communicator"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:messenger"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:editor"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:navigator"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:aim"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:mozldap"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:necko"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:cookie"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:wallet"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:content-packs"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:help"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:pipnss"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:pippki"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:global-platform"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:communicator-platform"/>
-    <RDF:li resource="urn:mozilla:locale:de-DE:navigator-platform"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:de-DE:navigator"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/navigator/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:global"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/global/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:navigator-platform"
-                   c:baseURL="jar:resource:/chrome/de-unix.jar!/locale/de-DE/navigator-platform/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:DE:messenger-region"
-                   c:baseURL="jar:resource:/chrome/DE.jar!/locale/DE/messenger-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </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:DE:communicator-region"
-                   c:baseURL="jar:resource:/chrome/DE.jar!/locale/DE/communicator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </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:communicator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/FR.jar!/locale/FR/communicator-region/">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:communicator-platform"
-                   c:baseURL="jar:resource:/chrome/de-unix.jar!/locale/de-DE/communicator-platform/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:global-platform"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/de-unix.jar!/locale/de-DE/global-platform/">
-    <c:package resource="urn:mozilla:package:global-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:help"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/help/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:help"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:FR:aim-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/FR.jar!/locale/FR/aim-region/">
-    <c:package resource="urn:mozilla:package:aim-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:DE:editor-region"
-                   c:baseURL="jar:resource:/chrome/DE.jar!/locale/DE/editor-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:editor"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/editor/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-  <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:US:global-region"
-                   c:baseURL="jar:resource:/chrome/US.jar!/locale/US/global-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:global-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:DE:navigator-region"
-                   c:baseURL="jar:resource:/chrome/DE.jar!/locale/DE/navigator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:de-DE"/>
-    <RDF:li resource="urn:mozilla:locale:DE"/>
-    <RDF:li resource="urn:mozilla:locale:US"/>
-    <RDF:li resource="urn:mozilla:locale:FR"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:DE:global-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/DE.jar!/locale/DE/global-region/">
-    <c:package resource="urn:mozilla:package:global-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:pipnss"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/pipnss/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:pipnss"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:de-DE:aim"
-                   c:baseURL="jar:resource:/chrome/de-DE.jar!/locale/de-DE/aim/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:aim"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:US:packages">
-    <RDF:li resource="urn:mozilla:locale:US:aim-region"/>
-    <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:RDF>
diff --git a/german/linux-netscape6/files/all-packages.rdf b/german/linux-netscape6/files/all-packages.rdf
deleted file mode 100644
index e41e60a5ea94..000000000000
--- a/german/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: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: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: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: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: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: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: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: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: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: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: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: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: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: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:global-region"
-                   c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global-region/"
-                   c:locType="install"
-                   c:displayName="DE-Regionalstandard"
-                   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: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: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: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: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-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: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:RDF>
diff --git a/german/linux-netscape6/files/all-skins.rdf b/german/linux-netscape6/files/all-skins.rdf
deleted file mode 100644
index a3b85f56aa69..000000000000
--- a/german/linux-netscape6/files/all-skins.rdf
+++ /dev/null
@@ -1,116 +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: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"
-                   c:displayName="Modern"
-                   c:author="Netscape"
-                   c:description="Dies ist das Standardmotiv für Netscape 6. Weisen Sie dieses Motiv zu, wenn Sie die Originaleinstellungen wiederherstellen möchten."
-                   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: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:li resource="urn:mozilla:skin:classic/1.0:aim"/>
-  </RDF:Seq>
-  <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:Description about="urn:mozilla:skin:modern/1.0:messenger"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/messenger/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:modern/1.0:communicator"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/communicator/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0"
-                   c:displayName="Classic"
-                   c:accessKey="C"
-                   c:author="mozilla.org"
-                   c:description="TDieses Motiv simuliert das vertraute Bild älterer Netscape-Versionen für 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:communicator"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/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:global"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/global/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:global"/>
-  </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:classic/1.0:navigator"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/navigator/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </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:li resource="urn:mozilla:skin:modern/1.0:aim"/>
-  </RDF:Seq>
-  <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:modern/1.0:aim"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/aim/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:aim"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:aim"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/aim/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:aim"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:modern/1.0:editor"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/editor/"
-                   c:allowScripts="false"
-                   c:skinVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/german/linux-netscape6/pkg-comment b/german/linux-netscape6/pkg-comment
deleted file mode 100644
index 803a2366d6ef..000000000000
--- a/german/linux-netscape6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux Netscape 6 suite (German)
diff --git a/german/linux-netscape6/pkg-descr b/german/linux-netscape6/pkg-descr
deleted file mode 100644
index ef92b6b2b471..000000000000
--- a/german/linux-netscape6/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-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 is necessary if you want to use Linux versions of plugins.
-Many plugins are distributed only as Linux binaries.  The Sun Java
-and Macromedia Flash plugins are available.  AOL Instant Messenger
-is omitted (see ports/net/aim).  The German, French and US- American
-region packs, personal security manager, spell-checker, and talkback
-are available.
-
-For use with the Java plugin, linux_base-61 or linux_base-62 are
-recommended (not linux_base-7).
-
-WWW: http://www.netscape.de/netscapeprodukte/netscapebrowser/netscape62/
-
-Thomas E. Zander
-riggs@rrr.de
diff --git a/german/linux-netscape6/pkg-message b/german/linux-netscape6/pkg-message
deleted file mode 100644
index 83ef79c59b63..000000000000
--- a/german/linux-netscape6/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-* WARNING *********************************************************************
-*    Users should back up their bookmark files.  There have been reports that *
-* the bookmark file can be clobbered the first time Netscape 6 is run.        *
-*    Problems have also been reported from running Mozilla and Netscape 6     *
-* simultaneously.  Both use $HOME/.mozilla for preferences, but some          *
-* configuration files seem to be incompatible.                                *
-*******************************************************************************
diff --git a/german/linux-netscape6/scripts/configure b/german/linux-netscape6/scripts/configure
deleted file mode 100644
index d99b5c1783a2..000000000000
--- a/german/linux-netscape6/scripts/configure
+++ /dev/null
@@ -1,56 +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 component selection" --clear \
-	--checklist "\n\
-Choose components of Netscape 6 to download and install. \n\
-Press the space bar to toggle selections." -1 -1 11 \
-"browser"	"browser (6576 kB)"				ON \
-"defldede"	"German profile defaults (26 kB)"		ON \
-"flash"		"Flash plugin (576 kB)"				ON \
-"jre"		"Java plugin (13808 kB)"			ON \
-"langdede"	"German language pack (592 kB)"			ON \
-"mail"		"e-mail and news (1824 kB)"			ON \
-"regde"		"regional settings for Germany (56 kB)"		ON \
-"regfr"		"regional settings for France (52 kB)"		ON \
-"regus"		"regional settings for the USA (56 kB)"		ON \
-"spellchecker"	"spell-checker (1040 kB)"			ON \
-"talkback"	"sends bug reports to Netscape staff (832 kB)"	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 "Nothing selected"
-			exit 1;
-	fi
-	;;
-	1)	echo "Cancel pressed."
-		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/german/netscape7/Makefile b/german/netscape7/Makefile
index 8e3d83cc37c1..ab30b0ac3fe6 100644
--- a/german/netscape7/Makefile
+++ b/german/netscape7/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: de-linux-netscape6
+# New ports collection makefile for: de-netscape7
 # Date created:			28 Feb 2002
 # Whom:				Thomas E. Zander <riggs@rrr.de>
 # based on the www/linux-netscape6 port
@@ -7,10 +7,10 @@
 #
 
 PKGNAMEPREFIX?=	de-
-PORTREVISION=	0
 CATEGORIES=	german www linux
 
-DISTFILES=	browser.xpi \
+DISTFILES=	AIM.xpi \
+		browser.xpi \
 		defldede.xpi \
 		flash.xpi \
 		jre.xpi \
@@ -19,13 +19,12 @@ DISTFILES=	browser.xpi \
 		psm.xpi \
 		regde.xpi \
 		regfr.xpi \
-		regus.xpi \
 		spellchecker.xpi \
 		talkback.xpi \
 		xpcom.xpi
 
 MAINTAINER=	riggs@rrr.de
 
-NETSCAPE6_LANG=	german
+NETSCAPE_LANG=	german
 
-.include "../../www/linux-netscape6/Makefile"
+.include "../../www/netscape7/Makefile"
diff --git a/german/netscape7/distinfo b/german/netscape7/distinfo
index ef4d4e518bec..af9964f504f6 100644
--- a/german/netscape7/distinfo
+++ b/german/netscape7/distinfo
@@ -1,14 +1,14 @@
-MD5 (netscape6/german/6.2.3/browser.xpi) = 40764d48428814752ade9dce0cd0a699
-MD5 (netscape6/german/6.2.3/defldede.xpi) = 2f275a69dec3b8dd4c1e2ba67892d38b
-MD5 (netscape6/german/6.2.3/flash.xpi) = d859b60eaa7cc503095228b48a5ce9a5
-MD5 (netscape6/german/6.2.3/jre.xpi) = c14a6a642d6592e60c40f000cbffbdcc
-MD5 (netscape6/german/6.2.3/langdede.xpi) = 0ae0321023bac4037f6f109aef40394e
-MD5 (netscape6/german/6.2.3/mail.xpi) = 6a231b5fbd1491a0e0b66d8335bc2b4d
-MD5 (netscape6/german/6.2.3/psm.xpi) = 5e99a0d5e3ddf98a3051e78c206e06dd
-MD5 (netscape6/german/6.2.3/regde.xpi) = 03402eee3e4ef82daef66f034d3bd64f
-MD5 (netscape6/german/6.2.3/regfr.xpi) = 5f719ef06d38de912e094b7f16169cef
-MD5 (netscape6/german/6.2.3/regus.xpi) = 6b7a2786cc016ed62961ea7ba748cee2
-MD5 (netscape6/german/6.2.3/spellchecker.xpi) = 24b5a79c8d529a47cae22e635fd572cd
-MD5 (netscape6/german/6.2.3/talkback.xpi) = 72c45f4322d574ef9d3746bb7c07a656
-MD5 (netscape6/german/6.2.3/xpcom.xpi) = 0298012ec9fac8bc748a06c78fa82454
-MD5 (netscape6/german/6.2.3/linux-netscape6-6.2.3-generated-files.tar.gz) = 8345bae84e99f264fd1ff9517f3b8128
+MD5 (netscape7/german/7.0/AIM.xpi) = bd59234dd8c7c24e126fa3942a878075
+MD5 (netscape7/german/7.0/browser.xpi) = 367ea5776c51cc0502318834759a0b6c
+MD5 (netscape7/german/7.0/defldede.xpi) = 1d10081961ec6e50c5b8b50747a8e12b
+MD5 (netscape7/german/7.0/flash.xpi) = 6e8547d6654430f268bdc61a8c251a33
+MD5 (netscape7/german/7.0/jre.xpi) = bfb912644a0dfe310350c872f0f5fc23
+MD5 (netscape7/german/7.0/langdede.xpi) = 8538febbde0003e5b621eaf7dd3bbcfc
+MD5 (netscape7/german/7.0/mail.xpi) = 3b20ae0622f1c4af8248493febf44fd7
+MD5 (netscape7/german/7.0/psm.xpi) = 017e4a1146032bb5c1c5559335e662d4
+MD5 (netscape7/german/7.0/regde.xpi) = 5ffc68e54013d7cbfe9ba30e75b087f9
+MD5 (netscape7/german/7.0/regfr.xpi) = 5f719ef06d38de912e094b7f16169cef
+MD5 (netscape7/german/7.0/spellchecker.xpi) = ce11ea8ed43997ccc308662de02dbc51
+MD5 (netscape7/german/7.0/talkback.xpi) = 511447c63e3f488d062ce81641aeaf4d
+MD5 (netscape7/german/7.0/xpcom.xpi) = a902c7cbe282968516ade1234ccf82fa
+MD5 (netscape7/german/7.0/de-linux-netscape7-7.0-generated-files.tar.gz) = e4474b583a630c522ad4af888f4fc549
diff --git a/german/netscape7/pkg-descr b/german/netscape7/pkg-descr
index ef92b6b2b471..c84306ab1de4 100644
--- a/german/netscape7/pkg-descr
+++ b/german/netscape7/pkg-descr
@@ -1,16 +1,15 @@
-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 is necessary if you want to use Linux versions of plugins.
-Many plugins are distributed only as Linux binaries.  The Sun Java
-and Macromedia Flash plugins are available.  AOL Instant Messenger
-is omitted (see ports/net/aim).  The German, French and US- American
-region packs, personal security manager, spell-checker, and talkback
-are available.
+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 is necessary if you want to use Linux versions of plugins.
+Many plugins are distributed only as Linux binaries.  The Sun Java and
+Macromedia Flash plugins are included in this port.  The German and French
+region packs, personal security manager, spell-checker, and talkback are
+available.
 
 For use with the Java plugin, linux_base-61 or linux_base-62 are
 recommended (not linux_base-7).
 
-WWW: http://www.netscape.de/netscapeprodukte/netscapebrowser/netscape62/
+WWW: http://www.netscape.de/netscapeprodukte/netscape70/
 
 Thomas E. Zander
 riggs@rrr.de
diff --git a/german/netscape7/pkg-message b/german/netscape7/pkg-message
index 83ef79c59b63..7531e1077bbd 100644
--- a/german/netscape7/pkg-message
+++ b/german/netscape7/pkg-message
@@ -1,7 +1,14 @@
-* WARNING *********************************************************************
-*    Users should back up their bookmark files.  There have been reports that *
-* the bookmark file can be clobbered the first time Netscape 6 is run.        *
-*    Problems have also been reported from running Mozilla and Netscape 6     *
-* simultaneously.  Both use $HOME/.mozilla for preferences, but some          *
-* configuration files seem to 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/german/netscape7/scripts/configure b/german/netscape7/scripts/configure
index d99b5c1783a2..1818bbe93cea 100644
--- a/german/netscape7/scripts/configure
+++ b/german/netscape7/scripts/configure
@@ -15,17 +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 11 \
-"browser"	"browser (6576 kB)"				ON \
-"defldede"	"German profile defaults (26 kB)"		ON \
-"flash"		"Flash plugin (576 kB)"				ON \
-"jre"		"Java plugin (13808 kB)"			ON \
-"langdede"	"German language pack (592 kB)"			ON \
-"mail"		"e-mail and news (1824 kB)"			ON \
-"regde"		"regional settings for Germany (56 kB)"		ON \
-"regfr"		"regional settings for France (52 kB)"		ON \
-"regus"		"regional settings for the USA (56 kB)"		ON \
-"spellchecker"	"spell-checker (1040 kB)"			ON \
-"talkback"	"sends bug reports to Netscape staff (832 kB)"	ON \
+"browser"	"browser"				ON \
+"defldede"	"German profile defaults"		ON \
+"flash"		"Flash plugin"				ON \
+"jre"		"Java plugin (requires linux_base-6"	ON \
+"langdede"	"German language pack"			ON \
+"mail"		"e-mail and news"			ON \
+"regde"		"regional settings for Germany"		ON \
+"regfr"		"regional settings for France"		ON \
+"spellchecker"	"spell-checker"				ON \
+"talkback"	"sends bug reports to Netscape staff"	ON \
 2> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -47,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" \