8 files changed, 29 insertions, 595 deletions

diff --git a/portuguese/netscape7/Makefile b/portuguese/netscape7/Makefile
index ffc008f375ad..24e616a5b8f1 100644
--- a/portuguese/netscape7/Makefile
+++ b/portuguese/netscape7/Makefile
@@ -7,14 +7,13 @@
 #
 
 PKGNAMEPREFIX=	pt_BR-
-PORTVERSION=	7.0
+PORTVERSION=	7.02
 CATEGORIES?=	portuguese www linux
-MASTER_SITE_SUBDIR?=${DIST_SUBDIR}/unix/linux22/ewc9e
+MASTER_SITE_SUBDIR=	${DIST_SUBDIR}/unix/linux22/eehxkt
 DISTFILES=	AIM.xpi \
 		browser.xpi \
 		deflptbr.xpi \
 		flash.xpi \
-		jre.xpi \
 		langptbr.xpi \
 		mail.xpi \
 		psm.xpi \
diff --git a/portuguese/netscape7/distinfo b/portuguese/netscape7/distinfo
index 66fdc7d39d11..f4bc8ecd0897 100644
--- a/portuguese/netscape7/distinfo
+++ b/portuguese/netscape7/distinfo
@@ -1,13 +1,12 @@
-MD5 (netscape7/portuguese_br/7.0/AIM.xpi) = 6bdd1e2a210b646df7e4d999d35b7865
-MD5 (netscape7/portuguese_br/7.0/browser.xpi) = e89a67da218c99416cf57c1bb2793fa1
-MD5 (netscape7/portuguese_br/7.0/deflptbr.xpi) = 97ddf85ae6695cce0cbf2a1c4dcbd23a
-MD5 (netscape7/portuguese_br/7.0/flash.xpi) = 6e8547d6654430f268bdc61a8c251a33
-MD5 (netscape7/portuguese_br/7.0/jre.xpi) = bfb912644a0dfe310350c872f0f5fc23
-MD5 (netscape7/portuguese_br/7.0/langptbr.xpi) = 306b3f8573cf0c6b9599cb381e3271e8
-MD5 (netscape7/portuguese_br/7.0/mail.xpi) = fed69cd5bc6db67f6936f369522a40e9
-MD5 (netscape7/portuguese_br/7.0/psm.xpi) = 017e4a1146032bb5c1c5559335e662d4
-MD5 (netscape7/portuguese_br/7.0/pt_BR-linux-netscape7-7.0-generated-files.tar.gz) = d0c9ddeb445d8de064e4c79dcc41766b
-MD5 (netscape7/portuguese_br/7.0/regbr.xpi) = 3f0da4b7ca68c400d1db6879282c95dc
-MD5 (netscape7/portuguese_br/7.0/spellchecker.xpi) = afaf8afbdd457b40274631831bedc536
-MD5 (netscape7/portuguese_br/7.0/talkback.xpi) = 511447c63e3f488d062ce81641aeaf4d
-MD5 (netscape7/portuguese_br/7.0/xpcom.xpi) = a902c7cbe282968516ade1234ccf82fa
+MD5 (netscape7/portuguese_br/7.02/AIM.xpi) = c4fc4d631b365650f56c873dfffe4f35
+MD5 (netscape7/portuguese_br/7.02/browser.xpi) = 6a7f4a5f84e6193d3f00da930eba048e
+MD5 (netscape7/portuguese_br/7.02/deflptbr.xpi) = f60d0867140ca793e3df261507725f1b
+MD5 (netscape7/portuguese_br/7.02/flash.xpi) = 2139ac62528df78929c67a3ac81f0a48
+MD5 (netscape7/portuguese_br/7.02/langptbr.xpi) = b6e99bc73d5d2796bc34071bfdca9673
+MD5 (netscape7/portuguese_br/7.02/mail.xpi) = 000fbc8741adc0db110c6b9ceb6eceb8
+MD5 (netscape7/portuguese_br/7.02/psm.xpi) = 5a98cf3b82c0f8621030c74f2a8ad8d7
+MD5 (netscape7/portuguese_br/7.02/pt_BR-netscape7-7.02-generated-files.tar.bz2) = 4637bcecb2110ef951c0d8d1631fc21a
+MD5 (netscape7/portuguese_br/7.02/regbr.xpi) = b48c6816cbb902ce6b89f8cad5e1c0e7
+MD5 (netscape7/portuguese_br/7.02/spellchecker.xpi) = 3d0e43e518db8f96f664f398998992f5
+MD5 (netscape7/portuguese_br/7.02/talkback.xpi) = fcb28adbe8df9ff8d492a4df0b2f1220
+MD5 (netscape7/portuguese_br/7.02/xpcom.xpi) = f8dd0d40ef7f5cfc55eac57bb6eb6334
diff --git a/portuguese/netscape7/files/all-locales.rdf b/portuguese/netscape7/files/all-locales.rdf
deleted file mode 100644
index 5c5ff08226bf..000000000000
--- a/portuguese/netscape7/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/portuguese/netscape7/files/all-packages.rdf b/portuguese/netscape7/files/all-packages.rdf
deleted file mode 100644
index e41e60a5ea94..000000000000
--- a/portuguese/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: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/portuguese/netscape7/files/all-skins.rdf b/portuguese/netscape7/files/all-skins.rdf
deleted file mode 100644
index a3b85f56aa69..000000000000
--- a/portuguese/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: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/portuguese/netscape7/pkg-descr b/portuguese/netscape7/pkg-descr
index 450a5fd8c248..c5192f006ab7 100644
--- a/portuguese/netscape7/pkg-descr
+++ b/portuguese/netscape7/pkg-descr
@@ -1,9 +1,9 @@
-This is a Brazilian Portuguese, 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 Brazilian region pack,
-personal security manager, spell-checker, and talkback are available.
+This is a Brazilian Portuguese, 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
+Macromedia Flash plugin is available in this port, as are the Brazilian region
+pack, personal security manager, spell-checker, and talkback.  AOL Instant
+Messenger is installed if the browser is selected.
 
 WWW: http://www.aol.com.br/netscape/novo_n7.adp
diff --git a/portuguese/netscape7/pkg-message b/portuguese/netscape7/pkg-message
index 27e5efb6034c..0d850653f6c5 100644
--- a/portuguese/netscape7/pkg-message
+++ b/portuguese/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/portuguese/netscape7/scripts/configure b/portuguese/netscape7/scripts/configure
index 17703c0f5d4c..0aa3aced1d87 100644
--- a/portuguese/netscape7/scripts/configure
+++ b/portuguese/netscape7/scripts/configure
@@ -18,7 +18,6 @@ Press the space bar to toggle selections." -1 -1 11 \
 "browser"	"browser"				ON \
 "deflptbr"	"Brazilian Portuguese profile defaults"	ON \
 "flash"		"Flash plugin"				ON \
-"jre"		"Java plugin"				ON \
 "langptbr"	"Brazilian Portuguese language pack"	ON \
 "mail"		"e-mail and news"			ON \
 "regbr"		"regional settings for Brazil"		ON \
@@ -52,3 +51,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