Update to 0.9.7.

51 files changed, 970 insertions, 304 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index c322ceeb20b..c2cac9ab73d 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,sobomax,} \
+		${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
+		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -56,10 +58,13 @@ CONFIGURE_ARGS=					\
 		--with-mng=${LOCALBASE}		\
 		--with-pthreads
 CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="" CXXFLAGS=""
+		CFLAGS="" CXXFLAGS="" \
+		MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		CFLAGS="" CXXFLAGS="" \
-		MALLOC_OPTIONS=j
+		MALLOC_OPTIONS=j \
+		MOZ_INTERNAL_LIBART_LGPL=1
+ALL_TARGET=	default
 
 post-build:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 0e59edc5b73..4675e10762f 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1 +1,2 @@
-MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
+MD5 (mozilla-source-0.9.7.tar.bz2) = 9c87cf29acd4d2c77783b71b5d41bd26
+MD5 (libart_lgpl-0.9.7.tar.bz2) = 3de7009f6062bb8da1abb168aebd9162
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
deleted file mode 100644
index 8da72465968..00000000000
--- a/www/mozilla-devel/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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-embedding::config::basebrowser-unix b/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
new file mode 100644
index 00000000000..64c8ac9cddc
--- /dev/null
+++ b/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
++++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+@@ -119,6 +119,7 @@
+ 
+ ; layout
+ components/libgkcontent.so
++libmoz_art_lgpl.so                   
+ components/libgklayout.so                   
+ components/libhtmlpars.so                 
+ components/libgkview.so                   
diff --git a/www/mozilla-devel/files/patch-extensions::transformiix::source::base::Double.cpp b/www/mozilla-devel/files/patch-extensions::transformiix::source::base::Double.cpp
new file mode 100644
index 00000000000..24608f0b4c9
--- /dev/null
+++ b/www/mozilla-devel/files/patch-extensions::transformiix::source::base::Double.cpp
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- extensions/transformiix/source/base/Double.cpp.orig	Sat Nov 24 00:36:13 2001
++++ extensions/transformiix/source/base/Double.cpp	Tue Dec 25 15:19:42 2001
+@@ -41,7 +41,7 @@
+ #endif
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ #ifndef TX_EXE
+ #include "prdtoa.h"
+@@ -56,7 +56,11 @@
+ 
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
++#ifdef __alpha__
++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
++#else
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
++#endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+ 
diff --git a/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg
new file mode 100644
index 00000000000..417d7d91ddb
--- /dev/null
+++ b/www/mozilla-devel/files/patch-nsprpub::pr::include::md::_freebsd.cfg
@@ -0,0 +1,13 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig	Mon Nov 26 17:07:20 2001
++++ nsprpub/pr/include/md/_freebsd.cfg	Mon Nov 26 17:15:01 2001
+@@ -93,8 +93,8 @@
+ 
+ #elif defined(__alpha)
+ 
+-#define IS_LITTLE_ENDIAN 1
+-#undef  IS_BIG_ENDIAN
++#define	IS_64
++
+ #define	HAVE_LONG_LONG
+ #define	HAVE_ALIGNED_DOUBLES
+ #define	HAVE_ALIGNED_LONGLONGS
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index 91667539477..a7c925a7202 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Nov  9 05:13:03 2001
-+++ configure	Wed Nov 21 14:22:13 2001
-@@ -5931,6 +5931,9 @@
+--- configure.orig	Wed Dec 12 10:12:41 2001
++++ configure	Tue Dec 25 15:21:43 2001
+@@ -6186,6 +6186,9 @@
  os2*)
      LIBS=
      ;;
@@ -13,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -6987,8 +6990,6 @@
+@@ -7357,8 +7360,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
@@ -22,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -7022,7 +7023,7 @@
+@@ -7392,7 +7393,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,15 +31,7 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -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 @@
+@@ -9839,7 +9840,7 @@
      fi
      MOC=$HOST_MOC
  
@@ -48,11 +40,11 @@ $FreeBSD$
      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 @@
-         ;;
-     *)
+@@ -13711,6 +13712,7 @@
+     echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
+     if test ! "$VACPP" && test -z "$_WIN32_MSVC"; then
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
 +	NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
          $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
-         ;;
-     esac
+     fi
+     if test -z "$_WIN32_MSVC"; then
diff --git a/www/mozilla-devel/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/mozilla-devel/files/patch-xpfe::bootstrap::nsAppRunner.cpp
new file mode 100644
index 00000000000..d1fec376adc
--- /dev/null
+++ b/www/mozilla-devel/files/patch-xpfe::bootstrap::nsAppRunner.cpp
@@ -0,0 +1,11 @@
+--- xpfe/bootstrap/nsAppRunner.cpp.orig	Mon Nov 26 16:53:29 2001
++++ xpfe/bootstrap/nsAppRunner.cpp	Mon Nov 26 16:54:12 2001
+@@ -1060,7 +1060,7 @@
+ 
+ #if defined(FREEBSD)
+ // pick up fpsetmask prototype.
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ 
+ // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index e6b4e0c7025..993815d75ce 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -1,5 +1,4 @@
 bin/mozilla
-lib/mozilla/CvtURL
 lib/mozilla/DumpColors
 lib/mozilla/FilesTest
 lib/mozilla/OutTestData/doctype.xif
@@ -55,6 +54,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPerf
 lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
@@ -64,9 +64,11 @@ lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
 lib/mozilla/TestSpaceManager
+lib/mozilla/TestStandardURL
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
+lib/mozilla/TestURLParser
 lib/mozilla/TestVoidBTree
 lib/mozilla/TestXMLExtras
 lib/mozilla/TestXPC
@@ -75,33 +77,31 @@ lib/mozilla/TestXPTCInvoke
 lib/mozilla/UnicharSelfTest
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
-lib/mozilla/chrome/embed.jar
+lib/mozilla/chrome/embed-sample.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
 lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
-@unexec rm -f %D/lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/venkman.jar
-lib/mozilla/component.reg
+@unexec rm %D/lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 lib/mozilla/components/addrbook.xpt
@@ -124,6 +124,7 @@ lib/mozilla/components/dom_events.xpt
 lib/mozilla/components/dom_html.xpt
 lib/mozilla/components/dom_range.xpt
 lib/mozilla/components/dom_stylesheets.xpt
+lib/mozilla/components/dom_svg.xpt
 lib/mozilla/components/dom_traversal.xpt
 lib/mozilla/components/dom_views.xpt
 lib/mozilla/components/dom_xbl.xpt
@@ -131,6 +132,7 @@ lib/mozilla/components/dom_xul.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
+lib/mozilla/components/filepicker.xpt
 lib/mozilla/components/find.xpt
 lib/mozilla/components/gfx.xpt
 lib/mozilla/components/gfx2.xpt
@@ -138,6 +140,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
+lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
 lib/mozilla/components/jsconsole-clhandler.js
@@ -160,6 +163,7 @@ lib/mozilla/components/libcookie.so
 lib/mozilla/components/libdocshell.so
 lib/mozilla/components/libeditor.so
 lib/mozilla/components/libembedcomponents.so
+lib/mozilla/components/libfileview.so
 lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
@@ -177,6 +181,7 @@ lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
+lib/mozilla/components/libinspector.so
 lib/mozilla/components/libjar50.so
 lib/mozilla/components/libjsd.so
 lib/mozilla/components/libjsdom.so
@@ -196,6 +201,7 @@ lib/mozilla/components/libmsgcompose.so
 lib/mozilla/components/libmsgdb.so
 lib/mozilla/components/libmsgimap.so
 lib/mozilla/components/libmsgnews.so
+lib/mozilla/components/libmsgsmime.so
 lib/mozilla/components/libnecko.so
 lib/mozilla/components/libnecko2.so
 lib/mozilla/components/libnkcache.so
@@ -204,6 +210,7 @@ lib/mozilla/components/libnsappshell.so
 lib/mozilla/components/libnslocale.so
 lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
+lib/mozilla/components/libpipboot.so
 lib/mozilla/components/libpipnss.so
 lib/mozilla/components/libpippki.so
 lib/mozilla/components/libpref.so
@@ -212,7 +219,6 @@ lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libsample.so
 lib/mozilla/components/libshistory.so
-lib/mozilla/components/libsmimestb.so
 lib/mozilla/components/libstrres.so
 lib/mozilla/components/libtestdynamic.so
 lib/mozilla/components/libtimer_gtk.so
@@ -256,6 +262,7 @@ lib/mozilla/components/msgimap.xpt
 lib/mozilla/components/msglocal.xpt
 lib/mozilla/components/msgnews.xpt
 lib/mozilla/components/msgsearch.xpt
+lib/mozilla/components/msgsmime.xpt
 lib/mozilla/components/necko.xpt
 lib/mozilla/components/necko_about.xpt
 lib/mozilla/components/necko_cache.xpt
@@ -278,6 +285,7 @@ lib/mozilla/components/nsSample.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipboot.xpt
 lib/mozilla/components/pipnss.xpt
 lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
@@ -294,6 +302,7 @@ lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
+lib/mozilla/components/smime-service.js
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -322,7 +331,7 @@ lib/mozilla/components/xpcom_xpti.xpt
 lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
-lib/mozilla/components/xpti.dat
+@unexec rm %D/lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -330,20 +339,22 @@ lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
+lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 lib/mozilla/defaults/pref/security-prefs.js
+lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
-lib/mozilla/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/defaults/profile/US/chrome/userContent.css
+lib/mozilla/defaults/profile/US/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/US/chrome/userContent-example.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/chrome/userChrome.css
-lib/mozilla/defaults/profile/chrome/userContent.css
+lib/mozilla/defaults/profile/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/chrome/userContent-example.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -368,6 +379,7 @@ lib/mozilla/libgtkxtbin.so
 lib/mozilla/libjsj.so
 lib/mozilla/liblber40.so
 lib/mozilla/libldap40.so
+lib/mozilla/libmoz_art_lgpl.so
 lib/mozilla/libmozjs.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
@@ -395,6 +407,7 @@ lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
 lib/mozilla/res/builtin/xbl-forms.css
@@ -419,7 +432,6 @@ lib/mozilla/res/forms.css
 lib/mozilla/res/gfx/icon_0.gif
 lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
-lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
 lib/mozilla/res/html/gopher-binary.gif
 lib/mozilla/res/html/gopher-find.gif
@@ -429,11 +441,13 @@ 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/inspector/search-registry.rdf
+lib/mozilla/res/inspector/viewer-registry.rdf
+lib/mozilla/res/jarlist.dat
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
+lib/mozilla/res/loading-image.gif
 lib/mozilla/res/mathml.css
-lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -579,6 +593,8 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
+lib/mozilla/testart
+lib/mozilla/testuta
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
@@ -592,6 +608,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/samples/sampleimages
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
+@dirrm lib/mozilla/res/inspector
 @dirrm lib/mozilla/res/html
 @dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/fonts
@@ -613,6 +630,8 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
 @dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
+@dirrm lib/mozilla/chrome/overlayinfo/inspector
 @dirrm lib/mozilla/chrome/overlayinfo/editor/content
 @dirrm lib/mozilla/chrome/overlayinfo/editor
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
diff --git a/www/mozilla-embedded-devel/pkg-plist b/www/mozilla-embedded-devel/pkg-plist
index 691ae84d1f7..3805d766afb 100644
--- a/www/mozilla-embedded-devel/pkg-plist
+++ b/www/mozilla-embedded-devel/pkg-plist
@@ -1,15 +1,11 @@
 lib/mozilla-embedded/TestGtkEmbed
-lib/mozilla-embedded/chrome/all-locales.rdf
-lib/mozilla-embedded/chrome/all-packages.rdf
-lib/mozilla-embedded/chrome/all-skins.rdf
+lib/mozilla-embedded/chrome/chrome.rdf
 lib/mozilla-embedded/chrome/embed.jar
 lib/mozilla-embedded/chrome/installed-chrome.txt
 lib/mozilla-embedded/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla-embedded/chrome/pipnss.jar
 lib/mozilla-embedded/chrome/pippki.jar
-lib/mozilla-embedded/chrome/user-locales.rdf
-lib/mozilla-embedded/chrome/user-skins.rdf
 lib/mozilla-embedded/component.reg
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
@@ -120,12 +116,14 @@ lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/libgkgfx.so
 lib/mozilla-embedded/libgtkembedmoz.so
 lib/mozilla-embedded/libgtksuperwin.so
+lib/mozilla-embedded/libmoz_art_lgpl.so
 lib/mozilla-embedded/libmozjs.so
 lib/mozilla-embedded/libnspr4.so
 lib/mozilla-embedded/libplc4.so
 lib/mozilla-embedded/libplds4.so
 lib/mozilla-embedded/libxpcom.so
 lib/mozilla-embedded/res/arrow.gif
+lib/mozilla-embedded/res/broken-image.gif
 lib/mozilla-embedded/res/builtin/htmlBindings.xml
 lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
 lib/mozilla-embedded/res/builtin/xbl-forms.css
@@ -140,6 +138,7 @@ lib/mozilla-embedded/res/forms.css
 lib/mozilla-embedded/res/html.css
 lib/mozilla-embedded/res/langGroups.properties
 lib/mozilla-embedded/res/language.properties
+lib/mozilla-embedded/res/loading-image.gif
 lib/mozilla-embedded/res/quirk.css
 lib/mozilla-embedded/res/ua.css
 lib/mozilla-embedded/res/unixcharset.properties
diff --git a/www/mozilla-embedded-vendor/pkg-plist b/www/mozilla-embedded-vendor/pkg-plist
index 691ae84d1f7..3805d766afb 100644
--- a/www/mozilla-embedded-vendor/pkg-plist
+++ b/www/mozilla-embedded-vendor/pkg-plist
@@ -1,15 +1,11 @@
 lib/mozilla-embedded/TestGtkEmbed
