Update to 0.9.6. Surprisingly, this update doesn't break Galeon/Nautilus.

46 files changed, 732 insertions, 286 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index edd38ac60984..c322ceeb20b3 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 3fac33567aa2..0e59edc5b73e 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.5.tar.bz2) = 1d0062ce61a3ad4baa92bdcad496c682
+MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
diff --git a/www/mozilla-devel/files/patch-aq b/www/mozilla-devel/files/patch-aq
index 4e5ff8746c33..0c63e6bcb097 100644
--- a/www/mozilla-devel/files/patch-aq
+++ b/www/mozilla-devel/files/patch-aq
@@ -1,6 +1,9 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Apr  3 17:25:43 2000
-+++ nsprpub/pr/include/md/_pth.h	Fri Feb 16 00:30:46 2001
-@@ -183,7 +183,7 @@
+
+$FreeBSD$
+
+--- nsprpub/pr/include/md/_pth.h.orig	Fri Oct 26 07:54:00 2001
++++ nsprpub/pr/include/md/_pth.h	Wed Nov 21 14:16:07 2001
+@@ -224,7 +224,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */
  
@@ -9,12 +12,12 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -203,7 +203,7 @@
+@@ -244,7 +244,7 @@
   */
  #define PT_PRIO_MIN            1
  #define PT_PRIO_MAX            127
 -#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
 +#elif defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
+ 	|| defined(BSDI) || defined(DARWIN) /* XXX */
  #define PT_PRIO_MIN            0
  #define PT_PRIO_MAX            126
diff --git a/www/mozilla-devel/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h b/www/mozilla-devel/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
new file mode 100644
index 000000000000..8da724659683
--- /dev/null
+++ b/www/mozilla-devel/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:09	1.1
++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:31
+@@ -48,7 +48,7 @@
+ #ifdef macintosh
+ # include "ldap-macos.h"
+ #else /* macintosh */
+-#if !defined(BSDI) && !defined(DARWIN)
++#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
+ # include <malloc.h>
+ #endif
+ # include <errno.h>
diff --git a/www/mozilla-devel/files/patch-directory::xpcom::base::src::Makefile.in b/www/mozilla-devel/files/patch-directory::xpcom::base::src::Makefile.in
deleted file mode 100644
index d2ef636766de..000000000000
--- a/www/mozilla-devel/files/patch-directory::xpcom::base::src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- directory/xpcom/base/src/Makefile.in.orig	Thu Sep 20 15:30:57 2001
-+++ directory/xpcom/base/src/Makefile.in	Thu Oct 25 15:37:03 2001
-@@ -80,6 +80,5 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--CFLAGS		+= $(LDAP_CFLAGS)
--CXXFLAGS	+= $(LDAP_CFLAGS)
-+DEFINES		+= $(LDAP_CFLAGS)
- 
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index ba6cdced59b7..91667539477a 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,18 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Jul 25 08:44:09 2001
-+++ configure	Sat Aug  4 11:18:33 2001
-@@ -6528,7 +6528,7 @@
-     echo "$ac_t""$HOST_MOC" 1>&6
-     MOC=$HOST_MOC
- 
--    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
-+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
-     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
- 
-     # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8587,6 +8587,9 @@
+--- configure.orig	Fri Nov  9 05:13:03 2001
++++ configure	Wed Nov 21 14:22:13 2001
+@@ -5931,6 +5931,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9316,8 +9319,6 @@
+@@ -6987,8 +6990,6 @@
  	if test $? -eq 0; then
  		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  			ac_cv_have_dash_pthread=yes
