Installing our own user-{locales,skins}.rdf is unnecessary, dumb, and breaks

the editor.  So, install the ones generated at build time instead.

6 files changed, 7 insertions, 42 deletions

diff --git a/www/mozilla/files/md5 b/www/mozilla/files/md5
index 068e7835838..2190df885e2 100644
--- a/www/mozilla/files/md5
+++ b/www/mozilla/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.17 2000/10/26 07:49:59 mycroft Exp $
+$NetBSD: md5,v 1.18 2000/10/29 03:51:19 mycroft Exp $
 
 MD5 (mozilla-source-M18.tar.bz2) = c92aadfd0a15ca7f48fafc2bbf321e0d
diff --git a/www/mozilla/files/user-locales.rdf b/www/mozilla/files/user-locales.rdf
deleted file mode 100644
index 8e15da32fed..00000000000
--- a/www/mozilla/files/user-locales.rdf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:package:navigator">
-    <NS13:selectedLocale xmlns:NS13="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:locale:en-US:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:global">
-    <NS14:selectedLocale xmlns:NS14="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:locale:en-US:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:messenger">
-    <NS15:selectedLocale xmlns:NS15="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:locale:en-US:messenger"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:communicator">
-    <NS16:selectedLocale xmlns:NS16="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:locale:en-US:communicator"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/www/mozilla/files/user-skins.rdf b/www/mozilla/files/user-skins.rdf
deleted file mode 100644
index 62b0f8d2e09..00000000000
--- a/www/mozilla/files/user-skins.rdf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="urn:mozilla:package:navigator">
-    <NS7:selectedSkin xmlns:NS7="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:skin:classic/1.0:navigator"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:global">
-    <NS8:selectedSkin xmlns:NS8="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:skin:classic/1.0:global"/>
-  </RDF:Description>
-  <RDF:Description about="urn:mozilla:package:communicator">
-    <NS9:selectedSkin xmlns:NS9="http://www.mozilla.org/rdf/chrome#" resource="urn:mozilla:skin:classic/1.0:communicator"/>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/www/mozilla/pkg/PLIST-ELF b/www/mozilla/pkg/PLIST-ELF
index 25e62f844e6..8f7311a7426 100644
--- a/www/mozilla/pkg/PLIST-ELF
+++ b/www/mozilla/pkg/PLIST-ELF
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST-ELF,v 1.3 2000/10/14 09:24:47 martin Exp $
+@comment $NetBSD: PLIST-ELF,v 1.4 2000/10/29 03:51:19 mycroft Exp $
 @option extract-in-place
 bin/mozilla
-lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
 lib/mozilla/nsTestSample
@@ -132,6 +130,8 @@ lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/toolkit.jar
+lib/mozilla/chrome/user-locales.rdf
+lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/addrbook.xpt
diff --git a/www/mozilla/pkg/PLIST-a.out b/www/mozilla/pkg/PLIST-a.out
index a2038d8e8d4..5ad0e0b93df 100644
--- a/www/mozilla/pkg/PLIST-a.out
+++ b/www/mozilla/pkg/PLIST-a.out
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST-a.out,v 1.3 2000/10/14 09:24:47 martin Exp $
+@comment $NetBSD: PLIST-a.out,v 1.4 2000/10/29 03:51:20 mycroft Exp $
 @option extract-in-place
 bin/mozilla
-lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
 lib/mozilla/nsTestSample
@@ -132,6 +130,8 @@ lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/toolkit.jar
+lib/mozilla/chrome/user-locales.rdf
+lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/addrbook.xpt
diff --git a/www/mozilla/scripts/moz-install b/www/mozilla/scripts/moz-install
index 2bf0be59a28..2575afd5e40 100755
--- a/www/mozilla/scripts/moz-install
+++ b/www/mozilla/scripts/moz-install
@@ -33,9 +33,3 @@ for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${PLIST_
 	src=`echo $i | sed -e 's@lib/mozilla@dist/bin@'`;
 	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
 done
-
-# install missing data.
-# those files are generated automatically at first startup
-# without root privilege, those could not be generated and mozilla could not be started
-${BSD_INSTALL_DATA} ${FILESDIR}/user-locales.rdf ${PREFIX}/lib/mozilla/chrome
-${BSD_INSTALL_DATA} ${FILESDIR}/user-skins.rdf ${PREFIX}/lib/mozilla/chrome