-lib/mozilla-embedded/chrome/all-locales.rdf
-lib/mozilla-embedded/chrome/all-packages.rdf
-lib/mozilla-embedded/chrome/all-skins.rdf
+lib/mozilla-embedded/chrome/chrome.rdf
 lib/mozilla-embedded/chrome/embed.jar
 lib/mozilla-embedded/chrome/installed-chrome.txt
 lib/mozilla-embedded/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla-embedded/chrome/pipnss.jar
 lib/mozilla-embedded/chrome/pippki.jar
-lib/mozilla-embedded/chrome/user-locales.rdf
-lib/mozilla-embedded/chrome/user-skins.rdf
 lib/mozilla-embedded/component.reg
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
@@ -120,12 +116,14 @@ lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/libgkgfx.so
 lib/mozilla-embedded/libgtkembedmoz.so
 lib/mozilla-embedded/libgtksuperwin.so
+lib/mozilla-embedded/libmoz_art_lgpl.so
 lib/mozilla-embedded/libmozjs.so
 lib/mozilla-embedded/libnspr4.so
 lib/mozilla-embedded/libplc4.so
 lib/mozilla-embedded/libplds4.so
 lib/mozilla-embedded/libxpcom.so
 lib/mozilla-embedded/res/arrow.gif
+lib/mozilla-embedded/res/broken-image.gif
 lib/mozilla-embedded/res/builtin/htmlBindings.xml
 lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
 lib/mozilla-embedded/res/builtin/xbl-forms.css
@@ -140,6 +138,7 @@ lib/mozilla-embedded/res/forms.css
 lib/mozilla-embedded/res/html.css
 lib/mozilla-embedded/res/langGroups.properties
 lib/mozilla-embedded/res/language.properties
+lib/mozilla-embedded/res/loading-image.gif
 lib/mozilla-embedded/res/quirk.css
 lib/mozilla-embedded/res/ua.css
 lib/mozilla-embedded/res/unixcharset.properties
diff --git a/www/mozilla-embedded/pkg-plist b/www/mozilla-embedded/pkg-plist
index 691ae84d1f7..3805d766afb 100644
--- a/www/mozilla-embedded/pkg-plist
+++ b/www/mozilla-embedded/pkg-plist
@@ -1,15 +1,11 @@
 lib/mozilla-embedded/TestGtkEmbed
-lib/mozilla-embedded/chrome/all-locales.rdf
-lib/mozilla-embedded/chrome/all-packages.rdf
-lib/mozilla-embedded/chrome/all-skins.rdf
+lib/mozilla-embedded/chrome/chrome.rdf
 lib/mozilla-embedded/chrome/embed.jar
 lib/mozilla-embedded/chrome/installed-chrome.txt
 lib/mozilla-embedded/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla-embedded/chrome/pipnss.jar
 lib/mozilla-embedded/chrome/pippki.jar
-lib/mozilla-embedded/chrome/user-locales.rdf
-lib/mozilla-embedded/chrome/user-skins.rdf
 lib/mozilla-embedded/component.reg
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
@@ -120,12 +116,14 @@ lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/libgkgfx.so
 lib/mozilla-embedded/libgtkembedmoz.so
 lib/mozilla-embedded/libgtksuperwin.so
+lib/mozilla-embedded/libmoz_art_lgpl.so
 lib/mozilla-embedded/libmozjs.so
 lib/mozilla-embedded/libnspr4.so
 lib/mozilla-embedded/libplc4.so
 lib/mozilla-embedded/libplds4.so
 lib/mozilla-embedded/libxpcom.so
 lib/mozilla-embedded/res/arrow.gif
+lib/mozilla-embedded/res/broken-image.gif
 lib/mozilla-embedded/res/builtin/htmlBindings.xml
 lib/mozilla-embedded/res/builtin/platformHTMLBindings.xml
 lib/mozilla-embedded/res/builtin/xbl-forms.css
@@ -140,6 +138,7 @@ lib/mozilla-embedded/res/forms.css
 lib/mozilla-embedded/res/html.css
 lib/mozilla-embedded/res/langGroups.properties
 lib/mozilla-embedded/res/language.properties
+lib/mozilla-embedded/res/loading-image.gif
 lib/mozilla-embedded/res/quirk.css
 lib/mozilla-embedded/res/ua.css
 lib/mozilla-embedded/res/unixcharset.properties
diff --git a/www/mozilla-headers-devel/pkg-plist b/www/mozilla-headers-devel/pkg-plist
index f55e19841ea..60db937097e 100644
--- a/www/mozilla-headers-devel/pkg-plist
+++ b/www/mozilla-headers-devel/pkg-plist
@@ -202,6 +202,9 @@ include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
+include/mozilla/content/nsISVGAttribute.h
+include/mozilla/content/nsISVGStyleValue.h
+include/mozilla/content/nsISVGValue.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -224,7 +227,6 @@ include/mozilla/content/nsIXBLDocumentInfo.h
 include/mozilla/content/nsIXBLInsertionPoint.h
 include/mozilla/content/nsIXBLPrototypeBinding.h
 include/mozilla/content/nsIXBLPrototypeHandler.h
-include/mozilla/content/nsIXBLPrototypeProperty.h
 include/mozilla/content/nsIXBLService.h
 include/mozilla/content/nsIXMLContent.h
 include/mozilla/content/nsIXMLContentSink.h
@@ -235,6 +237,8 @@ include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
 include/mozilla/content/nsRuleNode.h
 include/mozilla/content/nsRuleWalker.h
+include/mozilla/content/nsSVGAtomList.h
+include/mozilla/content/nsSVGAtoms.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
@@ -275,6 +279,7 @@ include/mozilla/docshell/nsIWebNavigation.h
 include/mozilla/dom/domstubs.h
 include/mozilla/dom/nsDOMCID.h
 include/mozilla/dom/nsDOMError.h
+include/mozilla/dom/nsIDOM3Node.h
 include/mozilla/dom/nsIDOMAbstractView.h
 include/mozilla/dom/nsIDOMAttr.h
 include/mozilla/dom/nsIDOMBarProp.h
@@ -397,6 +402,7 @@ include/mozilla/dom/nsIDOMMouseMotionListener.h
 include/mozilla/dom/nsIDOMMutationEvent.h
 include/mozilla/dom/nsIDOMMutationListener.h
 include/mozilla/dom/nsIDOMNSDocument.h
+include/mozilla/dom/nsIDOMNSEvent.h
 include/mozilla/dom/nsIDOMNSHTMLAnchorElement.h
 include/mozilla/dom/nsIDOMNSHTMLAreaElement.h
 include/mozilla/dom/nsIDOMNSHTMLButtonElement.h
@@ -429,6 +435,38 @@ include/mozilla/dom/nsIDOMProcessingInstruction.h
 include/mozilla/dom/nsIDOMRGBColor.h
 include/mozilla/dom/nsIDOMRange.h
 include/mozilla/dom/nsIDOMRect.h
+include/mozilla/dom/nsIDOMSVGAnimPresAspRatio.h
+include/mozilla/dom/nsIDOMSVGAnimTransformList.h
+include/mozilla/dom/nsIDOMSVGAnimatedLength.h
+include/mozilla/dom/nsIDOMSVGAnimatedPathData.h
+include/mozilla/dom/nsIDOMSVGAnimatedPoints.h
+include/mozilla/dom/nsIDOMSVGAnimatedRect.h
+include/mozilla/dom/nsIDOMSVGCircleElement.h
+include/mozilla/dom/nsIDOMSVGDocument.h
+include/mozilla/dom/nsIDOMSVGElement.h
+include/mozilla/dom/nsIDOMSVGEllipseElement.h
+include/mozilla/dom/nsIDOMSVGFitToViewBox.h
+include/mozilla/dom/nsIDOMSVGForeignObjectElem.h
+include/mozilla/dom/nsIDOMSVGGElement.h
+include/mozilla/dom/nsIDOMSVGLength.h
+include/mozilla/dom/nsIDOMSVGLineElement.h
+include/mozilla/dom/nsIDOMSVGLocatable.h
+include/mozilla/dom/nsIDOMSVGMatrix.h
+include/mozilla/dom/nsIDOMSVGPathElement.h
+include/mozilla/dom/nsIDOMSVGPathSeg.h
+include/mozilla/dom/nsIDOMSVGPathSegList.h
+include/mozilla/dom/nsIDOMSVGPoint.h
+include/mozilla/dom/nsIDOMSVGPointList.h
+include/mozilla/dom/nsIDOMSVGPolygonElement.h
+include/mozilla/dom/nsIDOMSVGPolylineElement.h
+include/mozilla/dom/nsIDOMSVGPresAspectRatio.h
+include/mozilla/dom/nsIDOMSVGRect.h
+include/mozilla/dom/nsIDOMSVGRectElement.h
+include/mozilla/dom/nsIDOMSVGSVGElement.h
+include/mozilla/dom/nsIDOMSVGStylable.h
+include/mozilla/dom/nsIDOMSVGTransform.h
+include/mozilla/dom/nsIDOMSVGTransformList.h
+include/mozilla/dom/nsIDOMSVGTransformable.h
 include/mozilla/dom/nsIDOMScreen.h
 include/mozilla/dom/nsIDOMScriptObjectFactory.h
 include/mozilla/dom/nsIDOMScrollListener.h
@@ -454,6 +492,7 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULPopupElement.h
 include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
 include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
@@ -502,6 +541,7 @@ include/mozilla/exthandler/nsHelperAppRDF.h
 include/mozilla/exthandler/nsIExternalHelperAppService.h
 include/mozilla/exthandler/nsIExternalProtocolService.h
 include/mozilla/exthandler/nsOSHelperAppService.h
+include/mozilla/filepicker/nsIFileView.h
 include/mozilla/find/nsIWebBrowserFind.h
 include/mozilla/gfx/imgScaler.h
 include/mozilla/gfx/nsColor.h
@@ -590,6 +630,19 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
+include/mozilla/inspector/inIBitmap.h
+include/mozilla/inspector/inIBitmapDepot.h
+include/mozilla/inspector/inIBitmapURI.h
+include/mozilla/inspector/inICSSValueSearch.h
+include/mozilla/inspector/inIDOMUtils.h
+include/mozilla/inspector/inIDOMView.h
+include/mozilla/inspector/inIDeepTreeWalker.h
+include/mozilla/inspector/inIFileSearch.h
+include/mozilla/inspector/inIFlasher.h
+include/mozilla/inspector/inIPNGEncoder.h
+include/mozilla/inspector/inIScreenCapturer.h
+include/mozilla/inspector/inISearchObserver.h
+include/mozilla/inspector/inISearchProcess.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -725,9 +778,11 @@ include/mozilla/layout/nsIMutableStyleContext.h
 include/mozilla/layout/nsIObjectFrame.h
 include/mozilla/layout/nsIOutlinerBoxObject.h
 include/mozilla/layout/nsIOutlinerColFrame.h
+include/mozilla/layout/nsIOutlinerContentView.h
 include/mozilla/layout/nsIOutlinerSelection.h
 include/mozilla/layout/nsIOutlinerView.h
 include/mozilla/layout/nsIPageSequenceFrame.h
+include/mozilla/layout/nsIPercentHeightObserver.h
 include/mozilla/layout/nsIPopupBoxObject.h
 include/mozilla/layout/nsIPopupSetFrame.h
 include/mozilla/layout/nsIPresContext.h
@@ -739,7 +794,6 @@ include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
-include/mozilla/layout/nsISVGFrame.h
 include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
@@ -756,7 +810,9 @@ include/mozilla/layout/nsITreeFrame.h
 include/mozilla/layout/nsLayoutCID.h
 include/mozilla/layout/nsOutlinerBodyFrame.h
 include/mozilla/layout/nsOutlinerColFrame.h
+include/mozilla/layout/nsOutlinerContentView.h
 include/mozilla/layout/nsOutlinerSelection.h
+include/mozilla/layout/nsOutlinerUtils.h
 include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
@@ -765,6 +821,50 @@ include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
 include/mozilla/ldap/srchpref.h
+include/mozilla/libart_lgpl/art_affine.h
+include/mozilla/libart_lgpl/art_alphagamma.h
+include/mozilla/libart_lgpl/art_bpath.h
+include/mozilla/libart_lgpl/art_config.h
+include/mozilla/libart_lgpl/art_filterlevel.h
+include/mozilla/libart_lgpl/art_gray_svp.h
+include/mozilla/libart_lgpl/art_misc.h
+include/mozilla/libart_lgpl/art_pathcode.h
+include/mozilla/libart_lgpl/art_pixbuf.h
+include/mozilla/libart_lgpl/art_point.h
+include/mozilla/libart_lgpl/art_rect.h
+include/mozilla/libart_lgpl/art_rect_svp.h
+include/mozilla/libart_lgpl/art_rect_uta.h
+include/mozilla/libart_lgpl/art_render.h
+include/mozilla/libart_lgpl/art_render_gradient.h
+include/mozilla/libart_lgpl/art_render_svp.h
+include/mozilla/libart_lgpl/art_rgb.h
+include/mozilla/libart_lgpl/art_rgb_a_affine.h
+include/mozilla/libart_lgpl/art_rgb_affine.h
+include/mozilla/libart_lgpl/art_rgb_bitmap_affine.h
+include/mozilla/libart_lgpl/art_rgb_pixbuf_affine.h
+include/mozilla/libart_lgpl/art_rgb_rgba_affine.h
+include/mozilla/libart_lgpl/art_rgb_svp.h
+include/mozilla/libart_lgpl/art_rgba.h
+include/mozilla/libart_lgpl/art_svp.h
+include/mozilla/libart_lgpl/art_svp_intersect.h
+include/mozilla/libart_lgpl/art_svp_ops.h
+include/mozilla/libart_lgpl/art_svp_point.h
+include/mozilla/libart_lgpl/art_svp_render_aa.h
+include/mozilla/libart_lgpl/art_svp_vpath.h
+include/mozilla/libart_lgpl/art_svp_vpath_stroke.h
+include/mozilla/libart_lgpl/art_svp_wind.h
+include/mozilla/libart_lgpl/art_uta.h
+include/mozilla/libart_lgpl/art_uta_ops.h
+include/mozilla/libart_lgpl/art_uta_rect.h
+include/mozilla/libart_lgpl/art_uta_svp.h
+include/mozilla/libart_lgpl/art_uta_vpath.h
+include/mozilla/libart_lgpl/art_vpath.h
+include/mozilla/libart_lgpl/art_vpath_bpath.h
+include/mozilla/libart_lgpl/art_vpath_dash.h
+include/mozilla/libart_lgpl/art_vpath_svp.h
+include/mozilla/libart_lgpl/config.h
+include/mozilla/libart_lgpl/libart-features.h
+include/mozilla/libart_lgpl/libart.h
 include/mozilla/libreg/NSReg.h
 include/mozilla/libreg/VerReg.h
 include/mozilla/locale/nsCollation.h
