Update mozilla to 0.9.6

From "What's New" section of release notes:

* Mozilla now displays page icons in the url bar (Expect support for
 shortcut icons (aka favicon) in Mozilla 0.9.7). Page icons can be defined
 in the html head section of a document like so:

	<LINK REL="icon" HREF="images/mozilla-16.png" TYPE="image/png">
	<LINK REL="SHORTCUT ICON" HREF="/images/global/branding/dellecomicon.ico">

* Mozilla can now display Windows .BMP and .ICO images on all platforms.
* Print Preview has been implemented.
* Macintosh Page Setup has been implemented (Bug 36796)
* Mail message "labels" support has been implemented. (Bug 81292)
* Mail "prefill mail filter" support has been implemented (Bug 65761)
* The new Search for item on the context menu lets you search for any text
 you highlight on a web page.
* Select some text in browser window.
* Right click in the browser window and a context menu will pop up.
* Choose the Search for item and Mozilla will search for the highlighted text at your default engine.

10 files changed, 36 insertions, 83 deletions

diff --git a/www/mozilla/patches/patch-au b/www/mozilla/patches/patch-au
deleted file mode 100644
index a0e75a1f146..00000000000
--- a/www/mozilla/patches/patch-au
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-au,v 1.6 2001/10/16 15:52:09 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 Oct 13 19:56:43 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-aw b/www/mozilla/patches/patch-aw
index 09d6f49282d..808e2acf964 100644
--- a/www/mozilla/patches/patch-aw
+++ b/www/mozilla/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.5 2001/10/16 15:52:09 taya Exp $
+$NetBSD: patch-aw,v 1.6 2001/11/22 16:25:37 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 Oct 13 19:56:53 2001
+--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	Sat Oct 27 14:49:19 2001
++++ ./widget/src/gtksuperwin/Makefile.in	Thu Nov 22 12:30:43 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 f9f867e7173..f34655fc24e 100644
--- a/www/mozilla/patches/patch-ax
+++ b/www/mozilla/patches/patch-ax
@@ -1,9 +1,9 @@
-$NetBSD: patch-ax,v 1.4 2001/10/16 15:52:09 taya Exp $
+$NetBSD: patch-ax,v 1.5 2001/11/22 16:25:37 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/src/nsSocketTransport.cpp
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp	Sat Sep 29 17:27:36 2001
-+++ ./netwerk/base/src/nsSocketTransport.cpp	Sat Oct 13 19:56:58 2001
-@@ -187,8 +187,7 @@
+--- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp	Tue Oct  9 07:17:25 2001
++++ ./netwerk/base/src/nsSocketTransport.cpp	Thu Nov 22 12:30:55 2001
+@@ -188,8 +188,7 @@
      //
      // Set up Internet defaults...
      //
@@ -13,7 +13,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      
      //
      // Initialize the global connect timeout value if necessary...
-@@ -237,6 +236,13 @@
+@@ -238,6 +237,13 @@
          nsAutoMonitor::DestroyMonitor(mMonitor);
          mMonitor = nsnull;
      }
@@ -27,7 +27,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
  }
  
  
-@@ -641,15 +647,7 @@
+@@ -642,15 +648,7 @@
      //
      // The hostname has not been resolved yet...
      //
@@ -44,7 +44,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
          nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
          if (NS_FAILED(rv)) return rv;
  
-@@ -672,7 +670,7 @@
+@@ -673,7 +671,7 @@
              //
              // The DNS lookup has finished...  It has either failed or succeeded.
              //
@@ -53,7 +53,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
                  mDNSRequest = 0;
                  rv = mStatus;
              } 
