Most notable changes are:

     * Personal Security Manager 2.0 with improved performance and new UI.
     * MailNews front end has been overhauled with a huge performance
       improvement.
     * Browser and Mail now utilize a new cache, and new viewmanager
       for improved performance and correctness.
     * Image rendering library was rewritten from scratch for increased
       preformance.

See the release notes below for detail:
    http://www.mozilla.org/releases/mozilla0.9/

11 files changed, 154 insertions, 199 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 2b5e2a5463e..3227bd1d271 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2001/05/05 21:06:26 fredb Exp $
+# $NetBSD: Makefile,v 1.65 2001/05/11 00:37:45 taya Exp $
 
-MOZ_VER=	0.8.1
+MOZ_VER=	0.9
 DISTNAME=	mozilla-source-${MOZ_VER}
 PKGNAME=	mozilla-${MOZ_VER}
 WRKSRC=		${WRKDIR}/mozilla
@@ -17,6 +17,7 @@ BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
 BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
+DEPENDS+=	gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
 DEPENDS+=	ORBit>=0.5.3:../../net/ORBit
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png>1.0.9:../../graphics/png
@@ -35,7 +36,8 @@ CONFIGURE_ARGS=	--disable-tests \
 		--enable-mathml \
 		--enable-svg \
 		--with-extensions=cookie,irc,wallet,xmlextras,xml-rpc \
-		--without-pthreads
+		--without-pthreads \
+		--enable-modules=all,psm2
 
 .if  ${MACHINE_ARCH} == "m68k"
 DBG=
@@ -69,8 +71,8 @@ pre-configure:
 	(cd ${WRKSRC}/nsprpub && ${LOCALBASE}/bin/autoconf)
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} BUILD_MODULES=psm
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} BUILD_MODULES=all
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} BUILD_MODULES=psm2
 
 post-build:
 	${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 3a26810924e..2e1949aac58 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 12:12:56 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/05/11 00:37:45 taya Exp $
 
-SHA1 (mozilla-source-0.8.1.tar.bz2) = 3da3c9b236cdd662e98b2c655ce343478cdbaccb
-SHA1 (patch-ao) = de139891a25f136c0192e2089ff81c881a3cf396
-SHA1 (patch-aq) = 1d380eca30f686cfa44b8f8f2e35cb0f1a802b12
-SHA1 (patch-ar) = 89da463a694f4250e15f5a622a270a7ad68252ed
-SHA1 (patch-as) = 470175fc894b0bcf844ab4335613893040956ae7
-SHA1 (patch-at) = a1ed1da212a11a6af33cd5b270d460c329d9998f
+SHA1 (mozilla-source-0.9.tar.bz2) = 96d86a66a94549fdc3deecaf69bdc9b148646ec5
+Size (mozilla-source-0.9.tar.bz2) = 25066194 bytes
+SHA1 (patch-aq) = 3583a7ad9d790a29a0b75b68344aea5362969db7
+SHA1 (patch-ar) = 1f2b619b101c4a66f25b5c3cf0aa96547986842e
+SHA1 (patch-au) = 1f41011251a33b3049156ca9a46b19d1d151a007
+SHA1 (patch-av) = 12c8f04241797b66a7c29cc52102787d40df49f6
diff --git a/www/mozilla/patches/patch-ao b/www/mozilla/patches/patch-ao
deleted file mode 100644
index 85ddb3e6b3d..00000000000
--- a/www/mozilla/patches/patch-ao
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2001/02/17 11:03:28 taya Exp $
-
-diff -ru ../Orig/mozilla/security/psm/server/Makefile ./security/psm/server/Makefile
---- ../Orig/mozilla/security/psm/server/Makefile	Thu Feb  8 06:05:21 2001
-+++ ./security/psm/server/Makefile	Sat Feb 17 02:11:30 2001
-@@ -44,9 +44,13 @@
- CPLUSPLUSRUNTIME = -L /usr/lib -lstdc++ -lm
- else
- # libC, presumably, is what we must link with elsewhere
-+ifeq ($(OS_ARCH), NetBSD)
-+CPLUSPLUSRUNTIME = -lm
-+else
- CPLUSPLUSRUNTIME = -lC -lm
- endif
- endif
-+endif
- 
- INCLUDES += -I$(CORE_DEPTH)/../dist/public/nlslayer -I$(CORE_DEPTH)/../dist/include
- 
-@@ -152,9 +156,14 @@
- NSPR_LINK_LIBS = -L$(DIST)/lib -Bdynamic -lnspr4 -lplc4 -lplds4
- XPCOM_LINK_LIBS = -lxpcom
- XPCOM_LIBS += $(DIST)/lib/libz.$(DLL_SUFFIX)
--else
-+else # SunOS
-+ifeq ($(OS_ARCH), NetBSD)
-+NSPR_LINK_LIBS = -L$(DIST)/lib -lnspr4 -lplc4 -lplds4
-+XPCOM_LINK_LIBS = -lxpcom
-+else # NetBSD
- NSPR_LINK_LIBS = $(NSPR_LIBS)
- XPCOM_LINK_LIBS	= $(XPCOM_LIBS)
-+endif
- endif
- 
- ifndef MOZ_DIST
diff --git a/www/mozilla/patches/patch-aq b/www/mozilla/patches/patch-aq
index a4453ae1b84..185a2652420 100644
--- a/www/mozilla/patches/patch-aq
+++ b/www/mozilla/patches/patch-aq
@@ -1,9 +1,9 @@
-$NetBSD: patch-aq,v 1.1 2001/01/16 16:01:24 taya Exp $
+$NetBSD: patch-aq,v 1.2 2001/05/11 00:37:46 taya Exp $
 
 diff -ru ../Orig/mozilla/security/nss/lib/freebl/Makefile ./security/nss/lib/freebl/Makefile
---- ../Orig/mozilla/security/nss/lib/freebl/Makefile	Tue Oct  3 07:52:43 2000
-+++ ./security/nss/lib/freebl/Makefile	Mon Jan 15 15:37:55 2001
-@@ -200,6 +200,17 @@
+--- ../Orig/mozilla/security/nss/lib/freebl/Makefile	Thu Mar 15 08:30:37 2001
++++ ./security/nss/lib/freebl/Makefile	Mon May  7 05:40:18 2001
+@@ -265,6 +265,17 @@
  MPI_OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_SRCS:.c=$(OBJ_SUFFIX)))
  MPI_OBJS += $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_USERS:.c=$(OBJ_SUFFIX)))
  