@@ -1107,6 +1207,10 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
+include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
+include/mozilla/msgsmime/nsMsgComposeSecure.h
+include/mozilla/msgsmime/nsMsgSMIMECID.h
 include/mozilla/necko/mozITXTToHTMLConv.h
 include/mozilla/necko/netCore.h
 include/mozilla/necko/nsHTTPChunkConv.h
@@ -1136,6 +1240,7 @@ include/mozilla/necko/nsIJARChannel.h
 include/mozilla/necko/nsIJARProtocolHandler.h
 include/mozilla/necko/nsIJARURI.h
 include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMultiPartChannel.h
 include/mozilla/necko/nsINetModRegEntry.h
 include/mozilla/necko/nsINetModuleMgr.h
 include/mozilla/necko/nsINetNotify.h
@@ -1349,6 +1454,9 @@ include/mozilla/oji/nsIThreadManager.h
 include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
+include/mozilla/pipboot/nsIBufEntropyCollector.h
+include/mozilla/pipboot/nsISSLStatusProvider.h
+include/mozilla/pipboot/nsISecurityWarningDialogs.h
 include/mozilla/pipnss/nsIBadCertListener.h
 include/mozilla/pipnss/nsICMS.h
 include/mozilla/pipnss/nsICMSSecureMessage.h
@@ -1501,6 +1609,7 @@ include/mozilla/uconv/nsICharRepresentable.h
 include/mozilla/uconv/nsICharsetAlias.h
 include/mozilla/uconv/nsICharsetConverterManager.h
 include/mozilla/uconv/nsICharsetConverterManager2.h
+include/mozilla/uconv/nsIConverterInputStream.h
 include/mozilla/uconv/nsICurrentCharsetListener.h
 include/mozilla/uconv/nsIMappingCache.h
 include/mozilla/uconv/nsIPlatformCharset.h
@@ -1546,7 +1655,6 @@ include/mozilla/util/nsITimeRecorder.h
 include/mozilla/util/nsTimer.h
 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
@@ -1903,6 +2011,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/plugin
 @dirrm include/mozilla/pippki
 @dirrm include/mozilla/pipnss
+@dirrm include/mozilla/pipboot
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
@@ -1912,6 +2021,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/nkcache
 @dirrm include/mozilla/necko2
 @dirrm include/mozilla/necko
+@dirrm include/mozilla/msgsmime
 @dirrm include/mozilla/msgnews
 @dirrm include/mozilla/msglocal
 @dirrm include/mozilla/msgimap
@@ -1930,6 +2040,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/lwbrk
 @dirrm include/mozilla/locale
 @dirrm include/mozilla/libreg
+@dirrm include/mozilla/libart_lgpl
 @dirrm include/mozilla/ldap
 @dirrm include/mozilla/layout
 @dirrm include/mozilla/jsurl
@@ -1939,6 +2050,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/java
 @dirrm include/mozilla/jar
 @dirrm include/mozilla/intl
+@dirrm include/mozilla/inspector
 @dirrm include/mozilla/import
 @dirrm include/mozilla/imglib2
 @dirrm include/mozilla/htmlparser
@@ -1948,6 +2060,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/gfx2
 @dirrm include/mozilla/gfx
 @dirrm include/mozilla/find
+@dirrm include/mozilla/filepicker
 @dirrm include/mozilla/exthandler
 @dirrm include/mozilla/expat
 @dirrm include/mozilla/embedcomponents
diff --git a/www/mozilla-headers-vendor/pkg-plist b/www/mozilla-headers-vendor/pkg-plist
index f55e19841ea..60db937097e 100644
--- a/www/mozilla-headers-vendor/pkg-plist
+++ b/www/mozilla-headers-vendor/pkg-plist
@@ -202,6 +202,9 @@ include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
+include/mozilla/content/nsISVGAttribute.h
+include/mozilla/content/nsISVGStyleValue.h
+include/mozilla/content/nsISVGValue.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -224,7 +227,6 @@ include/mozilla/content/nsIXBLDocumentInfo.h
 include/mozilla/content/nsIXBLInsertionPoint.h
 include/mozilla/content/nsIXBLPrototypeBinding.h
 include/mozilla/content/nsIXBLPrototypeHandler.h
-include/mozilla/content/nsIXBLPrototypeProperty.h
 include/mozilla/content/nsIXBLService.h
 include/mozilla/content/nsIXMLContent.h
 include/mozilla/content/nsIXMLContentSink.h
@@ -235,6 +237,8 @@ include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
 include/mozilla/content/nsRuleNode.h
 include/mozilla/content/nsRuleWalker.h
+include/mozilla/content/nsSVGAtomList.h
+include/mozilla/content/nsSVGAtoms.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
@@ -275,6 +279,7 @@ include/mozilla/docshell/nsIWebNavigation.h
 include/mozilla/dom/domstubs.h
 include/mozilla/dom/nsDOMCID.h
 include/mozilla/dom/nsDOMError.h
+include/mozilla/dom/nsIDOM3Node.h
 include/mozilla/dom/nsIDOMAbstractView.h
 include/mozilla/dom/nsIDOMAttr.h
 include/mozilla/dom/nsIDOMBarProp.h
@@ -397,6 +402,7 @@ include/mozilla/dom/nsIDOMMouseMotionListener.h
 include/mozilla/dom/nsIDOMMutationEvent.h
 include/mozilla/dom/nsIDOMMutationListener.h
 include/mozilla/dom/nsIDOMNSDocument.h
+include/mozilla/dom/nsIDOMNSEvent.h
 include/mozilla/dom/nsIDOMNSHTMLAnchorElement.h
 include/mozilla/dom/nsIDOMNSHTMLAreaElement.h
 include/mozilla/dom/nsIDOMNSHTMLButtonElement.h
@@ -429,6 +435,38 @@ include/mozilla/dom/nsIDOMProcessingInstruction.h
 include/mozilla/dom/nsIDOMRGBColor.h
 include/mozilla/dom/nsIDOMRange.h
 include/mozilla/dom/nsIDOMRect.h
+include/mozilla/dom/nsIDOMSVGAnimPresAspRatio.h
+include/mozilla/dom/nsIDOMSVGAnimTransformList.h
+include/mozilla/dom/nsIDOMSVGAnimatedLength.h
+include/mozilla/dom/nsIDOMSVGAnimatedPathData.h
+include/mozilla/dom/nsIDOMSVGAnimatedPoints.h
+include/mozilla/dom/nsIDOMSVGAnimatedRect.h
+include/mozilla/dom/nsIDOMSVGCircleElement.h
+include/mozilla/dom/nsIDOMSVGDocument.h
+include/mozilla/dom/nsIDOMSVGElement.h
+include/mozilla/dom/nsIDOMSVGEllipseElement.h
+include/mozilla/dom/nsIDOMSVGFitToViewBox.h
+include/mozilla/dom/nsIDOMSVGForeignObjectElem.h
+include/mozilla/dom/nsIDOMSVGGElement.h
+include/mozilla/dom/nsIDOMSVGLength.h
+include/mozilla/dom/nsIDOMSVGLineElement.h
+include/mozilla/dom/nsIDOMSVGLocatable.h
+include/mozilla/dom/nsIDOMSVGMatrix.h
+include/mozilla/dom/nsIDOMSVGPathElement.h
+include/mozilla/dom/nsIDOMSVGPathSeg.h
+include/mozilla/dom/nsIDOMSVGPathSegList.h
+include/mozilla/dom/nsIDOMSVGPoint.h
+include/mozilla/dom/nsIDOMSVGPointList.h
+include/mozilla/dom/nsIDOMSVGPolygonElement.h
+include/mozilla/dom/nsIDOMSVGPolylineElement.h
+include/mozilla/dom/nsIDOMSVGPresAspectRatio.h
+include/mozilla/dom/nsIDOMSVGRect.h
+include/mozilla/dom/nsIDOMSVGRectElement.h
+include/mozilla/dom/nsIDOMSVGSVGElement.h
+include/mozilla/dom/nsIDOMSVGStylable.h
+include/mozilla/dom/nsIDOMSVGTransform.h
+include/mozilla/dom/nsIDOMSVGTransformList.h
+include/mozilla/dom/nsIDOMSVGTransformable.h
 include/mozilla/dom/nsIDOMScreen.h
 include/mozilla/dom/nsIDOMScriptObjectFactory.h
 include/mozilla/dom/nsIDOMScrollListener.h
@@ -454,6 +492,7 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULPopupElement.h
 include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
 include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
@@ -502,6 +541,7 @@ include/mozilla/exthandler/nsHelperAppRDF.h
 include/mozilla/exthandler/nsIExternalHelperAppService.h
 include/mozilla/exthandler/nsIExternalProtocolService.h
 include/mozilla/exthandler/nsOSHelperAppService.h
+include/mozilla/filepicker/nsIFileView.h
 include/mozilla/find/nsIWebBrowserFind.h
 include/mozilla/gfx/imgScaler.h
 include/mozilla/gfx/nsColor.h
@@ -590,6 +630,19 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
+include/mozilla/inspector/inIBitmap.h
+include/mozilla/inspector/inIBitmapDepot.h
+include/mozilla/inspector/inIBitmapURI.h
+include/mozilla/inspector/inICSSValueSearch.h
+include/mozilla/inspector/inIDOMUtils.h
+include/mozilla/inspector/inIDOMView.h
+include/mozilla/inspector/inIDeepTreeWalker.h
+include/mozilla/inspector/inIFileSearch.h
+include/mozilla/inspector/inIFlasher.h
+include/mozilla/inspector/inIPNGEncoder.h
+include/mozilla/inspector/inIScreenCapturer.h
+include/mozilla/inspector/inISearchObserver.h
+include/mozilla/inspector/inISearchProcess.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -725,9 +778,11 @@ include/mozilla/layout/nsIMutableStyleContext.h
 include/mozilla/layout/nsIObjectFrame.h
 include/mozilla/layout/nsIOutlinerBoxObject.h
 include/mozilla/layout/nsIOutlinerColFrame.h
+include/mozilla/layout/nsIOutlinerContentView.h
 include/mozilla/layout/nsIOutlinerSelection.h
 include/mozilla/layout/nsIOutlinerView.h
 include/mozilla/layout/nsIPageSequenceFrame.h
+include/mozilla/layout/nsIPercentHeightObserver.h
 include/mozilla/layout/nsIPopupBoxObject.h
 include/mozilla/layout/nsIPopupSetFrame.h
 include/mozilla/layout/nsIPresContext.h
@@ -739,7 +794,6 @@ include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
-include/mozilla/layout/nsISVGFrame.h
 include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
@@ -756,7 +810,9 @@ include/mozilla/layout/nsITreeFrame.h
 include/mozilla/layout/nsLayoutCID.h
 include/mozilla/layout/nsOutlinerBodyFrame.h
 include/mozilla/layout/nsOutlinerColFrame.h
+include/mozilla/layout/nsOutlinerContentView.h
 include/mozilla/layout/nsOutlinerSelection.h
+include/mozilla/layout/nsOutlinerUtils.h
 include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
@@ -765,6 +821,50 @@ include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
 include/mozilla/ldap/srchpref.h
+include/mozilla/libart_lgpl/art_affine.h
+include/mozilla/libart_lgpl/art_alphagamma.h
+include/mozilla/libart_lgpl/art_bpath.h
+include/mozilla/libart_lgpl/art_config.h
+include/mozilla/libart_lgpl/art_filterlevel.h
+include/mozilla/libart_lgpl/art_gray_svp.h
+include/mozilla/libart_lgpl/art_misc.h
+include/mozilla/libart_lgpl/art_pathcode.h
+include/mozilla/libart_lgpl/art_pixbuf.h
+include/mozilla/libart_lgpl/art_point.h
+include/mozilla/libart_lgpl/art_rect.h
+include/mozilla/libart_lgpl/art_rect_svp.h
+include/mozilla/libart_lgpl/art_rect_uta.h
+include/mozilla/libart_lgpl/art_render.h
+include/mozilla/libart_lgpl/art_render_gradient.h
+include/mozilla/libart_lgpl/art_render_svp.h
+include/mozilla/libart_lgpl/art_rgb.h
+include/mozilla/libart_lgpl/art_rgb_a_affine.h
+include/mozilla/libart_lgpl/art_rgb_affine.h
+include/mozilla/libart_lgpl/art_rgb_bitmap_affine.h
+include/mozilla/libart_lgpl/art_rgb_pixbuf_affine.h
+include/mozilla/libart_lgpl/art_rgb_rgba_affine.h
+include/mozilla/libart_lgpl/art_rgb_svp.h
+include/mozilla/libart_lgpl/art_rgba.h
+include/mozilla/libart_lgpl/art_svp.h
+include/mozilla/libart_lgpl/art_svp_intersect.h
+include/mozilla/libart_lgpl/art_svp_ops.h
+include/mozilla/libart_lgpl/art_svp_point.h
+include/mozilla/libart_lgpl/art_svp_render_aa.h
+include/mozilla/libart_lgpl/art_svp_vpath.h
+include/mozilla/libart_lgpl/art_svp_vpath_stroke.h
+include/mozilla/libart_lgpl/art_svp_wind.h
+include/mozilla/libart_lgpl/art_uta.h
+include/mozilla/libart_lgpl/art_uta_ops.h
+include/mozilla/libart_lgpl/art_uta_rect.h
+include/mozilla/libart_lgpl/art_uta_svp.h
+include/mozilla/libart_lgpl/art_uta_vpath.h
+include/mozilla/libart_lgpl/art_vpath.h
+include/mozilla/libart_lgpl/art_vpath_bpath.h
+include/mozilla/libart_lgpl/art_vpath_dash.h
+include/mozilla/libart_lgpl/art_vpath_svp.h
+include/mozilla/libart_lgpl/config.h
+include/mozilla/libart_lgpl/libart-features.h
+include/mozilla/libart_lgpl/libart.h
 include/mozilla/libreg/NSReg.h
 include/mozilla/libreg/VerReg.h
 include/mozilla/locale/nsCollation.h