@@ -31,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -9351,7 +9352,7 @@
+@@ -7022,7 +7023,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +31,24 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -13701,6 +13702,7 @@
+@@ -8365,6 +8366,7 @@
+         ;;
+     *)
+         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
++        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+         ;;
+     esac
+ fi
+@@ -9421,7 +9423,7 @@
+     fi
+     MOC=$HOST_MOC
+ 
+-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
++    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
+     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
+ 
+     # Check whether --with-static-qt or --without-static-qt was given.
+@@ -13233,6 +13235,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/mozilla-devel/files/patch-xpcom::ds::plvector.c b/www/mozilla-devel/files/patch-xpcom::ds::plvector.c
new file mode 100644
index 000000000000..645751f3c3d6
--- /dev/null
+++ b/www/mozilla-devel/files/patch-xpcom::ds::plvector.c
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- xpcom/ds/plvector.c	2001/11/21 12:36:30	1.1
++++ xpcom/ds/plvector.c	2001/11/21 12:43:54
+@@ -177,11 +177,12 @@
+ PL_VectorCompact(PLVector* v)
+ {
+     if (v->size != v->maxSize) {
++        void ** newData = NULL;
++
+         /* shrink to desired size */
+ #ifdef SIZE_T_MAX
+         PR_ASSERT(v->size <= SIZE_T_MAX/sizeof(void *)); /* no overflow */
+ #endif
+-        void ** newData = NULL;
+         if (v->size != 0) {
+             newData = (void **)PR_Malloc(v->size * sizeof(void *));
+             /* copy new data from old */
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index 9059b4dc54c0..e6b4e0c70254 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -55,6 +55,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
 lib/mozilla/TestRect
@@ -62,6 +63,7 @@ lib/mozilla/TestServMgr
 lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
+lib/mozilla/TestSpaceManager
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
@@ -76,6 +78,7 @@ lib/mozilla/chrome/US.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -166,6 +169,7 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimgbmp.so
 lib/mozilla/components/libimggif.so
 lib/mozilla/components/libimgjpeg.so
 lib/mozilla/components/libimglib2.so
@@ -242,7 +246,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 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/mozxfer.xpt
@@ -286,14 +289,11 @@ lib/mozilla/components/proxytest.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/sample.xpt
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -307,6 +307,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -322,7 +323,6 @@ lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
 lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -357,7 +357,6 @@ 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/htmlrobot
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
@@ -395,7 +394,6 @@ lib/mozilla/rdfpoll
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -431,6 +429,7 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
+lib/mozilla/res/html/loading-image.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -580,8 +579,6 @@ 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/timebombgen
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
diff --git a/www/mozilla-embedded-devel/pkg-plist b/www/mozilla-embedded-devel/pkg-plist
index 022d5c2da69a..691ae84d1f7d 100644
--- a/www/mozilla-embedded-devel/pkg-plist
+++ b/www/mozilla-embedded-devel/pkg-plist
@@ -113,12 +113,10 @@ lib/mozilla-embedded/components/xpcom_threads.xpt
 lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
 lib/mozilla-embedded/components/xpti.dat
-lib/mozilla-embedded/components/xptitemp.dat
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
-lib/mozilla-embedded/gtkEmbed
 lib/mozilla-embedded/libgkgfx.so
 lib/mozilla-embedded/libgtkembedmoz.so
 lib/mozilla-embedded/libgtksuperwin.so
@@ -127,13 +125,17 @@ lib/mozilla-embedded/libnspr4.so
 lib/mozilla-embedded/libplc4.so
 lib/mozilla-embedded/libplds4.so
 lib/mozilla-embedded/libxpcom.so
-lib/mozilla-embedded/res/acceptlanguage.properties
 lib/mozilla-embedded/res/arrow.gif
 lib/mozilla-embedded/res/builtin/htmlBindings.xml
 lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
 lib/mozilla-embedded/res/builtin/xbl-forms.css
 lib/mozilla-embedded/res/charsetData.properties
 lib/mozilla-embedded/res/charsetalias.properties
+lib/mozilla-embedded/res/entityTables/html40Latin1.properties
+lib/mozilla-embedded/res/entityTables/html40Special.properties
+lib/mozilla-embedded/res/entityTables/html40Symbols.properties
+lib/mozilla-embedded/res/entityTables/htmlEntityVersions.properties
+lib/mozilla-embedded/res/entityTables/transliterate.properties
 lib/mozilla-embedded/res/forms.css
 lib/mozilla-embedded/res/html.css
 lib/mozilla-embedded/res/langGroups.properties
@@ -143,6 +145,7 @@ lib/mozilla-embedded/res/ua.css
 lib/mozilla-embedded/res/unixcharset.properties
 lib/mozilla-embedded/res/viewsource.css
 lib/mozilla-embedded/run-mozilla.sh
+@dirrm lib/mozilla-embedded/res/entityTables
 @dirrm lib/mozilla-embedded/res/builtin
 @dirrm lib/mozilla-embedded/res
 @dirrm lib/mozilla-embedded/defaults/pref
diff --git a/www/mozilla-embedded-vendor/pkg-plist b/www/mozilla-embedded-vendor/pkg-plist
index 022d5c2da69a..691ae84d1f7d 100644
--- a/www/mozilla-embedded-vendor/pkg-plist
+++ b/www/mozilla-embedded-vendor/pkg-plist
@@ -113,12 +113,10 @@ lib/mozilla-embedded/components/xpcom_threads.xpt
 lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
 lib/mozilla-embedded/components/xpti.dat
-lib/mozilla-embedded/components/xptitemp.dat
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
-lib/mozilla-embedded/gtkEmbed
 lib/mozilla-embedded/libgkgfx.so
 lib/mozilla-embedded/libgtkembedmoz.so
 lib/mozilla-embedded/libgtksuperwin.so
@@ -127,13 +125,17 @@ lib/mozilla-embedded/libnspr4.so
 lib/mozilla-embedded/libplc4.so
 lib/mozilla-embedded/libplds4.so
 lib/mozilla-embedded/libxpcom.so
-lib/mozilla-embedded/res/acceptlanguage.properties
 lib/mozilla-embedded/res/arrow.gif
 lib/mozilla-embedded/res/builtin/htmlBindings.xml
 lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
 lib/mozilla-embedded/res/builtin/xbl-forms.css
 lib/mozilla-embedded/res/charsetData.properties
 lib/mozilla-embedded/res/charsetalias.properties
+lib/mozilla-embedded/res/entityTables/html40Latin1.properties
+lib/mozilla-embedded/res/entityTables/html40Special.properties
+lib/mozilla-embedded/res/entityTables/html40Symbols.properties
+lib/mozilla-embedded/res/entityTables/htmlEntityVersions.properties
+lib/mozilla-embedded/res/entityTables/transliterate.properties
 lib/mozilla-embedded/res/forms.css
 lib/mozilla-embedded/res/html.css
 lib/mozilla-embedded/res/langGroups.properties
@@ -143,6 +145,7 @@ lib/mozilla-embedded/res/ua.css
 lib/mozilla-embedded/res/unixcharset.properties
 lib/mozilla-embedded/res/viewsource.css
 lib/mozilla-embedded/run-mozilla.sh
+@dirrm lib/mozilla-embedded/res/entityTables
 @dirrm lib/mozilla-embedded/res/builtin
 @dirrm lib/mozilla-embedded/res
 @dirrm lib/mozilla-embedded/defaults/pref
diff --git a/www/mozilla-embedded/pkg-plist b/www/mozilla-embedded/pkg-plist
index 022d5c2da69a..691ae84d1f7d 100644
--- a/www/mozilla-embedded/pkg-plist
+++ b/www/mozilla-embedded/pkg-plist
@@ -113,12 +113,10 @@ lib/mozilla-embedded/components/xpcom_threads.xpt
 lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
 lib/mozilla-embedded/components/xpti.dat
-lib/mozilla-embedded/components/xptitemp.dat
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
-lib/mozilla-embedded/gtkEmbed
 lib/mozilla-embedded/libgkgfx.so
 lib/mozilla-embedded/libgtkembedmoz.so
 lib/mozilla-embedded/libgtksuperwin.so
@@ -127,13 +125,17 @@ lib/mozilla-embedded/libnspr4.so
 lib/mozilla-embedded/libplc4.so
 lib/mozilla-embedded/libplds4.so
 lib/mozilla-embedded/libxpcom.so
-lib/mozilla-embedded/res/acceptlanguage.properties
 lib/mozilla-embedded/res/arrow.gif
 lib/mozilla-embedded/res/builtin/htmlBindings.xml
 lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
 lib/mozilla-embedded/res/builtin/xbl-forms.css
 lib/mozilla-embedded/res/charsetData.properties
 lib/mozilla-embedded/res/charsetalias.properties
+lib/mozilla-embedded/res/entityTables/html40Latin1.properties
+lib/mozilla-embedded/res/entityTables/html40Special.properties
+lib/mozilla-embedded/res/entityTables/html40Symbols.properties
+lib/mozilla-embedded/res/entityTables/htmlEntityVersions.properties
+lib/mozilla-embedded/res/entityTables/transliterate.properties
 lib/mozilla-embedded/res/forms.css
 lib/mozilla-embedded/res/html.css
 lib/mozilla-embedded/res/langGroups.properties
@@ -143,6 +145,7 @@ lib/mozilla-embedded/res/ua.css
 lib/mozilla-embedded/res/unixcharset.properties
 lib/mozilla-embedded/res/viewsource.css
 lib/mozilla-embedded/run-mozilla.sh
+@dirrm lib/mozilla-embedded/res/entityTables
 @dirrm lib/mozilla-embedded/res/builtin
 @dirrm lib/mozilla-embedded/res
 @dirrm lib/mozilla-embedded/defaults/pref
diff --git a/www/mozilla-headers-devel/pkg-plist b/www/mozilla-headers-devel/pkg-plist
index f2bc239931da..f55e19841eac 100644
--- a/www/mozilla-headers-devel/pkg-plist
+++ b/www/mozilla-headers-devel/pkg-plist
@@ -89,9 +89,7 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
 include/mozilla/appcomps/nsIRelatedLinksHandler.h
 include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
-include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
-include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
 include/mozilla/appshell/nsICmdLineHandler.h
@@ -161,6 +159,7 @@ include/mozilla/content/nsICSSLoader.h
 include/mozilla/content/nsICSSLoaderObserver.h
 include/mozilla/content/nsICSSMediaRule.h
 include/mozilla/content/nsICSSNameSpaceRule.h
+include/mozilla/content/nsICSSOMFactory.h
 include/mozilla/content/nsICSSParser.h
 include/mozilla/content/nsICSSPseudoComparator.h
 include/mozilla/content/nsICSSRule.h
@@ -196,14 +195,13 @@ include/mozilla/content/nsIMediaList.h
 include/mozilla/content/nsINameSpace.h
 include/mozilla/content/nsINameSpaceManager.h
 include/mozilla/content/nsINodeInfo.h
+include/mozilla/content/nsIOptionElement.h
 include/mozilla/content/nsIPrivateCompositionEvent.h
 include/mozilla/content/nsIPrivateDOMEvent.h
 include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
-include/mozilla/content/nsIRuleNode.h
-include/mozilla/content/nsIRuleWalker.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -219,6 +217,7 @@ include/mozilla/content/nsIStyleSheet.h
 include/mozilla/content/nsIStyleSheetLinkingElement.h
 include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextContent.h
+include/mozilla/content/nsITextControlElement.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
 include/mozilla/content/nsIXBLDocumentInfo.h
@@ -234,10 +233,14 @@ include/mozilla/content/nsImageMapUtils.h
 include/mozilla/content/nsLayoutAtomList.h
 include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
+include/mozilla/content/nsRuleNode.h
+include/mozilla/content/nsRuleWalker.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
+include/mozilla/content/nsXBLAtomList.h
+include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
 include/mozilla/content_xsl/nsIDocumentTransformer.h
@@ -451,6 +454,8 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
+include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
 include/mozilla/dom/nsIEntropyCollector.h
 include/mozilla/dom/nsIFocusController.h
@@ -525,6 +530,7 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSettings.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -564,13 +570,14 @@ include/mozilla/htmlparser/nsITokenizer.h
 include/mozilla/htmlparser/nsParserCIID.h
 include/mozilla/htmlparser/nsParserError.h
 include/mozilla/htmlparser/nsToken.h
-include/mozilla/htmlparser/nshtmlpars.h
+include/mozilla/imglib2/ImageErrors.h
 include/mozilla/imglib2/ImageLogging.h
 include/mozilla/imglib2/imgICache.h
 include/mozilla/imglib2/imgIContainer.h
 include/mozilla/imglib2/imgIContainerObserver.h
 include/mozilla/imglib2/imgIDecoder.h
 include/mozilla/imglib2/imgIDecoderObserver.h
+include/mozilla/imglib2/imgILoad.h
 include/mozilla/imglib2/imgILoader.h
 include/mozilla/imglib2/imgIRequest.h
 include/mozilla/import/nsIImportABDescriptor.h
@@ -583,7 +590,6 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
-include/mozilla/intl/nsIAcceptLang.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -667,6 +673,14 @@ include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
+include/mozilla/layout/nsGrid.h
+include/mozilla/layout/nsGridCell.h
+include/mozilla/layout/nsGridLayout2.h
+include/mozilla/layout/nsGridRow.h
+include/mozilla/layout/nsGridRowGroupLayout.h
+include/mozilla/layout/nsGridRowLayout.h
+include/mozilla/layout/nsGridRowLeafFrame.h
+include/mozilla/layout/nsGridRowLeafLayout.h
 include/mozilla/layout/nsHTMLParts.h
 include/mozilla/layout/nsHTMLReflowMetrics.h
 include/mozilla/layout/nsHTMLReflowState.h
@@ -694,9 +708,11 @@ include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
 include/mozilla/layout/nsIGfxTextControlFrame.h
+include/mozilla/layout/nsIGridPart.h
 include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
+include/mozilla/layout/nsIImageControlFrame.h
 include/mozilla/layout/nsIImageFrame.h
 include/mozilla/layout/nsIIndependentSelection.h
 include/mozilla/layout/nsILayoutDebugger.h
@@ -719,6 +735,7 @@ include/mozilla/layout/nsIPresShell.h
 include/mozilla/layout/nsIPresState.h
 include/mozilla/layout/nsIPrintContext.h
 include/mozilla/layout/nsIPrintListener.h
+include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
@@ -727,7 +744,6 @@ include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
 include/mozilla/layout/nsISelectControlFrame.h
-include/mozilla/layout/nsISpaceManager.h
 include/mozilla/layout/nsIStatefulFrame.h
 include/mozilla/layout/nsIStyleContext.h
 include/mozilla/layout/nsIStyleFrameConstruction.h
@@ -745,7 +761,6 @@ include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
 include/mozilla/layout/nsTextTransformer.h
-include/mozilla/layout/nslayout.h
 include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
@@ -822,8 +837,6 @@ include/mozilla/mimetype/nsMimeTypes.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
-include/mozilla/mozcomps/nsIAppShellComponent.h
-include/mozilla/mozcomps/nsIAppShellComponentImpl.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -950,10 +963,12 @@ include/mozilla/msgbaseutil/nsMsgUtils.h
 include/mozilla/msgbaseutil/nsNewsSummarySpec.h
 include/mozilla/msgbaseutil/nsUInt32Array.h
 include/mozilla/msgbaseutil/nsUint8Array.h
+include/mozilla/msgcompose/nsIMsgAttachment.h
 include/mozilla/msgcompose/nsIMsgCompFields.h
 include/mozilla/msgcompose/nsIMsgCompose.h
 include/mozilla/msgcompose/nsIMsgComposeParams.h
 include/mozilla/msgcompose/nsIMsgComposeProgressParams.h
+include/mozilla/msgcompose/nsIMsgComposeSecure.h
 include/mozilla/msgcompose/nsIMsgComposeService.h
 include/mozilla/msgcompose/nsIMsgDraft.h
 include/mozilla/msgcompose/nsIMsgQuote.h
@@ -967,6 +982,7 @@ include/mozilla/msgcompose/nsISmtpServer.h
 include/mozilla/msgcompose/nsISmtpService.h
 include/mozilla/msgcompose/nsISmtpUrl.h
 include/mozilla/msgcompose/nsIURLFetcher.h
+include/mozilla/msgcompose/nsMsgAttachment.h
 include/mozilla/msgcompose/nsMsgAttachmentHandler.h
 include/mozilla/msgcompose/nsMsgCompCID.h
 include/mozilla/msgcompose/nsMsgCompFields.h
@@ -1185,6 +1201,80 @@ include/mozilla/npapi.h
 include/mozilla/npsimple/nsISimplePluginInstance.h
 include/mozilla/npupp.h
 include/mozilla/nsBuildID.h
+include/mozilla/nspr/md/_aix.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/_beos.h
+include/mozilla/nspr/md/_bsdi.cfg
+include/mozilla/nspr/md/_bsdi.h
+include/mozilla/nspr/md/_darwin.cfg
+include/mozilla/nspr/md/_darwin.h
+include/mozilla/nspr/md/_dgux.cfg
+include/mozilla/nspr/md/_dgux.h
+include/mozilla/nspr/md/_freebsd.cfg
+include/mozilla/nspr/md/_freebsd.h
+include/mozilla/nspr/md/_hpux.h
+include/mozilla/nspr/md/_hpux32.cfg
+include/mozilla/nspr/md/_hpux64.cfg
+include/mozilla/nspr/md/_irix.h
+include/mozilla/nspr/md/_irix32.cfg
+include/mozilla/nspr/md/_irix64.cfg
+include/mozilla/nspr/md/_linux.cfg
+include/mozilla/nspr/md/_linux.h
+include/mozilla/nspr/md/_macos.h
+include/mozilla/nspr/md/_ncr.cfg
+include/mozilla/nspr/md/_ncr.h
+include/mozilla/nspr/md/_nec.cfg
+include/mozilla/nspr/md/_nec.h
+include/mozilla/nspr/md/_netbsd.cfg
+include/mozilla/nspr/md/_netbsd.h
+include/mozilla/nspr/md/_nextstep.cfg
+include/mozilla/nspr/md/_nextstep.h
+include/mozilla/nspr/md/_nspr_pthread.h
+include/mozilla/nspr/md/_nto.cfg
+include/mozilla/nspr/md/_nto.h
+include/mozilla/nspr/md/_openbsd.cfg
+include/mozilla/nspr/md/_openbsd.h
+include/mozilla/nspr/md/_openvms.cfg
+include/mozilla/nspr/md/_openvms.h
+include/mozilla/nspr/md/_os2.cfg
+include/mozilla/nspr/md/_os2.h
+include/mozilla/nspr/md/_os2_errors.h
+include/mozilla/nspr/md/_osf1.cfg
+include/mozilla/nspr/md/_osf1.h
+include/mozilla/nspr/md/_pcos.h
+include/mozilla/nspr/md/_pth.h
+include/mozilla/nspr/md/_qnx.cfg
+include/mozilla/nspr/md/_qnx.h
+include/mozilla/nspr/md/_reliantunix.cfg
+include/mozilla/nspr/md/_reliantunix.h
+include/mozilla/nspr/md/_rhapsody.cfg
+include/mozilla/nspr/md/_rhapsody.h
+include/mozilla/nspr/md/_scoos.cfg
+include/mozilla/nspr/md/_scoos.h
+include/mozilla/nspr/md/_solaris.h
+include/mozilla/nspr/md/_solaris32.cfg
+include/mozilla/nspr/md/_solaris64.cfg
+include/mozilla/nspr/md/_sony.cfg
+include/mozilla/nspr/md/_sony.h
+include/mozilla/nspr/md/_sunos4.cfg
+include/mozilla/nspr/md/_sunos4.h
+include/mozilla/nspr/md/_unix_errors.h
+include/mozilla/nspr/md/_unixos.h
+include/mozilla/nspr/md/_unixware.cfg
+include/mozilla/nspr/md/_unixware.h
+include/mozilla/nspr/md/_unixware7.cfg
+include/mozilla/nspr/md/_win16.cfg
+include/mozilla/nspr/md/_win16.h
+include/mozilla/nspr/md/_win32_errors.h
+include/mozilla/nspr/md/_win95.cfg
+include/mozilla/nspr/md/_win95.h
+include/mozilla/nspr/md/_winnt.cfg
+include/mozilla/nspr/md/_winnt.h
+include/mozilla/nspr/md/prosdep.h
+include/mozilla/nspr/md/sunos4.h
 include/mozilla/nspr/nspr.h
 include/mozilla/nspr/obsolete/pralarm.h
 include/mozilla/nspr/obsolete/probslet.h
@@ -1260,6 +1350,8 @@ include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
 include/mozilla/pipnss/nsIBadCertListener.h
+include/mozilla/pipnss/nsICMS.h
+include/mozilla/pipnss/nsICMSSecureMessage.h
 include/mozilla/pipnss/nsICertOutliner.h
 include/mozilla/pipnss/nsICertSelect.h
 include/mozilla/pipnss/nsIKeygenThread.h
@@ -1267,6 +1359,7 @@ include/mozilla/pipnss/nsINSSDialogs.h
 include/mozilla/pipnss/nsIPK11TokenDB.h
 include/mozilla/pipnss/nsIPKCS11Slot.h
 include/mozilla/pipnss/nsISSLStatus.h
+include/mozilla/pipnss/nsIUserCertPicker.h
 include/mozilla/pipnss/nsIX509Cert.h
 include/mozilla/pipnss/nsIX509CertDB.h
 include/mozilla/pippki/nsIASN1Outliner.h
@@ -1348,7 +1441,6 @@ include/mozilla/rdf/nsRDFCID.h
 include/mozilla/rdf/rdf.h
 include/mozilla/rdfutil/nsRDFResource.h
 include/mozilla/regviewer/nsIRegistryDataSource.h
-include/mozilla/remote/nsIRemoteBrowserControl.h
 include/mozilla/shistory/nsIHistoryEntry.h
 include/mozilla/shistory/nsISHContainer.h
 include/mozilla/shistory/nsISHEntry.h
@@ -1360,6 +1452,7 @@ include/mozilla/sidebar/nsISidebar.h
 include/mozilla/string/nsAFlatString.h
 include/mozilla/string/nsAPromiseString.h
 include/mozilla/string/nsAReadableString.h
+include/mozilla/string/nsASingleFragmentString.h
 include/mozilla/string/nsAString.h
 include/mozilla/string/nsAStringGenerator.h
 include/mozilla/string/nsAWritableString.h
@@ -1373,7 +1466,6 @@ include/mozilla/string/nsDependentSubstring.h
 include/mozilla/string/nsFragmentedString.h
 include/mozilla/string/nsLiteralString.h
 include/mozilla/string/nsPrintfCString.h
-include/mozilla/string/nsPrivateSharableString.h
 include/mozilla/string/nsPromiseFlatString.h
 include/mozilla/string/nsReadableUtils.h
 include/mozilla/string/nsSharableString.h
@@ -1440,6 +1532,7 @@ include/mozilla/unicharutil/nsIUBidiUtils.h
 include/mozilla/unicharutil/nsIUGenCategory.h
 include/mozilla/unicharutil/nsIUGenDetailCategory.h
 include/mozilla/unicharutil/nsUnicharUtilCIID.h
+include/mozilla/unicharutil/nsUnicharUtils.h
 include/mozilla/uriloader/nsCURILoader.h
 include/mozilla/uriloader/nsDocLoader.h
 include/mozilla/uriloader/nsIContentHandler.h
@@ -1455,6 +1548,7 @@ include/mozilla/util/stopwatch.h
 include/mozilla/util/xp_obs.h
 include/mozilla/view/nsIClipView.h
 include/mozilla/view/nsICompositeListener.h
+include/mozilla/view/nsIEventProcessor.h
 include/mozilla/view/nsIScrollPositionListener.h
 include/mozilla/view/nsIScrollableView.h
 include/mozilla/view/nsIView.h
@@ -1468,6 +1562,8 @@ include/mozilla/wallet/nsIWalletService.h
 include/mozilla/walletviewers/nsISignonViewer.h
 include/mozilla/walletviewers/nsIWalletEditor.h
 include/mozilla/walletviewers/nsIWalletPreview.h
+include/mozilla/webbrowserpersist/nsCWebBrowserPersist.h
+include/mozilla/webbrowserpersist/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsCTooltipTextProvider.h
 include/mozilla/webbrwsr/nsCWebBrowser.h
 include/mozilla/webbrwsr/nsICommandHandler.h
@@ -1479,7 +1575,6 @@ include/mozilla/webbrwsr/nsIWebBrowser.h
 include/mozilla/webbrwsr/nsIWebBrowserChrome.h
 include/mozilla/webbrwsr/nsIWebBrowserChromeFocus.h
 include/mozilla/webbrwsr/nsIWebBrowserFocus.h
-include/mozilla/webbrwsr/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsIWebBrowserPrint.h
 include/mozilla/webbrwsr/nsIWebBrowserSetup.h
 include/mozilla/webshell/nsIClipboardCommands.h
@@ -1623,13 +1718,11 @@ include/mozilla/xpcom/nsIInterfaceRequestor.h
 include/mozilla/xpcom/nsIInterfaceRequestorUtils.h
 include/mozilla/xpcom/nsILineInputStream.h
 include/mozilla/xpcom/nsILocalFile.h
-include/mozilla/xpcom/nsILoggingService.h
 include/mozilla/xpcom/nsIMemory.h
 include/mozilla/xpcom/nsIModule.h
 include/mozilla/xpcom/nsIObjectInputStream.h
 include/mozilla/xpcom/nsIObjectOutputStream.h
 include/mozilla/xpcom/nsIObserver.h
-include/mozilla/xpcom/nsIObserverList.h
 include/mozilla/xpcom/nsIObserverService.h
 include/mozilla/xpcom/nsIOutputStream.h
 include/mozilla/xpcom/nsIPersistentProperties2.h
@@ -1637,6 +1730,7 @@ include/mozilla/xpcom/nsIPipe.h
 include/mozilla/xpcom/nsIProcess.h
 include/mozilla/xpcom/nsIProgrammingLanguage.h
 include/mozilla/xpcom/nsIProperties.h
+include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
 include/mozilla/xpcom/nsIPtr.h
@@ -1648,9 +1742,10 @@ include/mozilla/xpcom/nsIScriptableInputStream.h
 include/mozilla/xpcom/nsISeekableStream.h
 include/mozilla/xpcom/nsISerializable.h
 include/mozilla/xpcom/nsIServiceManager.h
+include/mozilla/xpcom/nsIServiceManagerObsolete.h
+include/mozilla/xpcom/nsIServiceManagerUtils.h
 include/mozilla/xpcom/nsISimpleEnumerator.h
 include/mozilla/xpcom/nsISizeOfHandler.h
-include/mozilla/xpcom/nsIStopwatch.h
 include/mozilla/xpcom/nsIStorageStream.h
 include/mozilla/xpcom/nsIStreamBufferAccess.h
 include/mozilla/xpcom/nsIStringStream.h
@@ -1668,12 +1763,15 @@ include/mozilla/xpcom/nsIThreadPool.h
 include/mozilla/xpcom/nsITimelineService.h
 include/mozilla/xpcom/nsIUnicharBuffer.h
 include/mozilla/xpcom/nsIUnicharInputStream.h
+include/mozilla/xpcom/nsIVariant.h
 include/mozilla/xpcom/nsIWeakReference.h
+include/mozilla/xpcom/nsIWeakReferenceUtils.h
 include/mozilla/xpcom/nsInt64.h
 include/mozilla/xpcom/nsLinebreakConverter.h
 include/mozilla/xpcom/nsLocalFile.h
 include/mozilla/xpcom/nsLocalFileUnix.h
 include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsObserverService.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
@@ -1691,14 +1789,15 @@ include/mozilla/xpcom/nsTextFormatter.h
 include/mozilla/xpcom/nsTime.h
 include/mozilla/xpcom/nsTraceRefcnt.h
 include/mozilla/xpcom/nsUnitConversion.h
+include/mozilla/xpcom/nsVariant.h
 include/mozilla/xpcom/nsVector.h
 include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsVoidBTree.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
+include/mozilla/xpcom/nsXPCOM.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
-include/mozilla/xpcom/nslog.h
 include/mozilla/xpcom/nsrootidl.h
 include/mozilla/xpcom/pldhash.h
 include/mozilla/xpcom/plevent.h
@@ -1772,6 +1871,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/webshell_tests
 @dirrm include/mozilla/webshell
 @dirrm include/mozilla/webbrwsr
+@dirrm include/mozilla/webbrowserpersist
 @dirrm include/mozilla/walletviewers
 @dirrm include/mozilla/wallet
 @dirrm include/mozilla/view
@@ -1794,7 +1894,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/string
 @dirrm include/mozilla/sidebar
 @dirrm include/mozilla/shistory
-@dirrm include/mozilla/remote
 @dirrm include/mozilla/regviewer
 @dirrm include/mozilla/rdfutil
 @dirrm include/mozilla/rdf
@@ -1807,6 +1906,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
+@dirrm include/mozilla/nspr/md
 @dirrm include/mozilla/nspr
 @dirrm include/mozilla/npsimple
 @dirrm include/mozilla/nkcache
@@ -1822,7 +1922,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/mpfilelocprovider
 @dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
-@dirrm include/mozilla/mozcomps
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mimetype
 @dirrm include/mozilla/mimeemitter
diff --git a/www/mozilla-headers-vendor/pkg-plist b/www/mozilla-headers-vendor/pkg-plist
index f2bc239931da..f55e19841eac 100644
--- a/www/mozilla-headers-vendor/pkg-plist
+++ b/www/mozilla-headers-vendor/pkg-plist
@@ -89,9 +89,7 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
 include/mozilla/appcomps/nsIRelatedLinksHandler.h
 include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
-include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
-include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
 include/mozilla/appshell/nsICmdLineHandler.h
@@ -161,6 +159,7 @@ include/mozilla/content/nsICSSLoader.h
 include/mozilla/content/nsICSSLoaderObserver.h
 include/mozilla/content/nsICSSMediaRule.h
 include/mozilla/content/nsICSSNameSpaceRule.h
+include/mozilla/content/nsICSSOMFactory.h
 include/mozilla/content/nsICSSParser.h
 include/mozilla/content/nsICSSPseudoComparator.h
 include/mozilla/content/nsICSSRule.h
@@ -196,14 +195,13 @@ include/mozilla/content/nsIMediaList.h
 include/mozilla/content/nsINameSpace.h
 include/mozilla/content/nsINameSpaceManager.h
 include/mozilla/content/nsINodeInfo.h
+include/mozilla/content/nsIOptionElement.h
 include/mozilla/content/nsIPrivateCompositionEvent.h
 include/mozilla/content/nsIPrivateDOMEvent.h
 include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
-include/mozilla/content/nsIRuleNode.h
-include/mozilla/content/nsIRuleWalker.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -219,6 +217,7 @@ include/mozilla/content/nsIStyleSheet.h
 include/mozilla/content/nsIStyleSheetLinkingElement.h
 include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextContent.h
+include/mozilla/content/nsITextControlElement.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
 include/mozilla/content/nsIXBLDocumentInfo.h
@@ -234,10 +233,14 @@ include/mozilla/content/nsImageMapUtils.h
 include/mozilla/content/nsLayoutAtomList.h
 include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
+include/mozilla/content/nsRuleNode.h
+include/mozilla/content/nsRuleWalker.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
+include/mozilla/content/nsXBLAtomList.h
+include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
 include/mozilla/content_xsl/nsIDocumentTransformer.h
@@ -451,6 +454,8 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
+include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
 include/mozilla/dom/nsIEntropyCollector.h
 include/mozilla/dom/nsIFocusController.h
@@ -525,6 +530,7 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSettings.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -564,13 +570,14 @@ include/mozilla/htmlparser/nsITokenizer.h
 include/mozilla/htmlparser/nsParserCIID.h
 include/mozilla/htmlparser/nsParserError.h
 include/mozilla/htmlparser/nsToken.h
-include/mozilla/htmlparser/nshtmlpars.h
+include/mozilla/imglib2/ImageErrors.h
 include/mozilla/imglib2/ImageLogging.h
 include/mozilla/imglib2/imgICache.h
 include/mozilla/imglib2/imgIContainer.h
 include/mozilla/imglib2/imgIContainerObserver.h
 include/mozilla/imglib2/imgIDecoder.h
 include/mozilla/imglib2/imgIDecoderObserver.h
+include/mozilla/imglib2/imgILoad.h
 include/mozilla/imglib2/imgILoader.h
 include/mozilla/imglib2/imgIRequest.h
 include/mozilla/import/nsIImportABDescriptor.h
@@ -583,7 +590,6 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
-include/mozilla/intl/nsIAcceptLang.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -667,6 +673,14 @@ include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
+include/mozilla/layout/nsGrid.h
+include/mozilla/layout/nsGridCell.h
+include/mozilla/layout/nsGridLayout2.h
+include/mozilla/layout/nsGridRow.h
+include/mozilla/layout/nsGridRowGroupLayout.h
+include/mozilla/layout/nsGridRowLayout.h
+include/mozilla/layout/nsGridRowLeafFrame.h
+include/mozilla/layout/nsGridRowLeafLayout.h
 include/mozilla/layout/nsHTMLParts.h
 include/mozilla/layout/nsHTMLReflowMetrics.h
 include/mozilla/layout/nsHTMLReflowState.h
@@ -694,9 +708,11 @@ include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
 include/mozilla/layout/nsIGfxTextControlFrame.h
+include/mozilla/layout/nsIGridPart.h
 include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
+include/mozilla/layout/nsIImageControlFrame.h
 include/mozilla/layout/nsIImageFrame.h
 include/mozilla/layout/nsIIndependentSelection.h
 include/mozilla/layout/nsILayoutDebugger.h
@@ -719,6 +735,7 @@ include/mozilla/layout/nsIPresShell.h
 include/mozilla/layout/nsIPresState.h
 include/mozilla/layout/nsIPrintContext.h
 include/mozilla/layout/nsIPrintListener.h
+include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
@@ -727,7 +744,6 @@ include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
 include/mozilla/layout/nsISelectControlFrame.h
-include/mozilla/layout/nsISpaceManager.h
 include/mozilla/layout/nsIStatefulFrame.h
 include/mozilla/layout/nsIStyleContext.h
 include/mozilla/layout/nsIStyleFrameConstruction.h
@@ -745,7 +761,6 @@ include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
 include/mozilla/layout/nsTextTransformer.h
-include/mozilla/layout/nslayout.h
 include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
@@ -822,8 +837,6 @@ include/mozilla/mimetype/nsMimeTypes.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
-include/mozilla/mozcomps/nsIAppShellComponent.h
-include/mozilla/mozcomps/nsIAppShellComponentImpl.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -950,10 +963,12 @@ include/mozilla/msgbaseutil/nsMsgUtils.h
 include/mozilla/msgbaseutil/nsNewsSummarySpec.h
 include/mozilla/msgbaseutil/nsUInt32Array.h
 include/mozilla/msgbaseutil/nsUint8Array.h
+include/mozilla/msgcompose/nsIMsgAttachment.h
 include/mozilla/msgcompose/nsIMsgCompFields.h
 include/mozilla/msgcompose/nsIMsgCompose.h
 include/mozilla/msgcompose/nsIMsgComposeParams.h
 include/mozilla/msgcompose/nsIMsgComposeProgressParams.h
+include/mozilla/msgcompose/nsIMsgComposeSecure.h
 include/mozilla/msgcompose/nsIMsgComposeService.h
 include/mozilla/msgcompose/nsIMsgDraft.h
 include/mozilla/msgcompose/nsIMsgQuote.h
@@ -967,6 +982,7 @@ include/mozilla/msgcompose/nsISmtpServer.h
 include/mozilla/msgcompose/nsISmtpService.h
 include/mozilla/msgcompose/nsISmtpUrl.h
 include/mozilla/msgcompose/nsIURLFetcher.h
+include/mozilla/msgcompose/nsMsgAttachment.h
 include/mozilla/msgcompose/nsMsgAttachmentHandler.h
 include/mozilla/msgcompose/nsMsgCompCID.h
 include/mozilla/msgcompose/nsMsgCompFields.h
@@ -1185,6 +1201,80 @@ include/mozilla/npapi.h
 include/mozilla/npsimple/nsISimplePluginInstance.h
 include/mozilla/npupp.h
 include/mozilla/nsBuildID.h
+include/mozilla/nspr/md/_aix.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/_beos.h
+include/mozilla/nspr/md/_bsdi.cfg
+include/mozilla/nspr/md/_bsdi.h
+include/mozilla/nspr/md/_darwin.cfg
+include/mozilla/nspr/md/_darwin.h
+include/mozilla/nspr/md/_dgux.cfg
+include/mozilla/nspr/md/_dgux.h
+include/mozilla/nspr/md/_freebsd.cfg
+include/mozilla/nspr/md/_freebsd.h
+include/mozilla/nspr/md/_hpux.h
+include/mozilla/nspr/md/_hpux32.cfg
+include/mozilla/nspr/md/_hpux64.cfg
+include/mozilla/nspr/md/_irix.h
+include/mozilla/nspr/md/_irix32.cfg
+include/mozilla/nspr/md/_irix64.cfg
+include/mozilla/nspr/md/_linux.cfg
+include/mozilla/nspr/md/_linux.h
+include/mozilla/nspr/md/_macos.h
+include/mozilla/nspr/md/_ncr.cfg
+include/mozilla/nspr/md/_ncr.h
+include/mozilla/nspr/md/_nec.cfg
+include/mozilla/nspr/md/_nec.h
+include/mozilla/nspr/md/_netbsd.cfg
+include/mozilla/nspr/md/_netbsd.h
+include/mozilla/nspr/md/_nextstep.cfg
+include/mozilla/nspr/md/_nextstep.h
+include/mozilla/nspr/md/_nspr_pthread.h
+include/mozilla/nspr/md/_nto.cfg
+include/mozilla/nspr/md/_nto.h
+include/mozilla/nspr/md/_openbsd.cfg
+include/mozilla/nspr/md/_openbsd.h
+include/mozilla/nspr/md/_openvms.cfg
+include/mozilla/nspr/md/_openvms.h
+include/mozilla/nspr/md/_os2.cfg
+include/mozilla/nspr/md/_os2.h
+include/mozilla/nspr/md/_os2_errors.h
+include/mozilla/nspr/md/_osf1.cfg
+include/mozilla/nspr/md/_osf1.h
+include/mozilla/nspr/md/_pcos.h
+include/mozilla/nspr/md/_pth.h
+include/mozilla/nspr/md/_qnx.cfg
+include/mozilla/nspr/md/_qnx.h
+include/mozilla/nspr/md/_reliantunix.cfg
+include/mozilla/nspr/md/_reliantunix.h
+include/mozilla/nspr/md/_rhapsody.cfg
+include/mozilla/nspr/md/_rhapsody.h
+include/mozilla/nspr/md/_scoos.cfg
+include/mozilla/nspr/md/_scoos.h
+include/mozilla/nspr/md/_solaris.h
+include/mozilla/nspr/md/_solaris32.cfg
+include/mozilla/nspr/md/_solaris64.cfg
+include/mozilla/nspr/md/_sony.cfg
+include/mozilla/nspr/md/_sony.h
+include/mozilla/nspr/md/_sunos4.cfg
+include/mozilla/nspr/md/_sunos4.h
+include/mozilla/nspr/md/_unix_errors.h
+include/mozilla/nspr/md/_unixos.h
+include/mozilla/nspr/md/_unixware.cfg
+include/mozilla/nspr/md/_unixware.h
+include/mozilla/nspr/md/_unixware7.cfg
+include/mozilla/nspr/md/_win16.cfg
+include/mozilla/nspr/md/_win16.h
+include/mozilla/nspr/md/_win32_errors.h
+include/mozilla/nspr/md/_win95.cfg
+include/mozilla/nspr/md/_win95.h
+include/mozilla/nspr/md/_winnt.cfg
+include/mozilla/nspr/md/_winnt.h
+include/mozilla/nspr/md/prosdep.h
+include/mozilla/nspr/md/sunos4.h
 include/mozilla/nspr/nspr.h
 include/mozilla/nspr/obsolete/pralarm.h
 include/mozilla/nspr/obsolete/probslet.h
@@ -1260,6 +1350,8 @@ include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
 include/mozilla/pipnss/nsIBadCertListener.h
+include/mozilla/pipnss/nsICMS.h
+include/mozilla/pipnss/nsICMSSecureMessage.h
 include/mozilla/pipnss/nsICertOutliner.h
 include/mozilla/pipnss/nsICertSelect.h
 include/mozilla/pipnss/nsIKeygenThread.h
@@ -1267,6 +1359,7 @@ include/mozilla/pipnss/nsINSSDialogs.h
 include/mozilla/pipnss/nsIPK11TokenDB.h
 include/mozilla/pipnss/nsIPKCS11Slot.h
 include/mozilla/pipnss/nsISSLStatus.h
+include/mozilla/pipnss/nsIUserCertPicker.h
 include/mozilla/pipnss/nsIX509Cert.h
 include/mozilla/pipnss/nsIX509CertDB.h
 include/mozilla/pippki/nsIASN1Outliner.h
@@ -1348,7 +1441,6 @@ include/mozilla/rdf/nsRDFCID.h
 include/mozilla/rdf/rdf.h
 include/mozilla/rdfutil/nsRDFResource.h
 include/mozilla/regviewer/nsIRegistryDataSource.h
-include/mozilla/remote/nsIRemoteBrowserControl.h
 include/mozilla/shistory/nsIHistoryEntry.h
 include/mozilla/shistory/nsISHContainer.h
 include/mozilla/shistory/nsISHEntry.h
@@ -1360,6 +1452,7 @@ include/mozilla/sidebar/nsISidebar.h
 include/mozilla/string/nsAFlatString.h
 include/mozilla/string/nsAPromiseString.h
 include/mozilla/string/nsAReadableString.h
+include/mozilla/string/nsASingleFragmentString.h
 include/mozilla/string/nsAString.h
 include/mozilla/string/nsAStringGenerator.h
 include/mozilla/string/nsAWritableString.h
@@ -1373,7 +1466,6 @@ include/mozilla/string/nsDependentSubstring.h
 include/mozilla/string/nsFragmentedString.h
 include/mozilla/string/nsLiteralString.h
 include/mozilla/string/nsPrintfCString.h
-include/mozilla/string/nsPrivateSharableString.h
 include/mozilla/string/nsPromiseFlatString.h
 include/mozilla/string/nsReadableUtils.h
 include/mozilla/string/nsSharableString.h
@@ -1440,6 +1532,7 @@ include/mozilla/unicharutil/nsIUBidiUtils.h
 include/mozilla/unicharutil/nsIUGenCategory.h
 include/mozilla/unicharutil/nsIUGenDetailCategory.h
 include/mozilla/unicharutil/nsUnicharUtilCIID.h
+include/mozilla/unicharutil/nsUnicharUtils.h
 include/mozilla/uriloader/nsCURILoader.h
 include/mozilla/uriloader/nsDocLoader.h
 include/mozilla/uriloader/nsIContentHandler.h
@@ -1455,6 +1548,7 @@ include/mozilla/util/stopwatch.h
 include/mozilla/util/xp_obs.h
 include/mozilla/view/nsIClipView.h
 include/mozilla/view/nsICompositeListener.h
+include/mozilla/view/nsIEventProcessor.h
 include/mozilla/view/nsIScrollPositionListener.h
 include/mozilla/view/nsIScrollableView.h
 include/mozilla/view/nsIView.h
@@ -1468,6 +1562,8 @@ include/mozilla/wallet/nsIWalletService.h
 include/mozilla/walletviewers/nsISignonViewer.h
 include/mozilla/walletviewers/nsIWalletEditor.h
 include/mozilla/walletviewers/nsIWalletPreview.h
+include/mozilla/webbrowserpersist/nsCWebBrowserPersist.h
+include/mozilla/webbrowserpersist/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsCTooltipTextProvider.h
 include/mozilla/webbrwsr/nsCWebBrowser.h
 include/mozilla/webbrwsr/nsICommandHandler.h
@@ -1479,7 +1575,6 @@ include/mozilla/webbrwsr/nsIWebBrowser.h
 include/mozilla/webbrwsr/nsIWebBrowserChrome.h
 include/mozilla/webbrwsr/nsIWebBrowserChromeFocus.h
 include/mozilla/webbrwsr/nsIWebBrowserFocus.h
-include/mozilla/webbrwsr/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsIWebBrowserPrint.h
 include/mozilla/webbrwsr/nsIWebBrowserSetup.h
 include/mozilla/webshell/nsIClipboardCommands.h
@@ -1623,13 +1718,11 @@ include/mozilla/xpcom/nsIInterfaceRequestor.h
 include/mozilla/xpcom/nsIInterfaceRequestorUtils.h
 include/mozilla/xpcom/nsILineInputStream.h
 include/mozilla/xpcom/nsILocalFile.h
-include/mozilla/xpcom/nsILoggingService.h
 include/mozilla/xpcom/nsIMemory.h
 include/mozilla/xpcom/nsIModule.h
 include/mozilla/xpcom/nsIObjectInputStream.h
 include/mozilla/xpcom/nsIObjectOutputStream.h
 include/mozilla/xpcom/nsIObserver.h
-include/mozilla/xpcom/nsIObserverList.h
 include/mozilla/xpcom/nsIObserverService.h
 include/mozilla/xpcom/nsIOutputStream.h
 include/mozilla/xpcom/nsIPersistentProperties2.h
@@ -1637,6 +1730,7 @@ include/mozilla/xpcom/nsIPipe.h
 include/mozilla/xpcom/nsIProcess.h
 include/mozilla/xpcom/nsIProgrammingLanguage.h
 include/mozilla/xpcom/nsIProperties.h
+include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
 include/mozilla/xpcom/nsIPtr.h
@@ -1648,9 +1742,10 @@ include/mozilla/xpcom/nsIScriptableInputStream.h
 include/mozilla/xpcom/nsISeekableStream.h
 include/mozilla/xpcom/nsISerializable.h
 include/mozilla/xpcom/nsIServiceManager.h
+include/mozilla/xpcom/nsIServiceManagerObsolete.h
+include/mozilla/xpcom/nsIServiceManagerUtils.h
 include/mozilla/xpcom/nsISimpleEnumerator.h
 include/mozilla/xpcom/nsISizeOfHandler.h
-include/mozilla/xpcom/nsIStopwatch.h
 include/mozilla/xpcom/nsIStorageStream.h
 include/mozilla/xpcom/nsIStreamBufferAccess.h
 include/mozilla/xpcom/nsIStringStream.h
@@ -1668,12 +1763,15 @@ include/mozilla/xpcom/nsIThreadPool.h
 include/mozilla/xpcom/nsITimelineService.h
 include/mozilla/xpcom/nsIUnicharBuffer.h
 include/mozilla/xpcom/nsIUnicharInputStream.h
+include/mozilla/xpcom/nsIVariant.h
 include/mozilla/xpcom/nsIWeakReference.h
+include/mozilla/xpcom/nsIWeakReferenceUtils.h
 include/mozilla/xpcom/nsInt64.h
 include/mozilla/xpcom/nsLinebreakConverter.h
 include/mozilla/xpcom/nsLocalFile.h
 include/mozilla/xpcom/nsLocalFileUnix.h
 include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsObserverService.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
@@ -1691,14 +1789,15 @@ include/mozilla/xpcom/nsTextFormatter.h
 include/mozilla/xpcom/nsTime.h
 include/mozilla/xpcom/nsTraceRefcnt.h
 include/mozilla/xpcom/nsUnitConversion.h
+include/mozilla/xpcom/nsVariant.h
 include/mozilla/xpcom/nsVector.h
 include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsVoidBTree.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
+include/mozilla/xpcom/nsXPCOM.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
-include/mozilla/xpcom/nslog.h
 include/mozilla/xpcom/nsrootidl.h
 include/mozilla/xpcom/pldhash.h
 include/mozilla/xpcom/plevent.h
@@ -1772,6 +1871,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/webshell_tests
 @dirrm include/mozilla/webshell
 @dirrm include/mozilla/webbrwsr
+@dirrm include/mozilla/webbrowserpersist
 @dirrm include/mozilla/walletviewers
 @dirrm include/mozilla/wallet
 @dirrm include/mozilla/view
@@ -1794,7 +1894,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/string
 @dirrm include/mozilla/sidebar
 @dirrm include/mozilla/shistory
-@dirrm include/mozilla/remote
 @dirrm include/mozilla/regviewer
 @dirrm include/mozilla/rdfutil
 @dirrm include/mozilla/rdf
@@ -1807,6 +1906,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
+@dirrm include/mozilla/nspr/md
 @dirrm include/mozilla/nspr
 @dirrm include/mozilla/npsimple
 @dirrm include/mozilla/nkcache
@@ -1822,7 +1922,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/mpfilelocprovider
 @dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
-@dirrm include/mozilla/mozcomps
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mimetype
 @dirrm include/mozilla/mimeemitter
diff --git a/www/mozilla-headers/pkg-plist b/www/mozilla-headers/pkg-plist
index f2bc239931da..f55e19841eac 100644
--- a/www/mozilla-headers/pkg-plist
+++ b/www/mozilla-headers/pkg-plist
@@ -89,9 +89,7 @@ include/mozilla/appcomps/nsILDAPAutoCompleteSession.h
 include/mozilla/appcomps/nsIRelatedLinksHandler.h
 include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
-include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
-include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
 include/mozilla/appshell/nsICmdLineHandler.h
@@ -161,6 +159,7 @@ include/mozilla/content/nsICSSLoader.h
 include/mozilla/content/nsICSSLoaderObserver.h
 include/mozilla/content/nsICSSMediaRule.h
 include/mozilla/content/nsICSSNameSpaceRule.h
+include/mozilla/content/nsICSSOMFactory.h
 include/mozilla/content/nsICSSParser.h
 include/mozilla/content/nsICSSPseudoComparator.h
 include/mozilla/content/nsICSSRule.h
@@ -196,14 +195,13 @@ include/mozilla/content/nsIMediaList.h
 include/mozilla/content/nsINameSpace.h
 include/mozilla/content/nsINameSpaceManager.h
 include/mozilla/content/nsINodeInfo.h
+include/mozilla/content/nsIOptionElement.h
 include/mozilla/content/nsIPrivateCompositionEvent.h
 include/mozilla/content/nsIPrivateDOMEvent.h
 include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
-include/mozilla/content/nsIRuleNode.h
-include/mozilla/content/nsIRuleWalker.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -219,6 +217,7 @@ include/mozilla/content/nsIStyleSheet.h
 include/mozilla/content/nsIStyleSheetLinkingElement.h
 include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextContent.h
+include/mozilla/content/nsITextControlElement.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
 include/mozilla/content/nsIXBLDocumentInfo.h
@@ -234,10 +233,14 @@ include/mozilla/content/nsImageMapUtils.h
 include/mozilla/content/nsLayoutAtomList.h
 include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
+include/mozilla/content/nsRuleNode.h
+include/mozilla/content/nsRuleWalker.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
+include/mozilla/content/nsXBLAtomList.h
+include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
 include/mozilla/content_xsl/nsIDocumentTransformer.h
@@ -451,6 +454,8 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
+include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
 include/mozilla/dom/nsIEntropyCollector.h
 include/mozilla/dom/nsIFocusController.h
@@ -525,6 +530,7 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSettings.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -564,13 +570,14 @@ include/mozilla/htmlparser/nsITokenizer.h
 include/mozilla/htmlparser/nsParserCIID.h
 include/mozilla/htmlparser/nsParserError.h
 include/mozilla/htmlparser/nsToken.h
-include/mozilla/htmlparser/nshtmlpars.h
+include/mozilla/imglib2/ImageErrors.h
 include/mozilla/imglib2/ImageLogging.h
 include/mozilla/imglib2/imgICache.h
 include/mozilla/imglib2/imgIContainer.h
 include/mozilla/imglib2/imgIContainerObserver.h
 include/mozilla/imglib2/imgIDecoder.h
 include/mozilla/imglib2/imgIDecoderObserver.h
+include/mozilla/imglib2/imgILoad.h
 include/mozilla/imglib2/imgILoader.h
 include/mozilla/imglib2/imgIRequest.h
 include/mozilla/import/nsIImportABDescriptor.h
@@ -583,7 +590,6 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
-include/mozilla/intl/nsIAcceptLang.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -667,6 +673,14 @@ include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
+include/mozilla/layout/nsGrid.h
+include/mozilla/layout/nsGridCell.h
+include/mozilla/layout/nsGridLayout2.h
+include/mozilla/layout/nsGridRow.h
+include/mozilla/layout/nsGridRowGroupLayout.h
+include/mozilla/layout/nsGridRowLayout.h
+include/mozilla/layout/nsGridRowLeafFrame.h
+include/mozilla/layout/nsGridRowLeafLayout.h
 include/mozilla/layout/nsHTMLParts.h
 include/mozilla/layout/nsHTMLReflowMetrics.h
 include/mozilla/layout/nsHTMLReflowState.h
@@ -694,9 +708,11 @@ include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
 include/mozilla/layout/nsIGfxTextControlFrame.h
+include/mozilla/layout/nsIGridPart.h
 include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
+include/mozilla/layout/nsIImageControlFrame.h
 include/mozilla/layout/nsIImageFrame.h
 include/mozilla/layout/nsIIndependentSelection.h
 include/mozilla/layout/nsILayoutDebugger.h
@@ -719,6 +735,7 @@ include/mozilla/layout/nsIPresShell.h
 include/mozilla/layout/nsIPresState.h
 include/mozilla/layout/nsIPrintContext.h
 include/mozilla/layout/nsIPrintListener.h
+include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
@@ -727,7 +744,6 @@ include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
 include/mozilla/layout/nsISelectControlFrame.h
-include/mozilla/layout/nsISpaceManager.h
 include/mozilla/layout/nsIStatefulFrame.h
 include/mozilla/layout/nsIStyleContext.h
 include/mozilla/layout/nsIStyleFrameConstruction.h
@@ -745,7 +761,6 @@ include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
 include/mozilla/layout/nsTextTransformer.h
-include/mozilla/layout/nslayout.h
 include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
@@ -822,8 +837,6 @@ include/mozilla/mimetype/nsMimeTypes.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
-include/mozilla/mozcomps/nsIAppShellComponent.h
-include/mozilla/mozcomps/nsIAppShellComponentImpl.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -950,10 +963,12 @@ include/mozilla/msgbaseutil/nsMsgUtils.h
 include/mozilla/msgbaseutil/nsNewsSummarySpec.h
 include/mozilla/msgbaseutil/nsUInt32Array.h
 include/mozilla/msgbaseutil/nsUint8Array.h
+include/mozilla/msgcompose/nsIMsgAttachment.h
 include/mozilla/msgcompose/nsIMsgCompFields.h
 include/mozilla/msgcompose/nsIMsgCompose.h
 include/mozilla/msgcompose/nsIMsgComposeParams.h
 include/mozilla/msgcompose/nsIMsgComposeProgressParams.h
+include/mozilla/msgcompose/nsIMsgComposeSecure.h
 include/mozilla/msgcompose/nsIMsgComposeService.h
 include/mozilla/msgcompose/nsIMsgDraft.h
 include/mozilla/msgcompose/nsIMsgQuote.h
@@ -967,6 +982,7 @@ include/mozilla/msgcompose/nsISmtpServer.h
 include/mozilla/msgcompose/nsISmtpService.h
 include/mozilla/msgcompose/nsISmtpUrl.h
 include/mozilla/msgcompose/nsIURLFetcher.h
+include/mozilla/msgcompose/nsMsgAttachment.h
 include/mozilla/msgcompose/nsMsgAttachmentHandler.h
 include/mozilla/msgcompose/nsMsgCompCID.h
 include/mozilla/msgcompose/nsMsgCompFields.h
@@ -1185,6 +1201,80 @@ include/mozilla/npapi.h
 include/mozilla/npsimple/nsISimplePluginInstance.h
 include/mozilla/npupp.h
 include/mozilla/nsBuildID.h
+include/mozilla/nspr/md/_aix.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/_beos.h
+include/mozilla/nspr/md/_bsdi.cfg
+include/mozilla/nspr/md/_bsdi.h
+include/mozilla/nspr/md/_darwin.cfg
+include/mozilla/nspr/md/_darwin.h
+include/mozilla/nspr/md/_dgux.cfg
+include/mozilla/nspr/md/_dgux.h
+include/mozilla/nspr/md/_freebsd.cfg
+include/mozilla/nspr/md/_freebsd.h
+include/mozilla/nspr/md/_hpux.h
+include/mozilla/nspr/md/_hpux32.cfg
+include/mozilla/nspr/md/_hpux64.cfg
+include/mozilla/nspr/md/_irix.h
+include/mozilla/nspr/md/_irix32.cfg
+include/mozilla/nspr/md/_irix64.cfg
+include/mozilla/nspr/md/_linux.cfg
+include/mozilla/nspr/md/_linux.h
+include/mozilla/nspr/md/_macos.h
+include/mozilla/nspr/md/_ncr.cfg
+include/mozilla/nspr/md/_ncr.h
+include/mozilla/nspr/md/_nec.cfg
+include/mozilla/nspr/md/_nec.h
+include/mozilla/nspr/md/_netbsd.cfg
+include/mozilla/nspr/md/_netbsd.h
+include/mozilla/nspr/md/_nextstep.cfg
+include/mozilla/nspr/md/_nextstep.h
+include/mozilla/nspr/md/_nspr_pthread.h
+include/mozilla/nspr/md/_nto.cfg
+include/mozilla/nspr/md/_nto.h
+include/mozilla/nspr/md/_openbsd.cfg
+include/mozilla/nspr/md/_openbsd.h
+include/mozilla/nspr/md/_openvms.cfg
+include/mozilla/nspr/md/_openvms.h
+include/mozilla/nspr/md/_os2.cfg
+include/mozilla/nspr/md/_os2.h
+include/mozilla/nspr/md/_os2_errors.h
+include/mozilla/nspr/md/_osf1.cfg
+include/mozilla/nspr/md/_osf1.h
+include/mozilla/nspr/md/_pcos.h
+include/mozilla/nspr/md/_pth.h
+include/mozilla/nspr/md/_qnx.cfg
+include/mozilla/nspr/md/_qnx.h
+include/mozilla/nspr/md/_reliantunix.cfg
+include/mozilla/nspr/md/_reliantunix.h
+include/mozilla/nspr/md/_rhapsody.cfg
+include/mozilla/nspr/md/_rhapsody.h
+include/mozilla/nspr/md/_scoos.cfg
+include/mozilla/nspr/md/_scoos.h
+include/mozilla/nspr/md/_solaris.h
+include/mozilla/nspr/md/_solaris32.cfg
+include/mozilla/nspr/md/_solaris64.cfg
+include/mozilla/nspr/md/_sony.cfg
+include/mozilla/nspr/md/_sony.h
+include/mozilla/nspr/md/_sunos4.cfg
+include/mozilla/nspr/md/_sunos4.h
+include/mozilla/nspr/md/_unix_errors.h
+include/mozilla/nspr/md/_unixos.h
+include/mozilla/nspr/md/_unixware.cfg
+include/mozilla/nspr/md/_unixware.h
+include/mozilla/nspr/md/_unixware7.cfg
+include/mozilla/nspr/md/_win16.cfg
+include/mozilla/nspr/md/_win16.h
+include/mozilla/nspr/md/_win32_errors.h
+include/mozilla/nspr/md/_win95.cfg
+include/mozilla/nspr/md/_win95.h
+include/mozilla/nspr/md/_winnt.cfg
+include/mozilla/nspr/md/_winnt.h
+include/mozilla/nspr/md/prosdep.h
+include/mozilla/nspr/md/sunos4.h
 include/mozilla/nspr/nspr.h
 include/mozilla/nspr/obsolete/pralarm.h
 include/mozilla/nspr/obsolete/probslet.h
@@ -1260,6 +1350,8 @@ include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
 include/mozilla/pipnss/nsIBadCertListener.h
+include/mozilla/pipnss/nsICMS.h
+include/mozilla/pipnss/nsICMSSecureMessage.h
 include/mozilla/pipnss/nsICertOutliner.h
 include/mozilla/pipnss/nsICertSelect.h
 include/mozilla/pipnss/nsIKeygenThread.h
@@ -1267,6 +1359,7 @@ include/mozilla/pipnss/nsINSSDialogs.h
 include/mozilla/pipnss/nsIPK11TokenDB.h
 include/mozilla/pipnss/nsIPKCS11Slot.h
 include/mozilla/pipnss/nsISSLStatus.h
+include/mozilla/pipnss/nsIUserCertPicker.h
 include/mozilla/pipnss/nsIX509Cert.h
 include/mozilla/pipnss/nsIX509CertDB.h
 include/mozilla/pippki/nsIASN1Outliner.h
@@ -1348,7 +1441,6 @@ include/mozilla/rdf/nsRDFCID.h
 include/mozilla/rdf/rdf.h
 include/mozilla/rdfutil/nsRDFResource.h
 include/mozilla/regviewer/nsIRegistryDataSource.h
-include/mozilla/remote/nsIRemoteBrowserControl.h
 include/mozilla/shistory/nsIHistoryEntry.h
 include/mozilla/shistory/nsISHContainer.h
 include/mozilla/shistory/nsISHEntry.h
@@ -1360,6 +1452,7 @@ include/mozilla/sidebar/nsISidebar.h
 include/mozilla/string/nsAFlatString.h
 include/mozilla/string/nsAPromiseString.h
 include/mozilla/string/nsAReadableString.h
+include/mozilla/string/nsASingleFragmentString.h
 include/mozilla/string/nsAString.h
 include/mozilla/string/nsAStringGenerator.h
 include/mozilla/string/nsAWritableString.h
@@ -1373,7 +1466,6 @@ include/mozilla/string/nsDependentSubstring.h
 include/mozilla/string/nsFragmentedString.h
 include/mozilla/string/nsLiteralString.h
 include/mozilla/string/nsPrintfCString.h
-include/mozilla/string/nsPrivateSharableString.h
 include/mozilla/string/nsPromiseFlatString.h
 include/mozilla/string/nsReadableUtils.h
 include/mozilla/string/nsSharableString.h
@@ -1440,6 +1532,7 @@ include/mozilla/unicharutil/nsIUBidiUtils.h
 include/mozilla/unicharutil/nsIUGenCategory.h
 include/mozilla/unicharutil/nsIUGenDetailCategory.h
 include/mozilla/unicharutil/nsUnicharUtilCIID.h
+include/mozilla/unicharutil/nsUnicharUtils.h
 include/mozilla/uriloader/nsCURILoader.h
 include/mozilla/uriloader/nsDocLoader.h
 include/mozilla/uriloader/nsIContentHandler.h
@@ -1455,6 +1548,7 @@ include/mozilla/util/stopwatch.h
 include/mozilla/util/xp_obs.h
 include/mozilla/view/nsIClipView.h
 include/mozilla/view/nsICompositeListener.h
+include/mozilla/view/nsIEventProcessor.h
 include/mozilla/view/nsIScrollPositionListener.h
 include/mozilla/view/nsIScrollableView.h
 include/mozilla/view/nsIView.h
@@ -1468,6 +1562,8 @@ include/mozilla/wallet/nsIWalletService.h
 include/mozilla/walletviewers/nsISignonViewer.h
 include/mozilla/walletviewers/nsIWalletEditor.h
 include/mozilla/walletviewers/nsIWalletPreview.h
+include/mozilla/webbrowserpersist/nsCWebBrowserPersist.h
+include/mozilla/webbrowserpersist/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsCTooltipTextProvider.h
 include/mozilla/webbrwsr/nsCWebBrowser.h
 include/mozilla/webbrwsr/nsICommandHandler.h
@@ -1479,7 +1575,6 @@ include/mozilla/webbrwsr/nsIWebBrowser.h
 include/mozilla/webbrwsr/nsIWebBrowserChrome.h
 include/mozilla/webbrwsr/nsIWebBrowserChromeFocus.h
 include/mozilla/webbrwsr/nsIWebBrowserFocus.h
-include/mozilla/webbrwsr/nsIWebBrowserPersist.h
 include/mozilla/webbrwsr/nsIWebBrowserPrint.h
 include/mozilla/webbrwsr/nsIWebBrowserSetup.h
 include/mozilla/webshell/nsIClipboardCommands.h
@@ -1623,13 +1718,11 @@ include/mozilla/xpcom/nsIInterfaceRequestor.h
 include/mozilla/xpcom/nsIInterfaceRequestorUtils.h
 include/mozilla/xpcom/nsILineInputStream.h
 include/mozilla/xpcom/nsILocalFile.h
-include/mozilla/xpcom/nsILoggingService.h
 include/mozilla/xpcom/nsIMemory.h
 include/mozilla/xpcom/nsIModule.h
 include/mozilla/xpcom/nsIObjectInputStream.h
 include/mozilla/xpcom/nsIObjectOutputStream.h
 include/mozilla/xpcom/nsIObserver.h
-include/mozilla/xpcom/nsIObserverList.h
 include/mozilla/xpcom/nsIObserverService.h
 include/mozilla/xpcom/nsIOutputStream.h
 include/mozilla/xpcom/nsIPersistentProperties2.h
@@ -1637,6 +1730,7 @@ include/mozilla/xpcom/nsIPipe.h
 include/mozilla/xpcom/nsIProcess.h
 include/mozilla/xpcom/nsIProgrammingLanguage.h
 include/mozilla/xpcom/nsIProperties.h
+include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
 include/mozilla/xpcom/nsIPtr.h
@@ -1648,9 +1742,10 @@ include/mozilla/xpcom/nsIScriptableInputStream.h
 include/mozilla/xpcom/nsISeekableStream.h
 include/mozilla/xpcom/nsISerializable.h
 include/mozilla/xpcom/nsIServiceManager.h
+include/mozilla/xpcom/nsIServiceManagerObsolete.h
+include/mozilla/xpcom/nsIServiceManagerUtils.h
 include/mozilla/xpcom/nsISimpleEnumerator.h
 include/mozilla/xpcom/nsISizeOfHandler.h
-include/mozilla/xpcom/nsIStopwatch.h
 include/mozilla/xpcom/nsIStorageStream.h
 include/mozilla/xpcom/nsIStreamBufferAccess.h
 include/mozilla/xpcom/nsIStringStream.h
@@ -1668,12 +1763,15 @@ include/mozilla/xpcom/nsIThreadPool.h
 include/mozilla/xpcom/nsITimelineService.h
 include/mozilla/xpcom/nsIUnicharBuffer.h
 include/mozilla/xpcom/nsIUnicharInputStream.h
+include/mozilla/xpcom/nsIVariant.h
 include/mozilla/xpcom/nsIWeakReference.h
+include/mozilla/xpcom/nsIWeakReferenceUtils.h
 include/mozilla/xpcom/nsInt64.h
 include/mozilla/xpcom/nsLinebreakConverter.h
 include/mozilla/xpcom/nsLocalFile.h
 include/mozilla/xpcom/nsLocalFileUnix.h
 include/mozilla/xpcom/nsMemory.h
+include/mozilla/xpcom/nsObserverService.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
@@ -1691,14 +1789,15 @@ include/mozilla/xpcom/nsTextFormatter.h
 include/mozilla/xpcom/nsTime.h
 include/mozilla/xpcom/nsTraceRefcnt.h
 include/mozilla/xpcom/nsUnitConversion.h
+include/mozilla/xpcom/nsVariant.h
 include/mozilla/xpcom/nsVector.h
 include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsVoidBTree.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
+include/mozilla/xpcom/nsXPCOM.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
-include/mozilla/xpcom/nslog.h
 include/mozilla/xpcom/nsrootidl.h
 include/mozilla/xpcom/pldhash.h
 include/mozilla/xpcom/plevent.h
@@ -1772,6 +1871,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/webshell_tests
 @dirrm include/mozilla/webshell
 @dirrm include/mozilla/webbrwsr
+@dirrm include/mozilla/webbrowserpersist
 @dirrm include/mozilla/walletviewers
 @dirrm include/mozilla/wallet
 @dirrm include/mozilla/view
@@ -1794,7 +1894,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/string
 @dirrm include/mozilla/sidebar
 @dirrm include/mozilla/shistory
-@dirrm include/mozilla/remote
 @dirrm include/mozilla/regviewer
 @dirrm include/mozilla/rdfutil
 @dirrm include/mozilla/rdf
@@ -1807,6 +1906,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
+@dirrm include/mozilla/nspr/md
 @dirrm include/mozilla/nspr
 @dirrm include/mozilla/npsimple
 @dirrm include/mozilla/nkcache
@@ -1822,7 +1922,6 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/mpfilelocprovider
 @dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
-@dirrm include/mozilla/mozcomps
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mimetype
 @dirrm include/mozilla/mimeemitter
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index edd38ac60984..c322ceeb20b3 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/mozilla-vendor/distinfo b/www/mozilla-vendor/distinfo
index 3fac33567aa2..0e59edc5b73e 100644
--- a/www/mozilla-vendor/distinfo
+++ b/www/mozilla-vendor/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.5.tar.bz2) = 1d0062ce61a3ad4baa92bdcad496c682
+MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
diff --git a/www/mozilla-vendor/files/patch-aq b/www/mozilla-vendor/files/patch-aq
index 4e5ff8746c33..0c63e6bcb097 100644
--- a/www/mozilla-vendor/files/patch-aq
+++ b/www/mozilla-vendor/files/patch-aq
@@ -1,6 +1,9 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Apr  3 17:25:43 2000
-+++ nsprpub/pr/include/md/_pth.h	Fri Feb 16 00:30:46 2001
-@@ -183,7 +183,7 @@
+
+$FreeBSD$
+
+--- nsprpub/pr/include/md/_pth.h.orig	Fri Oct 26 07:54:00 2001
++++ nsprpub/pr/include/md/_pth.h	Wed Nov 21 14:16:07 2001
+@@ -224,7 +224,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */
  
@@ -9,12 +12,12 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -203,7 +203,7 @@
+@@ -244,7 +244,7 @@
   */
  #define PT_PRIO_MIN            1
  #define PT_PRIO_MAX            127
 -#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
 +#elif defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
+ 	|| defined(BSDI) || defined(DARWIN) /* XXX */
  #define PT_PRIO_MIN            0
  #define PT_PRIO_MAX            126
diff --git a/www/mozilla-vendor/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h b/www/mozilla-vendor/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
new file mode 100644
index 000000000000..8da724659683
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:09	1.1
++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:31
+@@ -48,7 +48,7 @@
+ #ifdef macintosh
+ # include "ldap-macos.h"
+ #else /* macintosh */
+-#if !defined(BSDI) && !defined(DARWIN)
++#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
+ # include <malloc.h>
+ #endif
+ # include <errno.h>
diff --git a/www/mozilla-vendor/files/patch-directory::xpcom::base::src::Makefile.in b/www/mozilla-vendor/files/patch-directory::xpcom::base::src::Makefile.in
deleted file mode 100644
index d2ef636766de..000000000000
--- a/www/mozilla-vendor/files/patch-directory::xpcom::base::src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- directory/xpcom/base/src/Makefile.in.orig	Thu Sep 20 15:30:57 2001
-+++ directory/xpcom/base/src/Makefile.in	Thu Oct 25 15:37:03 2001
-@@ -80,6 +80,5 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--CFLAGS		+= $(LDAP_CFLAGS)
--CXXFLAGS	+= $(LDAP_CFLAGS)
-+DEFINES		+= $(LDAP_CFLAGS)
- 
diff --git a/www/mozilla-vendor/files/patch-qt b/www/mozilla-vendor/files/patch-qt
index ba6cdced59b7..91667539477a 100644
--- a/www/mozilla-vendor/files/patch-qt
+++ b/www/mozilla-vendor/files/patch-qt
@@ -1,18 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Jul 25 08:44:09 2001
-+++ configure	Sat Aug  4 11:18:33 2001
-@@ -6528,7 +6528,7 @@
-     echo "$ac_t""$HOST_MOC" 1>&6
-     MOC=$HOST_MOC
- 
--    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
-+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
-     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
- 
-     # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8587,6 +8587,9 @@
+--- configure.orig	Fri Nov  9 05:13:03 2001
++++ configure	Wed Nov 21 14:22:13 2001
+@@ -5931,6 +5931,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9316,8 +9319,6 @@
+@@ -6987,8 +6990,6 @@
  	if test $? -eq 0; then
  		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  			ac_cv_have_dash_pthread=yes
@@ -31,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -9351,7 +9352,7 @@
+@@ -7022,7 +7023,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +31,24 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -13701,6 +13702,7 @@
+@@ -8365,6 +8366,7 @@
+         ;;
+     *)
+         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
++        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+         ;;
+     esac
+ fi
+@@ -9421,7 +9423,7 @@
+     fi
+     MOC=$HOST_MOC
+ 
+-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
++    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
+     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
+ 
+     # Check whether --with-static-qt or --without-static-qt was given.
+@@ -13233,6 +13235,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/mozilla-vendor/files/patch-xpcom::ds::plvector.c b/www/mozilla-vendor/files/patch-xpcom::ds::plvector.c
new file mode 100644
index 000000000000..645751f3c3d6
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-xpcom::ds::plvector.c
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- xpcom/ds/plvector.c	2001/11/21 12:36:30	1.1
++++ xpcom/ds/plvector.c	2001/11/21 12:43:54
+@@ -177,11 +177,12 @@
+ PL_VectorCompact(PLVector* v)
+ {
+     if (v->size != v->maxSize) {
++        void ** newData = NULL;
++
+         /* shrink to desired size */
+ #ifdef SIZE_T_MAX
+         PR_ASSERT(v->size <= SIZE_T_MAX/sizeof(void *)); /* no overflow */
+ #endif
+-        void ** newData = NULL;
+         if (v->size != 0) {
+             newData = (void **)PR_Malloc(v->size * sizeof(void *));
+             /* copy new data from old */
diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist
index 9059b4dc54c0..e6b4e0c70254 100644
--- a/www/mozilla-vendor/pkg-plist
+++ b/www/mozilla-vendor/pkg-plist
@@ -55,6 +55,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
 lib/mozilla/TestRect
@@ -62,6 +63,7 @@ lib/mozilla/TestServMgr
 lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
+lib/mozilla/TestSpaceManager
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
@@ -76,6 +78,7 @@ lib/mozilla/chrome/US.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -166,6 +169,7 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimgbmp.so
 lib/mozilla/components/libimggif.so
 lib/mozilla/components/libimgjpeg.so
 lib/mozilla/components/libimglib2.so
@@ -242,7 +246,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 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/mozxfer.xpt
@@ -286,14 +289,11 @@ lib/mozilla/components/proxytest.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/sample.xpt
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -307,6 +307,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -322,7 +323,6 @@ lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
 lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -357,7 +357,6 @@ 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/htmlrobot
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
@@ -395,7 +394,6 @@ lib/mozilla/rdfpoll
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -431,6 +429,7 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
+lib/mozilla/res/html/loading-image.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -580,8 +579,6 @@ 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/timebombgen
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index edd38ac60984..c322ceeb20b3 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 3fac33567aa2..0e59edc5b73e 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.5.tar.bz2) = 1d0062ce61a3ad4baa92bdcad496c682
+MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
diff --git a/www/mozilla/files/patch-aq b/www/mozilla/files/patch-aq
index 4e5ff8746c33..0c63e6bcb097 100644
--- a/www/mozilla/files/patch-aq
+++ b/www/mozilla/files/patch-aq
@@ -1,6 +1,9 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Apr  3 17:25:43 2000
-+++ nsprpub/pr/include/md/_pth.h	Fri Feb 16 00:30:46 2001
-@@ -183,7 +183,7 @@
+
+$FreeBSD$
+
+--- nsprpub/pr/include/md/_pth.h.orig	Fri Oct 26 07:54:00 2001
++++ nsprpub/pr/include/md/_pth.h	Wed Nov 21 14:16:07 2001
+@@ -224,7 +224,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */
  
@@ -9,12 +12,12 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -203,7 +203,7 @@
+@@ -244,7 +244,7 @@
   */
  #define PT_PRIO_MIN            1
  #define PT_PRIO_MAX            127
 -#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
 +#elif defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
+ 	|| defined(BSDI) || defined(DARWIN) /* XXX */
  #define PT_PRIO_MIN            0
  #define PT_PRIO_MAX            126
diff --git a/www/mozilla/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h b/www/mozilla/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
new file mode 100644
index 000000000000..8da724659683
--- /dev/null
+++ b/www/mozilla/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:09	1.1
++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:31
+@@ -48,7 +48,7 @@
+ #ifdef macintosh
+ # include "ldap-macos.h"
+ #else /* macintosh */
+-#if !defined(BSDI) && !defined(DARWIN)
++#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
+ # include <malloc.h>
+ #endif
+ # include <errno.h>
diff --git a/www/mozilla/files/patch-directory::xpcom::base::src::Makefile.in b/www/mozilla/files/patch-directory::xpcom::base::src::Makefile.in
deleted file mode 100644
index d2ef636766de..000000000000
--- a/www/mozilla/files/patch-directory::xpcom::base::src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- directory/xpcom/base/src/Makefile.in.orig	Thu Sep 20 15:30:57 2001
-+++ directory/xpcom/base/src/Makefile.in	Thu Oct 25 15:37:03 2001
-@@ -80,6 +80,5 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--CFLAGS		+= $(LDAP_CFLAGS)
--CXXFLAGS	+= $(LDAP_CFLAGS)
-+DEFINES		+= $(LDAP_CFLAGS)
- 
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index ba6cdced59b7..91667539477a 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,18 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Jul 25 08:44:09 2001
-+++ configure	Sat Aug  4 11:18:33 2001
-@@ -6528,7 +6528,7 @@
-     echo "$ac_t""$HOST_MOC" 1>&6
-     MOC=$HOST_MOC
- 
--    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
-+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
-     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
- 
-     # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8587,6 +8587,9 @@
+--- configure.orig	Fri Nov  9 05:13:03 2001
++++ configure	Wed Nov 21 14:22:13 2001
+@@ -5931,6 +5931,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9316,8 +9319,6 @@
+@@ -6987,8 +6990,6 @@
  	if test $? -eq 0; then
  		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  			ac_cv_have_dash_pthread=yes
@@ -31,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -9351,7 +9352,7 @@
+@@ -7022,7 +7023,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +31,24 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -13701,6 +13702,7 @@
+@@ -8365,6 +8366,7 @@
+         ;;
+     *)
+         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
++        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+         ;;
+     esac
+ fi
+@@ -9421,7 +9423,7 @@
+     fi
+     MOC=$HOST_MOC
+ 
+-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
++    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
+     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
+ 
+     # Check whether --with-static-qt or --without-static-qt was given.
+@@ -13233,6 +13235,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/mozilla/files/patch-xpcom::ds::plvector.c b/www/mozilla/files/patch-xpcom::ds::plvector.c
new file mode 100644
index 000000000000..645751f3c3d6
--- /dev/null
+++ b/www/mozilla/files/patch-xpcom::ds::plvector.c
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- xpcom/ds/plvector.c	2001/11/21 12:36:30	1.1
++++ xpcom/ds/plvector.c	2001/11/21 12:43:54
+@@ -177,11 +177,12 @@
+ PL_VectorCompact(PLVector* v)
+ {
+     if (v->size != v->maxSize) {
++        void ** newData = NULL;
++
+         /* shrink to desired size */
+ #ifdef SIZE_T_MAX
+         PR_ASSERT(v->size <= SIZE_T_MAX/sizeof(void *)); /* no overflow */
+ #endif
+-        void ** newData = NULL;
+         if (v->size != 0) {
+             newData = (void **)PR_Malloc(v->size * sizeof(void *));
+             /* copy new data from old */
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 9059b4dc54c0..e6b4e0c70254 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -55,6 +55,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
 lib/mozilla/TestRect
@@ -62,6 +63,7 @@ lib/mozilla/TestServMgr
 lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
+lib/mozilla/TestSpaceManager
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
@@ -76,6 +78,7 @@ lib/mozilla/chrome/US.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -166,6 +169,7 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimgbmp.so
 lib/mozilla/components/libimggif.so
 lib/mozilla/components/libimgjpeg.so
 lib/mozilla/components/libimglib2.so
@@ -242,7 +246,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 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/mozxfer.xpt
@@ -286,14 +289,11 @@ lib/mozilla/components/proxytest.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/sample.xpt
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -307,6 +307,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -322,7 +323,6 @@ lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
 lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -357,7 +357,6 @@ 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/htmlrobot
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
@@ -395,7 +394,6 @@ lib/mozilla/rdfpoll
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -431,6 +429,7 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
+lib/mozilla/res/html/loading-image.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -580,8 +579,6 @@ 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/timebombgen
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index edd38ac60984..c322ceeb20b3 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 3fac33567aa2..0e59edc5b73e 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.5.tar.bz2) = 1d0062ce61a3ad4baa92bdcad496c682
+MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
diff --git a/www/seamonkey/files/patch-aq b/www/seamonkey/files/patch-aq
index 4e5ff8746c33..0c63e6bcb097 100644
--- a/www/seamonkey/files/patch-aq
+++ b/www/seamonkey/files/patch-aq
@@ -1,6 +1,9 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Apr  3 17:25:43 2000
-+++ nsprpub/pr/include/md/_pth.h	Fri Feb 16 00:30:46 2001
-@@ -183,7 +183,7 @@
+
+$FreeBSD$
+
+--- nsprpub/pr/include/md/_pth.h.orig	Fri Oct 26 07:54:00 2001
++++ nsprpub/pr/include/md/_pth.h	Wed Nov 21 14:16:07 2001
+@@ -224,7 +224,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */
  
@@ -9,12 +12,12 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -203,7 +203,7 @@
+@@ -244,7 +244,7 @@
   */
  #define PT_PRIO_MIN            1
  #define PT_PRIO_MAX            127
 -#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
 +#elif defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
+ 	|| defined(BSDI) || defined(DARWIN) /* XXX */
  #define PT_PRIO_MIN            0
  #define PT_PRIO_MAX            126
diff --git a/www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h b/www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
new file mode 100644
index 000000000000..8da724659683
--- /dev/null
+++ b/www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:09	1.1
++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:31
+@@ -48,7 +48,7 @@
+ #ifdef macintosh
+ # include "ldap-macos.h"
+ #else /* macintosh */
+-#if !defined(BSDI) && !defined(DARWIN)
++#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
+ # include <malloc.h>
+ #endif
+ # include <errno.h>
diff --git a/www/seamonkey/files/patch-directory::xpcom::base::src::Makefile.in b/www/seamonkey/files/patch-directory::xpcom::base::src::Makefile.in
deleted file mode 100644
index d2ef636766de..000000000000
--- a/www/seamonkey/files/patch-directory::xpcom::base::src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- directory/xpcom/base/src/Makefile.in.orig	Thu Sep 20 15:30:57 2001
-+++ directory/xpcom/base/src/Makefile.in	Thu Oct 25 15:37:03 2001
-@@ -80,6 +80,5 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--CFLAGS		+= $(LDAP_CFLAGS)
--CXXFLAGS	+= $(LDAP_CFLAGS)
-+DEFINES		+= $(LDAP_CFLAGS)
- 
diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt
index ba6cdced59b7..91667539477a 100644
--- a/www/seamonkey/files/patch-qt
+++ b/www/seamonkey/files/patch-qt
@@ -1,18 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Jul 25 08:44:09 2001
-+++ configure	Sat Aug  4 11:18:33 2001
-@@ -6528,7 +6528,7 @@
-     echo "$ac_t""$HOST_MOC" 1>&6
-     MOC=$HOST_MOC
- 
--    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
-+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
-     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
- 
-     # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8587,6 +8587,9 @@
+--- configure.orig	Fri Nov  9 05:13:03 2001
++++ configure	Wed Nov 21 14:22:13 2001
+@@ -5931,6 +5931,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9316,8 +9319,6 @@
+@@ -6987,8 +6990,6 @@
  	if test $? -eq 0; then
  		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  			ac_cv_have_dash_pthread=yes
@@ -31,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -9351,7 +9352,7 @@
+@@ -7022,7 +7023,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +31,24 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -13701,6 +13702,7 @@
+@@ -8365,6 +8366,7 @@
+         ;;
+     *)
+         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
++        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+         ;;
+     esac
+ fi
+@@ -9421,7 +9423,7 @@
+     fi
+     MOC=$HOST_MOC
+ 
+-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
++    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
+     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
+ 
+     # Check whether --with-static-qt or --without-static-qt was given.
+@@ -13233,6 +13235,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/seamonkey/files/patch-xpcom::ds::plvector.c b/www/seamonkey/files/patch-xpcom::ds::plvector.c
new file mode 100644
index 000000000000..645751f3c3d6
--- /dev/null
+++ b/www/seamonkey/files/patch-xpcom::ds::plvector.c
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- xpcom/ds/plvector.c	2001/11/21 12:36:30	1.1
++++ xpcom/ds/plvector.c	2001/11/21 12:43:54
+@@ -177,11 +177,12 @@
+ PL_VectorCompact(PLVector* v)
+ {
+     if (v->size != v->maxSize) {
++        void ** newData = NULL;
++
+         /* shrink to desired size */
+ #ifdef SIZE_T_MAX
+         PR_ASSERT(v->size <= SIZE_T_MAX/sizeof(void *)); /* no overflow */
+ #endif
+-        void ** newData = NULL;
+         if (v->size != 0) {
+             newData = (void **)PR_Malloc(v->size * sizeof(void *));
+             /* copy new data from old */
diff --git a/www/seamonkey/pkg-plist b/www/seamonkey/pkg-plist
index 9059b4dc54c0..e6b4e0c70254 100644
--- a/www/seamonkey/pkg-plist
+++ b/www/seamonkey/pkg-plist
@@ -55,6 +55,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
 lib/mozilla/TestRect
@@ -62,6 +63,7 @@ lib/mozilla/TestServMgr
 lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
+lib/mozilla/TestSpaceManager
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
@@ -76,6 +78,7 @@ lib/mozilla/chrome/US.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -166,6 +169,7 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimgbmp.so
 lib/mozilla/components/libimggif.so
 lib/mozilla/components/libimgjpeg.so
 lib/mozilla/components/libimglib2.so
@@ -242,7 +246,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 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/mozxfer.xpt
@@ -286,14 +289,11 @@ lib/mozilla/components/proxytest.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/sample.xpt
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -307,6 +307,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -322,7 +323,6 @@ lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
 lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -357,7 +357,6 @@ 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/htmlrobot
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
@@ -395,7 +394,6 @@ lib/mozilla/rdfpoll
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -431,6 +429,7 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
+lib/mozilla/res/html/loading-image.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -580,8 +579,6 @@ 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/timebombgen
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index edd38ac60984..c322ceeb20b3 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index 3fac33567aa2..0e59edc5b73e 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.5.tar.bz2) = 1d0062ce61a3ad4baa92bdcad496c682
+MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
diff --git a/www/seamonkey2/files/patch-aq b/www/seamonkey2/files/patch-aq
index 4e5ff8746c33..0c63e6bcb097 100644
--- a/www/seamonkey2/files/patch-aq
+++ b/www/seamonkey2/files/patch-aq
@@ -1,6 +1,9 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Apr  3 17:25:43 2000
-+++ nsprpub/pr/include/md/_pth.h	Fri Feb 16 00:30:46 2001
-@@ -183,7 +183,7 @@
+
+$FreeBSD$
+
+--- nsprpub/pr/include/md/_pth.h.orig	Fri Oct 26 07:54:00 2001
++++ nsprpub/pr/include/md/_pth.h	Wed Nov 21 14:16:07 2001
+@@ -224,7 +224,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */
  
@@ -9,12 +12,12 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -203,7 +203,7 @@
+@@ -244,7 +244,7 @@
   */
  #define PT_PRIO_MIN            1
  #define PT_PRIO_MAX            127
 -#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
 +#elif defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
+ 	|| defined(BSDI) || defined(DARWIN) /* XXX */
  #define PT_PRIO_MIN            0
  #define PT_PRIO_MAX            126
diff --git a/www/seamonkey2/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h b/www/seamonkey2/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
new file mode 100644
index 000000000000..8da724659683
--- /dev/null
+++ b/www/seamonkey2/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:09	1.1
++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:31
+@@ -48,7 +48,7 @@
+ #ifdef macintosh
+ # include "ldap-macos.h"
+ #else /* macintosh */
+-#if !defined(BSDI) && !defined(DARWIN)
++#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
+ # include <malloc.h>
+ #endif
+ # include <errno.h>
diff --git a/www/seamonkey2/files/patch-directory::xpcom::base::src::Makefile.in b/www/seamonkey2/files/patch-directory::xpcom::base::src::Makefile.in
deleted file mode 100644
index d2ef636766de..000000000000
--- a/www/seamonkey2/files/patch-directory::xpcom::base::src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- directory/xpcom/base/src/Makefile.in.orig	Thu Sep 20 15:30:57 2001
-+++ directory/xpcom/base/src/Makefile.in	Thu Oct 25 15:37:03 2001
-@@ -80,6 +80,5 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--CFLAGS		+= $(LDAP_CFLAGS)
--CXXFLAGS	+= $(LDAP_CFLAGS)
-+DEFINES		+= $(LDAP_CFLAGS)
- 
diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt
index ba6cdced59b7..91667539477a 100644
--- a/www/seamonkey2/files/patch-qt
+++ b/www/seamonkey2/files/patch-qt
@@ -1,18 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Jul 25 08:44:09 2001
-+++ configure	Sat Aug  4 11:18:33 2001
-@@ -6528,7 +6528,7 @@
-     echo "$ac_t""$HOST_MOC" 1>&6
-     MOC=$HOST_MOC
- 
--    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
-+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
-     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
- 
-     # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8587,6 +8587,9 @@
+--- configure.orig	Fri Nov  9 05:13:03 2001
++++ configure	Wed Nov 21 14:22:13 2001
+@@ -5931,6 +5931,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9316,8 +9319,6 @@
+@@ -6987,8 +6990,6 @@
  	if test $? -eq 0; then
  		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  			ac_cv_have_dash_pthread=yes
@@ -31,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -9351,7 +9352,7 @@
+@@ -7022,7 +7023,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +31,24 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -13701,6 +13702,7 @@
+@@ -8365,6 +8366,7 @@
+         ;;
+     *)
+         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
++        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+         ;;
+     esac
+ fi
+@@ -9421,7 +9423,7 @@
+     fi
+     MOC=$HOST_MOC
+ 
+-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
++    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
+     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
+ 
+     # Check whether --with-static-qt or --without-static-qt was given.
+@@ -13233,6 +13235,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/seamonkey2/files/patch-xpcom::ds::plvector.c b/www/seamonkey2/files/patch-xpcom::ds::plvector.c
new file mode 100644
index 000000000000..645751f3c3d6
--- /dev/null
+++ b/www/seamonkey2/files/patch-xpcom::ds::plvector.c
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- xpcom/ds/plvector.c	2001/11/21 12:36:30	1.1
++++ xpcom/ds/plvector.c	2001/11/21 12:43:54
+@@ -177,11 +177,12 @@
+ PL_VectorCompact(PLVector* v)
+ {
+     if (v->size != v->maxSize) {
++        void ** newData = NULL;
++
+         /* shrink to desired size */
+ #ifdef SIZE_T_MAX
+         PR_ASSERT(v->size <= SIZE_T_MAX/sizeof(void *)); /* no overflow */
+ #endif
+-        void ** newData = NULL;
+         if (v->size != 0) {
+             newData = (void **)PR_Malloc(v->size * sizeof(void *));
+             /* copy new data from old */
diff --git a/www/seamonkey2/pkg-plist b/www/seamonkey2/pkg-plist
index 9059b4dc54c0..e6b4e0c70254 100644
--- a/www/seamonkey2/pkg-plist
+++ b/www/seamonkey2/pkg-plist
@@ -55,6 +55,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
 lib/mozilla/TestRect
@@ -62,6 +63,7 @@ lib/mozilla/TestServMgr
 lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
+lib/mozilla/TestSpaceManager
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
@@ -76,6 +78,7 @@ lib/mozilla/chrome/US.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -166,6 +169,7 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimgbmp.so
 lib/mozilla/components/libimggif.so
 lib/mozilla/components/libimgjpeg.so
 lib/mozilla/components/libimglib2.so
@@ -242,7 +246,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 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/mozxfer.xpt
@@ -286,14 +289,11 @@ lib/mozilla/components/proxytest.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/sample.xpt
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -307,6 +307,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -322,7 +323,6 @@ lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
 lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -357,7 +357,6 @@ 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/htmlrobot
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
@@ -395,7 +394,6 @@ lib/mozilla/rdfpoll
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -431,6 +429,7 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
+lib/mozilla/res/html/loading-image.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -580,8 +579,6 @@ 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/timebombgen
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk