6 files changed, 581 insertions, 161 deletions

diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 6be0d5558bbb..60d041b45078 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	linux-netscape
-PORTVERSION=	6.2
-PORTREVISION=	1
+PORTVERSION=	6.2.1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
 		ftp://ftp.bu.edu/pub/mirrors/ftp.netscape.com/pub/netscape6/english/${PORTVERSION}/unix/linux22/xpi/ \
@@ -62,7 +61,7 @@ DIST_SUBDIR=	netscape6/english/${PORTVERSION}
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	trevor
-PATCHFILES=	linux-netscape6-${PORTVERSION}-generated-files-v2.tar.gz
+PATCHFILES=	linux-netscape6-${PORTVERSION}-generated-files.tar.gz
 
 MAINTAINER=	trevor@FreeBSD.org
 
@@ -76,7 +75,7 @@ LINUX_BASE=	/compat/linux
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 ONLY_FOR_ARCHS=	i386
-RESTRICTED=	"license for Java plugin allows `internal use only'"
+RESTRICTED=	"License for Java plugin allows internal use only.  Also see license for Netscape itself."
 NO_PACKAGE=	${RESTRICTED}
 NO_CDROM=	${RESTRICTED}
 USE_XLIB=	yes
diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo
index 312c5f1ae9d4..4f7ff5174bc5 100644
--- a/www/netscape7/distinfo
+++ b/www/netscape7/distinfo
@@ -1,16 +1,16 @@
-MD5 (netscape6/english/6.2/browser.xpi) = 01596e3c26fd8c2efd2025f7db99e453
-MD5 (netscape6/english/6.2/deflenus.xpi) = 306e3d143b45980bb9036aea9c35f27e
-MD5 (netscape6/english/6.2/langenus.xpi) = 419ce3befd7240b0a486468e05b297ea
-MD5 (netscape6/english/6.2/flash.xpi) = 76269cdaf76a16a99d02f7efb1d2f0fa
-MD5 (netscape6/english/6.2/jre.xpi) = d5ee03d0f09344d45e9769746a8f03dd
-MD5 (netscape6/english/6.2/langenus.xpi) = 419ce3befd7240b0a486468e05b297ea
-MD5 (netscape6/english/6.2/mail.xpi) = 425015188a88ac54c2d9bb67f977d3d2
-MD5 (netscape6/english/6.2/psm.xpi) = aeae20472294840ffe7b36b06c96cb97
-MD5 (netscape6/english/6.2/regca.xpi) = e3afb3cd62bb3196683d773f1818f9ad
-MD5 (netscape6/english/6.2/reges.xpi) = fc737fb9dfcf31fbca4be41de099a073
-MD5 (netscape6/english/6.2/reggb.xpi) = ca7bea283f2a8bc0a03412f342de24d6
-MD5 (netscape6/english/6.2/regus.xpi) = ca23e0aea6711414bd29be0e494279c1
-MD5 (netscape6/english/6.2/spellchecker.xpi) = 94e69786ac803b8562abf9c624732edc
-MD5 (netscape6/english/6.2/talkback.xpi) = 59d523c6e65f7c4d4c45977d1f2ca8a1
-MD5 (netscape6/english/6.2/xpcom.xpi) = 99c37db4daa2e08cefbcdd9d1b598313
-MD5 (netscape6/english/6.2/linux-netscape6-6.2-generated-files-v2.tar.gz) = 5e04a8e204911c8cf7afeb1f99d72cf5
+MD5 (netscape6/english/6.2.1/browser.xpi) = fd8f632393b10a50e890d79bf6bb6f38
+MD5 (netscape6/english/6.2.1/deflenus.xpi) = 5a5cc92fd214385f3aee9f4652ffec45
+MD5 (netscape6/english/6.2.1/langenus.xpi) = 8a79cccb18dbd48f4f23bcc5b3bf9f9d
+MD5 (netscape6/english/6.2.1/flash.xpi) = 39c9390f0273afcc0f25ec07d308e514
+MD5 (netscape6/english/6.2.1/jre.xpi) = 0203aafa3bfe9ff18a6e6d2cd8b9b7b8
+MD5 (netscape6/english/6.2.1/langenus.xpi) = 8a79cccb18dbd48f4f23bcc5b3bf9f9d
+MD5 (netscape6/english/6.2.1/mail.xpi) = ee2d45dec5e3a0625fca8ac2e3c94121
+MD5 (netscape6/english/6.2.1/psm.xpi) = 634c2bf5ec5999ff36d69ffafacd52e7
+MD5 (netscape6/english/6.2.1/regca.xpi) = 47732df012b6bc7184f212ffec4bf705
+MD5 (netscape6/english/6.2.1/reges.xpi) = acf3177eb0e2165dbc969c3427d2a775
+MD5 (netscape6/english/6.2.1/reggb.xpi) = e1403f0719a82ff0f21e2346ea92e88e
+MD5 (netscape6/english/6.2.1/regus.xpi) = 8310c8d78e5f38096adfb2e17e316794
+MD5 (netscape6/english/6.2.1/spellchecker.xpi) = 04cdfda97951b2bec74c0cf0e1f6ec0c
+MD5 (netscape6/english/6.2.1/talkback.xpi) = 351374cd0bbdea3a2de3725f063c842a
+MD5 (netscape6/english/6.2.1/xpcom.xpi) = d20178795e717c1d089bc4320331bb52
+MD5 (netscape6/english/6.2.1/linux-netscape6-6.2.1-generated-files.tar.gz) = 81ff0fb65894627db7dd52bfd8dc82b0
diff --git a/www/netscape7/files/all-locales.rdf b/www/netscape7/files/all-locales.rdf
index e4f7f7b9c107..172016c9d53f 100644
--- a/www/netscape7/files/all-locales.rdf
+++ b/www/netscape7/files/all-locales.rdf
@@ -1,29 +1,272 @@
 <?xml version="1.0"?>