@@ -1107,6 +1207,10 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
+include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
+include/mozilla/msgsmime/nsMsgComposeSecure.h
+include/mozilla/msgsmime/nsMsgSMIMECID.h
 include/mozilla/necko/mozITXTToHTMLConv.h
 include/mozilla/necko/netCore.h
 include/mozilla/necko/nsHTTPChunkConv.h
@@ -1136,6 +1240,7 @@ include/mozilla/necko/nsIJARChannel.h
 include/mozilla/necko/nsIJARProtocolHandler.h
 include/mozilla/necko/nsIJARURI.h
 include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMultiPartChannel.h
 include/mozilla/necko/nsINetModRegEntry.h
 include/mozilla/necko/nsINetModuleMgr.h
 include/mozilla/necko/nsINetNotify.h
@@ -1349,6 +1454,9 @@ include/mozilla/oji/nsIThreadManager.h
 include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
+include/mozilla/pipboot/nsIBufEntropyCollector.h
+include/mozilla/pipboot/nsISSLStatusProvider.h
+include/mozilla/pipboot/nsISecurityWarningDialogs.h
 include/mozilla/pipnss/nsIBadCertListener.h
 include/mozilla/pipnss/nsICMS.h
 include/mozilla/pipnss/nsICMSSecureMessage.h
@@ -1501,6 +1609,7 @@ include/mozilla/uconv/nsICharRepresentable.h
 include/mozilla/uconv/nsICharsetAlias.h
 include/mozilla/uconv/nsICharsetConverterManager.h
 include/mozilla/uconv/nsICharsetConverterManager2.h
+include/mozilla/uconv/nsIConverterInputStream.h
 include/mozilla/uconv/nsICurrentCharsetListener.h
 include/mozilla/uconv/nsIMappingCache.h
 include/mozilla/uconv/nsIPlatformCharset.h
@@ -1546,7 +1655,6 @@ include/mozilla/util/nsITimeRecorder.h
 include/mozilla/util/nsTimer.h
 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
@@ -1903,6 +2011,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/plugin
 @dirrm include/mozilla/pippki
 @dirrm include/mozilla/pipnss
+@dirrm include/mozilla/pipboot
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
@@ -1912,6 +2021,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/nkcache
 @dirrm include/mozilla/necko2
 @dirrm include/mozilla/necko
+@dirrm include/mozilla/msgsmime
 @dirrm include/mozilla/msgnews
 @dirrm include/mozilla/msglocal
 @dirrm include/mozilla/msgimap
@@ -1930,6 +2040,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/lwbrk
 @dirrm include/mozilla/locale
 @dirrm include/mozilla/libreg
+@dirrm include/mozilla/libart_lgpl
 @dirrm include/mozilla/ldap
 @dirrm include/mozilla/layout
 @dirrm include/mozilla/jsurl
@@ -1939,6 +2050,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/java
 @dirrm include/mozilla/jar
 @dirrm include/mozilla/intl
+@dirrm include/mozilla/inspector
 @dirrm include/mozilla/import
 @dirrm include/mozilla/imglib2
 @dirrm include/mozilla/htmlparser
@@ -1948,6 +2060,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/gfx2
 @dirrm include/mozilla/gfx
 @dirrm include/mozilla/find
+@dirrm include/mozilla/filepicker
 @dirrm include/mozilla/exthandler
 @dirrm include/mozilla/expat
 @dirrm include/mozilla/embedcomponents
diff --git a/www/mozilla-headers/pkg-plist b/www/mozilla-headers/pkg-plist
index f55e19841ea..60db937097e 100644
--- a/www/mozilla-headers/pkg-plist
+++ b/www/mozilla-headers/pkg-plist
@@ -202,6 +202,9 @@ include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRangeUtils.h
+include/mozilla/content/nsISVGAttribute.h
+include/mozilla/content/nsISVGStyleValue.h
+include/mozilla/content/nsISVGValue.h
 include/mozilla/content/nsIScriptElement.h
 include/mozilla/content/nsIScriptLoader.h
 include/mozilla/content/nsIScriptLoaderObserver.h
@@ -224,7 +227,6 @@ include/mozilla/content/nsIXBLDocumentInfo.h
 include/mozilla/content/nsIXBLInsertionPoint.h
 include/mozilla/content/nsIXBLPrototypeBinding.h
 include/mozilla/content/nsIXBLPrototypeHandler.h
-include/mozilla/content/nsIXBLPrototypeProperty.h
 include/mozilla/content/nsIXBLService.h
 include/mozilla/content/nsIXMLContent.h
 include/mozilla/content/nsIXMLContentSink.h
@@ -235,6 +237,8 @@ include/mozilla/content/nsLayoutAtoms.h
 include/mozilla/content/nsMutationEvent.h
 include/mozilla/content/nsRuleNode.h
 include/mozilla/content/nsRuleWalker.h
+include/mozilla/content/nsSVGAtomList.h
+include/mozilla/content/nsSVGAtoms.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
 include/mozilla/content/nsStyleUtil.h
@@ -275,6 +279,7 @@ include/mozilla/docshell/nsIWebNavigation.h
 include/mozilla/dom/domstubs.h
 include/mozilla/dom/nsDOMCID.h
 include/mozilla/dom/nsDOMError.h
+include/mozilla/dom/nsIDOM3Node.h
 include/mozilla/dom/nsIDOMAbstractView.h
 include/mozilla/dom/nsIDOMAttr.h
 include/mozilla/dom/nsIDOMBarProp.h
@@ -397,6 +402,7 @@ include/mozilla/dom/nsIDOMMouseMotionListener.h
 include/mozilla/dom/nsIDOMMutationEvent.h
 include/mozilla/dom/nsIDOMMutationListener.h
 include/mozilla/dom/nsIDOMNSDocument.h
+include/mozilla/dom/nsIDOMNSEvent.h
 include/mozilla/dom/nsIDOMNSHTMLAnchorElement.h
 include/mozilla/dom/nsIDOMNSHTMLAreaElement.h
 include/mozilla/dom/nsIDOMNSHTMLButtonElement.h
@@ -429,6 +435,38 @@ include/mozilla/dom/nsIDOMProcessingInstruction.h
 include/mozilla/dom/nsIDOMRGBColor.h
 include/mozilla/dom/nsIDOMRange.h
 include/mozilla/dom/nsIDOMRect.h
+include/mozilla/dom/nsIDOMSVGAnimPresAspRatio.h
+include/mozilla/dom/nsIDOMSVGAnimTransformList.h
+include/mozilla/dom/nsIDOMSVGAnimatedLength.h
+include/mozilla/dom/nsIDOMSVGAnimatedPathData.h
+include/mozilla/dom/nsIDOMSVGAnimatedPoints.h
+include/mozilla/dom/nsIDOMSVGAnimatedRect.h
+include/mozilla/dom/nsIDOMSVGCircleElement.h
+include/mozilla/dom/nsIDOMSVGDocument.h
+include/mozilla/dom/nsIDOMSVGElement.h
+include/mozilla/dom/nsIDOMSVGEllipseElement.h
+include/mozilla/dom/nsIDOMSVGFitToViewBox.h
+include/mozilla/dom/nsIDOMSVGForeignObjectElem.h
+include/mozilla/dom/nsIDOMSVGGElement.h
+include/mozilla/dom/nsIDOMSVGLength.h
+include/mozilla/dom/nsIDOMSVGLineElement.h
+include/mozilla/dom/nsIDOMSVGLocatable.h
+include/mozilla/dom/nsIDOMSVGMatrix.h
+include/mozilla/dom/nsIDOMSVGPathElement.h
+include/mozilla/dom/nsIDOMSVGPathSeg.h
+include/mozilla/dom/nsIDOMSVGPathSegList.h
+include/mozilla/dom/nsIDOMSVGPoint.h
+include/mozilla/dom/nsIDOMSVGPointList.h
+include/mozilla/dom/nsIDOMSVGPolygonElement.h
+include/mozilla/dom/nsIDOMSVGPolylineElement.h
+include/mozilla/dom/nsIDOMSVGPresAspectRatio.h
+include/mozilla/dom/nsIDOMSVGRect.h
+include/mozilla/dom/nsIDOMSVGRectElement.h
+include/mozilla/dom/nsIDOMSVGSVGElement.h
+include/mozilla/dom/nsIDOMSVGStylable.h
+include/mozilla/dom/nsIDOMSVGTransform.h
+include/mozilla/dom/nsIDOMSVGTransformList.h
+include/mozilla/dom/nsIDOMSVGTransformable.h
 include/mozilla/dom/nsIDOMScreen.h
 include/mozilla/dom/nsIDOMScriptObjectFactory.h
 include/mozilla/dom/nsIDOMScrollListener.h
@@ -454,6 +492,7 @@ include/mozilla/dom/nsIDOMXULImageElement.h
 include/mozilla/dom/nsIDOMXULLabelElement.h
 include/mozilla/dom/nsIDOMXULLabeledControlEl.h
 include/mozilla/dom/nsIDOMXULListener.h
+include/mozilla/dom/nsIDOMXULPopupElement.h
 include/mozilla/dom/nsIDOMXULSelectCntrlEl.h
 include/mozilla/dom/nsIDOMXULSelectCntrlItemEl.h
 include/mozilla/dom/nsIDOMXULTreeElement.h
@@ -502,6 +541,7 @@ include/mozilla/exthandler/nsHelperAppRDF.h
 include/mozilla/exthandler/nsIExternalHelperAppService.h
 include/mozilla/exthandler/nsIExternalProtocolService.h
 include/mozilla/exthandler/nsOSHelperAppService.h
+include/mozilla/filepicker/nsIFileView.h
 include/mozilla/find/nsIWebBrowserFind.h
 include/mozilla/gfx/imgScaler.h
 include/mozilla/gfx/nsColor.h
@@ -590,6 +630,19 @@ include/mozilla/import/nsIImportMimeEncode.h
 include/mozilla/import/nsIImportModule.h
 include/mozilla/import/nsIImportService.h
 include/mozilla/import/nsIImportSettings.h
+include/mozilla/inspector/inIBitmap.h
+include/mozilla/inspector/inIBitmapDepot.h
+include/mozilla/inspector/inIBitmapURI.h
+include/mozilla/inspector/inICSSValueSearch.h
+include/mozilla/inspector/inIDOMUtils.h
+include/mozilla/inspector/inIDOMView.h
+include/mozilla/inspector/inIDeepTreeWalker.h
+include/mozilla/inspector/inIFileSearch.h
+include/mozilla/inspector/inIFlasher.h
+include/mozilla/inspector/inIPNGEncoder.h
+include/mozilla/inspector/inIScreenCapturer.h
+include/mozilla/inspector/inISearchObserver.h
+include/mozilla/inspector/inISearchProcess.h
 include/mozilla/intl/nsIStringBundle.h
 include/mozilla/jar/nsIJAR.h
 include/mozilla/jar/nsIZipReader.h
@@ -725,9 +778,11 @@ include/mozilla/layout/nsIMutableStyleContext.h
 include/mozilla/layout/nsIObjectFrame.h
 include/mozilla/layout/nsIOutlinerBoxObject.h
 include/mozilla/layout/nsIOutlinerColFrame.h
+include/mozilla/layout/nsIOutlinerContentView.h
 include/mozilla/layout/nsIOutlinerSelection.h
 include/mozilla/layout/nsIOutlinerView.h
 include/mozilla/layout/nsIPageSequenceFrame.h
+include/mozilla/layout/nsIPercentHeightObserver.h
 include/mozilla/layout/nsIPopupBoxObject.h
 include/mozilla/layout/nsIPopupSetFrame.h
 include/mozilla/layout/nsIPresContext.h
@@ -739,7 +794,6 @@ include/mozilla/layout/nsIPrintPreviewContext.h
 include/mozilla/layout/nsIRadioControlFrame.h
 include/mozilla/layout/nsIReflowCallback.h
 include/mozilla/layout/nsIReflowCommand.h
-include/mozilla/layout/nsISVGFrame.h
 include/mozilla/layout/nsIScrollBoxObject.h
 include/mozilla/layout/nsIScrollableFrame.h
 include/mozilla/layout/nsIScrollableViewProvider.h
@@ -756,7 +810,9 @@ include/mozilla/layout/nsITreeFrame.h
 include/mozilla/layout/nsLayoutCID.h
 include/mozilla/layout/nsOutlinerBodyFrame.h
 include/mozilla/layout/nsOutlinerColFrame.h
+include/mozilla/layout/nsOutlinerContentView.h
 include/mozilla/layout/nsOutlinerSelection.h
+include/mozilla/layout/nsOutlinerUtils.h
 include/mozilla/layout/nsPIBoxObject.h
 include/mozilla/layout/nsStyleChangeList.h
 include/mozilla/layout/nsStyleConsts.h
@@ -765,6 +821,50 @@ include/mozilla/ldap/disptmpl.h
 include/mozilla/ldap/lber.h
 include/mozilla/ldap/ldap.h
 include/mozilla/ldap/srchpref.h