diff --git a/www/mozilla/patches/patch-ar b/www/mozilla/patches/patch-ar
index 47fee28c06b..53da1dc0d69 100644
--- a/www/mozilla/patches/patch-ar
+++ b/www/mozilla/patches/patch-ar
@@ -1,9 +1,9 @@
-$NetBSD: patch-ar,v 1.1 2001/03/30 09:37:50 taya Exp $
+$NetBSD: patch-ar,v 1.2 2001/05/11 00:37:46 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in	Sun Mar 11 15:24:30 2001
-+++ ./nsprpub/configure.in	Sat Mar 24 01:33:09 2001
-@@ -1073,24 +1073,29 @@
+--- ../Orig/mozilla/nsprpub/configure.in	Tue Apr 17 08:22:28 2001
++++ ./nsprpub/configure.in	Mon May  7 05:40:30 2001
+@@ -1121,24 +1121,29 @@
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
@@ -42,9 +42,9 @@ diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
 -        DSO_LDOPTS="$DSO_LDOPTS -R$(LIBRUNPATH)"
 +        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
      fi
-     ;;
- 
-@@ -1777,11 +1782,6 @@
+     MDCPUCFG_H=_netbsd.cfg
+     PR_MD_CSRCS=netbsd.c
+@@ -1868,11 +1873,6 @@
      _PTHREAD_LDFLAGS=
      USE_USER_PTHREADS=
      ;;