-<RDF:RDF
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:locale:en-US:communicator">
-    <NS476:baseURL xmlns:NS476="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/en-US.jar!/locale/en-US/communicator/</NS476:baseURL>
-    <NS477:package xmlns:NS477="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:communicator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:global">
-    <NS478:baseURL xmlns:NS478="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/en-US.jar!/locale/en-US/global/</NS478:baseURL>
-    <NS479:package xmlns:NS479="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger">
-    <NS480:baseURL xmlns:NS480="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/en-US.jar!/locale/en-US/messenger/</NS480:baseURL>
-    <NS481:package xmlns:NS481="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <NS484:displayName xmlns:NS484="http://www.mozilla.org/rdf/chrome#">English(US)</NS484:displayName>
-    <NS485:author xmlns:NS485="http://www.mozilla.org/rdf/chrome#">mozilla.org</NS485:author>
-    <NS486:name xmlns:NS486="http://www.mozilla.org/rdf/chrome#">en-US</NS486:name>
-    <NS487:previewURL xmlns:NS487="http://www.mozilla.org/rdf/chrome#">http://www.mozilla.org/locales/en-US.gif</NS487:previewURL>
-    <NS488:locType xmlns:NS488="http://www.mozilla.org/rdf/chrome#">install</NS488:locType>
-    <NS489:packages xmlns:NS489="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:locale:en-US:packages"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:locale:en-US:editor">
-    <NS490:baseURL xmlns:NS490="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/en-US.jar!/locale/en-US/editor/</NS490:baseURL>
-    <NS491:package xmlns:NS491="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:editor"/>
+<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"/>
@@ -31,12 +274,38 @@
     <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:en-US:navigator">
-    <NS492:baseURL xmlns:NS492="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/en-US.jar!/locale/en-US/navigator/</NS492:baseURL>
-    <NS493:package xmlns:NS493="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:navigator"/>
+  <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:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  <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
index 1aa814bc7491..d47883f6b8a9 100644
--- a/www/netscape7/files/all-packages.rdf
+++ b/www/netscape7/files/all-packages.rdf
@@ -1,47 +1,175 @@
 <?xml version="1.0"?>