+include/mozilla/libart_lgpl/art_affine.h
+include/mozilla/libart_lgpl/art_alphagamma.h
+include/mozilla/libart_lgpl/art_bpath.h
+include/mozilla/libart_lgpl/art_config.h
+include/mozilla/libart_lgpl/art_filterlevel.h
+include/mozilla/libart_lgpl/art_gray_svp.h
+include/mozilla/libart_lgpl/art_misc.h
+include/mozilla/libart_lgpl/art_pathcode.h
+include/mozilla/libart_lgpl/art_pixbuf.h
+include/mozilla/libart_lgpl/art_point.h
+include/mozilla/libart_lgpl/art_rect.h
+include/mozilla/libart_lgpl/art_rect_svp.h
+include/mozilla/libart_lgpl/art_rect_uta.h
+include/mozilla/libart_lgpl/art_render.h
+include/mozilla/libart_lgpl/art_render_gradient.h
+include/mozilla/libart_lgpl/art_render_svp.h
+include/mozilla/libart_lgpl/art_rgb.h
+include/mozilla/libart_lgpl/art_rgb_a_affine.h
+include/mozilla/libart_lgpl/art_rgb_affine.h
+include/mozilla/libart_lgpl/art_rgb_bitmap_affine.h
+include/mozilla/libart_lgpl/art_rgb_pixbuf_affine.h
+include/mozilla/libart_lgpl/art_rgb_rgba_affine.h
+include/mozilla/libart_lgpl/art_rgb_svp.h
+include/mozilla/libart_lgpl/art_rgba.h
+include/mozilla/libart_lgpl/art_svp.h
+include/mozilla/libart_lgpl/art_svp_intersect.h
+include/mozilla/libart_lgpl/art_svp_ops.h
+include/mozilla/libart_lgpl/art_svp_point.h
+include/mozilla/libart_lgpl/art_svp_render_aa.h
+include/mozilla/libart_lgpl/art_svp_vpath.h
+include/mozilla/libart_lgpl/art_svp_vpath_stroke.h
+include/mozilla/libart_lgpl/art_svp_wind.h
+include/mozilla/libart_lgpl/art_uta.h
+include/mozilla/libart_lgpl/art_uta_ops.h
+include/mozilla/libart_lgpl/art_uta_rect.h
+include/mozilla/libart_lgpl/art_uta_svp.h
+include/mozilla/libart_lgpl/art_uta_vpath.h
+include/mozilla/libart_lgpl/art_vpath.h
+include/mozilla/libart_lgpl/art_vpath_bpath.h
+include/mozilla/libart_lgpl/art_vpath_dash.h
+include/mozilla/libart_lgpl/art_vpath_svp.h
+include/mozilla/libart_lgpl/config.h
+include/mozilla/libart_lgpl/libart-features.h
+include/mozilla/libart_lgpl/libart.h
 include/mozilla/libreg/NSReg.h
 include/mozilla/libreg/VerReg.h
 include/mozilla/locale/nsCollation.h
@@ -1107,6 +1207,10 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
+include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
+include/mozilla/msgsmime/nsMsgComposeSecure.h
+include/mozilla/msgsmime/nsMsgSMIMECID.h
 include/mozilla/necko/mozITXTToHTMLConv.h
 include/mozilla/necko/netCore.h
 include/mozilla/necko/nsHTTPChunkConv.h
@@ -1136,6 +1240,7 @@ include/mozilla/necko/nsIJARChannel.h
 include/mozilla/necko/nsIJARProtocolHandler.h
 include/mozilla/necko/nsIJARURI.h
 include/mozilla/necko/nsILoadGroup.h
+include/mozilla/necko/nsIMultiPartChannel.h
 include/mozilla/necko/nsINetModRegEntry.h
 include/mozilla/necko/nsINetModuleMgr.h
 include/mozilla/necko/nsINetNotify.h
@@ -1349,6 +1454,9 @@ include/mozilla/oji/nsIThreadManager.h
 include/mozilla/oji/nsJVMManager.h
 include/mozilla/oji/nsJVMPluginTagInfo.h
 include/mozilla/oji/nsjvm.h
+include/mozilla/pipboot/nsIBufEntropyCollector.h
+include/mozilla/pipboot/nsISSLStatusProvider.h
+include/mozilla/pipboot/nsISecurityWarningDialogs.h
 include/mozilla/pipnss/nsIBadCertListener.h
 include/mozilla/pipnss/nsICMS.h
 include/mozilla/pipnss/nsICMSSecureMessage.h
@@ -1501,6 +1609,7 @@ include/mozilla/uconv/nsICharRepresentable.h
 include/mozilla/uconv/nsICharsetAlias.h
 include/mozilla/uconv/nsICharsetConverterManager.h
 include/mozilla/uconv/nsICharsetConverterManager2.h
+include/mozilla/uconv/nsIConverterInputStream.h
 include/mozilla/uconv/nsICurrentCharsetListener.h
 include/mozilla/uconv/nsIMappingCache.h
 include/mozilla/uconv/nsIPlatformCharset.h
@@ -1546,7 +1655,6 @@ include/mozilla/util/nsITimeRecorder.h
 include/mozilla/util/nsTimer.h
 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
@@ -1903,6 +2011,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/plugin
 @dirrm include/mozilla/pippki
 @dirrm include/mozilla/pipnss
+@dirrm include/mozilla/pipboot
 @dirrm include/mozilla/oji
 @dirrm include/mozilla/nspr/private
 @dirrm include/mozilla/nspr/obsolete
@@ -1912,6 +2021,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/nkcache
 @dirrm include/mozilla/necko2
 @dirrm include/mozilla/necko
+@dirrm include/mozilla/msgsmime
 @dirrm include/mozilla/msgnews
 @dirrm include/mozilla/msglocal
 @dirrm include/mozilla/msgimap
@@ -1930,6 +2040,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/lwbrk
 @dirrm include/mozilla/locale
 @dirrm include/mozilla/libreg
+@dirrm include/mozilla/libart_lgpl
 @dirrm include/mozilla/ldap
 @dirrm include/mozilla/layout
 @dirrm include/mozilla/jsurl
@@ -1939,6 +2050,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/java
 @dirrm include/mozilla/jar
 @dirrm include/mozilla/intl
+@dirrm include/mozilla/inspector
 @dirrm include/mozilla/import
 @dirrm include/mozilla/imglib2
 @dirrm include/mozilla/htmlparser
@@ -1948,6 +2060,7 @@ include/mozilla/xultmpl/nsIXULTemplateBuilder.h
 @dirrm include/mozilla/gfx2
 @dirrm include/mozilla/gfx
 @dirrm include/mozilla/find
+@dirrm include/mozilla/filepicker
 @dirrm include/mozilla/exthandler
 @dirrm include/mozilla/expat
 @dirrm include/mozilla/embedcomponents
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index c322ceeb20b..c2cac9ab73d 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,sobomax,} \
+		${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
+		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -56,10 +58,13 @@ CONFIGURE_ARGS=					\
 		--with-mng=${LOCALBASE}		\
 		--with-pthreads
 CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="" CXXFLAGS=""
+		CFLAGS="" CXXFLAGS="" \
+		MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		CFLAGS="" CXXFLAGS="" \
-		MALLOC_OPTIONS=j
+		MALLOC_OPTIONS=j \
+		MOZ_INTERNAL_LIBART_LGPL=1
+ALL_TARGET=	default
 
 post-build:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/mozilla-vendor/distinfo b/www/mozilla-vendor/distinfo
index 0e59edc5b73..4675e10762f 100644
--- a/www/mozilla-vendor/distinfo
+++ b/www/mozilla-vendor/distinfo
@@ -1 +1,2 @@
-MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
+MD5 (mozilla-source-0.9.7.tar.bz2) = 9c87cf29acd4d2c77783b71b5d41bd26
+MD5 (libart_lgpl-0.9.7.tar.bz2) = 3de7009f6062bb8da1abb168aebd9162
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
deleted file mode 100644
index 8da72465968..00000000000
--- a/www/mozilla-vendor/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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-embedding::config::basebrowser-unix b/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
new file mode 100644
index 00000000000..64c8ac9cddc
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-embedding::config::basebrowser-unix
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
++++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+@@ -119,6 +119,7 @@
+ 
+ ; layout
+ components/libgkcontent.so
++libmoz_art_lgpl.so                   
+ components/libgklayout.so                   
+ components/libhtmlpars.so                 
+ components/libgkview.so                   
diff --git a/www/mozilla-vendor/files/patch-extensions::transformiix::source::base::Double.cpp b/www/mozilla-vendor/files/patch-extensions::transformiix::source::base::Double.cpp
new file mode 100644
index 00000000000..24608f0b4c9
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-extensions::transformiix::source::base::Double.cpp
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- extensions/transformiix/source/base/Double.cpp.orig	Sat Nov 24 00:36:13 2001
++++ extensions/transformiix/source/base/Double.cpp	Tue Dec 25 15:19:42 2001
+@@ -41,7 +41,7 @@
+ #endif
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ #ifndef TX_EXE
+ #include "prdtoa.h"
+@@ -56,7 +56,11 @@
+ 
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
++#ifdef __alpha__
++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
++#else
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
++#endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+ 
diff --git a/www/mozilla-vendor/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/mozilla-vendor/files/patch-nsprpub::pr::include::md::_freebsd.cfg
new file mode 100644
index 00000000000..417d7d91ddb
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-nsprpub::pr::include::md::_freebsd.cfg
@@ -0,0 +1,13 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig	Mon Nov 26 17:07:20 2001
++++ nsprpub/pr/include/md/_freebsd.cfg	Mon Nov 26 17:15:01 2001
+@@ -93,8 +93,8 @@
+ 
+ #elif defined(__alpha)
+ 
+-#define IS_LITTLE_ENDIAN 1
+-#undef  IS_BIG_ENDIAN
++#define	IS_64
++
+ #define	HAVE_LONG_LONG
+ #define	HAVE_ALIGNED_DOUBLES
+ #define	HAVE_ALIGNED_LONGLONGS
diff --git a/www/mozilla-vendor/files/patch-qt b/www/mozilla-vendor/files/patch-qt
index 91667539477..a7c925a7202 100644
--- a/www/mozilla-vendor/files/patch-qt
+++ b/www/mozilla-vendor/files/patch-qt
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Nov  9 05:13:03 2001
-+++ configure	Wed Nov 21 14:22:13 2001
-@@ -5931,6 +5931,9 @@
+--- configure.orig	Wed Dec 12 10:12:41 2001
++++ configure	Tue Dec 25 15:21:43 2001
+@@ -6186,6 +6186,9 @@
  os2*)
      LIBS=
      ;;
@@ -13,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -6987,8 +6990,6 @@
+@@ -7357,8 +7360,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
@@ -22,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -7022,7 +7023,7 @@
+@@ -7392,7 +7393,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,15 +31,7 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -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 @@
+@@ -9839,7 +9840,7 @@
      fi
      MOC=$HOST_MOC
  
@@ -48,11 +40,11 @@ $FreeBSD$
      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 @@
-         ;;
-     *)
+@@ -13711,6 +13712,7 @@
+     echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
+     if test ! "$VACPP" && test -z "$_WIN32_MSVC"; then
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
 +	NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
          $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
-         ;;
-     esac
+     fi
+     if test -z "$_WIN32_MSVC"; then
diff --git a/www/mozilla-vendor/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/mozilla-vendor/files/patch-xpfe::bootstrap::nsAppRunner.cpp
new file mode 100644
index 00000000000..d1fec376adc
--- /dev/null
+++ b/www/mozilla-vendor/files/patch-xpfe::bootstrap::nsAppRunner.cpp
@@ -0,0 +1,11 @@
+--- xpfe/bootstrap/nsAppRunner.cpp.orig	Mon Nov 26 16:53:29 2001
++++ xpfe/bootstrap/nsAppRunner.cpp	Mon Nov 26 16:54:12 2001
+@@ -1060,7 +1060,7 @@
+ 
+ #if defined(FREEBSD)
+ // pick up fpsetmask prototype.
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ 
+ // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist
index e6b4e0c7025..993815d75ce 100644
--- a/www/mozilla-vendor/pkg-plist
+++ b/www/mozilla-vendor/pkg-plist
@@ -1,5 +1,4 @@
 bin/mozilla
-lib/mozilla/CvtURL
 lib/mozilla/DumpColors
 lib/mozilla/FilesTest
 lib/mozilla/OutTestData/doctype.xif
@@ -55,6 +54,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPerf
 lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
@@ -64,9 +64,11 @@ lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
 lib/mozilla/TestSpaceManager
+lib/mozilla/TestStandardURL
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
+lib/mozilla/TestURLParser
 lib/mozilla/TestVoidBTree
 lib/mozilla/TestXMLExtras
 lib/mozilla/TestXPC
@@ -75,33 +77,31 @@ lib/mozilla/TestXPTCInvoke
 lib/mozilla/UnicharSelfTest
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
-lib/mozilla/chrome/embed.jar
+lib/mozilla/chrome/embed-sample.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
 lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
-@unexec rm -f %D/lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/venkman.jar
-lib/mozilla/component.reg
+@unexec rm %D/lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 lib/mozilla/components/addrbook.xpt
@@ -124,6 +124,7 @@ lib/mozilla/components/dom_events.xpt
 lib/mozilla/components/dom_html.xpt
 lib/mozilla/components/dom_range.xpt
 lib/mozilla/components/dom_stylesheets.xpt
+lib/mozilla/components/dom_svg.xpt
 lib/mozilla/components/dom_traversal.xpt
 lib/mozilla/components/dom_views.xpt
 lib/mozilla/components/dom_xbl.xpt
@@ -131,6 +132,7 @@ lib/mozilla/components/dom_xul.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
+lib/mozilla/components/filepicker.xpt
 lib/mozilla/components/find.xpt
 lib/mozilla/components/gfx.xpt
 lib/mozilla/components/gfx2.xpt