diff --git a/www/mozilla/patches/patch-as b/www/mozilla/patches/patch-as
deleted file mode 100644
index 71139ab6d86..00000000000
--- a/www/mozilla/patches/patch-as
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-as,v 1.1 2001/03/30 09:37:50 taya Exp $
-
-diff -ru ../Orig/mozilla/netwerk/dns/src/nsDnsService.cpp ./netwerk/dns/src/nsDnsService.cpp
---- ../Orig/mozilla/netwerk/dns/src/nsDnsService.cpp	Fri Mar 23 23:23:37 2001
-+++ ./netwerk/dns/src/nsDnsService.cpp	Sat Mar 24 01:35:04 2001
-@@ -943,6 +943,11 @@
- 
-     nsAutoMonitor mon(mLookupQMon);
- 
-+    // Don't wait on the monitor if we're in the process
-+    // of shutting down the DNS service.
-+    if (mShutdownInProgress)
-+        return NS_OK;
-+
-     // Wait for notification of a queued request.
-     if (!mLookupQ)
-         mon.Wait();
-@@ -967,22 +972,21 @@
- ////////////////////////////////////////////////////////////////////////////////
- 
- nsDNSService::nsDNSService()
--    : mState(NS_OK),
--      mMonitor(nsnull),
--      mLookups(64)
-+    : mState(NS_OK)
-+    , mMonitor(nsnull)
-+    , mLookups(64)
- #if defined(XP_UNIX)
-     , mLookupQ(nsnull)
-+    , mLookupQMon(nsnull)
-+    , mShutdownInProgress(PR_FALSE)
- #endif
- #ifdef DNS_TIMING
--      ,
--      mCount(0),
--      mTimes(0),
--      mSquaredTimes(0),
--      mOut(nsnull)
--
-+    , mCount(0)
-+    , mTimes(0)
-+    , mSquaredTimes(0)
-+    , mOut(nsnull)
- #endif
--    ,
--      mMyIPAddress(0)
-+    , mMyIPAddress(0)
- {
-     NS_INIT_REFCNT();
-     
-@@ -1262,9 +1266,7 @@
-         if (NS_FAILED(rv)) return rv;
- 
-         if (lookup) {
--            //
-             // Got a request!!
--            //
-             lookup->DoSyncLookup();
-             NS_RELEASE(lookup);
-         } else
-@@ -1544,6 +1546,7 @@
-             // Clear the lookup queue and wake up the worker thread.
-             //
-             nsAutoMonitor mon2(mLookupQMon);
-+            mShutdownInProgress = PR_TRUE;
-             if (mLookupQ) {
-                 mLookupQ->ClearNextLookup();
-                 NS_RELEASE(mLookupQ);
diff --git a/www/mozilla/patches/patch-at b/www/mozilla/patches/patch-at
deleted file mode 100644
index f782f9b4c0b..00000000000
--- a/www/mozilla/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.1 2001/03/30 09:37:50 taya Exp $
-
-diff -ru ../Orig/mozilla/netwerk/dns/src/nsDnsService.h ./netwerk/dns/src/nsDnsService.h
---- ../Orig/mozilla/netwerk/dns/src/nsDnsService.h	Fri Feb 23 09:15:35 2001
-+++ ./netwerk/dns/src/nsDnsService.h	Sat Mar 24 01:35:05 2001
-@@ -111,6 +111,9 @@
-     // Called by the DNS thread to get the next lookup to process.
-     // Blocks until a lookup is available.
-     nsresult DequeueLookup(nsDNSLookup **);
-+
-+    // Needed if the DNS thread is not already waiting on the lookup monitor.
-+    PRBool mShutdownInProgress;
- #endif
- 
- #ifdef DNS_TIMING
diff --git a/www/mozilla/patches/patch-au b/www/mozilla/patches/patch-au
new file mode 100644
index 00000000000..c15080c25b2
--- /dev/null
+++ b/www/mozilla/patches/patch-au
@@ -0,0 +1,20 @@
+$NetBSD: patch-au,v 1.1 2001/05/11 00:37:46 taya Exp $
+
+diff -ru ../Orig/mozilla/security/coreconf/NetBSD.mk ./security/coreconf/NetBSD.mk
+--- ../Orig/mozilla/security/coreconf/NetBSD.mk	Sat Sep 30 02:42:36 2000
++++ ./security/coreconf/NetBSD.mk	Mon May  7 05:40:36 2001
+@@ -40,8 +40,13 @@
+ CCC			= g++
+ RANLIB			= ranlib
+ 
++ifeq ($(OS_TEST),i386)
++CPU_ARCH		:= x86
+ OS_REL_CFLAGS		= -Di386
+-CPU_ARCH		= x86
++else
++CPU_ARCH		:= $(shell uname -p)
++OS_REL_CFLAGS		= -D$(CPU_ARCH)
++endif
+ 
+ ifndef OBJECT_FMT
+ OBJECT_FMT		:= $(shell if echo __ELF__ | $${CC:-cc} -E - | grep -q __ELF__ ; then echo a.out ; else echo ELF ; fi)
diff --git a/www/mozilla/patches/patch-av b/www/mozilla/patches/patch-av
new file mode 100644
index 00000000000..f90a9f75729
--- /dev/null
+++ b/www/mozilla/patches/patch-av
@@ -0,0 +1,17 @@
+$NetBSD: patch-av,v 1.1 2001/05/11 00:37:46 taya Exp $
+
+diff -ru ../Orig/mozilla/security/coreconf/ruleset.mk ./security/coreconf/ruleset.mk
+--- ../Orig/mozilla/security/coreconf/ruleset.mk	Sun Feb  4 14:52:37 2001
++++ ./security/coreconf/ruleset.mk	Mon May  7 05:40:42 2001
+@@ -93,9 +93,9 @@
+ endif
+ 
+ #
+-# Always set CPU_TAG on Linux.
++# Always set CPU_TAG on Linux & NetBSD.
+ #
+-ifeq ($(OS_ARCH), Linux)
++ifeq (,$(filter-out Linux NetBSD,$(OS_ARCH)))
+ 	CPU_TAG = _$(CPU_ARCH)
+ endif
+ 
diff --git a/www/mozilla/pkg/PLIST-ELF b/www/mozilla/pkg/PLIST-ELF
index cf08a6b63ee..0509211328b 100644
--- a/www/mozilla/pkg/PLIST-ELF
+++ b/www/mozilla/pkg/PLIST-ELF
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST-ELF,v 1.10 2001/03/30 09:37:50 taya Exp $
+@comment $NetBSD: PLIST-ELF,v 1.11 2001/05/11 00:37:46 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
 lib/mozilla/nsinstall
-lib/mozilla/psm
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
@@ -15,10 +14,10 @@ lib/mozilla/xpcshell
 @comment end PROGRAMS
 @comment begin SCRIPTS
 lib/mozilla/mozilla-config
-lib/mozilla/start-psm
 @comment end SCRIPTS
 @comment begin DSO
 lib/mozilla/components/libabsyncsvc.so
+lib/mozilla/components/libaccessibility.so
 lib/mozilla/components/libaddrbook.so
 lib/mozilla/components/libappcomps.so
 lib/mozilla/components/libcaps.so
@@ -28,6 +27,7 @@ lib/mozilla/components/libcookie.so
 lib/mozilla/components/libdocshell.so
 lib/mozilla/components/libeditor.so
 lib/mozilla/components/libembedcomponents.so
+lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
 lib/mozilla/components/libgkcontent.so
@@ -35,6 +35,11 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimggif.so
+lib/mozilla/components/libimgjpeg.so
+lib/mozilla/components/libimglib2.so
+lib/mozilla/components/libimgpng.so
+lib/mozilla/components/libimgppm.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
 lib/mozilla/components/libjar50.so
@@ -48,6 +53,7 @@ lib/mozilla/components/libmimeemitter.so
 lib/mozilla/components/libmork.so
 lib/mozilla/components/libmozbrwsr.so
 lib/mozilla/components/libmozfind.so
+lib/mozilla/components/libmozldap.so
 lib/mozilla/components/libmozucth.so
 lib/mozilla/components/libmozxfer.so
 lib/mozilla/components/libmsgcompose.so
@@ -56,6 +62,7 @@ lib/mozilla/components/libmsgimap.so
 lib/mozilla/components/libmsgnews.so
 lib/mozilla/components/libnecko.so
 lib/mozilla/components/libnecko2.so
+lib/mozilla/components/libnkcache.so
 lib/mozilla/components/libnsappshell.so
 lib/mozilla/components/libnsgif.so
 lib/mozilla/components/libnsjpg.so
@@ -64,9 +71,10 @@ lib/mozilla/components/libnsmng.so
 lib/mozilla/components/libnspng.so
 lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
+lib/mozilla/components/libpipnss.so
+lib/mozilla/components/libpippki.so
 lib/mozilla/components/libpref.so
 lib/mozilla/components/libprofile.so
-lib/mozilla/components/libpsmglue.so
 lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libshistory.so
@@ -96,13 +104,14 @@ lib/mozilla/components/libxmlextras.so
 lib/mozilla/components/libxpconnect.so
 lib/mozilla/components/libxpinstall.so
 lib/mozilla/components/libxremote_client.so
-lib/mozilla/libcmt.so
 lib/mozilla/libgkgfx.so
 lib/mozilla/libgtkembedmoz.so
 lib/mozilla/libgtksuperwin.so
 lib/mozilla/libgtkxtbin.so
 lib/mozilla/libjsdom.so
 lib/mozilla/libjsj.so
+lib/mozilla/liblber40.so
+lib/mozilla/libldap40.so
 lib/mozilla/libmozjs.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
@@ -110,7 +119,6 @@ lib/mozilla/libnssckbi.so
 lib/mozilla/libnullplugin.so
 lib/mozilla/libplc4.so
 lib/mozilla/libplds4.so
-lib/mozilla/libprotocol.so
 lib/mozilla/libxpcom.so
 lib/mozilla/libxpistub.so
 lib/mozilla/plugins/libnullplugin.so
@@ -124,11 +132,15 @@ lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/embed.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-unix.jar
+lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
+lib/mozilla/chrome/pipnss.jar
+lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/components/absync.xpt
+lib/mozilla/components/accessibility.xpt
 lib/mozilla/components/addrbook.xpt
 lib/mozilla/components/appshell.xpt
 lib/mozilla/components/autocomplete.xpt
@@ -138,7 +150,7 @@ lib/mozilla/components/chardet.xpt
 lib/mozilla/components/chatzilla-service.js
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/content_base.xpt
-lib/mozilla/components/cookieviewer.xpt
+lib/mozilla/components/cookie.xpt
 lib/mozilla/components/directory.xpt
 lib/mozilla/components/docshell.xpt
 lib/mozilla/components/dom.xpt
@@ -146,7 +158,9 @@ lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
 lib/mozilla/components/gfx.xpt
+lib/mozilla/components/gfx2.xpt
 lib/mozilla/components/history.xpt
+lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
@@ -163,6 +177,7 @@ lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
 lib/mozilla/components/mozcomps.xpt
 lib/mozilla/components/mozfind.xpt
+lib/mozilla/components/mozldap.xpt
 lib/mozilla/components/mozucth.xpt
 lib/mozilla/components/mozxfer.xpt
 lib/mozilla/components/msgbase.xpt
@@ -183,17 +198,20 @@ lib/mozilla/components/necko_jar.xpt
 lib/mozilla/components/necko_res.xpt
 lib/mozilla/components/necko_socket.xpt
 lib/mozilla/components/necko_strconv.xpt
+lib/mozilla/components/necko_viewsource.xpt
 lib/mozilla/components/nsDictionary.js
 lib/mozilla/components/nsFilePicker.js
+lib/mozilla/components/nsProxyAutoConfig.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipnss.xpt
+lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
 lib/mozilla/components/pref.xpt
 lib/mozilla/components/prefmigr.xpt
 lib/mozilla/components/profile.xpt
 lib/mozilla/components/proxyObjInst.xpt
-lib/mozilla/components/psmglue.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
@@ -255,26 +273,15 @@ lib/mozilla/defaults/wallet/SchemaConcat.tbl
 lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
+lib/mozilla/dirver
 lib/mozilla/dtd/mathml.dtd
 lib/mozilla/gtkEmbed
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
-lib/mozilla/psmdata/doc/04digsgn.gif
-lib/mozilla/psmdata/doc/06pcrypt.gif
-lib/mozilla/psmdata/doc/bannerrn.gif
-lib/mozilla/psmdata/doc/cartbanner.gif
-lib/mozilla/psmdata/doc/cmcjavascriptapi.html
-lib/mozilla/psmdata/doc/contents.htm
-lib/mozilla/psmdata/doc/glossary.htm
-lib/mozilla/psmdata/doc/help.htm
-lib/mozilla/psmdata/doc/next.gif
-lib/mozilla/psmdata/doc/prev.gif
-lib/mozilla/psmdata/doc/psmtest.html
-lib/mozilla/psmdata/doc/release_notes.html
-lib/mozilla/psmdata/ui/psm_bin.properties
-lib/mozilla/psmdata/ui/psm_doc.properties
-lib/mozilla/psmdata/ui/psm_text.properties
-lib/mozilla/psmdata/ui/psm_ui.properties
+lib/mozilla/profile/defaults/profile/US/chrome/userChrome.css
+lib/mozilla/profile/defaults/profile/US/chrome/userContent.css
+lib/mozilla/profile/defaults/profile/chrome/userChrome.css
+lib/mozilla/profile/defaults/profile/chrome/userContent.css
 lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
@@ -291,7 +298,10 @@ lib/mozilla/res/fonts/mathfont.properties
 lib/mozilla/res/fonts/mathfontCMEX10.properties
 lib/mozilla/res/fonts/mathfontCMSY10.properties
 lib/mozilla/res/fonts/mathfontMTExtra.properties
+lib/mozilla/res/fonts/mathfontMath1.properties
+lib/mozilla/res/fonts/mathfontMath2.properties
 lib/mozilla/res/fonts/mathfontMath4.properties
+lib/mozilla/res/fonts/mathfontPUA.properties
 lib/mozilla/res/fonts/mathfontSymbol.properties
 lib/mozilla/res/forms.css
 lib/mozilla/res/gfx/icon_0.gif
@@ -327,6 +337,7 @@ lib/mozilla/res/rdf/folder-open.gif
 lib/mozilla/res/rdf/ignore-test.xul
 lib/mozilla/res/rdf/loading.gif
 lib/mozilla/res/rdf/xpidl-test-1.xul
+lib/mozilla/res/sample.unixpsfonts.properties
 lib/mozilla/res/samples/colorpicker.xul
 lib/mozilla/res/samples/dexopenchrome.xul
 lib/mozilla/res/samples/dexparamdialog.html
@@ -343,6 +354,7 @@ lib/mozilla/res/samples/widgets.xul
 lib/mozilla/res/samples/xpmenu.xul
 lib/mozilla/res/ua.css
 lib/mozilla/res/unixcharset.properties
+lib/mozilla/res/viewsource.css
 lib/mozilla/searchplugins/NetscapeSearch.gif
 lib/mozilla/searchplugins/NetscapeSearch.src
 lib/mozilla/searchplugins/bugzilla.gif
@@ -356,9 +368,11 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
+lib/mozilla/startup-test.html
+lib/mozilla/xpicleanup
 @comment end DATA
-@exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
+@exec env LD_LIBRARY_PATH=/usr/X11R6/lib:%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
+@exec env LD_LIBRARY_PATH=/usr/X11R6/lib:%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
 @unexec rm %D/lib/mozilla/component.reg
 @unexec rm %D/lib/mozilla/chrome/user-locales.rdf
 @unexec rm %D/lib/mozilla/chrome/user-skins.rdf
@@ -391,9 +405,12 @@ lib/mozilla/splash.xpm
 @dirrm lib/mozilla/res/entityTables
 @dirrm lib/mozilla/res/builtin
 @dirrm lib/mozilla/res
-@dirrm lib/mozilla/psmdata/ui
-@dirrm lib/mozilla/psmdata/doc
-@dirrm lib/mozilla/psmdata
+@dirrm lib/mozilla/profile/defaults/profile/chrome
+@dirrm lib/mozilla/profile/defaults/profile/US/chrome
+@dirrm lib/mozilla/profile/defaults/profile/US
+@dirrm lib/mozilla/profile/defaults/profile
+@dirrm lib/mozilla/profile/defaults
+@dirrm lib/mozilla/profile
 @dirrm lib/mozilla/plugins
 @dirrm lib/mozilla/icons
 @dirrm lib/mozilla/dtd
diff --git a/www/mozilla/pkg/PLIST-a.out b/www/mozilla/pkg/PLIST-a.out
index f491b73d062..0cbb263d36b 100644
--- a/www/mozilla/pkg/PLIST-a.out
+++ b/www/mozilla/pkg/PLIST-a.out
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST-a.out,v 1.10 2001/03/30 09:37:51 taya Exp $
+@comment $NetBSD: PLIST-a.out,v 1.11 2001/05/11 00:37:46 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
 lib/mozilla/nsinstall
-lib/mozilla/psm
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
@@ -15,10 +14,10 @@ lib/mozilla/xpcshell
 @comment end PROGRAMS
 @comment begin SCRIPTS
 lib/mozilla/mozilla-config
-lib/mozilla/start-psm
 @comment end SCRIPTS
 @comment begin DSO
 lib/mozilla/components/libabsyncsvc.so.1.0
+lib/mozilla/components/libaccessibility.so.1.0
 lib/mozilla/components/libaddrbook.so.1.0
 lib/mozilla/components/libappcomps.so.1.0
 lib/mozilla/components/libcaps.so.1.0
@@ -28,6 +27,7 @@ lib/mozilla/components/libcookie.so.1.0
 lib/mozilla/components/libdocshell.so.1.0
 lib/mozilla/components/libeditor.so.1.0
 lib/mozilla/components/libembedcomponents.so.1.0
+lib/mozilla/components/libgfx2.so.1.0
 lib/mozilla/components/libgfx_gtk.so.1.0
 lib/mozilla/components/libgfxps.so.1.0
 lib/mozilla/components/libgkcontent.so.1.0
@@ -35,6 +35,11 @@ lib/mozilla/components/libgklayout.so.1.0
 lib/mozilla/components/libgkplugin.so.1.0
 lib/mozilla/components/libgkview.so.1.0
 lib/mozilla/components/libhtmlpars.so.1.0
+lib/mozilla/components/libimggif.so.1.0
+lib/mozilla/components/libimgjpeg.so.1.0
+lib/mozilla/components/libimglib2.so.1.0
+lib/mozilla/components/libimgpng.so.1.0
+lib/mozilla/components/libimgppm.so.1.0
 lib/mozilla/components/libimpText.so.1.0
 lib/mozilla/components/libimport.so.1.0
 lib/mozilla/components/libjar50.so.1.0
@@ -48,6 +53,7 @@ lib/mozilla/components/libmimeemitter.so.1.0
 lib/mozilla/components/libmork.so.1.0
 lib/mozilla/components/libmozbrwsr.so.1.0
 lib/mozilla/components/libmozfind.so.1.0
+lib/mozilla/components/libmozldap.so.1.0
 lib/mozilla/components/libmozucth.so.1.0
 lib/mozilla/components/libmozxfer.so.1.0
 lib/mozilla/components/libmsgcompose.so.1.0
@@ -56,6 +62,7 @@ lib/mozilla/components/libmsgimap.so.1.0
 lib/mozilla/components/libmsgnews.so.1.0
 lib/mozilla/components/libnecko.so.1.0
 lib/mozilla/components/libnecko2.so.1.0
+lib/mozilla/components/libnkcache.so.1.0
 lib/mozilla/components/libnsappshell.so.1.0
 lib/mozilla/components/libnsgif.so.1.0
 lib/mozilla/components/libnsjpg.so.1.0
@@ -64,9 +71,10 @@ lib/mozilla/components/libnsmng.so.1.0
 lib/mozilla/components/libnspng.so.1.0
 lib/mozilla/components/libnsprefm.so.1.0
 lib/mozilla/components/liboji.so.1.0
+lib/mozilla/components/libpipnss.so.1.0
+lib/mozilla/components/libpippki.so.1.0
 lib/mozilla/components/libpref.so.1.0
 lib/mozilla/components/libprofile.so.1.0
-lib/mozilla/components/libpsmglue.so.1.0
 lib/mozilla/components/librdf.so.1.0
 lib/mozilla/components/libregviewer.so.1.0
 lib/mozilla/components/libshistory.so.1.0
@@ -96,13 +104,14 @@ lib/mozilla/components/libxmlextras.so.1.0
 lib/mozilla/components/libxpconnect.so.1.0
 lib/mozilla/components/libxpinstall.so.1.0
 lib/mozilla/components/libxremote_client.so.1.0
-lib/mozilla/libcmt.so.1.0
 lib/mozilla/libgkgfx.so.1.0
 lib/mozilla/libgtkembedmoz.so.1.0
 lib/mozilla/libgtksuperwin.so.1.0
 lib/mozilla/libgtkxtbin.so.1.0
 lib/mozilla/libjsdom.so.1.0
 lib/mozilla/libjsj.so.1.0
+lib/mozilla/liblber40.so.1.0
+lib/mozilla/libldap40.so.1.0
 lib/mozilla/libmozjs.so.1.0
 lib/mozilla/libmsgbaseutil.so.1.0
 lib/mozilla/libnspr4.so.1.0
@@ -110,7 +119,6 @@ lib/mozilla/libnssckbi.so.1.0
 lib/mozilla/libnullplugin.so.1.0
 lib/mozilla/libplc4.so.1.0
 lib/mozilla/libplds4.so.1.0
-lib/mozilla/libprotocol.so.1.0
 lib/mozilla/libxpcom.so.1.0
 lib/mozilla/libxpistub.so.1.0
 lib/mozilla/plugins/libnullplugin.so.1.0
@@ -124,11 +132,15 @@ lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/embed.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-unix.jar
+lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
+lib/mozilla/chrome/pipnss.jar
+lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/components/absync.xpt
+lib/mozilla/components/accessibility.xpt
 lib/mozilla/components/addrbook.xpt
 lib/mozilla/components/appshell.xpt
 lib/mozilla/components/autocomplete.xpt
@@ -138,7 +150,7 @@ lib/mozilla/components/chardet.xpt
 lib/mozilla/components/chatzilla-service.js
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/content_base.xpt
-lib/mozilla/components/cookieviewer.xpt
+lib/mozilla/components/cookie.xpt
 lib/mozilla/components/directory.xpt
 lib/mozilla/components/docshell.xpt
 lib/mozilla/components/dom.xpt
@@ -146,7 +158,9 @@ lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
 lib/mozilla/components/gfx.xpt
+lib/mozilla/components/gfx2.xpt
 lib/mozilla/components/history.xpt
+lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
@@ -163,6 +177,7 @@ lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
 lib/mozilla/components/mozcomps.xpt
 lib/mozilla/components/mozfind.xpt
+lib/mozilla/components/mozldap.xpt
 lib/mozilla/components/mozucth.xpt
 lib/mozilla/components/mozxfer.xpt
 lib/mozilla/components/msgbase.xpt
@@ -183,17 +198,20 @@ lib/mozilla/components/necko_jar.xpt
 lib/mozilla/components/necko_res.xpt
 lib/mozilla/components/necko_socket.xpt
 lib/mozilla/components/necko_strconv.xpt
+lib/mozilla/components/necko_viewsource.xpt
 lib/mozilla/components/nsDictionary.js
 lib/mozilla/components/nsFilePicker.js
+lib/mozilla/components/nsProxyAutoConfig.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipnss.xpt
+lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
 lib/mozilla/components/pref.xpt
 lib/mozilla/components/prefmigr.xpt
 lib/mozilla/components/profile.xpt
 lib/mozilla/components/proxyObjInst.xpt
-lib/mozilla/components/psmglue.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
@@ -255,26 +273,15 @@ lib/mozilla/defaults/wallet/SchemaConcat.tbl
 lib/mozilla/defaults/wallet/SchemaStrings.tbl
 lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
+lib/mozilla/dirver
 lib/mozilla/dtd/mathml.dtd
 lib/mozilla/gtkEmbed
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
-lib/mozilla/psmdata/doc/04digsgn.gif
-lib/mozilla/psmdata/doc/06pcrypt.gif
-lib/mozilla/psmdata/doc/bannerrn.gif
-lib/mozilla/psmdata/doc/cartbanner.gif
-lib/mozilla/psmdata/doc/cmcjavascriptapi.html
-lib/mozilla/psmdata/doc/contents.htm
-lib/mozilla/psmdata/doc/glossary.htm
-lib/mozilla/psmdata/doc/help.htm
-lib/mozilla/psmdata/doc/next.gif
-lib/mozilla/psmdata/doc/prev.gif
-lib/mozilla/psmdata/doc/psmtest.html
-lib/mozilla/psmdata/doc/release_notes.html
-lib/mozilla/psmdata/ui/psm_bin.properties
-lib/mozilla/psmdata/ui/psm_doc.properties
-lib/mozilla/psmdata/ui/psm_text.properties
-lib/mozilla/psmdata/ui/psm_ui.properties
+lib/mozilla/profile/defaults/profile/US/chrome/userChrome.css
+lib/mozilla/profile/defaults/profile/US/chrome/userContent.css
+lib/mozilla/profile/defaults/profile/chrome/userChrome.css
+lib/mozilla/profile/defaults/profile/chrome/userContent.css
 lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
@@ -291,7 +298,10 @@ lib/mozilla/res/fonts/mathfont.properties
 lib/mozilla/res/fonts/mathfontCMEX10.properties
 lib/mozilla/res/fonts/mathfontCMSY10.properties
 lib/mozilla/res/fonts/mathfontMTExtra.properties
+lib/mozilla/res/fonts/mathfontMath1.properties
+lib/mozilla/res/fonts/mathfontMath2.properties
 lib/mozilla/res/fonts/mathfontMath4.properties
+lib/mozilla/res/fonts/mathfontPUA.properties
 lib/mozilla/res/fonts/mathfontSymbol.properties
 lib/mozilla/res/forms.css
 lib/mozilla/res/gfx/icon_0.gif
@@ -327,6 +337,7 @@ lib/mozilla/res/rdf/folder-open.gif
 lib/mozilla/res/rdf/ignore-test.xul
 lib/mozilla/res/rdf/loading.gif
 lib/mozilla/res/rdf/xpidl-test-1.xul
+lib/mozilla/res/sample.unixpsfonts.properties
 lib/mozilla/res/samples/colorpicker.xul
 lib/mozilla/res/samples/dexopenchrome.xul
 lib/mozilla/res/samples/dexparamdialog.html
@@ -343,6 +354,7 @@ lib/mozilla/res/samples/widgets.xul
 lib/mozilla/res/samples/xpmenu.xul
 lib/mozilla/res/ua.css
 lib/mozilla/res/unixcharset.properties
+lib/mozilla/res/viewsource.css
 lib/mozilla/searchplugins/NetscapeSearch.gif
 lib/mozilla/searchplugins/NetscapeSearch.src
 lib/mozilla/searchplugins/bugzilla.gif
@@ -356,9 +368,11 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
+lib/mozilla/startup-test.html
+lib/mozilla/xpicleanup
 @comment end DATA
-@exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
+@exec env LD_LIBRARY_PATH=/usr/X11R6/lib:%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regxpcom
+@exec env LD_LIBRARY_PATH=/usr/X11R6/lib:%D/lib/mozilla MOZILLA_FIVE_HOME=%D/lib/mozilla %D/lib/mozilla/regchrome
 @unexec rm %D/lib/mozilla/component.reg
 @unexec rm %D/lib/mozilla/chrome/user-locales.rdf
 @unexec rm %D/lib/mozilla/chrome/user-skins.rdf
@@ -391,9 +405,12 @@ lib/mozilla/splash.xpm
 @dirrm lib/mozilla/res/entityTables
 @dirrm lib/mozilla/res/builtin
 @dirrm lib/mozilla/res
-@dirrm lib/mozilla/psmdata/ui
-@dirrm lib/mozilla/psmdata/doc
-@dirrm lib/mozilla/psmdata
+@dirrm lib/mozilla/profile/defaults/profile/chrome
+@dirrm lib/mozilla/profile/defaults/profile/US/chrome
+@dirrm lib/mozilla/profile/defaults/profile/US
+@dirrm lib/mozilla/profile/defaults/profile
+@dirrm lib/mozilla/profile/defaults
+@dirrm lib/mozilla/profile
 @dirrm lib/mozilla/plugins
 @dirrm lib/mozilla/icons
 @dirrm lib/mozilla/dtd