-<RDF:RDF
-     xmlns:NS391="http://www.mozilla.org/rdf/chrome#"
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:package:global">
-    <NS391:baseURL>jar:resource:/chrome/toolkit.jar!/content/global/</NS391:baseURL>
-    <NS391:locType>install</NS391:locType>
-    <NS391:displayName>Toolkit</NS391:displayName>
-    <NS391:author>mozilla.org</NS391:author>
-    <NS391:name>global</NS391:name>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:communicator">
-    <NS391:baseURL>jar:resource:/chrome/comm.jar!/content/communicator/</NS391:baseURL>
-    <NS391:locType>install</NS391:locType>
-    <NS391:displayName>Communicator Shared</NS391:displayName>
-    <NS391:author>mozilla.org</NS391:author>
-    <NS391:name>communicator</NS391:name>
-  </RDF:Description>
+<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:navigator">
-    <NS391:baseURL>jar:resource:/chrome/comm.jar!/content/navigator/</NS391:baseURL>
-    <NS391:locType>install</NS391:locType>
-    <NS391:displayName>Navigator</NS391:displayName>
-    <NS391:author>mozilla.org</NS391:author>
-    <NS391:name>navigator</NS391:name>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:editor">
-    <NS391:baseURL>jar:resource:/chrome/comm.jar!/content/editor/</NS391:baseURL>
-    <NS391:locType>install</NS391:locType>
-    <NS391:displayName>Editor</NS391:displayName>
-    <NS391:author>mozilla.org</NS391:author>
-    <NS391:name>editor</NS391:name>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:messenger">
-    <NS391:baseURL>jar:resource:/chrome/messenger.jar!/content/messenger/</NS391:baseURL>
-    <NS391:locType>install</NS391:locType>
-    <NS391:displayName>Messenger</NS391:displayName>
-    <NS391:author>mozilla.org</NS391:author>
-    <NS391:name>messenger</NS391:name>
-  </RDF:Description>
+  <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
index 3fcbb043db93..d11df3d90211 100644
--- a/www/netscape7/files/all-skins.rdf
+++ b/www/netscape7/files/all-skins.rdf
@@ -1,90 +1,116 @@
 <?xml version="1.0"?>