@@ -138,6 +140,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
+lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
 lib/mozilla/components/jsconsole-clhandler.js
@@ -160,6 +163,7 @@ lib/mozilla/components/libcookie.so
 lib/mozilla/components/libdocshell.so
 lib/mozilla/components/libeditor.so
 lib/mozilla/components/libembedcomponents.so
+lib/mozilla/components/libfileview.so
 lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
@@ -177,6 +181,7 @@ lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
+lib/mozilla/components/libinspector.so
 lib/mozilla/components/libjar50.so
 lib/mozilla/components/libjsd.so
 lib/mozilla/components/libjsdom.so
@@ -196,6 +201,7 @@ lib/mozilla/components/libmsgcompose.so
 lib/mozilla/components/libmsgdb.so
 lib/mozilla/components/libmsgimap.so
 lib/mozilla/components/libmsgnews.so
+lib/mozilla/components/libmsgsmime.so
 lib/mozilla/components/libnecko.so
 lib/mozilla/components/libnecko2.so
 lib/mozilla/components/libnkcache.so
@@ -204,6 +210,7 @@ lib/mozilla/components/libnsappshell.so
 lib/mozilla/components/libnslocale.so
 lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
+lib/mozilla/components/libpipboot.so
 lib/mozilla/components/libpipnss.so
 lib/mozilla/components/libpippki.so
 lib/mozilla/components/libpref.so
@@ -212,7 +219,6 @@ lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libsample.so
 lib/mozilla/components/libshistory.so
-lib/mozilla/components/libsmimestb.so
 lib/mozilla/components/libstrres.so
 lib/mozilla/components/libtestdynamic.so
 lib/mozilla/components/libtimer_gtk.so
@@ -256,6 +262,7 @@ lib/mozilla/components/msgimap.xpt
 lib/mozilla/components/msglocal.xpt
 lib/mozilla/components/msgnews.xpt
 lib/mozilla/components/msgsearch.xpt
+lib/mozilla/components/msgsmime.xpt
 lib/mozilla/components/necko.xpt
 lib/mozilla/components/necko_about.xpt
 lib/mozilla/components/necko_cache.xpt
@@ -278,6 +285,7 @@ lib/mozilla/components/nsSample.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipboot.xpt
 lib/mozilla/components/pipnss.xpt
 lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
@@ -294,6 +302,7 @@ lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
+lib/mozilla/components/smime-service.js
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -322,7 +331,7 @@ lib/mozilla/components/xpcom_xpti.xpt
 lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
-lib/mozilla/components/xpti.dat
+@unexec rm %D/lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -330,20 +339,22 @@ lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
+lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 lib/mozilla/defaults/pref/security-prefs.js
+lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
-lib/mozilla/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/defaults/profile/US/chrome/userContent.css
+lib/mozilla/defaults/profile/US/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/US/chrome/userContent-example.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/chrome/userChrome.css
-lib/mozilla/defaults/profile/chrome/userContent.css
+lib/mozilla/defaults/profile/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/chrome/userContent-example.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -368,6 +379,7 @@ lib/mozilla/libgtkxtbin.so
 lib/mozilla/libjsj.so
 lib/mozilla/liblber40.so
 lib/mozilla/libldap40.so
+lib/mozilla/libmoz_art_lgpl.so
 lib/mozilla/libmozjs.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
@@ -395,6 +407,7 @@ lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
 lib/mozilla/res/builtin/xbl-forms.css
@@ -419,7 +432,6 @@ lib/mozilla/res/forms.css
 lib/mozilla/res/gfx/icon_0.gif
 lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
-lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
 lib/mozilla/res/html/gopher-binary.gif
 lib/mozilla/res/html/gopher-find.gif
@@ -429,11 +441,13 @@ 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/inspector/search-registry.rdf
+lib/mozilla/res/inspector/viewer-registry.rdf
+lib/mozilla/res/jarlist.dat
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
+lib/mozilla/res/loading-image.gif
 lib/mozilla/res/mathml.css
-lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -579,6 +593,8 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
+lib/mozilla/testart
+lib/mozilla/testuta
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
@@ -592,6 +608,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/samples/sampleimages
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
+@dirrm lib/mozilla/res/inspector
 @dirrm lib/mozilla/res/html
 @dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/fonts
@@ -613,6 +630,8 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
 @dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
+@dirrm lib/mozilla/chrome/overlayinfo/inspector
 @dirrm lib/mozilla/chrome/overlayinfo/editor/content
 @dirrm lib/mozilla/chrome/overlayinfo/editor
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index c322ceeb20b..c2cac9ab73d 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,sobomax,} \
+		${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
+		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -56,10 +58,13 @@ CONFIGURE_ARGS=					\
 		--with-mng=${LOCALBASE}		\
 		--with-pthreads
 CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="" CXXFLAGS=""
+		CFLAGS="" CXXFLAGS="" \
+		MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		CFLAGS="" CXXFLAGS="" \
-		MALLOC_OPTIONS=j
+		MALLOC_OPTIONS=j \
+		MOZ_INTERNAL_LIBART_LGPL=1
+ALL_TARGET=	default
 
 post-build:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 0e59edc5b73..4675e10762f 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1 +1,2 @@
-MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
+MD5 (mozilla-source-0.9.7.tar.bz2) = 9c87cf29acd4d2c77783b71b5d41bd26
+MD5 (libart_lgpl-0.9.7.tar.bz2) = 3de7009f6062bb8da1abb168aebd9162
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
deleted file mode 100644
index 8da72465968..00000000000
--- a/www/mozilla/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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-embedding::config::basebrowser-unix b/www/mozilla/files/patch-embedding::config::basebrowser-unix
new file mode 100644
index 00000000000..64c8ac9cddc
--- /dev/null
+++ b/www/mozilla/files/patch-embedding::config::basebrowser-unix
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
++++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+@@ -119,6 +119,7 @@
+ 
+ ; layout
+ components/libgkcontent.so
++libmoz_art_lgpl.so                   
+ components/libgklayout.so                   
+ components/libhtmlpars.so                 
+ components/libgkview.so                   
diff --git a/www/mozilla/files/patch-extensions::transformiix::source::base::Double.cpp b/www/mozilla/files/patch-extensions::transformiix::source::base::Double.cpp
new file mode 100644
index 00000000000..24608f0b4c9
--- /dev/null
+++ b/www/mozilla/files/patch-extensions::transformiix::source::base::Double.cpp
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- extensions/transformiix/source/base/Double.cpp.orig	Sat Nov 24 00:36:13 2001
++++ extensions/transformiix/source/base/Double.cpp	Tue Dec 25 15:19:42 2001
+@@ -41,7 +41,7 @@
+ #endif
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ #ifndef TX_EXE
+ #include "prdtoa.h"
+@@ -56,7 +56,11 @@
+ 
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
++#ifdef __alpha__
++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
++#else
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
++#endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+ 
diff --git a/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg
new file mode 100644
index 00000000000..417d7d91ddb
--- /dev/null
+++ b/www/mozilla/files/patch-nsprpub::pr::include::md::_freebsd.cfg
@@ -0,0 +1,13 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig	Mon Nov 26 17:07:20 2001
++++ nsprpub/pr/include/md/_freebsd.cfg	Mon Nov 26 17:15:01 2001
+@@ -93,8 +93,8 @@
+ 
+ #elif defined(__alpha)
+ 
+-#define IS_LITTLE_ENDIAN 1
+-#undef  IS_BIG_ENDIAN
++#define	IS_64
++
+ #define	HAVE_LONG_LONG
+ #define	HAVE_ALIGNED_DOUBLES
+ #define	HAVE_ALIGNED_LONGLONGS
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index 91667539477..a7c925a7202 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Nov  9 05:13:03 2001
-+++ configure	Wed Nov 21 14:22:13 2001
-@@ -5931,6 +5931,9 @@
+--- configure.orig	Wed Dec 12 10:12:41 2001
++++ configure	Tue Dec 25 15:21:43 2001
+@@ -6186,6 +6186,9 @@
  os2*)
      LIBS=
      ;;
@@ -13,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -6987,8 +6990,6 @@
+@@ -7357,8 +7360,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
@@ -22,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -7022,7 +7023,7 @@
+@@ -7392,7 +7393,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,15 +31,7 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -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 @@
+@@ -9839,7 +9840,7 @@
      fi
      MOC=$HOST_MOC
  
@@ -48,11 +40,11 @@ $FreeBSD$
      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 @@
-         ;;
-     *)
+@@ -13711,6 +13712,7 @@
+     echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
+     if test ! "$VACPP" && test -z "$_WIN32_MSVC"; then
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
 +	NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
          $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
-         ;;
-     esac
+     fi
+     if test -z "$_WIN32_MSVC"; then
diff --git a/www/mozilla/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/mozilla/files/patch-xpfe::bootstrap::nsAppRunner.cpp
new file mode 100644
index 00000000000..d1fec376adc
--- /dev/null
+++ b/www/mozilla/files/patch-xpfe::bootstrap::nsAppRunner.cpp
@@ -0,0 +1,11 @@
+--- xpfe/bootstrap/nsAppRunner.cpp.orig	Mon Nov 26 16:53:29 2001
++++ xpfe/bootstrap/nsAppRunner.cpp	Mon Nov 26 16:54:12 2001
+@@ -1060,7 +1060,7 @@
+ 
+ #if defined(FREEBSD)
+ // pick up fpsetmask prototype.
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ 
+ // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index e6b4e0c7025..993815d75ce 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -1,5 +1,4 @@
 bin/mozilla
-lib/mozilla/CvtURL
 lib/mozilla/DumpColors
 lib/mozilla/FilesTest
 lib/mozilla/OutTestData/doctype.xif
@@ -55,6 +54,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPerf
 lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
@@ -64,9 +64,11 @@ lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
 lib/mozilla/TestSpaceManager
+lib/mozilla/TestStandardURL
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
+lib/mozilla/TestURLParser
 lib/mozilla/TestVoidBTree
 lib/mozilla/TestXMLExtras
 lib/mozilla/TestXPC
@@ -75,33 +77,31 @@ lib/mozilla/TestXPTCInvoke
 lib/mozilla/UnicharSelfTest
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
-lib/mozilla/chrome/embed.jar
+lib/mozilla/chrome/embed-sample.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
 lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
-@unexec rm -f %D/lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/venkman.jar
-lib/mozilla/component.reg
+@unexec rm %D/lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 lib/mozilla/components/addrbook.xpt
@@ -124,6 +124,7 @@ lib/mozilla/components/dom_events.xpt
 lib/mozilla/components/dom_html.xpt
 lib/mozilla/components/dom_range.xpt
 lib/mozilla/components/dom_stylesheets.xpt
+lib/mozilla/components/dom_svg.xpt
 lib/mozilla/components/dom_traversal.xpt
 lib/mozilla/components/dom_views.xpt
 lib/mozilla/components/dom_xbl.xpt
@@ -131,6 +132,7 @@ lib/mozilla/components/dom_xul.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
+lib/mozilla/components/filepicker.xpt
 lib/mozilla/components/find.xpt
 lib/mozilla/components/gfx.xpt
 lib/mozilla/components/gfx2.xpt
@@ -138,6 +140,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
+lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
 lib/mozilla/components/jsconsole-clhandler.js
@@ -160,6 +163,7 @@ lib/mozilla/components/libcookie.so
 lib/mozilla/components/libdocshell.so
 lib/mozilla/components/libeditor.so
 lib/mozilla/components/libembedcomponents.so
+lib/mozilla/components/libfileview.so
 lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
@@ -177,6 +181,7 @@ lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
+lib/mozilla/components/libinspector.so
 lib/mozilla/components/libjar50.so
 lib/mozilla/components/libjsd.so
 lib/mozilla/components/libjsdom.so
@@ -196,6 +201,7 @@ lib/mozilla/components/libmsgcompose.so
 lib/mozilla/components/libmsgdb.so
 lib/mozilla/components/libmsgimap.so
 lib/mozilla/components/libmsgnews.so
+lib/mozilla/components/libmsgsmime.so
 lib/mozilla/components/libnecko.so
 lib/mozilla/components/libnecko2.so
 lib/mozilla/components/libnkcache.so
@@ -204,6 +210,7 @@ lib/mozilla/components/libnsappshell.so
 lib/mozilla/components/libnslocale.so
 lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
+lib/mozilla/components/libpipboot.so
 lib/mozilla/components/libpipnss.so
 lib/mozilla/components/libpippki.so
 lib/mozilla/components/libpref.so
@@ -212,7 +219,6 @@ lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libsample.so
 lib/mozilla/components/libshistory.so
-lib/mozilla/components/libsmimestb.so
 lib/mozilla/components/libstrres.so
 lib/mozilla/components/libtestdynamic.so
 lib/mozilla/components/libtimer_gtk.so
@@ -256,6 +262,7 @@ lib/mozilla/components/msgimap.xpt
 lib/mozilla/components/msglocal.xpt
 lib/mozilla/components/msgnews.xpt
 lib/mozilla/components/msgsearch.xpt
+lib/mozilla/components/msgsmime.xpt
 lib/mozilla/components/necko.xpt
 lib/mozilla/components/necko_about.xpt
 lib/mozilla/components/necko_cache.xpt
@@ -278,6 +285,7 @@ lib/mozilla/components/nsSample.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipboot.xpt
 lib/mozilla/components/pipnss.xpt
 lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
@@ -294,6 +302,7 @@ lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
+lib/mozilla/components/smime-service.js
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -322,7 +331,7 @@ lib/mozilla/components/xpcom_xpti.xpt
 lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
