Update mozilla to 0.9.4 & add some patches for sparc64(not complete yet)

See release notes for detail.

http://www.mozilla.org/releases/mozilla0.9.4/

13 files changed, 291 insertions, 326 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 62aa539de15..4460412602b 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2001/08/04 07:05:18 taya Exp $
+# $NetBSD: Makefile,v 1.72 2001/09/16 14:03:07 taya Exp $
 
-MOZ_VER=	0.9.3
+MOZ_VER=	0.9.4
 NB_VER=
 DISTNAME=	mozilla-source-${MOZ_VER}
 PKGNAME=	mozilla-${MOZ_VER}${NB_VER}
@@ -68,6 +68,14 @@ DBG=
 CONFIGURE_ARGS+= --enable-optimize
 .endif
 
+XPTCFILES+=	xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
+XPTCFILES+=	xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
+
+post-extract:
+.for F in ${XPTCFILES}
+	${CP} ${FILESDIR}/${F} ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/${F}
+.endfor
+
 post-build:
 	${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
 	${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index cd1490cef02..c496dfa4786 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.8 2001/08/04 15:40:11 taya Exp $
+$NetBSD: distinfo,v 1.9 2001/09/16 14:03:07 taya Exp $
 
-SHA1 (mozilla-source-0.9.3.tar.bz2) = 99c2889bfd2add04b654af44b54392b6de0cbf45
-Size (mozilla-source-0.9.3.tar.bz2) = 26201678 bytes
-SHA1 (patch-aq) = 69524f1b8cf04fe61d0e85db4572ad47a936d308
-SHA1 (patch-au) = 1082412fca3ab32d9bfe573742960b7a51c3f3cd
-SHA1 (patch-aw) = 7ad784a6e947b140ca15cbad23dc06ed02c6f474
-SHA1 (patch-ax) = 02e423df8977198d768470d31fba5c1b8fcde186
-SHA1 (patch-ay) = 8ce9adf98ba0acbea70fa2251cf9969efe3bdac5
-SHA1 (patch-az) = be85cf29b29d3dd6dc6a49c365ee1316bf8d8cfc
+SHA1 (mozilla-source-0.9.4.tar.bz2) = 80105fbd7da80f92c6dd445c7a3aae72cd642baf
+Size (mozilla-source-0.9.4.tar.bz2) = 26350048 bytes
+SHA1 (patch-au) = e245ebfde0f8dd6385c5e59f529590d110534799
+SHA1 (patch-aw) = 7eaa8b24105a6da8ad77b537bbb632621dc9f204
+SHA1 (patch-ax) = e41e4d186cee67d9931e49f428c9a8a30e1e949d
+SHA1 (patch-ay) = 73f81d625b5f0de86f8907492d5175430b7b117c
+SHA1 (patch-az) = e8cbcd85d15189f22f1a282c6e7e00b4f446f40d
+SHA1 (patch-ba) = afd441a3dfa73ec98424f6096fb9197e49d24fe9
+SHA1 (patch-bb) = 9bebf874dc735bfde60bab2a0d615b08819c5d99
+SHA1 (patch-bc) = 852ba0222782cb603627b111c7f079c975c03e59
diff --git a/www/mozilla/patches/patch-aq b/www/mozilla/patches/patch-aq
deleted file mode 100644
index 33ae651420d..00000000000
--- a/www/mozilla/patches/patch-aq
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aq,v 1.5 2001/08/04 07:05:19 taya Exp $
-
-diff -ru ../Orig/mozilla/security/nss/lib/freebl/Makefile ./security/nss/lib/freebl/Makefile
---- ../Orig/mozilla/security/nss/lib/freebl/Makefile	Thu Jun 14 07:53:34 2001
-+++ ./security/nss/lib/freebl/Makefile	Sat Aug  4 10:38:04 2001
-@@ -256,6 +256,19 @@
- MPI_OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_SRCS:.c=$(OBJ_SUFFIX)))
- MPI_OBJS += $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_USERS:.c=$(OBJ_SUFFIX)))
- 
-+#
-+# for NetBSD pkgsrc system
-+#     NetBSD pkgsrc set env. variable 'CFLAGS'.
-+#     This cause CFLAG inherit from config/autoconfig.mk
-+#     CFLAG contains -pedantic and fail to compile dh.c
-+#     SO filter-out -pedantic from CFLAGS
-+#
-+ifeq ($(OS_TARGET),NetBSD)
-+      CFLAGS := $(filter-out -pedantic,$(CFLAGS))
-+endif
-+
-+
-+
- $(MPI_OBJS): $(MPI_HDRS)
- 
- $(OBJDIR)/$(PROG_PREFIX)mpprime$(OBJ_SUFFIX): primes.c
diff --git a/www/mozilla/patches/patch-au b/www/mozilla/patches/patch-au
index de9d8405601..bb8d1174e67 100644
--- a/www/mozilla/patches/patch-au
+++ b/www/mozilla/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.4 2001/08/04 07:05:19 taya Exp $
+$NetBSD: patch-au,v 1.5 2001/09/16 14:03:08 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	Sat Aug  4 10:38:06 2001
++++ ./security/coreconf/NetBSD.mk	Sun Sep 16 20:47:00 2001
 @@ -40,8 +40,13 @@
  CCC			= g++
  RANLIB			= ranlib
diff --git a/www/mozilla/patches/patch-aw b/www/mozilla/patches/patch-aw
index eb734c185c1..e4e7e74296e 100644
--- a/www/mozilla/patches/patch-aw
+++ b/www/mozilla/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.3 2001/08/04 07:05:19 taya Exp $
+$NetBSD: patch-aw,v 1.4 2001/09/16 14:03:08 taya Exp $
 
 diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
 --- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	Sun Apr 29 04:46:11 2001
-+++ ./widget/src/gtksuperwin/Makefile.in	Sat Aug  4 10:38:16 2001
++++ ./widget/src/gtksuperwin/Makefile.in	Sun Sep 16 20:47:03 2001
 @@ -25,6 +25,7 @@
  MODULE		= widget
  LIBRARY_NAME	= gtksuperwin
diff --git a/www/mozilla/patches/patch-ax b/www/mozilla/patches/patch-ax
index 74100687cf8..d77a7cdd716 100644
--- a/www/mozilla/patches/patch-ax
+++ b/www/mozilla/patches/patch-ax
@@ -1,22 +1,19 @@
-$NetBSD: patch-ax,v 1.2 2001/08/04 07:05:19 taya Exp $
+$NetBSD: patch-ax,v 1.3 2001/09/16 14:03:08 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/src/nsSocketTransport.cpp
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp	Wed Jul 25 16:53:13 2001
-+++ ./netwerk/base/src/nsSocketTransport.cpp	Sat Aug  4 10:38:21 2001
-@@ -170,8 +170,12 @@
+--- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp	Wed Aug 22 09:24:26 2001
++++ ./netwerk/base/src/nsSocketTransport.cpp	Sun Sep 16 20:47:05 2001
+@@ -170,8 +170,7 @@
      //
      // Set up Internet defaults...
      //
-+#if 0
-     memset(&mNetAddress, 0, sizeof(mNetAddress));
-     PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
-+#else
+-    memset(&mNetAddress, 0, sizeof(mNetAddress));
+-    PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, 0, &mNetAddress);
 +    mNetAddressList = NULL;
-+#endif
      
      //
      // Initialize the global connect timeout value if necessary...
-@@ -220,6 +224,13 @@
+@@ -220,6 +219,13 @@
          nsAutoMonitor::DestroyMonitor(mMonitor);
          mMonitor = nsnull;
      }
@@ -30,53 +27,42 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
  }
  
  
-@@ -604,14 +615,20 @@
+@@ -604,14 +610,13 @@
      //
      // The hostname has not been resolved yet...
      //
-+#if 0
-     if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+#else
+-    if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
 +    if (mNetAddressList == NULL) {
-+#endif
          //
          // Initialize the port used for the connection...
          //
          // XXX: The list of ports must be restricted - see net_bad_ports_table[] in 
          //      mozilla/network/main/mkconect.c
          //
-+#if 0
-         mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+#endif
+-        mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
  
          nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
          if (NS_FAILED(rv)) return rv;
-@@ -635,7 +652,11 @@
+@@ -635,7 +640,7 @@
              //
              // The DNS lookup has finished...  It has either failed or succeeded.
              //
-+#if 0
-             if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+#else
+-            if (NS_FAILED(mStatus) || !PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
 +            if (NS_FAILED(mStatus) || mNetAddressList != NULL) {
-+#endif
                  mDNSRequest = 0;
                  rv = mStatus;
              } 
-@@ -795,7 +816,12 @@
+@@ -795,7 +800,8 @@
          //    This is only done the first time doConnection(...) is called.
          //
          if (NS_SUCCEEDED(rv)) {
-+#if 0
-             status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
-+#else
+-            status = PR_Connect(mSocketFD, &mNetAddress, gConnectTimeout);
 +try_again:
 +            status = PR_Connect(mSocketFD, &(mNetAddressp->mNetAddress), gConnectTimeout);
-+#endif
              if (PR_SUCCESS != status) {
                  PRErrorCode code = PR_GetError();
                  //
-@@ -820,6 +846,9 @@
+@@ -820,6 +826,9 @@
                  //
                  else {
                      // Connection refused...
@@ -86,7 +72,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
                      LOG(("nsSocketTransport: Connection Refused [%s:%d %x].  PRErrorCode = %x\n",
                          mHostName, mPort, this, code));
                      rv = NS_ERROR_CONNECTION_REFUSED;
-@@ -833,11 +862,17 @@
+@@ -833,11 +842,17 @@
      //
      else if (aSelectFlags) {
          if (PR_POLL_EXCEPT & aSelectFlags) {
@@ -104,80 +90,65 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
              LOG(("nsSocketTransport: Connection Refused via PR_POLL_HUP. [%s:%d %x].\n", 
                  mHostName, mPort, this));
              rv = NS_ERROR_CONNECTION_REFUSED;
-@@ -880,7 +915,11 @@
+@@ -880,7 +895,7 @@
      //
      // The hostname has not been resolved yet...
      //
-+#if 0
-     if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
-+#else
+-    if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny)) {
 +    if (mNetAddressList == NULL) {
-+#endif
          nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
          if (NS_FAILED(rv)) return rv;
  
-@@ -899,6 +938,7 @@
+@@ -899,16 +914,19 @@
              return NS_ERROR_FAILURE;
          }
  
-+#if 0
-         if (addr.raw.family == PR_AF_INET)
-             PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
-         else
-@@ -909,6 +949,21 @@
- 
-         LOG(("address { family=%hu, port=%hu }\n",
-             mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
-+#else
 +/****************/
 +        mNetAddressList = new PRNetAddrList;
 +	mNetAddressList->next = NULL;
-+        if (addr.raw.family == PR_AF_INET)
+         if (addr.raw.family == PR_AF_INET)
+-            PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &mNetAddress.ipv6.ip);
 +            PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &(mNetAddressList->mNetAddress.ipv6.ip));
-+        else
+         else
+-            memcpy(&mNetAddress.ipv6.ip, &addr.ipv6.ip, sizeof(mNetAddress.ipv6.ip));
 +            memcpy(&(mNetAddressList->mNetAddress.ipv6.ip), &addr.ipv6.ip, sizeof(mNetAddressList->mNetAddress.ipv6.ip));
-+
+ 
+-        mNetAddress.ipv6.port
 +        mNetAddressList->mNetAddress.ipv6.port
-+            = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
-+
-+        LOG(("address { family=%hu, port=%hu }\n",
+             = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
+ 
+         LOG(("address { family=%hu, port=%hu }\n",
+-            mNetAddress.ipv6.family, PR_ntohs(mNetAddress.ipv6.port)));
 +            mNetAddressList->mNetAddress.ipv6.family, PR_ntohs(mNetAddressList->mNetAddress.ipv6.port)));
-+#endif
      }
  
      //
-@@ -1340,6 +1395,7 @@
-     return NS_OK;
- }
- 
-+#if 0
- NS_IMETHODIMP
- nsSocketTransport::OnFound(nsISupports *aContext, 
-                            const char* aHostName,
-@@ -1376,6 +1432,51 @@
- 
-     return rv;
- }
-+#else
-+NS_IMETHODIMP
-+nsSocketTransport::OnFound(nsISupports *aContext, 
-+                           const char* aHostName,
-+                           nsHostEnt *aHostEnt) 
-+{
-+    // Enter the socket transport lock...
-+    nsAutoMonitor mon(mMonitor);
-+    nsresult rv = NS_OK;
+@@ -1373,21 +1391,28 @@
+     // Enter the socket transport lock...
+     nsAutoMonitor mon(mMonitor);
+     nsresult rv = NS_OK;
 +    char **p;
 +    PRNetAddrList **addrp = &mNetAddressList;
-+
-+    if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
+ 
+     if (aHostEnt->hostEnt.h_addr_list && aHostEnt->hostEnt.h_addr_list[0]) {
+-        if (aHostEnt->hostEnt.h_addrtype == PR_AF_INET6)
+-            memcpy(&mNetAddress.ipv6.ip, aHostEnt->hostEnt.h_addr_list[0], sizeof(mNetAddress.ipv6.ip));
+-        else
+-            PR_ConvertIPv4AddrToIPv6(*(PRUint32*)aHostEnt->hostEnt.h_addr_list[0], &mNetAddress.ipv6.ip);
 +        for(p = aHostEnt->hostEnt.h_addr_list; *p; p++){
 +	  *addrp = new PRNetAddrList;
 +	  (*addrp)->next = NULL;
 +          (*addrp)->mNetAddress.ipv6.port = PR_htons(((mProxyPort != -1 && !mProxyTransparent) ? mProxyPort : mPort));
 +          (*addrp)->mNetAddress.raw.family = PR_AF_INET6;
 +          memcpy(&((*addrp)->mNetAddress.ipv6.ip), *p, sizeof((*addrp)->mNetAddress.ipv6.ip));
-+#if defined(PR_LOGGING)
+ #if defined(PR_LOGGING)
+-        char addrbuf[50];
+-        PR_NetAddrToString(&mNetAddress, addrbuf, sizeof(addrbuf));
+-        LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
+-            "  DNS lookup succeeded => %s (%s)\n",
+-            mHostName, mPort, this,
+-            aHostEnt->hostEnt.h_name,
+-            addrbuf));
 +          char addrbuf[50];
 +          PR_NetAddrToString(&((*addrp)->mNetAddress), addrbuf, sizeof(addrbuf));
 +          LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
@@ -185,48 +156,28 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
 +              mHostName, mPort, this,
 +              aHostEnt->hostEnt.h_name,
 +              addrbuf));
-+#endif
+ #endif
 +          addrp = &((*addrp)->next);
 +      }
 +      mNetAddressp = mNetAddressList;
-+    } else {
-+        // XXX: What should happen here?  The GetHostByName(...) succeeded but 
-+        //      there are *no* A records...
-+        rv = NS_ERROR_FAILURE;
-+
-+        LOG(("nsSocketTransport: OnFound(...) [%s:%d %x]."
-+            "  DNS lookup succeeded (%s) but no address returned!",
-+            mHostName, mPort, this,
-+            aHostEnt->hostEnt.h_name));
-+    }
-+
-+    return rv;
-+}
-+#endif
- 
- NS_IMETHODIMP
- nsSocketTransport::OnStopLookup(nsISupports *aContext,
-@@ -1395,7 +1496,11 @@
+     } else {
+         // XXX: What should happen here?  The GetHostByName(...) succeeded but 
+         //      there are *no* A records...
+@@ -1420,7 +1445,7 @@
      // If the lookup failed, set the status...
      if (NS_FAILED(aStatus))
          mStatus = aStatus;
-+#if 0
-     else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
-+#else
+-    else if (PR_IsNetAddrType(&mNetAddress, PR_IpAddrAny))
 +    else if (mNetAddressList == NULL)
-+#endif
          mStatus = NS_ERROR_ABORT;
  
      // Start processing the transport again - if necessary...
-@@ -1722,7 +1827,11 @@
+@@ -1741,7 +1766,7 @@
      *_retval = (char*)nsMemory::Alloc(aLen);
      if (!*_retval) return NS_ERROR_FAILURE;
  
-+#if 0
-     PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
-+#else
+-    PRStatus status = PR_NetAddrToString(&mNetAddress, *_retval, aLen);
 +    PRStatus status = PR_NetAddrToString(&mNetAddressList->mNetAddress, *_retval, aLen);
-+#endif
  
      if (PR_FAILURE == status) {
          nsMemory::Free(*_retval);
diff --git a/www/mozilla/patches/patch-ay b/www/mozilla/patches/patch-ay
index 47fe790258c..2947e793caa 100644
--- a/www/mozilla/patches/patch-ay
+++ b/www/mozilla/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.2 2001/08/04 07:05:19 taya Exp $
+$NetBSD: patch-ay,v 1.3 2001/09/16 14:03:09 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h ./netwerk/base/src/nsSocketTransport.h
 --- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h	Sat May 12 06:03:21 2001
-+++ ./netwerk/base/src/nsSocketTransport.h	Sat Aug  4 10:38:28 2001
++++ ./netwerk/base/src/nsSocketTransport.h	Sun Sep 16 20:47:10 2001
 @@ -107,6 +107,11 @@
    eSocketDNS_Wait             = 0x2020
  };
@@ -15,16 +15,13 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h ./netwerk/base/src
  //
  // This is the default timeout value (in milliseconds) for sockets which have
  // no activity...
-@@ -231,7 +236,12 @@
+@@ -231,7 +236,8 @@
      PRIntervalTime                  mLastActiveTime;
      PRCList                         mListLink;
      PRMonitor*                      mMonitor;
-+#if 0
-     PRNetAddr                       mNetAddress;
-+#else
+-    PRNetAddr                       mNetAddress;
 +    PRNetAddrList                   *mNetAddressList;
 +    PRNetAddrList                   *mNetAddressp;
-+#endif
      nsSocketOperation               mOperation;
      nsCOMPtr<nsISupports>           mSecurityInfo;
  
diff --git a/www/mozilla/patches/patch-az b/www/mozilla/patches/patch-az
index 77a823c6b31..8bbece36dad 100644
--- a/www/mozilla/patches/patch-az
+++ b/www/mozilla/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.1 2001/08/04 07:05:19 taya Exp $
+$NetBSD: patch-az,v 1.2 2001/09/16 14:03:09 taya Exp $
 
 diff -ru ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h ./directory/c-sdk/ldap/include/portable.h
---- ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h	Sat Jul 28 07:02:31 2001
-+++ ./directory/c-sdk/ldap/include/portable.h	Sat Aug  4 10:38:30 2001
+--- ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h	Wed Aug 15 16:14:54 2001
++++ ./directory/c-sdk/ldap/include/portable.h	Sun Sep 16 20:47:15 2001
 @@ -98,7 +98,7 @@
   * some systems don't have the BSD re_comp and re_exec routines
   */
diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba
new file mode 100644
index 00000000000..9419c7d9a07
--- /dev/null
+++ b/www/mozilla/patches/patch-ba
@@ -0,0 +1,58 @@
+$NetBSD: patch-ba,v 1.1 2001/09/16 14:03:09 taya Exp $
+
+diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	Sat Dec  2 06:29:17 2000
++++ ./nsprpub/pr/include/md/_netbsd.cfg	Sun Sep 16 20:47:23 2001
+@@ -91,6 +91,52 @@
+ #define PR_ALIGN_OF_DOUBLE  4
+ #define PR_ALIGN_OF_POINTER 4
+ 
++#elif defined(__sparc_v9__)
++
++#undef IS_LITTLE_ENDIAN
++#define  IS_BIG_ENDIAN 1
++#define HAVE_LONG_LONG
++#define  HAVE_ALIGNED_DOUBLES
++#define  HAVE_ALIGNED_LONGLONGS
++
++#define PR_BYTES_PER_BYTE   1
++#define PR_BYTES_PER_SHORT  2
++#define PR_BYTES_PER_INT    4
++#define PR_BYTES_PER_INT64  8
++#define PR_BYTES_PER_LONG   8
++#define PR_BYTES_PER_FLOAT  4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD   8
++#define PR_BYTES_PER_DWORD  8
++#define PR_BYTES_PER_WORD_LOG2   3
++#define PR_BYTES_PER_DWORD_LOG2  3
++
++#define PR_BITS_PER_BYTE    8
++#define PR_BITS_PER_SHORT   16
++#define PR_BITS_PER_INT     32
++#define PR_BITS_PER_INT64   64
++#define PR_BITS_PER_LONG    64
++#define PR_BITS_PER_FLOAT   32
++#define PR_BITS_PER_DOUBLE  64
++#define PR_BITS_PER_WORD    64
++
++#define PR_BITS_PER_BYTE_LOG2   3
++#define PR_BITS_PER_SHORT_LOG2  4
++#define PR_BITS_PER_INT_LOG2    5
++#define PR_BITS_PER_INT64_LOG2  6
++#define PR_BITS_PER_LONG_LOG2   6
++#define PR_BITS_PER_FLOAT_LOG2  5
++#define PR_BITS_PER_DOUBLE_LOG2 6
++#define PR_BITS_PER_WORD_LOG2   6
++
++#define PR_ALIGN_OF_SHORT   2
++#define PR_ALIGN_OF_INT     4
++#define PR_ALIGN_OF_LONG    8
++#define PR_ALIGN_OF_INT64   8 
++#define PR_ALIGN_OF_FLOAT   4 
++#define PR_ALIGN_OF_DOUBLE  8 
++#define PR_ALIGN_OF_POINTER 8 
++
+ #elif defined(__sparc__) || defined(__MIPSEB__)
+ 
+ #undef IS_LITTLE_ENDIAN
diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb
new file mode 100644
index 00000000000..db98aa49999
--- /dev/null
+++ b/www/mozilla/patches/patch-bb
@@ -0,0 +1,33 @@
+$NetBSD: patch-bb,v 1.1 2001/09/16 14:03:09 taya Exp $
+
+diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	Fri Dec 29 02:04:04 2000
++++ ./nsprpub/pr/include/md/_netbsd.h	Sun Sep 16 20:47:26 2001
+@@ -48,6 +48,8 @@
+ #define _PR_SI_ARCHITECTURE "m68k"
+ #elif defined(__powerpc__)
+ #define _PR_SI_ARCHITECTURE "powerpc"
++#elif defined(__sparc_v9__)
++#define _PR_SI_ARCHITECTURE "sparc64"
+ #elif defined(__sparc__)
+ #define _PR_SI_ARCHITECTURE "sparc"
+ #elif defined(__mips__)
+@@ -106,7 +108,17 @@
+ }
+ #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
+ #endif
+-#ifdef __sparc__
++#ifdef __sparc_v9__
++#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                  \
++{                                                                      \
++    sigsetjmp(CONTEXT(_thread), 1);                                    \
++    CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff);      \
++    CONTEXT(_thread)[2] = (long) _main;                                \
++    CONTEXT(_thread)[3] = (long) _main + 4;                            \
++    *status = PR_TRUE;                                                 \
++}
++#define        _MD_GET_SP(_thread)     (CONTEXT(_thread)[2]+0x7ff)
++#elif defined(__sparc__)
+ #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
+ {									\
+     sigsetjmp(CONTEXT(_thread), 1);					\
diff --git a/www/mozilla/patches/patch-bc b/www/mozilla/patches/patch-bc
new file mode 100644
index 00000000000..6ca14fabbd9
--- /dev/null
+++ b/www/mozilla/patches/patch-bc
@@ -0,0 +1,19 @@
+$NetBSD: patch-bc,v 1.1 2001/09/16 14:03:10 taya Exp $
+
+diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Tue Jun 19 07:10:25 2001
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Sep 16 20:47:28 2001
+@@ -235,6 +235,13 @@
+ CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
+ ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
+ endif
++#   
++# NetBSD/SPARC64
++#   
++ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
++CPPSRCS		:= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
++ASFILES		:= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
++endif
+ #
+ # Solaris/SPARC
+ #
diff --git a/www/mozilla/pkg/PLIST-ELF b/www/mozilla/pkg/PLIST-ELF
index 374926ef786..da89ed855da 100644
--- a/www/mozilla/pkg/PLIST-ELF
+++ b/www/mozilla/pkg/PLIST-ELF
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-ELF,v 1.14 2001/08/04 07:05:19 taya Exp $
+@comment $NetBSD: PLIST-ELF,v 1.15 2001/09/16 14:03:10 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
@@ -65,11 +65,7 @@ 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
 lib/mozilla/components/libnslocale.so
-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
@@ -119,6 +115,7 @@ lib/mozilla/libnssckbi.so
 lib/mozilla/libnullplugin.so
 lib/mozilla/libplc4.so
 lib/mozilla/libplds4.so
+lib/mozilla/libxlibrgb.so
 lib/mozilla/libxpcom.so
 lib/mozilla/libxpistub.so
 lib/mozilla/plugins/libnullplugin.so
@@ -342,6 +339,7 @@ lib/mozilla/res/html/gopher-unknown.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
+lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -394,8 +392,6 @@ lib/mozilla/startup-test.html
 lib/mozilla/xpicleanup
 @comment end DATA
 @comment begin INCLUDE
-include/mozilla/CNavDTD.h
-include/mozilla/COtherDTD.h
 include/mozilla/ImageLogging.h
 include/mozilla/InstallCleanupDefines.h
 include/mozilla/MailNewsTypes.h
@@ -406,10 +402,8 @@ include/mozilla/VerReg.h
 include/mozilla/bool.h
 include/mozilla/cdefs.h
 include/mozilla/comi18n.h
-include/mozilla/csid.h
 include/mozilla/disptmpl.h
 include/mozilla/domstubs.h
-include/mozilla/dummy_nc.h
 include/mozilla/fdlibm.h
 include/mozilla/ftpCore.h
 include/mozilla/gdksuperwin.h
@@ -423,19 +417,6 @@ include/mozilla/gtkmozbox.h
 include/mozilla/gtkmozembed.h
 include/mozilla/gtkmozembed_internal.h
 include/mozilla/gtkxtbin.h
-include/mozilla/if_struct.h
-include/mozilla/il.h
-include/mozilla/ilErrors.h
-include/mozilla/ilIImageRenderer.h
-include/mozilla/ilINetContext.h
-include/mozilla/ilINetReader.h
-include/mozilla/ilISystemServices.h
-include/mozilla/ilIURL.h
-include/mozilla/il_icons.h
-include/mozilla/il_strm.h
-include/mozilla/il_types.h
-include/mozilla/il_util.h
-include/mozilla/il_utilp.h
 include/mozilla/imgICache.h
 include/mozilla/imgIContainer.h
 include/mozilla/imgIContainerObserver.h
@@ -502,7 +483,6 @@ include/mozilla/jsxdrapi.h
 include/mozilla/jvmmgr.h
 include/mozilla/lber.h
 include/mozilla/ldap.h
-include/mozilla/libimg.h
 include/mozilla/libmng.h
 include/mozilla/libmng_conf.h
 include/mozilla/libmng_types.h
@@ -527,7 +507,6 @@ include/mozilla/ncompat.h
 include/mozilla/netCore.h
 include/mozilla/netscape_javascript_JSException.h
 include/mozilla/netscape_javascript_JSObject.h
-include/mozilla/ni_pixmp.h
 include/mozilla/nntpCore.h
 include/mozilla/npapi.h
 include/mozilla/npupp.h
@@ -543,10 +522,22 @@ include/mozilla/nsAbAddressCollecter.h
 include/mozilla/nsAbAutoCompleteSession.h
 include/mozilla/nsAbBSDirectory.h
 include/mozilla/nsAbBaseCID.h
+include/mozilla/nsAbBooleanExpression.h
 include/mozilla/nsAbCardProperty.h
+include/mozilla/nsAbDirFactoryService.h
 include/mozilla/nsAbDirProperty.h
+include/mozilla/nsAbDirSearchListener.h
+include/mozilla/nsAbDirectoryQuery.h
+include/mozilla/nsAbDirectoryQueryProxy.h
+include/mozilla/nsAbDirectoryRDFResource.h
+include/mozilla/nsAbLDAPAutoCompFormatter.h
+include/mozilla/nsAbLDAPCard.h
+include/mozilla/nsAbLDAPDirFactory.h
+include/mozilla/nsAbLDAPDirectory.h
+include/mozilla/nsAbLDAPDirectoryQuery.h
 include/mozilla/nsAbMDBCard.h
 include/mozilla/nsAbMDBCardProperty.h
+include/mozilla/nsAbMDBDirFactory.h
 include/mozilla/nsAbMDBDirProperty.h
 include/mozilla/nsAbMDBDirectory.h
 include/mozilla/nsAbMDBRDFResource.h
@@ -613,7 +604,6 @@ include/mozilla/nsDBFolderInfo.h
 include/mozilla/nsDOMCID.h
 include/mozilla/nsDOMCSSDeclaration.h
 include/mozilla/nsDOMError.h
-include/mozilla/nsDOMEventsIIDs.h
 include/mozilla/nsDateTimeFormatCID.h
 include/mozilla/nsDebug.h
 include/mozilla/nsDependentConcatenation.h
@@ -637,6 +627,8 @@ include/mozilla/nsEscape.h
 include/mozilla/nsEvent.h
 include/mozilla/nsExternalHelperAppService.h
 include/mozilla/nsExternalProtocolHandler.h
+include/mozilla/nsFastLoadPtr.h
+include/mozilla/nsFastLoadService.h
 include/mozilla/nsFileSpec.h
 include/mozilla/nsFileSpecStreaming.h
 include/mozilla/nsFileStream.h
@@ -652,9 +644,8 @@ include/mozilla/nsGfxPSCID.h
 include/mozilla/nsGfxXPrintCID.h
 include/mozilla/nsHTMLAtomList.h
 include/mozilla/nsHTMLAtoms.h
-include/mozilla/nsHTMLEntities.h
-include/mozilla/nsHTMLEntityList.h
 include/mozilla/nsHTMLParts.h
+include/mozilla/nsHTMLReflowMetrics.h
 include/mozilla/nsHTMLReflowState.h
 include/mozilla/nsHTMLTagList.h
 include/mozilla/nsHTMLTags.h
@@ -669,8 +660,15 @@ include/mozilla/nsIASN1Outliner.h
 include/mozilla/nsIAbAddressCollecter.h
 include/mozilla/nsIAbAutoCompleteSession.h
 include/mozilla/nsIAbBase.h
+include/mozilla/nsIAbBooleanExpression.h
 include/mozilla/nsIAbCard.h
+include/mozilla/nsIAbDirFactory.h
+include/mozilla/nsIAbDirFactoryService.h
 include/mozilla/nsIAbDirectory.h
+include/mozilla/nsIAbDirectoryQuery.h
+include/mozilla/nsIAbDirectoryQueryProxy.h
+include/mozilla/nsIAbDirectorySearch.h
+include/mozilla/nsIAbLDAPAutoCompFormatter.h
 include/mozilla/nsIAbListener.h
 include/mozilla/nsIAbMDBCard.h
 include/mozilla/nsIAbMDBDirectory.h
@@ -723,6 +721,7 @@ include/mozilla/nsIBinaryOutputStream.h
 include/mozilla/nsIBinarySearchIterator.h
 include/mozilla/nsIBindingManager.h
 include/mozilla/nsIBlender.h
+include/mozilla/nsIBodySuper.h
 include/mozilla/nsIBookmarksService.h
 include/mozilla/nsIBoxLayoutManager.h
 include/mozilla/nsIBoxObject.h
@@ -789,7 +788,6 @@ include/mozilla/nsICmdLineService.h
 include/mozilla/nsICodebasePrincipal.h
 include/mozilla/nsICollation.h
 include/mozilla/nsICollection.h
-include/mozilla/nsIComboBox.h
 include/mozilla/nsIComboboxControlFrame.h
 include/mozilla/nsICommandHandler.h
 include/mozilla/nsIComponentLoader.h
@@ -810,7 +808,6 @@ include/mozilla/nsIContentViewer.h
 include/mozilla/nsIContentViewerContainer.h
 include/mozilla/nsIContentViewerEdit.h
 include/mozilla/nsIContentViewerFile.h
-include/mozilla/nsIContextMenu.h
 include/mozilla/nsIContextMenuListener.h
 include/mozilla/nsIController.h
 include/mozilla/nsIControllerCommand.h
@@ -944,7 +941,6 @@ include/mozilla/nsIDOMLinkStyle.h
 include/mozilla/nsIDOMLoadListener.h
 include/mozilla/nsIDOMLocation.h
 include/mozilla/nsIDOMMediaList.h
-include/mozilla/nsIDOMMenuListener.h
 include/mozilla/nsIDOMMimeType.h
 include/mozilla/nsIDOMMimeTypeArray.h
 include/mozilla/nsIDOMMouseEvent.h
@@ -1003,9 +999,9 @@ include/mozilla/nsIDOMXPConnectFactory.h
 include/mozilla/nsIDOMXULCommandDispatcher.h
 include/mozilla/nsIDOMXULDocument.h
 include/mozilla/nsIDOMXULElement.h
+include/mozilla/nsIDOMXULListener.h
 include/mozilla/nsIDOMXULTreeElement.h
 include/mozilla/nsIDTD.h
-include/mozilla/nsIDTDDebug.h
 include/mozilla/nsIDataChannel.h
 include/mozilla/nsIDateTimeFormat.h
 include/mozilla/nsIDeviceContext.h
@@ -1078,6 +1074,8 @@ include/mozilla/nsIExternalHelperAppService.h
 include/mozilla/nsIExternalProtocolService.h
 include/mozilla/nsIFTPChannel.h
 include/mozilla/nsIFactory.h
+include/mozilla/nsIFastLoadFileControl.h
+include/mozilla/nsIFastLoadService.h
 include/mozilla/nsIFile.h
 include/mozilla/nsIFileChannel.h
 include/mozilla/nsIFilePicker.h
@@ -1113,7 +1111,6 @@ include/mozilla/nsIFormSubmitObserver.h
 include/mozilla/nsIFormatConverter.h
 include/mozilla/nsIFrame.h
 include/mozilla/nsIFrameDebug.h
-include/mozilla/nsIFrameImageLoader.h
 include/mozilla/nsIFrameManager.h
 include/mozilla/nsIFrameSelection.h
 include/mozilla/nsIFrameTraversal.h
@@ -1149,10 +1146,6 @@ include/mozilla/nsIIMAPHostSessionList.h
 include/mozilla/nsIIOService.h
 include/mozilla/nsIImage.h
 include/mozilla/nsIImageFrame.h
-include/mozilla/nsIImageGroup.h
-include/mozilla/nsIImageManager.h
-include/mozilla/nsIImageObserver.h
-include/mozilla/nsIImageRequest.h
 include/mozilla/nsIImapExtensionSink.h
 include/mozilla/nsIImapFlagAndUidState.h
 include/mozilla/nsIImapIncomingServer.h
@@ -1164,8 +1157,6 @@ include/mozilla/nsIImapProtocol.h
 include/mozilla/nsIImapServerSink.h
 include/mozilla/nsIImapService.h
 include/mozilla/nsIImapUrl.h
-include/mozilla/nsIImgDCallbk.h
-include/mozilla/nsIImgDecoder.h
 include/mozilla/nsIImgManager.h
 include/mozilla/nsIImportABDescriptor.h
 include/mozilla/nsIImportAddressBooks.h
@@ -1205,6 +1196,8 @@ include/mozilla/nsIJVMPrefsWindow.h
 include/mozilla/nsIJVMWindow.h
 include/mozilla/nsIKBStateControl.h
 include/mozilla/nsIKeyedStreamGenerator.h
+include/mozilla/nsIKeygenThread.h
+include/mozilla/nsILDAPAutoCompFormatter.h
 include/mozilla/nsILDAPAutoCompleteSession.h
 include/mozilla/nsILDAPConnection.h
 include/mozilla/nsILDAPErrors.h
@@ -1227,9 +1220,7 @@ include/mozilla/nsILineIterator.h
 include/mozilla/nsILinearIterator.h
 include/mozilla/nsILink.h
 include/mozilla/nsILinkHandler.h
-include/mozilla/nsIListBox.h
 include/mozilla/nsIListControlFrame.h
-include/mozilla/nsIListWidget.h
 include/mozilla/nsILiveConnectManager.h
 include/mozilla/nsILiveConnectPlugInstPeer.h
 include/mozilla/nsILiveConnectPlugin.h
@@ -1239,10 +1230,8 @@ include/mozilla/nsILocalFile.h
 include/mozilla/nsILocalMailIncomingServer.h
 include/mozilla/nsILocalStore.h
 include/mozilla/nsILocale.h
-include/mozilla/nsILocaleFactory.h
 include/mozilla/nsILocaleService.h
 include/mozilla/nsILoggingService.h
-include/mozilla/nsILoggingSink.h
 include/mozilla/nsILookAndFeel.h
 include/mozilla/nsIMAPBodyShell.h
 include/mozilla/nsIMAPGenericParser.h
@@ -1258,6 +1247,7 @@ include/mozilla/nsIMalloc.h
 include/mozilla/nsIMappingCache.h
 include/mozilla/nsIMarkupDocumentViewer.h
 include/mozilla/nsIMdbFactoryFactory.h
+include/mozilla/nsIMediaList.h
 include/mozilla/nsIMemory.h
 include/mozilla/nsIMenu.h
 include/mozilla/nsIMenuBar.h
@@ -1337,6 +1327,7 @@ include/mozilla/nsIMsgSend.h
 include/mozilla/nsIMsgSendLater.h
 include/mozilla/nsIMsgSendLaterListener.h
 include/mozilla/nsIMsgSendListener.h
+include/mozilla/nsIMsgSendReport.h
 include/mozilla/nsIMsgSignature.h
 include/mozilla/nsIMsgStatusFeedback.h
 include/mozilla/nsIMsgStringService.h
@@ -1365,6 +1356,8 @@ include/mozilla/nsINodeInfo.h
 include/mozilla/nsINoneService.h
 include/mozilla/nsIOS2Locale.h
 include/mozilla/nsIObjectFrame.h
+include/mozilla/nsIObjectInputStream.h
+include/mozilla/nsIObjectOutputStream.h
 include/mozilla/nsIObserver.h
 include/mozilla/nsIObserverList.h
 include/mozilla/nsIObserverService.h
@@ -1415,7 +1408,7 @@ include/mozilla/nsIPop3Service.h
 include/mozilla/nsIPop3Sink.h
 include/mozilla/nsIPop3URL.h
 include/mozilla/nsIPopUpMenu.h
-include/mozilla/nsIPopupSetBoxObject.h
+include/mozilla/nsIPopupBoxObject.h
 include/mozilla/nsIPopupSetFrame.h
 include/mozilla/nsIPosixLocale.h
 include/mozilla/nsIPref.h
@@ -1474,7 +1467,6 @@ include/mozilla/nsIRDFXMLParser.h
 include/mozilla/nsIRDFXMLSerializer.h
 include/mozilla/nsIRDFXMLSink.h
 include/mozilla/nsIRDFXMLSource.h
-include/mozilla/nsIRadioButton.h
 include/mozilla/nsIRadioControlFrame.h
 include/mozilla/nsIRangeUtils.h
 include/mozilla/nsIReflowCallback.h
@@ -1531,6 +1523,7 @@ include/mozilla/nsIScriptableDateFormat.h
 include/mozilla/nsIScriptableInputStream.h
 include/mozilla/nsIScriptablePlugin.h
 include/mozilla/nsIScriptableRegion.h
+include/mozilla/nsIScriptableUConv.h
 include/mozilla/nsIScrollBoxObject.h
 include/mozilla/nsIScrollPositionListener.h
 include/mozilla/nsIScrollable.h
@@ -1550,12 +1543,14 @@ include/mozilla/nsISecurityEventSink.h
 include/mozilla/nsISecurityManagerComponent.h
 include/mozilla/nsISecurityPref.h
 include/mozilla/nsISeekablePluginStreamPeer.h
+include/mozilla/nsISeekableStream.h
 include/mozilla/nsISelectControlFrame.h
 include/mozilla/nsISelectElement.h
 include/mozilla/nsISelection.h
 include/mozilla/nsISelectionController.h
 include/mozilla/nsISelectionListener.h
 include/mozilla/nsISelectionPrivate.h
+include/mozilla/nsISerializable.h
 include/mozilla/nsIServiceManager.h
 include/mozilla/nsISidebar.h
 include/mozilla/nsISignatureVerifier.h
@@ -1575,7 +1570,9 @@ include/mozilla/nsISpaceManager.h
 include/mozilla/nsISpellChecker.h
 include/mozilla/nsISplashScreen.h
 include/mozilla/nsIStatefulFrame.h
+include/mozilla/nsIStopwatch.h
 include/mozilla/nsIStorageStream.h
+include/mozilla/nsIStreamBufferAccess.h
 include/mozilla/nsIStreamConverter.h
 include/mozilla/nsIStreamConverterService.h
 include/mozilla/nsIStreamIO.h
@@ -1610,7 +1607,6 @@ include/mozilla/nsITXTToHTMLConv.h
 include/mozilla/nsITableCellLayout.h
 include/mozilla/nsITableEditor.h
 include/mozilla/nsITableLayout.h
-include/mozilla/nsITextAreaWidget.h
 include/mozilla/nsITextContent.h
 include/mozilla/nsITextFrame.h
 include/mozilla/nsITextScroll.h
@@ -1624,6 +1620,7 @@ include/mozilla/nsIThreadManager.h
 include/mozilla/nsIThreadPool.h
 include/mozilla/nsITimeBomb.h
 include/mozilla/nsITimeRecorder.h
+include/mozilla/nsITimelineService.h
 include/mozilla/nsITimer.h
 include/mozilla/nsITimerCallback.h
 include/mozilla/nsITimerQueue.h
@@ -1648,6 +1645,7 @@ include/mozilla/nsIURI.h
 include/mozilla/nsIURIContentListener.h
 include/mozilla/nsIURIFixup.h
 include/mozilla/nsIURILoader.h
+include/mozilla/nsIURIRefObject.h
 include/mozilla/nsIURL.h
 include/mozilla/nsIURLFetcher.h
 include/mozilla/nsIURLParser.h
@@ -1738,7 +1736,6 @@ include/mozilla/nsImapServerResponseParser.h
 include/mozilla/nsImapService.h
 include/mozilla/nsImapUrl.h
 include/mozilla/nsImapUtils.h
-include/mozilla/nsImgDCallbk.h
 include/mozilla/nsInt64.h
 include/mozilla/nsJSPrincipals.h
 include/mozilla/nsJSProtocolHandler.h
@@ -1757,7 +1754,6 @@ include/mozilla/nsLocalFolderSummarySpec.h
 include/mozilla/nsLocalMailFolder.h
 include/mozilla/nsLocalStringBundle.h
 include/mozilla/nsLocaleCID.h
-include/mozilla/nsLocaleFactory.h
 include/mozilla/nsMPFileLocProvider.h
 include/mozilla/nsMailDatabase.h
 include/mozilla/nsMailHeaders.h
@@ -1854,7 +1850,9 @@ include/mozilla/nsMsgSearchSession.h
 include/mozilla/nsMsgSearchTerm.h
 include/mozilla/nsMsgSend.h
 include/mozilla/nsMsgSendLater.h
+include/mozilla/nsMsgSendReport.h
 include/mozilla/nsMsgServiceProvider.h
+include/mozilla/nsMsgSimulateError.h
 include/mozilla/nsMsgStatusFeedback.h
 include/mozilla/nsMsgThread.h
 include/mozilla/nsMsgTxn.h
@@ -1893,9 +1891,9 @@ include/mozilla/nsPIXPIManagerCallbacks.h
 include/mozilla/nsPIXPIProxy.h
 include/mozilla/nsPIXPIStubHook.h
 include/mozilla/nsParseMailbox.h
-include/mozilla/nsParser.h
 include/mozilla/nsParserCIID.h
 include/mozilla/nsParserError.h
+include/mozilla/nsPluginLogging.h
 include/mozilla/nsPluginsCID.h
 include/mozilla/nsPoint.h
 include/mozilla/nsPop3IncomingServer.h
@@ -1994,14 +1992,12 @@ include/mozilla/nsUnitConversion.h
 include/mozilla/nsUnixColorPrintf.h
 include/mozilla/nsUnixTimerCIID.h
 include/mozilla/nsUrlListenerManager.h
-include/mozilla/nsValidDTD.h
 include/mozilla/nsVector.h
 include/mozilla/nsViewsCID.h
 include/mozilla/nsVoidArray.h
 include/mozilla/nsVoidBTree.h
 include/mozilla/nsWeakPtr.h
 include/mozilla/nsWeakReference.h
-include/mozilla/nsWellFormedDTD.h
 include/mozilla/nsWidgetSupport.h
 include/mozilla/nsWidgetsCID.h
 include/mozilla/nsXMLEncodingCID.h
@@ -2018,40 +2014,6 @@ include/mozilla/nslayout.h
 include/mozilla/nslog.h
 include/mozilla/nsplugin.h
 include/mozilla/nsplugindefs.h
-include/mozilla/nspr/md/_aix32.cfg
-include/mozilla/nspr/md/_aix32in6.cfg
-include/mozilla/nspr/md/_aix64.cfg
-include/mozilla/nspr/md/_beos.cfg
-include/mozilla/nspr/md/_bsdi.cfg
-include/mozilla/nspr/md/_dgux.cfg
-include/mozilla/nspr/md/_freebsd.cfg
-include/mozilla/nspr/md/_hpux32.cfg
-include/mozilla/nspr/md/_hpux64.cfg
-include/mozilla/nspr/md/_irix32.cfg
-include/mozilla/nspr/md/_irix64.cfg
-include/mozilla/nspr/md/_linux.cfg
-include/mozilla/nspr/md/_ncr.cfg
-include/mozilla/nspr/md/_nec.cfg
-include/mozilla/nspr/md/_netbsd.cfg
-include/mozilla/nspr/md/_nextstep.cfg
-include/mozilla/nspr/md/_nto.cfg
-include/mozilla/nspr/md/_openbsd.cfg
-include/mozilla/nspr/md/_openvms.cfg
-include/mozilla/nspr/md/_os2.cfg
-include/mozilla/nspr/md/_osf1.cfg
-include/mozilla/nspr/md/_qnx.cfg
-include/mozilla/nspr/md/_reliantunix.cfg
-include/mozilla/nspr/md/_rhapsody.cfg
-include/mozilla/nspr/md/_scoos.cfg
-include/mozilla/nspr/md/_solaris32.cfg
-include/mozilla/nspr/md/_solaris64.cfg
-include/mozilla/nspr/md/_sony.cfg
-include/mozilla/nspr/md/_sunos4.cfg
-include/mozilla/nspr/md/_unixware.cfg
-include/mozilla/nspr/md/_unixware7.cfg
-include/mozilla/nspr/md/_win16.cfg
-include/mozilla/nspr/md/_win95.cfg
-include/mozilla/nspr/md/_winnt.cfg
 include/mozilla/nspr/nspr.h
 include/mozilla/nspr/obsolete/pralarm.h
 include/mozilla/nspr/obsolete/probslet.h
@@ -2126,6 +2088,7 @@ include/mozilla/typedefs.h
 include/mozilla/typedefs_md.h
 include/mozilla/uconvutil.h
 include/mozilla/winfile.h
+include/mozilla/xlibrgb.h
 include/mozilla/xmlparse.h
 include/mozilla/xp_core.h
 include/mozilla/xp_file.h
@@ -2137,7 +2100,6 @@ include/mozilla/xpc_map_end.h
 include/mozilla/xpccomponents.h
 include/mozilla/xpcexception.h
 include/mozilla/xpcjsid.h
-include/mozilla/xpcompat.h
 include/mozilla/xpt_arena.h
 include/mozilla/xpt_struct.h
 include/mozilla/xpt_xdr.h
@@ -2198,7 +2160,6 @@ include/mozilla/zipstub.h
 @dirrm lib/mozilla
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
-@dirrm include/mozilla/nspr/md
 @dirrm include/mozilla/nspr
 @dirrm include/mozilla
 @comment end DIRS
diff --git a/www/mozilla/pkg/PLIST-a.out b/www/mozilla/pkg/PLIST-a.out
index 75f0b5223d3..968d24ae5e8 100644
--- a/www/mozilla/pkg/PLIST-a.out
+++ b/www/mozilla/pkg/PLIST-a.out
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-a.out,v 1.14 2001/08/04 07:05:19 taya Exp $
+@comment $NetBSD: PLIST-a.out,v 1.15 2001/09/16 14:03:10 taya Exp $
 bin/mozilla
 @comment begin PROGRAMS
 lib/mozilla/mozilla-bin
@@ -65,11 +65,7 @@ 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
 lib/mozilla/components/libnslocale.so.1.0
-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
@@ -119,6 +115,7 @@ 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/libxlibrgb.so.1.0
 lib/mozilla/libxpcom.so.1.0
 lib/mozilla/libxpistub.so.1.0
 lib/mozilla/plugins/libnullplugin.so.1.0
@@ -342,6 +339,7 @@ lib/mozilla/res/html/gopher-unknown.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
+lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -394,8 +392,6 @@ lib/mozilla/startup-test.html
 lib/mozilla/xpicleanup
 @comment end DATA
 @comment begin INCLUDE
-include/mozilla/CNavDTD.h
-include/mozilla/COtherDTD.h
 include/mozilla/ImageLogging.h
 include/mozilla/InstallCleanupDefines.h
 include/mozilla/MailNewsTypes.h
@@ -406,10 +402,8 @@ include/mozilla/VerReg.h
 include/mozilla/bool.h
 include/mozilla/cdefs.h
 include/mozilla/comi18n.h
-include/mozilla/csid.h
 include/mozilla/disptmpl.h
 include/mozilla/domstubs.h
-include/mozilla/dummy_nc.h
 include/mozilla/fdlibm.h
 include/mozilla/ftpCore.h
 include/mozilla/gdksuperwin.h
@@ -423,19 +417,6 @@ include/mozilla/gtkmozbox.h
 include/mozilla/gtkmozembed.h
 include/mozilla/gtkmozembed_internal.h
 include/mozilla/gtkxtbin.h
-include/mozilla/if_struct.h
-include/mozilla/il.h
-include/mozilla/ilErrors.h
-include/mozilla/ilIImageRenderer.h
-include/mozilla/ilINetContext.h
-include/mozilla/ilINetReader.h
-include/mozilla/ilISystemServices.h
-include/mozilla/ilIURL.h
-include/mozilla/il_icons.h
-include/mozilla/il_strm.h
-include/mozilla/il_types.h
-include/mozilla/il_util.h
-include/mozilla/il_utilp.h
 include/mozilla/imgICache.h
 include/mozilla/imgIContainer.h
 include/mozilla/imgIContainerObserver.h
@@ -502,7 +483,6 @@ include/mozilla/jsxdrapi.h
 include/mozilla/jvmmgr.h
 include/mozilla/lber.h
 include/mozilla/ldap.h
-include/mozilla/libimg.h
 include/mozilla/libmng.h
 include/mozilla/libmng_conf.h
 include/mozilla/libmng_types.h
@@ -527,7 +507,6 @@ include/mozilla/ncompat.h
 include/mozilla/netCore.h
 include/mozilla/netscape_javascript_JSException.h
 include/mozilla/netscape_javascript_JSObject.h
-include/mozilla/ni_pixmp.h
 include/mozilla/nntpCore.h
 include/mozilla/npapi.h
 include/mozilla/npupp.h
@@ -543,10 +522,22 @@ include/mozilla/nsAbAddressCollecter.h
 include/mozilla/nsAbAutoCompleteSession.h
 include/mozilla/nsAbBSDirectory.h
 include/mozilla/nsAbBaseCID.h
+include/mozilla/nsAbBooleanExpression.h
 include/mozilla/nsAbCardProperty.h
+include/mozilla/nsAbDirFactoryService.h
 include/mozilla/nsAbDirProperty.h
+include/mozilla/nsAbDirSearchListener.h
+include/mozilla/nsAbDirectoryQuery.h
+include/mozilla/nsAbDirectoryQueryProxy.h
+include/mozilla/nsAbDirectoryRDFResource.h
+include/mozilla/nsAbLDAPAutoCompFormatter.h
+include/mozilla/nsAbLDAPCard.h
+include/mozilla/nsAbLDAPDirFactory.h
+include/mozilla/nsAbLDAPDirectory.h
+include/mozilla/nsAbLDAPDirectoryQuery.h
 include/mozilla/nsAbMDBCard.h
 include/mozilla/nsAbMDBCardProperty.h
+include/mozilla/nsAbMDBDirFactory.h
 include/mozilla/nsAbMDBDirProperty.h
 include/mozilla/nsAbMDBDirectory.h
 include/mozilla/nsAbMDBRDFResource.h
@@ -613,7 +604,6 @@ include/mozilla/nsDBFolderInfo.h
 include/mozilla/nsDOMCID.h
 include/mozilla/nsDOMCSSDeclaration.h
 include/mozilla/nsDOMError.h
-include/mozilla/nsDOMEventsIIDs.h
 include/mozilla/nsDateTimeFormatCID.h
 include/mozilla/nsDebug.h
 include/mozilla/nsDependentConcatenation.h
@@ -637,6 +627,8 @@ include/mozilla/nsEscape.h
 include/mozilla/nsEvent.h
 include/mozilla/nsExternalHelperAppService.h
 include/mozilla/nsExternalProtocolHandler.h
+include/mozilla/nsFastLoadPtr.h
+include/mozilla/nsFastLoadService.h
 include/mozilla/nsFileSpec.h
 include/mozilla/nsFileSpecStreaming.h
 include/mozilla/nsFileStream.h
@@ -652,9 +644,8 @@ include/mozilla/nsGfxPSCID.h
 include/mozilla/nsGfxXPrintCID.h
 include/mozilla/nsHTMLAtomList.h
 include/mozilla/nsHTMLAtoms.h
-include/mozilla/nsHTMLEntities.h
-include/mozilla/nsHTMLEntityList.h
 include/mozilla/nsHTMLParts.h
+include/mozilla/nsHTMLReflowMetrics.h
 include/mozilla/nsHTMLReflowState.h
 include/mozilla/nsHTMLTagList.h
 include/mozilla/nsHTMLTags.h
@@ -669,8 +660,15 @@ include/mozilla/nsIASN1Outliner.h
 include/mozilla/nsIAbAddressCollecter.h
 include/mozilla/nsIAbAutoCompleteSession.h
 include/mozilla/nsIAbBase.h
+include/mozilla/nsIAbBooleanExpression.h
 include/mozilla/nsIAbCard.h
+include/mozilla/nsIAbDirFactory.h
+include/mozilla/nsIAbDirFactoryService.h
 include/mozilla/nsIAbDirectory.h
+include/mozilla/nsIAbDirectoryQuery.h
+include/mozilla/nsIAbDirectoryQueryProxy.h
+include/mozilla/nsIAbDirectorySearch.h
+include/mozilla/nsIAbLDAPAutoCompFormatter.h
 include/mozilla/nsIAbListener.h
 include/mozilla/nsIAbMDBCard.h
 include/mozilla/nsIAbMDBDirectory.h
@@ -723,6 +721,7 @@ include/mozilla/nsIBinaryOutputStream.h
 include/mozilla/nsIBinarySearchIterator.h
 include/mozilla/nsIBindingManager.h
 include/mozilla/nsIBlender.h
+include/mozilla/nsIBodySuper.h
 include/mozilla/nsIBookmarksService.h
 include/mozilla/nsIBoxLayoutManager.h
 include/mozilla/nsIBoxObject.h
@@ -789,7 +788,6 @@ include/mozilla/nsICmdLineService.h
 include/mozilla/nsICodebasePrincipal.h
 include/mozilla/nsICollation.h
 include/mozilla/nsICollection.h
-include/mozilla/nsIComboBox.h
 include/mozilla/nsIComboboxControlFrame.h
 include/mozilla/nsICommandHandler.h
 include/mozilla/nsIComponentLoader.h
@@ -810,7 +808,6 @@ include/mozilla/nsIContentViewer.h
 include/mozilla/nsIContentViewerContainer.h
 include/mozilla/nsIContentViewerEdit.h
 include/mozilla/nsIContentViewerFile.h
-include/mozilla/nsIContextMenu.h
 include/mozilla/nsIContextMenuListener.h
 include/mozilla/nsIController.h
 include/mozilla/nsIControllerCommand.h
@@ -944,7 +941,6 @@ include/mozilla/nsIDOMLinkStyle.h
 include/mozilla/nsIDOMLoadListener.h
 include/mozilla/nsIDOMLocation.h
 include/mozilla/nsIDOMMediaList.h
-include/mozilla/nsIDOMMenuListener.h
 include/mozilla/nsIDOMMimeType.h
 include/mozilla/nsIDOMMimeTypeArray.h
 include/mozilla/nsIDOMMouseEvent.h
@@ -1003,9 +999,9 @@ include/mozilla/nsIDOMXPConnectFactory.h
 include/mozilla/nsIDOMXULCommandDispatcher.h
 include/mozilla/nsIDOMXULDocument.h
 include/mozilla/nsIDOMXULElement.h
+include/mozilla/nsIDOMXULListener.h
 include/mozilla/nsIDOMXULTreeElement.h
 include/mozilla/nsIDTD.h
-include/mozilla/nsIDTDDebug.h
 include/mozilla/nsIDataChannel.h
 include/mozilla/nsIDateTimeFormat.h
 include/mozilla/nsIDeviceContext.h
@@ -1078,6 +1074,8 @@ include/mozilla/nsIExternalHelperAppService.h
 include/mozilla/nsIExternalProtocolService.h
 include/mozilla/nsIFTPChannel.h
 include/mozilla/nsIFactory.h
+include/mozilla/nsIFastLoadFileControl.h
+include/mozilla/nsIFastLoadService.h
 include/mozilla/nsIFile.h
 include/mozilla/nsIFileChannel.h
 include/mozilla/nsIFilePicker.h
@@ -1113,7 +1111,6 @@ include/mozilla/nsIFormSubmitObserver.h
 include/mozilla/nsIFormatConverter.h
 include/mozilla/nsIFrame.h
 include/mozilla/nsIFrameDebug.h
-include/mozilla/nsIFrameImageLoader.h
 include/mozilla/nsIFrameManager.h
 include/mozilla/nsIFrameSelection.h
 include/mozilla/nsIFrameTraversal.h
@@ -1149,10 +1146,6 @@ include/mozilla/nsIIMAPHostSessionList.h
 include/mozilla/nsIIOService.h
 include/mozilla/nsIImage.h
 include/mozilla/nsIImageFrame.h
-include/mozilla/nsIImageGroup.h
-include/mozilla/nsIImageManager.h
-include/mozilla/nsIImageObserver.h
-include/mozilla/nsIImageRequest.h
 include/mozilla/nsIImapExtensionSink.h
 include/mozilla/nsIImapFlagAndUidState.h
 include/mozilla/nsIImapIncomingServer.h
@@ -1164,8 +1157,6 @@ include/mozilla/nsIImapProtocol.h
 include/mozilla/nsIImapServerSink.h
 include/mozilla/nsIImapService.h
 include/mozilla/nsIImapUrl.h
-include/mozilla/nsIImgDCallbk.h
-include/mozilla/nsIImgDecoder.h
 include/mozilla/nsIImgManager.h
 include/mozilla/nsIImportABDescriptor.h
 include/mozilla/nsIImportAddressBooks.h
@@ -1205,6 +1196,8 @@ include/mozilla/nsIJVMPrefsWindow.h
 include/mozilla/nsIJVMWindow.h
 include/mozilla/nsIKBStateControl.h
 include/mozilla/nsIKeyedStreamGenerator.h
+include/mozilla/nsIKeygenThread.h
+include/mozilla/nsILDAPAutoCompFormatter.h
 include/mozilla/nsILDAPAutoCompleteSession.h
 include/mozilla/nsILDAPConnection.h
 include/mozilla/nsILDAPErrors.h
@@ -1227,9 +1220,7 @@ include/mozilla/nsILineIterator.h
 include/mozilla/nsILinearIterator.h
 include/mozilla/nsILink.h
 include/mozilla/nsILinkHandler.h
-include/mozilla/nsIListBox.h
 include/mozilla/nsIListControlFrame.h
-include/mozilla/nsIListWidget.h
 include/mozilla/nsILiveConnectManager.h
 include/mozilla/nsILiveConnectPlugInstPeer.h
 include/mozilla/nsILiveConnectPlugin.h
@@ -1239,10 +1230,8 @@ include/mozilla/nsILocalFile.h
 include/mozilla/nsILocalMailIncomingServer.h
 include/mozilla/nsILocalStore.h
 include/mozilla/nsILocale.h
-include/mozilla/nsILocaleFactory.h
 include/mozilla/nsILocaleService.h
 include/mozilla/nsILoggingService.h
-include/mozilla/nsILoggingSink.h
 include/mozilla/nsILookAndFeel.h
 include/mozilla/nsIMAPBodyShell.h
 include/mozilla/nsIMAPGenericParser.h
@@ -1258,6 +1247,7 @@ include/mozilla/nsIMalloc.h
 include/mozilla/nsIMappingCache.h
 include/mozilla/nsIMarkupDocumentViewer.h
 include/mozilla/nsIMdbFactoryFactory.h
+include/mozilla/nsIMediaList.h
 include/mozilla/nsIMemory.h
 include/mozilla/nsIMenu.h
 include/mozilla/nsIMenuBar.h
@@ -1337,6 +1327,7 @@ include/mozilla/nsIMsgSend.h
 include/mozilla/nsIMsgSendLater.h
 include/mozilla/nsIMsgSendLaterListener.h
 include/mozilla/nsIMsgSendListener.h
+include/mozilla/nsIMsgSendReport.h
 include/mozilla/nsIMsgSignature.h
 include/mozilla/nsIMsgStatusFeedback.h
 include/mozilla/nsIMsgStringService.h
@@ -1365,6 +1356,8 @@ include/mozilla/nsINodeInfo.h
 include/mozilla/nsINoneService.h
 include/mozilla/nsIOS2Locale.h
 include/mozilla/nsIObjectFrame.h
+include/mozilla/nsIObjectInputStream.h
+include/mozilla/nsIObjectOutputStream.h
 include/mozilla/nsIObserver.h
 include/mozilla/nsIObserverList.h
 include/mozilla/nsIObserverService.h
@@ -1415,7 +1408,7 @@ include/mozilla/nsIPop3Service.h
 include/mozilla/nsIPop3Sink.h
 include/mozilla/nsIPop3URL.h
 include/mozilla/nsIPopUpMenu.h
-include/mozilla/nsIPopupSetBoxObject.h
+include/mozilla/nsIPopupBoxObject.h
 include/mozilla/nsIPopupSetFrame.h
 include/mozilla/nsIPosixLocale.h
 include/mozilla/nsIPref.h
@@ -1474,7 +1467,6 @@ include/mozilla/nsIRDFXMLParser.h
 include/mozilla/nsIRDFXMLSerializer.h
 include/mozilla/nsIRDFXMLSink.h
 include/mozilla/nsIRDFXMLSource.h
-include/mozilla/nsIRadioButton.h
 include/mozilla/nsIRadioControlFrame.h
 include/mozilla/nsIRangeUtils.h
 include/mozilla/nsIReflowCallback.h
@@ -1531,6 +1523,7 @@ include/mozilla/nsIScriptableDateFormat.h
 include/mozilla/nsIScriptableInputStream.h
 include/mozilla/nsIScriptablePlugin.h
 include/mozilla/nsIScriptableRegion.h
+include/mozilla/nsIScriptableUConv.h
 include/mozilla/nsIScrollBoxObject.h
 include/mozilla/nsIScrollPositionListener.h
 include/mozilla/nsIScrollable.h
@@ -1550,12 +1543,14 @@ include/mozilla/nsISecurityEventSink.h
 include/mozilla/nsISecurityManagerComponent.h
 include/mozilla/nsISecurityPref.h
 include/mozilla/nsISeekablePluginStreamPeer.h
+include/mozilla/nsISeekableStream.h
 include/mozilla/nsISelectControlFrame.h
 include/mozilla/nsISelectElement.h
 include/mozilla/nsISelection.h
 include/mozilla/nsISelectionController.h
 include/mozilla/nsISelectionListener.h
 include/mozilla/nsISelectionPrivate.h
+include/mozilla/nsISerializable.h
 include/mozilla/nsIServiceManager.h
 include/mozilla/nsISidebar.h
 include/mozilla/nsISignatureVerifier.h
@@ -1575,7 +1570,9 @@ include/mozilla/nsISpaceManager.h
 include/mozilla/nsISpellChecker.h
 include/mozilla/nsISplashScreen.h
 include/mozilla/nsIStatefulFrame.h
+include/mozilla/nsIStopwatch.h
 include/mozilla/nsIStorageStream.h
+include/mozilla/nsIStreamBufferAccess.h
 include/mozilla/nsIStreamConverter.h
 include/mozilla/nsIStreamConverterService.h
 include/mozilla/nsIStreamIO.h
@@ -1610,7 +1607,6 @@ include/mozilla/nsITXTToHTMLConv.h
 include/mozilla/nsITableCellLayout.h
 include/mozilla/nsITableEditor.h
 include/mozilla/nsITableLayout.h
-include/mozilla/nsITextAreaWidget.h
 include/mozilla/nsITextContent.h
 include/mozilla/nsITextFrame.h
 include/mozilla/nsITextScroll.h
@@ -1624,6 +1620,7 @@ include/mozilla/nsIThreadManager.h
 include/mozilla/nsIThreadPool.h
 include/mozilla/nsITimeBomb.h
 include/mozilla/nsITimeRecorder.h
+include/mozilla/nsITimelineService.h
 include/mozilla/nsITimer.h
 include/mozilla/nsITimerCallback.h
 include/mozilla/nsITimerQueue.h
@@ -1648,6 +1645,7 @@ include/mozilla/nsIURI.h
 include/mozilla/nsIURIContentListener.h
 include/mozilla/nsIURIFixup.h
 include/mozilla/nsIURILoader.h
+include/mozilla/nsIURIRefObject.h
 include/mozilla/nsIURL.h
 include/mozilla/nsIURLFetcher.h
 include/mozilla/nsIURLParser.h
@@ -1738,7 +1736,6 @@ include/mozilla/nsImapServerResponseParser.h
 include/mozilla/nsImapService.h
 include/mozilla/nsImapUrl.h
 include/mozilla/nsImapUtils.h
-include/mozilla/nsImgDCallbk.h
 include/mozilla/nsInt64.h
 include/mozilla/nsJSPrincipals.h
 include/mozilla/nsJSProtocolHandler.h
@@ -1757,7 +1754,6 @@ include/mozilla/nsLocalFolderSummarySpec.h
 include/mozilla/nsLocalMailFolder.h
 include/mozilla/nsLocalStringBundle.h
 include/mozilla/nsLocaleCID.h
-include/mozilla/nsLocaleFactory.h
 include/mozilla/nsMPFileLocProvider.h
 include/mozilla/nsMailDatabase.h
 include/mozilla/nsMailHeaders.h
@@ -1854,7 +1850,9 @@ include/mozilla/nsMsgSearchSession.h
 include/mozilla/nsMsgSearchTerm.h
 include/mozilla/nsMsgSend.h
 include/mozilla/nsMsgSendLater.h
+include/mozilla/nsMsgSendReport.h
 include/mozilla/nsMsgServiceProvider.h
+include/mozilla/nsMsgSimulateError.h
 include/mozilla/nsMsgStatusFeedback.h
 include/mozilla/nsMsgThread.h
 include/mozilla/nsMsgTxn.h
@@ -1893,9 +1891,9 @@ include/mozilla/nsPIXPIManagerCallbacks.h
 include/mozilla/nsPIXPIProxy.h
 include/mozilla/nsPIXPIStubHook.h
 include/mozilla/nsParseMailbox.h
-include/mozilla/nsParser.h
 include/mozilla/nsParserCIID.h
 include/mozilla/nsParserError.h
+include/mozilla/nsPluginLogging.h
 include/mozilla/nsPluginsCID.h
 include/mozilla/nsPoint.h
 include/mozilla/nsPop3IncomingServer.h
@@ -1994,14 +1992,12 @@ include/mozilla/nsUnitConversion.h
 include/mozilla/nsUnixColorPrintf.h
 include/mozilla/nsUnixTimerCIID.h
 include/mozilla/nsUrlListenerManager.h
-include/mozilla/nsValidDTD.h
 include/mozilla/nsVector.h
 include/mozilla/nsViewsCID.h
 include/mozilla/nsVoidArray.h
 include/mozilla/nsVoidBTree.h
 include/mozilla/nsWeakPtr.h
 include/mozilla/nsWeakReference.h
-include/mozilla/nsWellFormedDTD.h
 include/mozilla/nsWidgetSupport.h
 include/mozilla/nsWidgetsCID.h
 include/mozilla/nsXMLEncodingCID.h
@@ -2018,40 +2014,6 @@ include/mozilla/nslayout.h
 include/mozilla/nslog.h
 include/mozilla/nsplugin.h
 include/mozilla/nsplugindefs.h
-include/mozilla/nspr/md/_aix32.cfg
-include/mozilla/nspr/md/_aix32in6.cfg
-include/mozilla/nspr/md/_aix64.cfg
-include/mozilla/nspr/md/_beos.cfg
-include/mozilla/nspr/md/_bsdi.cfg
-include/mozilla/nspr/md/_dgux.cfg
-include/mozilla/nspr/md/_freebsd.cfg
-include/mozilla/nspr/md/_hpux32.cfg
-include/mozilla/nspr/md/_hpux64.cfg
-include/mozilla/nspr/md/_irix32.cfg
-include/mozilla/nspr/md/_irix64.cfg
-include/mozilla/nspr/md/_linux.cfg
-include/mozilla/nspr/md/_ncr.cfg
-include/mozilla/nspr/md/_nec.cfg
-include/mozilla/nspr/md/_netbsd.cfg
-include/mozilla/nspr/md/_nextstep.cfg
-include/mozilla/nspr/md/_nto.cfg
-include/mozilla/nspr/md/_openbsd.cfg
-include/mozilla/nspr/md/_openvms.cfg
-include/mozilla/nspr/md/_os2.cfg
-include/mozilla/nspr/md/_osf1.cfg
-include/mozilla/nspr/md/_qnx.cfg
-include/mozilla/nspr/md/_reliantunix.cfg
-include/mozilla/nspr/md/_rhapsody.cfg
-include/mozilla/nspr/md/_scoos.cfg
-include/mozilla/nspr/md/_solaris32.cfg
-include/mozilla/nspr/md/_solaris64.cfg
-include/mozilla/nspr/md/_sony.cfg
-include/mozilla/nspr/md/_sunos4.cfg
-include/mozilla/nspr/md/_unixware.cfg
-include/mozilla/nspr/md/_unixware7.cfg
-include/mozilla/nspr/md/_win16.cfg
-include/mozilla/nspr/md/_win95.cfg
-include/mozilla/nspr/md/_winnt.cfg
 include/mozilla/nspr/nspr.h
 include/mozilla/nspr/obsolete/pralarm.h
 include/mozilla/nspr/obsolete/probslet.h
@@ -2126,6 +2088,7 @@ include/mozilla/typedefs.h
 include/mozilla/typedefs_md.h
 include/mozilla/uconvutil.h
 include/mozilla/winfile.h
+include/mozilla/xlibrgb.h
 include/mozilla/xmlparse.h
 include/mozilla/xp_core.h
 include/mozilla/xp_file.h
@@ -2137,7 +2100,6 @@ include/mozilla/xpc_map_end.h
 include/mozilla/xpccomponents.h
 include/mozilla/xpcexception.h
 include/mozilla/xpcjsid.h
-include/mozilla/xpcompat.h
 include/mozilla/xpt_arena.h
 include/mozilla/xpt_struct.h
 include/mozilla/xpt_xdr.h
@@ -2198,7 +2160,6 @@ include/mozilla/zipstub.h
 @dirrm lib/mozilla
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
-@dirrm include/mozilla/nspr/md
 @dirrm include/mozilla/nspr
 @dirrm include/mozilla
 @comment end DIRS