-@@ -832,7 +830,8 @@
+@@ -833,7 +831,8 @@
          //    This is only done the first time doConnection(...) is called.
          //
          if (NS_SUCCEEDED(rv)) {
@@ -63,7 +63,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
              if (PR_SUCCESS != status) {
                  PRErrorCode code = PR_GetError();
                  //
-@@ -857,6 +856,12 @@
+@@ -858,6 +857,12 @@
                  //
                  else {
                      // Connection refused...
@@ -76,7 +76,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;
-@@ -870,11 +875,23 @@
+@@ -871,11 +876,23 @@
      //
      else if (aSelectFlags) {
          if (PR_POLL_EXCEPT & aSelectFlags) {
@@ -100,7 +100,7 @@ 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;
-@@ -917,7 +934,7 @@
+@@ -918,7 +935,7 @@
      //
      // The hostname has not been resolved yet...
      //
@@ -109,7 +109,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
          nsCOMPtr<nsIDNSService> pDNSService(do_GetService(kDNSService, &rv));
          if (NS_FAILED(rv)) return rv;
  
-@@ -936,16 +953,18 @@
+@@ -937,16 +954,18 @@
              return NS_ERROR_FAILURE;
          }
  
@@ -132,7 +132,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      }
  
      //
-@@ -1410,21 +1429,27 @@
+@@ -1411,21 +1430,27 @@
      // Enter the socket transport lock...
      nsAutoMonitor mon(mMonitor);
      nsresult rv = NS_OK;
@@ -171,7 +171,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
      } else {
          // XXX: What should happen here?  The GetHostByName(...) succeeded but 
          //      there are *no* A records...
-@@ -1457,7 +1482,7 @@
+@@ -1458,7 +1483,7 @@
      // If the lookup failed, set the status...
      if (NS_FAILED(aStatus))
          mStatus = aStatus;
@@ -180,7 +180,7 @@ diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.cpp ./netwerk/base/s
          mStatus = NS_ERROR_ABORT;
  
      // Start processing the transport again - if necessary...
-@@ -1778,7 +1803,7 @@
+@@ -1779,7 +1804,7 @@
      *_retval = (char*)nsMemory::Alloc(aLen);
      if (!*_retval) return NS_ERROR_FAILURE;
  
diff --git a/www/mozilla/patches/patch-ay b/www/mozilla/patches/patch-ay
index a8253661642..91824e53b8a 100644
--- a/www/mozilla/patches/patch-ay
+++ b/www/mozilla/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.4 2001/10/16 15:52:09 taya Exp $
+$NetBSD: patch-ay,v 1.5 2001/11/22 16:25:37 taya Exp $
 
 diff -ru ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h ./netwerk/base/src/nsSocketTransport.h
---- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h	Sat Sep 29 05:09:03 2001
-+++ ./netwerk/base/src/nsSocketTransport.h	Sat Oct 13 19:56:59 2001
+--- ../Orig/mozilla/netwerk/base/src/nsSocketTransport.h	Tue Oct  9 07:17:25 2001
++++ ./netwerk/base/src/nsSocketTransport.h	Thu Nov 22 12:30:57 2001
 @@ -123,6 +123,11 @@
    eSocketDNS_Wait             = 0x2020
  };
diff --git a/www/mozilla/patches/patch-az b/www/mozilla/patches/patch-az
index 354dde0057e..89c2d1b1775 100644
--- a/www/mozilla/patches/patch-az
+++ b/www/mozilla/patches/patch-az
@@ -1,14 +1,14 @@
-$NetBSD: patch-az,v 1.3 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-az,v 1.4 2001/11/22 16:25:37 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	Wed Aug 15 16:14:54 2001
-+++ ./directory/c-sdk/ldap/include/portable.h	Sat Oct 13 19:57:01 2001
+--- ../Orig/mozilla/directory/c-sdk/ldap/include/portable.h	Sat Oct 27 05:47:18 2001
++++ ./directory/c-sdk/ldap/include/portable.h	Thu Nov 22 12:31:02 2001
 @@ -98,7 +98,7 @@
   * some systems don't have the BSD re_comp and re_exec routines
   */
  #ifndef NEED_BSDREGEX
--#if ( defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux )) && !defined(sgi)
-+#if ( defined( SYSV ) || defined( VMS ) || defined( NETBSD ) || defined( freebsd ) || defined( linux )) && !defined(sgi)
+-#if ( defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( VMS ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
  #define NEED_BSDREGEX
  #endif
  #endif
diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba
index d2c420c07e6..e51e0ff6b59 100644
--- a/www/mozilla/patches/patch-ba
+++ b/www/mozilla/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-ba,v 1.3 2001/11/22 16:25:37 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	Sat Oct 13 19:57:09 2001
++++ ./nsprpub/pr/include/md/_netbsd.cfg	Thu Nov 22 12:31:06 2001
 @@ -91,6 +91,52 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb
index 42b8fa3df3d..55710fccde8 100644
--- a/www/mozilla/patches/patch-bb
+++ b/www/mozilla/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-bb,v 1.3 2001/11/22 16:25:37 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	Sat Oct 13 19:57:11 2001
++++ ./nsprpub/pr/include/md/_netbsd.h	Thu Nov 22 12:31:08 2001
 @@ -48,6 +48,8 @@
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
diff --git a/www/mozilla/patches/patch-bc b/www/mozilla/patches/patch-bc
index 2900d79e20d..ff3d1046e92 100644
--- a/www/mozilla/patches/patch-bc
+++ b/www/mozilla/patches/patch-bc
@@ -1,9 +1,9 @@
-$NetBSD: patch-bc,v 1.2 2001/10/16 15:52:10 taya Exp $
+$NetBSD: patch-bc,v 1.3 2001/11/22 16:25:37 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	Thu Sep  6 17:23:09 2001
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Oct 13 19:57:23 2001
-@@ -235,6 +235,13 @@
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sat Oct 27 16:38:10 2001
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Nov 22 12:31:19 2001
+@@ -247,6 +247,13 @@
  CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
diff --git a/www/mozilla/patches/patch-bd b/www/mozilla/patches/patch-bd
deleted file mode 100644
index 06bfaf67d62..00000000000
--- a/www/mozilla/patches/patch-bd
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2001/10/16 15:52:10 taya Exp $
-
-diff -ru ../Orig/mozilla/netwerk/base/public/nsNetUtil.h ./netwerk/base/public/nsNetUtil.h
---- ../Orig/mozilla/netwerk/base/public/nsNetUtil.h	Sat Sep 29 05:08:56 2001
-+++ ./netwerk/base/public/nsNetUtil.h	Sat Oct 13 20:33:47 2001
-@@ -604,8 +604,8 @@
-                         PRUint32 aOffset=0,
-                         PRUint32 aCount=0,
-                         PRUint32 aFlags=0,
--                        nsIRequestObserver *aObserver=NULL,
--                        nsISupports *aContext=NULL)
-+                        nsIRequestObserver *aObserver=(nsIRequestObserver *)NULL,
-+                        nsISupports *aContext=(nsISupports *)NULL)
- {
-     NS_ENSURE_ARG_POINTER(aTransport);
- 
-@@ -646,8 +646,8 @@
-                      PRUint32 aOffset=0,
-                      PRUint32 aCount=0,
-                      PRUint32 aFlags=0,
--                     nsIRequestObserver *aObserver=NULL,
--                     nsISupports *aContext=NULL)
-+                     nsIRequestObserver *aObserver=(nsIRequestObserver *)NULL,
-+                     nsISupports *aContext=(nsISupports *)NULL)
- {
-     NS_ENSURE_ARG_POINTER(aTransport);
- 
diff --git a/www/mozilla/patches/patch-be b/www/mozilla/patches/patch-be
index 20e7c2c520f..9ec4094794a 100644
--- a/www/mozilla/patches/patch-be
+++ b/www/mozilla/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.1 2001/10/26 15:27:57 taya Exp $
+$NetBSD: patch-be,v 1.2 2001/11/22 16:25:37 taya Exp $
 
 diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c ./nsprpub/pr/src/io/prsocket.c
 --- ../Orig/mozilla/nsprpub/pr/src/io/prsocket.c	Sat Jun  9 04:54:54 2001
-+++ ./nsprpub/pr/src/io/prsocket.c	Thu Oct 25 21:41:45 2001
++++ ./nsprpub/pr/src/io/prsocket.c	Thu Nov 22 12:31:25 2001
 @@ -1300,6 +1300,15 @@
  	if (osfd == -1) {
  		return 0;