Security fix: update to the latest versions: 7.1 for American

English; and 7.02 for French, German, Japanese, and Brazilian
Portuguese.  These are reportedly free of the onunload referrer bug
(#145579 in bugzilla).

The Sun Java plugin is no longer available from the same places.
AIM is needed by the 7.02 versions.  The DOM inspector and "venkman"
JavaScript debugger are available for 7.1.

Compress generated files with bzip2; omit "linux-" from their names.

The RDF files provided by the ports are no longer needed.

Update references to Netscape 6.

Run chmod to fix permissions on extracted files (for the Portuguese
slave port).

Remove unneeded XXXchecksum target.

Change the configuration process, so that extraneous files are not
downloaded.  This resolves PR 44101, submitted by Fernan Aguero.

8 files changed, 46 insertions, 694 deletions

diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 8317a1edef99..5239ed2b238b 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -7,21 +7,19 @@
 #
 
 PORTNAME=	netscape7
-PORTVERSION=	7.0
+PORTVERSION?=	7.1
 CATEGORIES?=	www linux
 MASTER_SITES=	${MASTER_SITE_NETSCAPE}
 DIST_SUBDIR=	${MAJ}/${NETSCAPE_LANG}/${VER}
-MASTER_SITE_SUBDIR?=${DIST_SUBDIR}/unix/linux22/ewc9e
+MASTER_SITE_SUBDIR?=${DIST_SUBDIR}/unix/linux22/jgksyc
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	trevor
-PATCHFILES=	${PKGNAMEPREFIX}linux-${MAJ}-${VER}-generated-files.tar.gz
+PATCHFILES=	${PKGNAMEPREFIX}${MAJ}-${VER}-generated-files.tar.bz2
 
 MAINTAINER?=	trevor@FreeBSD.org
 COMMENT=	Linux Netscape suite
 
-FORBIDDEN=	"security bug--see <URL:http://wp.netscape.com/eng/mozilla/ns7/relnotes/7.html\#psm> and <URL:http://www.xwt.org/sop.txt>"
-
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
 LATEST_LINK=	linux-${MAJ}
@@ -30,7 +28,7 @@ NETSCAPE_LANG?=english
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	i386
-RESTRICTED=	"License for Java plugin allows internal use only.  Also see license for Netscape itself"
+RESTRICTED=	"no redistribution"
 NO_CDROM=	${RESTRICTED}
 USE_LINUX=	yes
 USE_XLIB=	yes
@@ -50,13 +48,15 @@ IS_INTERACTIVE=	yes
 pre-everything::
 	${MKDIR} ${WRKSRC}/bin/plugins ${WRKSRC}/bin/chrome \
 		${WRKSRC}/plugins
+.if !exists(${WRKDIRPREFIX}${.CURDIR}/work/netscape-installer/xpi/components.conf)
 .if !defined(BATCH)
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
+.endif
 DISTFILES?=	browser.xpi \
 		deflenus.xpi \
 		flash.xpi \
-		jre.xpi \
+		inspector.xpi \
 		langenus.xpi \
 		mail.xpi \
 		psm.xpi \
@@ -64,54 +64,22 @@ DISTFILES?=	browser.xpi \
 		regus.xpi \
 		spellchecker.xpi \
 		talkback.xpi \
+		venkman.xpi \
 		xpcom.xpi
+
 .if exists(${WRKDIRPREFIX}${.CURDIR}/work/netscape-installer/xpi/components.conf)
 DISTFILES!=${CAT} ${WRKDIRPREFIX}${.CURDIR}/work/netscape-installer/xpi/components.conf
 .endif
 
-XXXchecksum:
-.if !defined(REAL_EXTRACT)
-	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch
-.endif
-	@if [ ! -f ${MD5_FILE} ]; then \
-		${ECHO_MSG} ">> No MD5 checksum file."; \
-	else \
-		(cd ${DISTDIR}; OK="true"; \
-		  for file in ${_CKSUMFILES}; do \
-			if [ -r $$file ]; then \
-				CKSUM=`${MD5} < $$file`; \
-				CKSUM2=`${GREP} "^MD5 ($$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
-				if [ "$$CKSUM2" = "" ]; then \
-					${ECHO_MSG} ">> No checksum recorded for $$file."; \
-					OK="false"; \
-				elif ${EXPR} "$$CKSUM2" : ".*$$CKSUM" > /dev/null; then \
-					${ECHO_MSG} ">> Checksum OK for $$file."; \
-			else \
-					${ECHO_MSG} ">> Checksum mismatch for $$file."; \
-					OK="false"; \
-				fi; \
-			fi; \
-		  done; \
-		  if [ "$$OK" != "true" ]; then \
-			${ECHO_MSG} "Make sure the Makefile and distinfo file (${MD5_FILE})"; \
-			${ECHO_MSG} "are up to date.  If you are absolutely sure you want to override this"; \
-			${ECHO_MSG} "check, type \"make NO_CHECKSUM=yes [other args]\"."; \
-			exit 1; \
-		  fi) ; \
-	fi
-
 do-extract:
 .for ii in ${DISTFILES}
 	unzip -qo ${DISTDIR}/${DIST_SUBDIR}/${ii} -d ${WRKSRC}
+	${CHMOD} -R go-w ${WRKDIR}
 .endfor
-	- ${MV} ${WRKSRC}/jre-image-i386 ${WRKSRC}/bin/plugins/java2
-	- ${MV} ${WRKSRC}/jre1.3.1_02 ${WRKSRC}/bin/plugins/java2
-	cd ${WRKSRC}/bin/plugins && ${LN} -s java2/plugin/i386/ns600/libjavaplugin_oji.so;
 
 do-patch:
-	${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/bin/chrome/user-skins.rdf ${WRKSRC}/bin/chrome/user-locales.rdf
-	${CP} -p ${FILESDIR}/*rdf ${WRKSRC}/bin/chrome
-	${TAR} -C ${WRKSRC}/bin -xzf ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES}
+	${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} | \
+		${TAR} -C ${WRKSRC}/bin -xf -
 
 do-configure:
 #	- kldload linux
diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo
index 2324f2c06f0f..e64f2c996f6f 100644
--- a/www/netscape7/distinfo
+++ b/www/netscape7/distinfo
@@ -1,13 +1,14 @@
-MD5 (netscape7/english/7.0/browser.xpi) = 0ac852189fcce97f998d35e5b8aa9cf9
-MD5 (netscape7/english/7.0/deflenus.xpi) = 39587d9c433e54a11732597616c17635
-MD5 (netscape7/english/7.0/flash.xpi) = 6e8547d6654430f268bdc61a8c251a33
-MD5 (netscape7/english/7.0/jre.xpi) = bfb912644a0dfe310350c872f0f5fc23
-MD5 (netscape7/english/7.0/langenus.xpi) = ac84af8724063a2f20dbaa18b70da5cc
-MD5 (netscape7/english/7.0/linux-netscape7-7.0-generated-files.tar.gz) = e887f87d715bce3f35d30608e8c6fd05
-MD5 (netscape7/english/7.0/mail.xpi) = fed69cd5bc6db67f6936f369522a40e9
-MD5 (netscape7/english/7.0/psm.xpi) = 017e4a1146032bb5c1c5559335e662d4
-MD5 (netscape7/english/7.0/regca.xpi) = fe67e56f693c9f811bcd8c763ae8f96c
-MD5 (netscape7/english/7.0/regus.xpi) = e394702833ddbae069a6486a867fbac8
-MD5 (netscape7/english/7.0/spellchecker.xpi) = 53028acfb5cde7b4de7cd8f83f4f1869
-MD5 (netscape7/english/7.0/talkback.xpi) = 511447c63e3f488d062ce81641aeaf4d
-MD5 (netscape7/english/7.0/xpcom.xpi) = a902c7cbe282968516ade1234ccf82fa
+MD5 (netscape7/english/7.1/browser.xpi) = a493024133fd89ec72b899736adf13cb
+MD5 (netscape7/english/7.1/deflenus.xpi) = e0dd1a65dbe4fdcd3638797e85c11041
+MD5 (netscape7/english/7.1/flash.xpi) = 9684912cb7214e94d51aa3d549b117c2
+MD5 (netscape7/english/7.1/inspector.xpi) = 34af4d04d70c4573ea212fa545a44f21
+MD5 (netscape7/english/7.1/langenus.xpi) = 3e060ba3310f54ff9a15aa837e57b9a9
+MD5 (netscape7/english/7.1/linux-netscape7-7.1-generated-files.tar.bz2) = 0271ea678c735fd755646027947004a5
+MD5 (netscape7/english/7.1/mail.xpi) = 8f924e20c8805306340fea9bcab3f039
+MD5 (netscape7/english/7.1/psm.xpi) = b55f31b35bd60253c525ad0f2c26c8e5
+MD5 (netscape7/english/7.1/regca.xpi) = d00150fd7edbbdc450e1c92cb2b2f00d
+MD5 (netscape7/english/7.1/regus.xpi) = 743a99bbc0746c3e6ec116f431a0f6d9
+MD5 (netscape7/english/7.1/spellchecker.xpi) = 52c1718577b84c982aaf578bb89083e6
+MD5 (netscape7/english/7.1/talkback.xpi) = b90901659af6209de09d1541e8fa435e
+MD5 (netscape7/english/7.1/venkman.xpi) = 50592cdda883a36bd61b47a9c75f0b56
+MD5 (netscape7/english/7.1/xpcom.xpi) = c4c08049cfd507d8357f7956b525b3ea
diff --git a/www/netscape7/files/all-locales.rdf b/www/netscape7/files/all-locales.rdf
deleted file mode 100644
index 172016c9d53f..000000000000
--- a/www/netscape7/files/all-locales.rdf
+++ /dev/null
@@ -1,311 +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:GB:communicator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/GB.jar!/locale/GB/communicator-region/">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ES:editor-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ES.jar!/locale/ES/editor-region/">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:GB:editor-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/GB.jar!/locale/GB/editor-region/">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:necko"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/necko/">
-    <c:package resource="urn:mozilla:package:necko"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:CA:editor-region"
-                   c:baseURL="jar:resource:/chrome/CA.jar!/locale/CA/editor-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:global-platform"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-unix.jar!/locale/en-US/global-platform/">
-    <c:package resource="urn:mozilla:package:global-platform"/>
-  </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:Seq about="urn:mozilla:locale:CA:packages">
-    <RDF:li resource="urn:mozilla:locale:CA:aim-region"/>
-    <RDF:li resource="urn:mozilla:locale:CA:global-region"/>
-    <RDF:li resource="urn:mozilla:locale:CA:communicator-region"/>
-    <RDF:li resource="urn:mozilla:locale:CA:editor-region"/>
-    <RDF:li resource="urn:mozilla:locale:CA:messenger-region"/>
-    <RDF:li resource="urn:mozilla:locale:CA:navigator-region"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:en-US:cookie"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/cookie/">
-    <c:package resource="urn:mozilla:package:cookie"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:global"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/global/">
-    <c:package resource="urn:mozilla:package:global"/>
-  </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:en-US:pippki"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/pippki/">
-    <c:package resource="urn:mozilla:package:pippki"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US"
-                   c:displayName="English (US)"
-                   c:author="mozilla.org"
-                   c:name="en-US"
-                   c:previewURL="http://www.mozilla.org/locales/en-US.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:en-US:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:CA:navigator-region"
-                   c:baseURL="jar:resource:/chrome/CA.jar!/locale/CA/navigator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:help"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/help/">
-    <c:package resource="urn:mozilla:package:help"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:GB:global-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/GB.jar!/locale/GB/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:CA:messenger-region"
-                   c:baseURL="jar:resource:/chrome/CA.jar!/locale/CA/messenger-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:CA:aim-region"
-                   c:baseURL="jar:resource:/chrome/CA.jar!/locale/CA/aim-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:aim-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:mozldap"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/mozldap/">
-    <c:package resource="urn:mozilla:package:mozldap"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ES:communicator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ES.jar!/locale/ES/communicator-region/">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:GB:aim-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/GB.jar!/locale/GB/aim-region/">
-    <c:package resource="urn:mozilla:package:aim-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:editor"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/editor/">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </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:CA:global-region"
-                   c:baseURL="jar:resource:/chrome/CA.jar!/locale/CA/global-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:global-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:CA"
-                   c:displayName="Canadian Region"
-                   c:localeType="region"
-                   c:author="mozilla.org"
-                   c:name="CA"
-                   c:previewURL="http://www.mozilla.org/locales/CA.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:CA:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ES:global-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ES.jar!/locale/ES/global-region/">
-    <c:package resource="urn:mozilla:package:global-region"/>
-  </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:en-US:communicator-platform"
-                   c:baseURL="jar:resource:/chrome/en-unix.jar!/locale/en-US/communicator-platform/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:GB:navigator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/GB.jar!/locale/GB/navigator-region/">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:pipnss"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/pipnss/">
-    <c:package resource="urn:mozilla:package:pipnss"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:CA:communicator-region"
-                   c:baseURL="jar:resource:/chrome/CA.jar!/locale/CA/communicator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:wallet"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/wallet/">
-    <c:package resource="urn:mozilla:package:wallet"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:GB"
-                   c:displayName="UK Region"
-                   c:localeType="region"
-                   c:author="mozilla.org"
-                   c:name="GB"
-                   c:previewURL="http://www.mozilla.org/locales/GB.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:GB:packages"/>
-  </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:Description about="urn:mozilla:locale:GB:messenger-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/GB.jar!/locale/GB/messenger-region/">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/messenger/">
-    <c:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:aim"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/aim/">
-    <c:package resource="urn:mozilla:package:aim"/>
-  </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:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-    <RDF:li resource="urn:mozilla:locale:US"/>
-    <RDF:li resource="urn:mozilla:locale:CA"/>
-    <RDF:li resource="urn:mozilla:locale:ES"/>
-    <RDF:li resource="urn:mozilla:locale:GB"/>
-  </RDF:Seq>
-  <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:Description about="urn:mozilla:locale:ES"
-                   c:displayName="Latin American Region"
-                   c:localeType="region"
-                   c:author="mozilla.org"
-                   c:name="ES"
-                   c:previewURL="http://www.mozilla.org/locales/ES.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:ES:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ES:navigator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ES.jar!/locale/ES/navigator-region/">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/navigator/">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:navigator-platform"
-                   c:baseURL="jar:resource:/chrome/en-unix.jar!/locale/en-US/navigator-platform/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:content-packs"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/content-packs/">
-    <c:package resource="urn:mozilla:package:content-packs"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ES:messenger-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ES.jar!/locale/ES/messenger-region/">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/en-US.jar!/locale/en-US/communicator/">
-    <c:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-    <RDF:li resource="urn:mozilla:locale:en-US:global"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:communicator"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:messenger"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:editor"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:navigator"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:aim"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:mozldap"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:necko"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:cookie"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:wallet"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:content-packs"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:help"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:pipnss"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:pippki"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:global-platform"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
-    <RDF:li resource="urn:mozilla:locale:en-US:navigator-platform"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:ES:aim-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ES.jar!/locale/ES/aim-region/">
-    <c:package resource="urn:mozilla:package:aim-region"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:GB:packages">
-    <RDF:li resource="urn:mozilla:locale:GB:aim-region"/>
-    <RDF:li resource="urn:mozilla:locale:GB:global-region"/>
-    <RDF:li resource="urn:mozilla:locale:GB:communicator-region"/>
-    <RDF:li resource="urn:mozilla:locale:GB:editor-region"/>
-    <RDF:li resource="urn:mozilla:locale:GB:messenger-region"/>
-    <RDF:li resource="urn:mozilla:locale:GB:navigator-region"/>
-  </RDF:Seq>
-  <RDF:Seq about="urn:mozilla:locale:ES:packages">
-    <RDF:li resource="urn:mozilla:locale:ES:aim-region"/>
-    <RDF:li resource="urn:mozilla:locale:ES:global-region"/>
-    <RDF:li resource="urn:mozilla:locale:ES:communicator-region"/>
-    <RDF:li resource="urn:mozilla:locale:ES:editor-region"/>
-    <RDF:li resource="urn:mozilla:locale:ES:messenger-region"/>
-    <RDF:li resource="urn:mozilla:locale:ES:navigator-region"/>
-  </RDF:Seq>
-</RDF:RDF>
diff --git a/www/netscape7/files/all-packages.rdf b/www/netscape7/files/all-packages.rdf
deleted file mode 100644
index d47883f6b8a9..000000000000
--- a/www/netscape7/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: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: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: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"
-                   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:global-region"
-                   c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global-region/"
-                   c:locType="install"
-                   c:displayName="US Regional Contents"
-                   c:author="mozilla.org"
-                   c:name="global-region"
-                   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: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: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: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: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: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: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: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: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"
-                   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-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: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: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: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: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:RDF>
diff --git a/www/netscape7/files/all-skins.rdf b/www/netscape7/files/all-skins.rdf
deleted file mode 100644
index d11df3d90211..000000000000
--- a/www/netscape7/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:Description about="urn:mozilla:skin:modern/1.0"
-                   c:displayName="Modern"
-                   c:author="Netscape"
-                   c:description="This is the default theme for Netscape 6. Apply this theme if you want to restore the original setting."
-                   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: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:Description about="urn:mozilla:skin:classic/1.0"
-                   c:displayName="Classic"
-                   c:accessKey="C"
-                   c:author="mozilla.org"
-                   c:description="This theme simulates the familiar appearance of previous Netscape versions for the Windows operating system."
-                   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: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: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: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: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: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:Description about="urn:mozilla:skin:classic/1.0:editor"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/editor/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:global"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/global/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:global"/>
-  </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: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: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:Description about="urn:mozilla:skin:classic/1.0:aim"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/aim/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:aim"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/www/netscape7/pkg-descr b/www/netscape7/pkg-descr
index df073d8f9ab7..0d42aab9db9f 100644
--- a/www/netscape7/pkg-descr
+++ b/www/netscape7/pkg-descr
@@ -1,15 +1,8 @@
-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 included.  AOL Instant Messenger
-is omitted (see ports/net/aim).  The Canadian and United States
-region packs, spell-checker, and talkback are available.
-
-The Java plugin requires linux_base-6.  It does not work with
-linux_base 7.1.
+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 Macromedia Flash plugin is available, as are the
+Canadian and United States region packs, spell-checker, and talkback.  AOL
+Instant Messenger is omitted (see ports/net/aim).
 
 WWW:  http://channels.netscape.com/ns/browsers/default.jsp/
-
-Trevor Johnson
-trevor@FreeBSD.org
diff --git a/www/netscape7/pkg-message b/www/netscape7/pkg-message
index 27e5efb6034c..0d850653f6c5 100644
--- a/www/netscape7/pkg-message
+++ b/www/netscape7/pkg-message
@@ -1,17 +1,4 @@
-* WARNING **********************************************************************
-* Using the same profile for Netscape 7 and Mozilla is strongly discouraged.   *
-* See <URL:http://wp.netscape.com/eng/mozilla/ns7/relnotes/7.html#prefs>.      *
-*                                                                              *
-* 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.                                        *
-********************************************************************************
+* WARNING ********************************************************************
+* Using the same profile for Netscape 7 and Mozilla is strongly discouraged. *
+* See <URL:http://wp.netscape.com/eng/mozilla/ns7/relnotes/7.html#prefs>.    *
+******************************************************************************
diff --git a/www/netscape7/scripts/configure b/www/netscape7/scripts/configure
index f4d35354e453..9de10c286d80 100644
--- a/www/netscape7/scripts/configure
+++ b/www/netscape7/scripts/configure
@@ -14,18 +14,19 @@ if [ -z "${BATCH}" ]; then
 
 /usr/bin/dialog --title "Netscape 7 component selection" --clear \
 	--checklist "\n\
-Choose components of Netscape 7 to install. \n\
+Choose components of Netscape 7 to download and install. \n\
 Press the space bar to toggle selections." -1 -1 12 \
-"browser"	"Web browser (8448 kB)"				ON \
+"browser"	"Web browser (10016 kB)"			ON \
 "deflenus"	"American English profile defaults (26 kB)"	ON \
 "flash"		"Flash plugin (576 kB)"				ON \
-"jre"		"Java plugin (28592 kB) needs linux_base-6"	OFF \
-"langenus"	"American English language pack (800 kB)"	ON \
-"mail"		"e-mail and news (2064 kB)"			ON \
+"langenus"	"American English language pack (864 kB)"	ON \
+"mail"		"e-mail and news--requires browser (2064 kB)"	ON \
 "regca"		"regional settings for Canada (58 kB)"		ON \
 "regus"		"regional settings for the USA (60 kB)"		ON \
 "spellchecker"	"spell-checker (544 kB)"			ON \
 "talkback"	"sends bug reports to Netscape staff (832 kB)"	ON \
+"inspector"	"DOM inspector (154 kB)"			ON \
+"venkman"	"JavaScript debugger (224 kB)"			ON \
 2> /tmp/checklist.tmp.$$
 
 retval=$?
@@ -54,3 +55,7 @@ echo "$choice" \
 	| perl -pi -e "s/ /\n/g" \
 	> ${WRKSRC}/components.conf
 fi
+
+echo "* Your choices are saved.  You must run the \"make\" command again to"
+echo "* complete the build.  Ignore the \"Error code 1\" below."
+exit 1