-lib/mozilla/components/xpti.dat
+@unexec rm %D/lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -330,20 +339,22 @@ lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
+lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 lib/mozilla/defaults/pref/security-prefs.js
+lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
-lib/mozilla/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/defaults/profile/US/chrome/userContent.css
+lib/mozilla/defaults/profile/US/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/US/chrome/userContent-example.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/chrome/userChrome.css
-lib/mozilla/defaults/profile/chrome/userContent.css
+lib/mozilla/defaults/profile/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/chrome/userContent-example.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -368,6 +379,7 @@ lib/mozilla/libgtkxtbin.so
 lib/mozilla/libjsj.so
 lib/mozilla/liblber40.so
 lib/mozilla/libldap40.so
+lib/mozilla/libmoz_art_lgpl.so
 lib/mozilla/libmozjs.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
@@ -395,6 +407,7 @@ lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
 lib/mozilla/res/builtin/xbl-forms.css
@@ -419,7 +432,6 @@ lib/mozilla/res/forms.css
 lib/mozilla/res/gfx/icon_0.gif
 lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
-lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
 lib/mozilla/res/html/gopher-binary.gif
 lib/mozilla/res/html/gopher-find.gif
@@ -429,11 +441,13 @@ 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/inspector/search-registry.rdf
+lib/mozilla/res/inspector/viewer-registry.rdf
+lib/mozilla/res/jarlist.dat
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
+lib/mozilla/res/loading-image.gif
 lib/mozilla/res/mathml.css
-lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -579,6 +593,8 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
+lib/mozilla/testart
+lib/mozilla/testuta
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
@@ -592,6 +608,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/samples/sampleimages
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
+@dirrm lib/mozilla/res/inspector
 @dirrm lib/mozilla/res/html
 @dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/fonts
@@ -613,6 +630,8 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
 @dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
+@dirrm lib/mozilla/chrome/overlayinfo/inspector
 @dirrm lib/mozilla/chrome/overlayinfo/editor/content
 @dirrm lib/mozilla/chrome/overlayinfo/editor
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index c322ceeb20b..c2cac9ab73d 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,sobomax,} \
+		${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
+		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -56,10 +58,13 @@ CONFIGURE_ARGS=					\
 		--with-mng=${LOCALBASE}		\
 		--with-pthreads
 CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="" CXXFLAGS=""
+		CFLAGS="" CXXFLAGS="" \
+		MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		CFLAGS="" CXXFLAGS="" \
-		MALLOC_OPTIONS=j
+		MALLOC_OPTIONS=j \
+		MOZ_INTERNAL_LIBART_LGPL=1
+ALL_TARGET=	default
 
 post-build:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 0e59edc5b73..4675e10762f 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1 +1,2 @@
-MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
+MD5 (mozilla-source-0.9.7.tar.bz2) = 9c87cf29acd4d2c77783b71b5d41bd26
+MD5 (libart_lgpl-0.9.7.tar.bz2) = 3de7009f6062bb8da1abb168aebd9162
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
deleted file mode 100644
index 8da72465968..00000000000
--- a/www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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-embedding::config::basebrowser-unix b/www/seamonkey/files/patch-embedding::config::basebrowser-unix
new file mode 100644
index 00000000000..64c8ac9cddc
--- /dev/null
+++ b/www/seamonkey/files/patch-embedding::config::basebrowser-unix
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
++++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+@@ -119,6 +119,7 @@
+ 
+ ; layout
+ components/libgkcontent.so
++libmoz_art_lgpl.so                   
+ components/libgklayout.so                   
+ components/libhtmlpars.so                 
+ components/libgkview.so                   
diff --git a/www/seamonkey/files/patch-extensions::transformiix::source::base::Double.cpp b/www/seamonkey/files/patch-extensions::transformiix::source::base::Double.cpp
new file mode 100644
index 00000000000..24608f0b4c9
--- /dev/null
+++ b/www/seamonkey/files/patch-extensions::transformiix::source::base::Double.cpp
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- extensions/transformiix/source/base/Double.cpp.orig	Sat Nov 24 00:36:13 2001
++++ extensions/transformiix/source/base/Double.cpp	Tue Dec 25 15:19:42 2001
+@@ -41,7 +41,7 @@
+ #endif
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ #ifndef TX_EXE
+ #include "prdtoa.h"
+@@ -56,7 +56,11 @@
+ 
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
++#ifdef __alpha__
++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
++#else
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
++#endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+ 
diff --git a/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg
new file mode 100644
index 00000000000..417d7d91ddb
--- /dev/null
+++ b/www/seamonkey/files/patch-nsprpub::pr::include::md::_freebsd.cfg
@@ -0,0 +1,13 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig	Mon Nov 26 17:07:20 2001
++++ nsprpub/pr/include/md/_freebsd.cfg	Mon Nov 26 17:15:01 2001
+@@ -93,8 +93,8 @@
+ 
+ #elif defined(__alpha)
+ 
+-#define IS_LITTLE_ENDIAN 1
+-#undef  IS_BIG_ENDIAN
++#define	IS_64
++
+ #define	HAVE_LONG_LONG
+ #define	HAVE_ALIGNED_DOUBLES
+ #define	HAVE_ALIGNED_LONGLONGS
diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt
index 91667539477..a7c925a7202 100644
--- a/www/seamonkey/files/patch-qt
+++ b/www/seamonkey/files/patch-qt
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Nov  9 05:13:03 2001
-+++ configure	Wed Nov 21 14:22:13 2001
-@@ -5931,6 +5931,9 @@
+--- configure.orig	Wed Dec 12 10:12:41 2001
++++ configure	Tue Dec 25 15:21:43 2001
+@@ -6186,6 +6186,9 @@
  os2*)
      LIBS=
      ;;
@@ -13,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -6987,8 +6990,6 @@
+@@ -7357,8 +7360,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
@@ -22,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -7022,7 +7023,7 @@
+@@ -7392,7 +7393,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,15 +31,7 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -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 @@
+@@ -9839,7 +9840,7 @@
      fi
      MOC=$HOST_MOC
  
@@ -48,11 +40,11 @@ $FreeBSD$
      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 @@
-         ;;
-     *)
+@@ -13711,6 +13712,7 @@
+     echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
+     if test ! "$VACPP" && test -z "$_WIN32_MSVC"; then
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
 +	NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
          $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
-         ;;
-     esac
+     fi
+     if test -z "$_WIN32_MSVC"; then
diff --git a/www/seamonkey/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/seamonkey/files/patch-xpfe::bootstrap::nsAppRunner.cpp
new file mode 100644
index 00000000000..d1fec376adc
--- /dev/null
+++ b/www/seamonkey/files/patch-xpfe::bootstrap::nsAppRunner.cpp
@@ -0,0 +1,11 @@
+--- xpfe/bootstrap/nsAppRunner.cpp.orig	Mon Nov 26 16:53:29 2001
++++ xpfe/bootstrap/nsAppRunner.cpp	Mon Nov 26 16:54:12 2001
+@@ -1060,7 +1060,7 @@
+ 
+ #if defined(FREEBSD)
+ // pick up fpsetmask prototype.
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ 
+ // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/seamonkey/pkg-plist b/www/seamonkey/pkg-plist
index e6b4e0c7025..993815d75ce 100644
--- a/www/seamonkey/pkg-plist
+++ b/www/seamonkey/pkg-plist
@@ -1,5 +1,4 @@
 bin/mozilla
-lib/mozilla/CvtURL
 lib/mozilla/DumpColors
 lib/mozilla/FilesTest
 lib/mozilla/OutTestData/doctype.xif
@@ -55,6 +54,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPerf
 lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
@@ -64,9 +64,11 @@ lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
 lib/mozilla/TestSpaceManager
+lib/mozilla/TestStandardURL
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
+lib/mozilla/TestURLParser
 lib/mozilla/TestVoidBTree
 lib/mozilla/TestXMLExtras
 lib/mozilla/TestXPC
@@ -75,33 +77,31 @@ lib/mozilla/TestXPTCInvoke
 lib/mozilla/UnicharSelfTest
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
-lib/mozilla/chrome/embed.jar
+lib/mozilla/chrome/embed-sample.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
 lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
-@unexec rm -f %D/lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/venkman.jar
-lib/mozilla/component.reg
+@unexec rm %D/lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 lib/mozilla/components/addrbook.xpt
@@ -124,6 +124,7 @@ lib/mozilla/components/dom_events.xpt
 lib/mozilla/components/dom_html.xpt
 lib/mozilla/components/dom_range.xpt
 lib/mozilla/components/dom_stylesheets.xpt
+lib/mozilla/components/dom_svg.xpt
 lib/mozilla/components/dom_traversal.xpt
 lib/mozilla/components/dom_views.xpt
 lib/mozilla/components/dom_xbl.xpt
@@ -131,6 +132,7 @@ lib/mozilla/components/dom_xul.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
+lib/mozilla/components/filepicker.xpt
 lib/mozilla/components/find.xpt
 lib/mozilla/components/gfx.xpt
 lib/mozilla/components/gfx2.xpt
@@ -138,6 +140,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
+lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
 lib/mozilla/components/jsconsole-clhandler.js
@@ -160,6 +163,7 @@ lib/mozilla/components/libcookie.so
 lib/mozilla/components/libdocshell.so
 lib/mozilla/components/libeditor.so
 lib/mozilla/components/libembedcomponents.so
+lib/mozilla/components/libfileview.so
 lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
@@ -177,6 +181,7 @@ lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
+lib/mozilla/components/libinspector.so
 lib/mozilla/components/libjar50.so
 lib/mozilla/components/libjsd.so
 lib/mozilla/components/libjsdom.so
@@ -196,6 +201,7 @@ lib/mozilla/components/libmsgcompose.so
 lib/mozilla/components/libmsgdb.so
 lib/mozilla/components/libmsgimap.so
 lib/mozilla/components/libmsgnews.so
+lib/mozilla/components/libmsgsmime.so
 lib/mozilla/components/libnecko.so
 lib/mozilla/components/libnecko2.so
 lib/mozilla/components/libnkcache.so
@@ -204,6 +210,7 @@ lib/mozilla/components/libnsappshell.so
 lib/mozilla/components/libnslocale.so
 lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
+lib/mozilla/components/libpipboot.so
 lib/mozilla/components/libpipnss.so
 lib/mozilla/components/libpippki.so
 lib/mozilla/components/libpref.so
@@ -212,7 +219,6 @@ lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libsample.so
 lib/mozilla/components/libshistory.so
-lib/mozilla/components/libsmimestb.so
 lib/mozilla/components/libstrres.so
 lib/mozilla/components/libtestdynamic.so
 lib/mozilla/components/libtimer_gtk.so
@@ -256,6 +262,7 @@ lib/mozilla/components/msgimap.xpt
 lib/mozilla/components/msglocal.xpt
 lib/mozilla/components/msgnews.xpt
 lib/mozilla/components/msgsearch.xpt
+lib/mozilla/components/msgsmime.xpt
 lib/mozilla/components/necko.xpt
 lib/mozilla/components/necko_about.xpt
 lib/mozilla/components/necko_cache.xpt
@@ -278,6 +285,7 @@ lib/mozilla/components/nsSample.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipboot.xpt
 lib/mozilla/components/pipnss.xpt
 lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
@@ -294,6 +302,7 @@ lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
+lib/mozilla/components/smime-service.js
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -322,7 +331,7 @@ lib/mozilla/components/xpcom_xpti.xpt
 lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
-lib/mozilla/components/xpti.dat
+@unexec rm %D/lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -330,20 +339,22 @@ lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
+lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 lib/mozilla/defaults/pref/security-prefs.js
+lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
-lib/mozilla/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/defaults/profile/US/chrome/userContent.css
+lib/mozilla/defaults/profile/US/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/US/chrome/userContent-example.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/chrome/userChrome.css
-lib/mozilla/defaults/profile/chrome/userContent.css
+lib/mozilla/defaults/profile/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/chrome/userContent-example.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -368,6 +379,7 @@ lib/mozilla/libgtkxtbin.so
 lib/mozilla/libjsj.so
 lib/mozilla/liblber40.so
 lib/mozilla/libldap40.so
+lib/mozilla/libmoz_art_lgpl.so
 lib/mozilla/libmozjs.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
@@ -395,6 +407,7 @@ lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
 lib/mozilla/res/builtin/xbl-forms.css
@@ -419,7 +432,6 @@ lib/mozilla/res/forms.css
 lib/mozilla/res/gfx/icon_0.gif
 lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
-lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
 lib/mozilla/res/html/gopher-binary.gif
 lib/mozilla/res/html/gopher-find.gif
@@ -429,11 +441,13 @@ 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/inspector/search-registry.rdf
+lib/mozilla/res/inspector/viewer-registry.rdf
+lib/mozilla/res/jarlist.dat
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
+lib/mozilla/res/loading-image.gif
 lib/mozilla/res/mathml.css
-lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -579,6 +593,8 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
+lib/mozilla/testart
+lib/mozilla/testuta
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
@@ -592,6 +608,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/samples/sampleimages
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
+@dirrm lib/mozilla/res/inspector
 @dirrm lib/mozilla/res/html
 @dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/fonts
@@ -613,6 +630,8 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
 @dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
+@dirrm lib/mozilla/chrome/overlayinfo/inspector
 @dirrm lib/mozilla/chrome/overlayinfo/editor/content
 @dirrm lib/mozilla/chrome/overlayinfo/editor
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index c322ceeb20b..c2cac9ab73d 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,sobomax,} \
+		${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/M/m/}/src
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
+		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -56,10 +58,13 @@ CONFIGURE_ARGS=					\
 		--with-mng=${LOCALBASE}		\
 		--with-pthreads
 CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="" CXXFLAGS=""
+		CFLAGS="" CXXFLAGS="" \
+		MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
 		CFLAGS="" CXXFLAGS="" \
-		MALLOC_OPTIONS=j
+		MALLOC_OPTIONS=j \
+		MOZ_INTERNAL_LIBART_LGPL=1
+ALL_TARGET=	default
 
 post-build:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index 0e59edc5b73..4675e10762f 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1 +1,2 @@
-MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
+MD5 (mozilla-source-0.9.7.tar.bz2) = 9c87cf29acd4d2c77783b71b5d41bd26
+MD5 (libart_lgpl-0.9.7.tar.bz2) = 3de7009f6062bb8da1abb168aebd9162
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
deleted file mode 100644
index 8da72465968..00000000000
--- a/www/seamonkey2/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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-embedding::config::basebrowser-unix b/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
new file mode 100644
index 00000000000..64c8ac9cddc
--- /dev/null
+++ b/www/seamonkey2/files/patch-embedding::config::basebrowser-unix
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- embedding/config/basebrowser-unix	2001/12/26 07:19:52	1.1
++++ embedding/config/basebrowser-unix	2001/12/26 07:24:15
+@@ -119,6 +119,7 @@
+ 
+ ; layout
+ components/libgkcontent.so
++libmoz_art_lgpl.so                   
+ components/libgklayout.so                   
+ components/libhtmlpars.so                 
+ components/libgkview.so                   
diff --git a/www/seamonkey2/files/patch-extensions::transformiix::source::base::Double.cpp b/www/seamonkey2/files/patch-extensions::transformiix::source::base::Double.cpp
new file mode 100644
index 00000000000..24608f0b4c9
--- /dev/null
+++ b/www/seamonkey2/files/patch-extensions::transformiix::source::base::Double.cpp
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- extensions/transformiix/source/base/Double.cpp.orig	Sat Nov 24 00:36:13 2001
++++ extensions/transformiix/source/base/Double.cpp	Tue Dec 25 15:19:42 2001
+@@ -41,7 +41,7 @@
+ #endif
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ #ifndef TX_EXE
+ #include "prdtoa.h"
+@@ -56,7 +56,11 @@
+ 
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
++#ifdef __alpha__
++fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
++#else
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
++#endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+ 
diff --git a/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg
new file mode 100644
index 00000000000..417d7d91ddb
--- /dev/null
+++ b/www/seamonkey2/files/patch-nsprpub::pr::include::md::_freebsd.cfg
@@ -0,0 +1,13 @@
+--- nsprpub/pr/include/md/_freebsd.cfg.orig	Mon Nov 26 17:07:20 2001
++++ nsprpub/pr/include/md/_freebsd.cfg	Mon Nov 26 17:15:01 2001
+@@ -93,8 +93,8 @@
+ 
+ #elif defined(__alpha)
+ 
+-#define IS_LITTLE_ENDIAN 1
+-#undef  IS_BIG_ENDIAN
++#define	IS_64
++
+ #define	HAVE_LONG_LONG
+ #define	HAVE_ALIGNED_DOUBLES
+ #define	HAVE_ALIGNED_LONGLONGS
diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt
index 91667539477..a7c925a7202 100644
--- a/www/seamonkey2/files/patch-qt
+++ b/www/seamonkey2/files/patch-qt
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Nov  9 05:13:03 2001
-+++ configure	Wed Nov 21 14:22:13 2001
-@@ -5931,6 +5931,9 @@
+--- configure.orig	Wed Dec 12 10:12:41 2001
++++ configure	Tue Dec 25 15:21:43 2001
+@@ -6186,6 +6186,9 @@
  os2*)
      LIBS=
      ;;
@@ -13,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -6987,8 +6990,6 @@
+@@ -7357,8 +7360,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
@@ -22,7 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -7022,7 +7023,7 @@
+@@ -7392,7 +7393,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -31,15 +31,7 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -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 @@
+@@ -9839,7 +9840,7 @@
      fi
      MOC=$HOST_MOC
  
@@ -48,11 +40,11 @@ $FreeBSD$
      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 @@
-         ;;
-     *)
+@@ -13711,6 +13712,7 @@
+     echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
+     if test ! "$VACPP" && test -z "$_WIN32_MSVC"; then
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
 +	NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
          $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
-         ;;
-     esac
+     fi
+     if test -z "$_WIN32_MSVC"; then
diff --git a/www/seamonkey2/files/patch-xpfe::bootstrap::nsAppRunner.cpp b/www/seamonkey2/files/patch-xpfe::bootstrap::nsAppRunner.cpp
new file mode 100644
index 00000000000..d1fec376adc
--- /dev/null
+++ b/www/seamonkey2/files/patch-xpfe::bootstrap::nsAppRunner.cpp
@@ -0,0 +1,11 @@
+--- xpfe/bootstrap/nsAppRunner.cpp.orig	Mon Nov 26 16:53:29 2001
++++ xpfe/bootstrap/nsAppRunner.cpp	Mon Nov 26 16:54:12 2001
+@@ -1060,7 +1060,7 @@
+ 
+ #if defined(FREEBSD)
+ // pick up fpsetmask prototype.
+-#include <floatingpoint.h>
++#include <ieeefp.h>
+ #endif
+ 
+ // Note: nativeApp is an owning reference that this function has responsibility
diff --git a/www/seamonkey2/pkg-plist b/www/seamonkey2/pkg-plist
index e6b4e0c7025..993815d75ce 100644
--- a/www/seamonkey2/pkg-plist
+++ b/www/seamonkey2/pkg-plist
@@ -1,5 +1,4 @@
 bin/mozilla
-lib/mozilla/CvtURL
 lib/mozilla/DumpColors
 lib/mozilla/FilesTest
 lib/mozilla/OutTestData/doctype.xif
@@ -55,6 +54,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPerf
 lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
@@ -64,9 +64,11 @@ lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
 lib/mozilla/TestSpaceManager
+lib/mozilla/TestStandardURL
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
+lib/mozilla/TestURLParser
 lib/mozilla/TestVoidBTree
 lib/mozilla/TestXMLExtras
 lib/mozilla/TestXPC
@@ -75,33 +77,31 @@ lib/mozilla/TestXPTCInvoke
 lib/mozilla/UnicharSelfTest
 lib/mozilla/bloaturls.txt
 lib/mozilla/chrome/US.jar
-lib/mozilla/chrome/all-locales.rdf
-lib/mozilla/chrome/all-packages.rdf
-lib/mozilla/chrome/all-skins.rdf
+@unexec rm %D/lib/mozilla/chrome/chrome.rdf
 lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
-lib/mozilla/chrome/embed.jar
+lib/mozilla/chrome/embed-sample.jar
 lib/mozilla/chrome/en-US.jar
 lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 lib/mozilla/chrome/messenger.jar
 lib/mozilla/chrome/modern.jar
 lib/mozilla/chrome/overlayinfo/communicator/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/editor/content/overlays.rdf
+lib/mozilla/chrome/overlayinfo/inspector/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
-@unexec rm -f %D/lib/mozilla/chrome/user-locales.rdf
-lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/venkman.jar
-lib/mozilla/component.reg
+@unexec rm %D/lib/mozilla/component.reg
 lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 lib/mozilla/components/addrbook.xpt
@@ -124,6 +124,7 @@ lib/mozilla/components/dom_events.xpt
 lib/mozilla/components/dom_html.xpt
 lib/mozilla/components/dom_range.xpt
 lib/mozilla/components/dom_stylesheets.xpt
+lib/mozilla/components/dom_svg.xpt
 lib/mozilla/components/dom_traversal.xpt
 lib/mozilla/components/dom_views.xpt
 lib/mozilla/components/dom_xbl.xpt
@@ -131,6 +132,7 @@ lib/mozilla/components/dom_xul.xpt
 lib/mozilla/components/editor.xpt
 lib/mozilla/components/embed_base.xpt
 lib/mozilla/components/exthandler.xpt
+lib/mozilla/components/filepicker.xpt
 lib/mozilla/components/find.xpt
 lib/mozilla/components/gfx.xpt
 lib/mozilla/components/gfx2.xpt
@@ -138,6 +140,7 @@ lib/mozilla/components/helperAppDlg.xpt
 lib/mozilla/components/history.xpt
 lib/mozilla/components/imglib2.xpt
 lib/mozilla/components/import.xpt
+lib/mozilla/components/inspector.xpt
 lib/mozilla/components/intl.xpt
 lib/mozilla/components/jar.xpt
 lib/mozilla/components/jsconsole-clhandler.js
@@ -160,6 +163,7 @@ lib/mozilla/components/libcookie.so
 lib/mozilla/components/libdocshell.so
 lib/mozilla/components/libeditor.so
 lib/mozilla/components/libembedcomponents.so
+lib/mozilla/components/libfileview.so
 lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
@@ -177,6 +181,7 @@ lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
 lib/mozilla/components/libimpText.so
 lib/mozilla/components/libimport.so
+lib/mozilla/components/libinspector.so
 lib/mozilla/components/libjar50.so
 lib/mozilla/components/libjsd.so
 lib/mozilla/components/libjsdom.so
@@ -196,6 +201,7 @@ lib/mozilla/components/libmsgcompose.so
 lib/mozilla/components/libmsgdb.so
 lib/mozilla/components/libmsgimap.so
 lib/mozilla/components/libmsgnews.so
+lib/mozilla/components/libmsgsmime.so
 lib/mozilla/components/libnecko.so
 lib/mozilla/components/libnecko2.so
 lib/mozilla/components/libnkcache.so
@@ -204,6 +210,7 @@ lib/mozilla/components/libnsappshell.so
 lib/mozilla/components/libnslocale.so
 lib/mozilla/components/libnsprefm.so
 lib/mozilla/components/liboji.so
+lib/mozilla/components/libpipboot.so
 lib/mozilla/components/libpipnss.so
 lib/mozilla/components/libpippki.so
 lib/mozilla/components/libpref.so
@@ -212,7 +219,6 @@ lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libsample.so
 lib/mozilla/components/libshistory.so
-lib/mozilla/components/libsmimestb.so
 lib/mozilla/components/libstrres.so
 lib/mozilla/components/libtestdynamic.so
 lib/mozilla/components/libtimer_gtk.so
@@ -256,6 +262,7 @@ lib/mozilla/components/msgimap.xpt
 lib/mozilla/components/msglocal.xpt
 lib/mozilla/components/msgnews.xpt
 lib/mozilla/components/msgsearch.xpt
+lib/mozilla/components/msgsmime.xpt
 lib/mozilla/components/necko.xpt
 lib/mozilla/components/necko_about.xpt
 lib/mozilla/components/necko_cache.xpt
@@ -278,6 +285,7 @@ lib/mozilla/components/nsSample.js
 lib/mozilla/components/nsSidebar.js
 lib/mozilla/components/nsXmlRpcClient.js
 lib/mozilla/components/oji.xpt
+lib/mozilla/components/pipboot.xpt
 lib/mozilla/components/pipnss.xpt
 lib/mozilla/components/pippki.xpt
 lib/mozilla/components/plugin.xpt
@@ -294,6 +302,7 @@ lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
+lib/mozilla/components/smime-service.js
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -322,7 +331,7 @@ lib/mozilla/components/xpcom_xpti.xpt
 lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
-lib/mozilla/components/xpti.dat
+@unexec rm %D/lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -330,20 +339,22 @@ lib/mozilla/defaults/pref/all.js
 lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
 lib/mozilla/defaults/pref/initpref.js
+lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 lib/mozilla/defaults/pref/security-prefs.js
+lib/mozilla/defaults/pref/smime.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
-lib/mozilla/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/defaults/profile/US/chrome/userContent.css
+lib/mozilla/defaults/profile/US/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/US/chrome/userContent-example.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
-lib/mozilla/defaults/profile/chrome/userChrome.css
-lib/mozilla/defaults/profile/chrome/userContent.css
+lib/mozilla/defaults/profile/chrome/userChrome-example.css
+lib/mozilla/defaults/profile/chrome/userContent-example.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -368,6 +379,7 @@ lib/mozilla/libgtkxtbin.so
 lib/mozilla/libjsj.so
 lib/mozilla/liblber40.so
 lib/mozilla/libldap40.so
+lib/mozilla/libmoz_art_lgpl.so
 lib/mozilla/libmozjs.so
 lib/mozilla/libmsgbaseutil.so
 lib/mozilla/libnspr4.so
@@ -395,6 +407,7 @@ lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
 lib/mozilla/res/arrow.gif
+lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
 lib/mozilla/res/builtin/xbl-forms.css
@@ -419,7 +432,6 @@ lib/mozilla/res/forms.css
 lib/mozilla/res/gfx/icon_0.gif
 lib/mozilla/res/gfx/icon_1.gif
 lib/mozilla/res/html.css
-lib/mozilla/res/html/broken-image.gif
 lib/mozilla/res/html/gopher-audio.gif
 lib/mozilla/res/html/gopher-binary.gif
 lib/mozilla/res/html/gopher-find.gif
@@ -429,11 +441,13 @@ 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/inspector/search-registry.rdf
+lib/mozilla/res/inspector/viewer-registry.rdf
+lib/mozilla/res/jarlist.dat
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
+lib/mozilla/res/loading-image.gif
 lib/mozilla/res/mathml.css
-lib/mozilla/res/nssifail.txt
 lib/mozilla/res/quirk.css
 lib/mozilla/res/rdf/article.gif
 lib/mozilla/res/rdf/document.gif
@@ -579,6 +593,8 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
+lib/mozilla/testart
+lib/mozilla/testuta
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk
@@ -592,6 +608,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/samples/sampleimages
 @dirrm lib/mozilla/res/samples
 @dirrm lib/mozilla/res/rdf
+@dirrm lib/mozilla/res/inspector
 @dirrm lib/mozilla/res/html
 @dirrm lib/mozilla/res/gfx
 @dirrm lib/mozilla/res/fonts
@@ -613,6 +630,8 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/navigator
 @dirrm lib/mozilla/chrome/overlayinfo/messenger/content
 @dirrm lib/mozilla/chrome/overlayinfo/messenger
+@dirrm lib/mozilla/chrome/overlayinfo/inspector/content
+@dirrm lib/mozilla/chrome/overlayinfo/inspector
 @dirrm lib/mozilla/chrome/overlayinfo/editor/content
 @dirrm lib/mozilla/chrome/overlayinfo/editor
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content