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, 29 insertions, 517 deletions

diff --git a/japanese/netscape7/Makefile b/japanese/netscape7/Makefile
index dee232725ea2..c2f14c2540cf 100644
--- a/japanese/netscape7/Makefile
+++ b/japanese/netscape7/Makefile
@@ -7,9 +7,9 @@
 #
 
 PKGNAMEPREFIX=	ja-
-PORTREVISION=	0
+PORTVERSION=	7.02
 CATEGORIES=	japanese www linux
-
+MASTER_SITE_SUBDIR=	${DIST_SUBDIR}/unix/linux22/eehxkt
 DISTFILES=	AIM.xpi \
 		browser.xpi \
 		defljajp.xpi \
diff --git a/japanese/netscape7/distinfo b/japanese/netscape7/distinfo
index 4d75df8b237f..8d1581b62bff 100644
--- a/japanese/netscape7/distinfo
+++ b/japanese/netscape7/distinfo
@@ -1,14 +1,13 @@
-MD5 (netscape7/japanese/7.0/AIM.xpi) = 0504089eb91a6a047b1ed0ee1af1abd2
-MD5 (netscape7/japanese/7.0/browser.xpi) = b2c20ce964369e05a45a57d4642bee33
-MD5 (netscape7/japanese/7.0/defljajp.xpi) = e010d9886d53a8ba1bdfa170ed6b653e
-MD5 (netscape7/japanese/7.0/flash.xpi) = 6e8547d6654430f268bdc61a8c251a33
-MD5 (netscape7/japanese/7.0/ja-linux-netscape7-7.0-generated-files.tar.gz) = 5d826663673a5f0e8028c5c66183278e
-MD5 (netscape7/japanese/7.0/jre.xpi) = bfb912644a0dfe310350c872f0f5fc23
-MD5 (netscape7/japanese/7.0/langjajp.xpi) = 8ec54ee2a4075c9783c9a4954b91cc34
-MD5 (netscape7/japanese/7.0/mail.xpi) = fed69cd5bc6db67f6936f369522a40e9
-MD5 (netscape7/japanese/7.0/psm.xpi) = 017e4a1146032bb5c1c5559335e662d4
-MD5 (netscape7/japanese/7.0/regjp.xpi) = 4a1f96fef353fd11f41b1a53985f5d60
-MD5 (netscape7/japanese/7.0/regus.xpi) = e394702833ddbae069a6486a867fbac8
-MD5 (netscape7/japanese/7.0/spellchecker.xpi) = 53028acfb5cde7b4de7cd8f83f4f1869
-MD5 (netscape7/japanese/7.0/talkback.xpi) = 511447c63e3f488d062ce81641aeaf4d
-MD5 (netscape7/japanese/7.0/xpcom.xpi) = a902c7cbe282968516ade1234ccf82fa
+MD5 (netscape7/japanese/7.02/AIM.xpi) = 08212710cb61652d3ff6c41b1e7db682
+MD5 (netscape7/japanese/7.02/browser.xpi) = a22562d8ad558366ef26d105e8cdd3c6
+MD5 (netscape7/japanese/7.02/defljajp.xpi) = b62aa0143409ada303be423add293b67
+MD5 (netscape7/japanese/7.02/flash.xpi) = 2139ac62528df78929c67a3ac81f0a48
+MD5 (netscape7/japanese/7.02/ja-netscape7-7.02-generated-files.tar.bz2) = 06ea8842b653fc0387be53caac31677a
+MD5 (netscape7/japanese/7.02/langjajp.xpi) = 47592c7476592bbac2a759a8515223cc
+MD5 (netscape7/japanese/7.02/mail.xpi) = 000fbc8741adc0db110c6b9ceb6eceb8
+MD5 (netscape7/japanese/7.02/psm.xpi) = 5a98cf3b82c0f8621030c74f2a8ad8d7
+MD5 (netscape7/japanese/7.02/regjp.xpi) = 8d2a38febddf6aea76692c0d8efb4253
+MD5 (netscape7/japanese/7.02/regus.xpi) = 25d89a38c36fce7158fc95d515c65d20
+MD5 (netscape7/japanese/7.02/spellchecker.xpi) = 5704497b8814304e5ef0ce099bd93e50
+MD5 (netscape7/japanese/7.02/talkback.xpi) = fcb28adbe8df9ff8d492a4df0b2f1220
+MD5 (netscape7/japanese/7.02/xpcom.xpi) = f8dd0d40ef7f5cfc55eac57bb6eb6334
diff --git a/japanese/netscape7/files/all-locales.rdf b/japanese/netscape7/files/all-locales.rdf
deleted file mode 100644
index a55c4acceefa..000000000000
--- a/japanese/netscape7/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: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:JP"
-                   c:displayName="JP Region"
-                   c:localeType="region"
-                   c:author="mozilla.org"
-                   c:name="JP"
-                   c:previewURL="http://www.mozilla.org/locales/JP.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:JP:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:global"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/global/">
-    <c:package resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:content-packs"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/content-packs/">
-    <c:package resource="urn:mozilla:package:content-packs"/>
-  </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: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:JP:messenger-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/JP.jar!/locale/JP/messenger-region/">
-    <c:package resource="urn:mozilla:package:messenger-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:communicator"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/communicator/">
-    <c:package resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:help"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/help/">
-    <c:package resource="urn:mozilla:package:help"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:wallet"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/wallet/">
-    <c:package resource="urn:mozilla:package:wallet"/>
-  </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: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:ja-JP:necko"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/necko/">
-    <c:package resource="urn:mozilla:package:necko"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:pippki"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pippki/">
-    <c:package resource="urn:mozilla:package:pippki"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:global-platform"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/global-platform/">
-    <c:package resource="urn:mozilla:package:global-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:JP:global-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/JP.jar!/locale/JP/global-region/">
-    <c:package resource="urn:mozilla:package:global-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:navigator"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/navigator/">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:JP:communicator-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/">
-    <c:package resource="urn:mozilla:package:communicator-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:Seq about="urn:mozilla:locale:ja-JP:packages">
-    <RDF:li resource="urn:mozilla:locale:ja-JP:global"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:communicator"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:messenger"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:editor"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:navigator"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:mozldap"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:necko"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:cookie"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:wallet"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:content-packs"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:help"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:pipnss"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:pippki"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:global-platform"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:communicator-platform"/>
-    <RDF:li resource="urn:mozilla:locale:ja-JP:navigator-platform"/>
-  </RDF:Seq>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:messenger"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:JP:editor-region"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/JP.jar!/locale/JP/editor-region/">
-    <c:package resource="urn:mozilla:package:editor-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:communicator-platform"
-                   c:baseURL="jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:communicator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:mozldap"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/mozldap/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:mozldap"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:cookie"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/">
-    <c:package resource="urn:mozilla:package:cookie"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:pipnss"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pipnss/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:pipnss"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:navigator-platform"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/navigator-platform/">
-    <c:package resource="urn:mozilla:package:navigator-platform"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP"
-                   c:displayName="Japanese (Japan)"
-                   c:author="mozilla.org"
-                   c:name="ja-JP"
-                   c:previewURL="http://www.mozilla.org/locales/ja-JP.gif"
-                   c:locType="install">
-    <c:packages resource="urn:mozilla:locale:ja-JP:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:JP:navigator-region"
-                   c:baseURL="jar:resource:/chrome/JP.jar!/locale/JP/navigator-region/"
-                   c:localeVersion="0.9.4">
-    <c:package resource="urn:mozilla:package:navigator-region"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:ja-JP:editor"
-                   c:localeVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/editor/">
-    <c:package resource="urn:mozilla:package:editor"/>
-  </RDF:Description>
-  <RDF:Seq about="urn:mozilla:locale:JP:packages">
-    <RDF:li resource="urn:mozilla:locale:JP:global-region"/>
-    <RDF:li resource="urn:mozilla:locale:JP:communicator-region"/>
-    <RDF:li resource="urn:mozilla:locale:JP:editor-region"/>
-    <RDF:li resource="urn:mozilla:locale:JP:messenger-region"/>
-    <RDF:li resource="urn:mozilla:locale:JP:navigator-region"/>
-  </RDF:Seq>
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:ja-JP"/>
-    <RDF:li resource="urn:mozilla:locale:JP"/>
-    <RDF:li resource="urn:mozilla:locale:US"/>
-  </RDF:Seq>
-  <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:RDF>
diff --git a/japanese/netscape7/files/all-packages.rdf b/japanese/netscape7/files/all-packages.rdf
deleted file mode 100644
index 34d8535ccd53..000000000000
--- a/japanese/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: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: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: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: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: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: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: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: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: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: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"
-                   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: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: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: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: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: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: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:global-region"
-                   c:baseURL="jar:resource:/chrome/toolkit.jar!/content/global-region/"
-                   c:locType="install"
-                   c:displayName="JP Regional Contents"
-                   c:author="mozilla.org"
-                   c:name="global-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:RDF>
diff --git a/japanese/netscape7/files/all-skins.rdf b/japanese/netscape7/files/all-skins.rdf
deleted file mode 100644
index a07227d61574..000000000000
--- a/japanese/netscape7/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: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: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:messenger"
-                   c:baseURL="jar:resource:/chrome/classic.jar!/skin/classic/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: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: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: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:navigator"
-                   c:skinVersion="0.9.4"
-                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/navigator/"
-                   c:allowScripts="false">
-    <c:package resource="urn:mozilla:package:navigator"/>
-  </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: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: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:classic/1.0"
-                   c:displayName="クラシック"
-                   c:accessKey="C"
-                   c:author="mozilla.org"
-                   c:description="これは以前の Windows 版 Netscape バージョンでお馴染みのテーマによく似ています。"
-                   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: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:modern/1.0"
-                   c:displayName="モダン"
-                   c:author="Netscape"
-                   c:description="これは Netscape 6 でデフォルトとして使用されているテーマです。テーマをオリジナルの設定に戻したい場合に適用します。"
-                   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: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:RDF>
diff --git a/japanese/netscape7/pkg-descr b/japanese/netscape7/pkg-descr
index 0bb0d8393fc9..1f89801d67b6 100644
--- a/japanese/netscape7/pkg-descr
+++ b/japanese/netscape7/pkg-descr
@@ -1,10 +1,7 @@
 This is a Linux version of the Netscape suite (Web browser, HTML editor, mail
 user agent and news reader).  It is compatible with Linux versions of plugins.
-The Sun Java and Macromedia Flash plugins are available in this port, as are the
-Japanese and U.S.  regional packs, personal security manager, spell-checker, and
-talkback.  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).
+The Macromedia Flash plugin is available in this port, as are the Japanese and
+U.S.  regional packs, personal security manager, spell-checker, and talkback.
+AOL Instant Messenger is installed if the browser is selected.
 
 WWW: http://home.netscape.com/ja/browsers/6/
diff --git a/japanese/netscape7/pkg-message b/japanese/netscape7/pkg-message
index 27e5efb6034c..0d850653f6c5 100644
--- a/japanese/netscape7/pkg-message
+++ b/japanese/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/japanese/netscape7/scripts/configure b/japanese/netscape7/scripts/configure
index c3512fa5bfc1..47da672d73e1 100644
--- a/japanese/netscape7/scripts/configure
+++ b/japanese/netscape7/scripts/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/japanese/netscape7/scripts/Attic/configure,v 1.3 2002-10-14 13:50:20 trevor Exp $
+# $FreeBSD: /tmp/pcvs/ports/japanese/netscape7/scripts/Attic/configure,v 1.4 2003-07-03 09:55:02 trevor Exp $
 
 echo ${WRKSRC}/components.conf
 if [ -f ${WRKSRC}/components.conf ]; then
@@ -11,14 +11,13 @@ tempfile=`/usr/bin/mktemp -t checklist`
 
 if [ -z "${BATCH}" ]; then
 
-/usr/bin/dialog --title "Netscape 6 component selection" --clear \
+/usr/bin/dialog --title "Netscape 7 component selection" --clear \
 	--checklist "\n\
-Choose components of Netscape 6 to download and install. \n\
+Choose components of Netscape 7 to download and install. \n\
 Press the space bar to toggle selections." -1 -1 10 \
 "browser"	"Web browser"				ON \
 "defljajp"	"Japanese/Japan profile defaults"	ON \
 "flash"		"Flash plugin"				ON \
-"jre"		"Java plugin (requires linux_base-6"	ON \
 "langjajp"	"Japanese/Japan language pack"		ON \
 "mail"		"e-mail and news"			ON \
 "regjp"		"regional settings for Japan"		ON \
@@ -53,3 +52,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