-<RDF:RDF
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <NS341:displayName xmlns:NS341="http://www.mozilla.org/rdf/chrome#">Classic</NS341:displayName>
-    <NS342:author xmlns:NS342="http://www.mozilla.org/rdf/chrome#">mozilla.org</NS342:author>
-    <NS343:description xmlns:NS343="http://www.mozilla.org/rdf/chrome#">This theme simulates the appearance of previous Netscape versions.</NS343:description>
-    <NS344:name xmlns:NS344="http://www.mozilla.org/rdf/chrome#">classic/1.0</NS344:name>
-    <NS345:image xmlns:NS345="http://www.mozilla.org/rdf/chrome#">jar:resource:///chrome/classic.jar!/skin/classic/global/preview.png</NS345:image>
-    <NS346:locType xmlns:NS346="http://www.mozilla.org/rdf/chrome#">install</NS346:locType>
-    <NS347:packages xmlns:NS347="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:skin:classic/1.0:packages"/>
+<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:messenger">
-    <NS348:baseURL xmlns:NS348="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/classic.jar!/skin/classic/messenger/</NS348:baseURL>
-    <NS349:allowScripts xmlns:NS349="http://www.mozilla.org/rdf/chrome#">false</NS349:allowScripts>
-    <NS350:package xmlns:NS350="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:messenger"/>
+  <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:global">
-    <NS351:baseURL xmlns:NS351="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/modern.jar!/skin/modern/global/</NS351:baseURL>
-    <NS352:allowScripts xmlns:NS352="http://www.mozilla.org/rdf/chrome#">false</NS352:allowScripts>
-    <NS353:package xmlns:NS353="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:global"/>
+  <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:Description about="urn:mozilla:skin:classic/1.0:editor">
-    <NS354:baseURL xmlns:NS354="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/classic.jar!/skin/classic/editor/</NS354:baseURL>
-    <NS355:allowScripts xmlns:NS355="http://www.mozilla.org/rdf/chrome#">false</NS355:allowScripts>
-    <NS356:package xmlns:NS356="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:editor"/>
+  <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:editor">
-    <NS357:baseURL xmlns:NS357="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/modern.jar!/skin/modern/editor/</NS357:baseURL>
-    <NS358:allowScripts xmlns:NS358="http://www.mozilla.org/rdf/chrome#">false</NS358:allowScripts>
-    <NS359:package xmlns:NS359="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:editor"/>
+  <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:navigator">
-    <NS360:baseURL xmlns:NS360="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/modern.jar!/skin/modern/navigator/</NS360:baseURL>
-    <NS361:allowScripts xmlns:NS361="http://www.mozilla.org/rdf/chrome#">false</NS361:allowScripts>
-    <NS362:package xmlns:NS362="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:navigator"/>
+  <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:modern/1.0">
-    <NS366:displayName xmlns:NS366="http://www.mozilla.org/rdf/chrome#">Modern</NS366:displayName>
-    <NS367:author xmlns:NS367="http://www.mozilla.org/rdf/chrome#">Netscape</NS367:author>
-    <NS368:description xmlns:NS368="http://www.mozilla.org/rdf/chrome#">This is the default theme for Netscape 6. Apply this theme if you want to restore the original setting.</NS368:description>
-    <NS369:name xmlns:NS369="http://www.mozilla.org/rdf/chrome#">modern/1.0</NS369:name>
-    <NS370:image xmlns:NS370="http://www.mozilla.org/rdf/chrome#">jar:resource:///chrome/modern.jar!/skin/modern/global/preview.gif</NS370:image>
-    <NS371:locType xmlns:NS371="http://www.mozilla.org/rdf/chrome#">install</NS371:locType>
-    <NS372:packages xmlns:NS372="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:skin:modern/1.0:packages"/>
+  <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:communicator">
-    <NS373:baseURL xmlns:NS373="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/classic.jar!/skin/classic/communicator/</NS373:baseURL>
-    <NS374:allowScripts xmlns:NS374="http://www.mozilla.org/rdf/chrome#">false</NS374:allowScripts>
-    <NS375:package xmlns:NS375="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:communicator"/>
+  <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:classic/1.0:global">
-    <NS379:baseURL xmlns:NS379="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/classic.jar!/skin/classic/global/</NS379:baseURL>
-    <NS380:allowScripts xmlns:NS380="http://www.mozilla.org/rdf/chrome#">false</NS380:allowScripts>
-    <NS381:package xmlns:NS381="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:global"/>
+  <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">
-    <NS382:baseURL xmlns:NS382="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/modern.jar!/skin/modern/communicator/</NS382:baseURL>
-    <NS383:allowScripts xmlns:NS383="http://www.mozilla.org/rdf/chrome#">false</NS383:allowScripts>
-    <NS384:package xmlns:NS384="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:communicator"/>
+  <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">
-    <NS385:baseURL xmlns:NS385="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/modern.jar!/skin/modern/messenger/</NS385:baseURL>
-    <NS386:allowScripts xmlns:NS386="http://www.mozilla.org/rdf/chrome#">false</NS386:allowScripts>
-    <NS387:package xmlns:NS387="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:messenger"/>
+  <RDF:Description about="urn:mozilla:skin:modern/1.0:messenger"
+                   c:baseURL="jar:resource:/chrome/modern.jar!/skin/modern/messenger/"
+                   c:allowScripts="false"
+                   c:skinVersion="0.9.4">
+    <c:package resource="urn:mozilla:package:messenger"/>
   </RDF:Description>
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:navigator">
-    <NS388:baseURL xmlns:NS388="http://www.mozilla.org/rdf/chrome#">jar:resource:/chrome/classic.jar!/skin/classic/navigator/</NS388:baseURL>
-    <NS389:allowScripts xmlns:NS389="http://www.mozilla.org/rdf/chrome#">false</NS389:allowScripts>
-    <NS390:package xmlns:NS390="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:package:navigator"/>
+  <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: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: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:RDF>
diff --git a/www/netscape7/pkg-descr b/www/netscape7/pkg-descr
index f21f29d322eb..c33e87715e05 100644
--- a/www/netscape7/pkg-descr
+++ b/www/netscape7/pkg-descr
@@ -6,10 +6,8 @@ and Macromedia Flash plugins are included.  AOL Instant Messenger
 is omitted (see ports/net/aim).  The Canadian, Latin American and
 British region packs, spell-checker, and talkback are enabled.
 
-Messenger can be started by going to a mailto: or news: URL (for
-example, by typing into the location window).  The dialogs for
-saving files and for searching within a document do not work, nor
-does the Privacy & Security menu, nor does about:plugins.
+Text cannot be typed into the dialogs for saving files or for
+searching within a document.
 
 WWW: http://browsers.netscape.com/browsers/6/