Update to 1.1. This fixes the font problem as well as the chatzilla bug. A

full list of changes can be found in the Mozilla 1.1 release notes from:

http://www.mozilla.org/releases/mozilla1.1/

PR:		42068

27 files changed, 342 insertions, 468 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 08fc786e13f1..9bc3db95e4e5 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
-		http://people.FreeBSD.org/~sobomax/:local
+		http://people.FreeBSD.org/~marcus/:local
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
-		sobomax/:local
+		marcus/:local
 DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
 		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
 
@@ -28,9 +27,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
+#WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
-USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -114,9 +112,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
-	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
+	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \
+	  ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf)
 	${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
 
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index e145e2426723..9d2cce22c437 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.0.tar.bz2) = 033da936e48336aa2c5d8bf0aa039056
-MD5 (libart_lgpl-1.0.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
+MD5 (mozilla-source-1.1.tar.gz) = f23ae90817506559da3bdf07fdf7c2a8
+MD5 (libart_lgpl-1.1.tar.gz) = 276f65c384d020c36003260689806735
diff --git a/www/mozilla-devel/files/patch-Makefile.in b/www/mozilla-devel/files/patch-Makefile.in
index f65ae1be8d13..43fa34684782 100644
--- a/www/mozilla-devel/files/patch-Makefile.in
+++ b/www/mozilla-devel/files/patch-Makefile.in
@@ -1,25 +1,22 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/12/25 21:00:23	1.1
-+++ Makefile.in	2001/12/26 06:40:16
-@@ -64,8 +64,7 @@
- DIRS = $(NSPRPUB_DIR) \
+--- Makefile.in.orig	Thu May 30 20:39:07 2002
++++ Makefile.in	Wed Aug 28 13:55:32 2002
+@@ -70,8 +70,7 @@
  	$(tier_0_dirs) \
  	$(tier_1_dirs) \
+ 	$(tier_2_dirs) \
 -	$(tier_9_dirs) \
 -	$(NULL)
 +	$(tier_9_dirs)
  
- ifdef MOZ_LDAP_XPCOM
- DIRS += directory/c-sdk/ldap
-@@ -81,7 +80,8 @@
+ ifdef GC_LEAK_DETECTOR
+ DIRS += gc/boehm
+@@ -90,7 +89,8 @@
  DIRS += $(tier_98_dirs)
  endif
  
 -DIRS	+= $(tier_99_dirs)
 +DIRS	+= $(tier_99_dirs) \
-+	    $(NULL)
++		$(NULL)
  
  #
  # tier 0 - base build config dirs
diff --git a/www/mozilla-devel/files/patch-nsFontMetricsGTK.cpp b/www/mozilla-devel/files/patch-nsFontMetricsGTK.cpp
deleted file mode 100644
index 3bab909b5a89..000000000000
--- a/www/mozilla-devel/files/patch-nsFontMetricsGTK.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/gtk/nsFontMetricsGTK.cpp	Mon Jun 10 01:02:08 2002
-+++ gfx/src/gtk/nsFontMetricsGTK.cpp	Thu Jun 13 00:06:33 2002
-@@ -87,6 +87,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1276,7 +1282,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(gdk_screen_height() * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla-devel/files/patch-nsFontMetricsXlib.cpp b/www/mozilla-devel/files/patch-nsFontMetricsXlib.cpp
deleted file mode 100644
index fd470f66d234..000000000000
--- a/www/mozilla-devel/files/patch-nsFontMetricsXlib.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/xlib/nsFontMetricsXlib.cpp	Tue Jun 11 16:20:31 2002
-+++ gfx/src/xlib/nsFontMetricsXlib.cpp	Thu Jun 13 00:05:47 2002
-@@ -99,6 +99,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1480,7 +1486,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(XHeightOfScreen(xxlib_rgb_get_screen(gXlibRgbHandle)) * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // Normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
deleted file mode 100644
index 2224e67cc95b..000000000000
--- a/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
-@@ -94,8 +94,16 @@
-  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
-  * can also identify the period of time that 4.0-CURRENT used thunks.
-  */
--#if defined(__FreeBSD_cc_version) && \
--    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
-+
-+/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
-+ * This solves a problem wherein regxpcom and/or regchrome would seg fault
-+ * after running for a while.  This problem has also exhibited itself on 
-+ * the alpha platform.  Therefore, use thunks on all versions of
-+ * -CURRENT that are using gcc-3.1.
-+ */
-+#if defined(__FreeBSD_cc_version) && \
-+    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
-+    (__FreeBSD_cc_version < 500003)
- #define CFRONT_STYLE_THIS_ADJUST
- #else
- #define THUNK_BASED_THIS_ADJUST
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index 1eaf93402b43..5b76f7163ace 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -21,6 +21,40 @@ lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/forms.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/icons/default/abcardWindow.xpm
+lib/mozilla/chrome/icons/default/abcardWindow16.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow16.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow16.xpm
+lib/mozilla/chrome/icons/default/bookmark-window.xpm
+lib/mozilla/chrome/icons/default/bookmark-window16.xpm
+lib/mozilla/chrome/icons/default/calendar-window.xpm
+lib/mozilla/chrome/icons/default/calendar-window16.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window16.xpm
+lib/mozilla/chrome/icons/default/downloadManager.xpm
+lib/mozilla/chrome/icons/default/downloadManager16.xpm
+lib/mozilla/chrome/icons/default/editorWindow.xpm
+lib/mozilla/chrome/icons/default/editorWindow16.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow16.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow16.xpm
+lib/mozilla/chrome/icons/default/history-window.xpm
+lib/mozilla/chrome/icons/default/history-window16.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow16.xpm
+lib/mozilla/chrome/icons/default/main-window.xpm
+lib/mozilla/chrome/icons/default/main-window16.xpm
+lib/mozilla/chrome/icons/default/messengerWindow.xpm
+lib/mozilla/chrome/icons/default/messengerWindow16.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow16.xpm
+lib/mozilla/chrome/icons/default/venkman-window.xpm
+lib/mozilla/chrome/icons/default/venkman-window16.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain16.xpm
 lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 %%MOZILLAMAILNEWS%%lib/mozilla/chrome/messenger.jar
@@ -35,8 +69,9 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
+lib/mozilla/chrome/user-locales.rdf
+lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/xmlterm.jar
-lib/mozilla/component.reg
 %%MOZILLAMAILNEWS%%lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/addrbook.xpt
@@ -50,10 +85,11 @@ lib/mozilla/components/chardet.xpt
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/commandhandler.xpt
 lib/mozilla/components/composer.xpt
+lib/mozilla/components/compreg.dat
 lib/mozilla/components/content.xpt
+lib/mozilla/components/content_xslt.xpt
 lib/mozilla/components/content_base.xpt
 lib/mozilla/components/content_html.xpt
-lib/mozilla/components/content_xsl.xpt
 lib/mozilla/components/cookie.xpt
 lib/mozilla/components/directory.xpt
 lib/mozilla/components/docshell.xpt
@@ -125,6 +161,7 @@ lib/mozilla/components/libimglib2.so
 lib/mozilla/components/libimgmng.so
 lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
+lib/mozilla/components/libimgxbm.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpComm4xMail.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpText.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimport.so
@@ -143,7 +180,6 @@ lib/mozilla/components/libmork.so
 lib/mozilla/components/libmozbrwsr.so
 lib/mozilla/components/libmozfind.so
 %%MOZILLALDAP%%lib/mozilla/components/libmozldap.so
-lib/mozilla/components/libmozxfer.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgcompose.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgdb.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgimap.so
@@ -200,7 +236,6 @@ lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
 lib/mozilla/components/mozfind.xpt
 %%MOZILLALDAP%%lib/mozilla/components/mozldap.xpt
-lib/mozilla/components/mozxfer.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgbase.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgcompose.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgdb.xpt
@@ -256,7 +291,6 @@ lib/mozilla/components/signonviewer.xpt
 lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
-lib/mozilla/components/txtsvc.xpt
 lib/mozilla/components/uconv.xpt
 lib/mozilla/components/unicharutil.xpt
 lib/mozilla/components/uriloader.xpt
@@ -270,6 +304,7 @@ lib/mozilla/components/webBrowser_core.xpt
 lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
+lib/mozilla/components/windowds.xpt
 lib/mozilla/components/windowwatcher.xpt
 lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
@@ -289,11 +324,10 @@ lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
+lib/mozilla/defaults/autoconfig/platform.js
 lib/mozilla/defaults/autoconfig/prefcalls.js
 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
 %%MOZILLAMAILNEWS%%lib/mozilla/defaults/pref/mdn.js
@@ -364,7 +398,6 @@ lib/mozilla/res/arrowd.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
 lib/mozilla/res/charsetData.properties
 lib/mozilla/res/charsetalias.properties
 lib/mozilla/res/cmessage.txt
@@ -375,6 +408,7 @@ lib/mozilla/res/entityTables/html40Latin1.properties
 lib/mozilla/res/entityTables/html40Special.properties
 lib/mozilla/res/entityTables/html40Symbols.properties
 lib/mozilla/res/entityTables/htmlEntityVersions.properties
+lib/mozilla/res/entityTables/mathml20.properties
 lib/mozilla/res/entityTables/transliterate.properties
 lib/mozilla/res/fonts/mathfont.properties
 lib/mozilla/res/fonts/mathfontCMEX10.properties
@@ -551,7 +585,7 @@ lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
 @unexec rm -f %D/lib/mozilla/chrome/chrome.rdf || true
-@unexec rm -f %D/lib/mozilla/component.reg || true
+@unexec rm -f %D/lib/mozilla/compreg.dat || true
 @unexec rm -f %D/lib/mozilla/components/xpti.dat || true
 @dirrm lib/mozilla/searchplugins
 @dirrm lib/mozilla/res/throbber
@@ -590,5 +624,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
 @dirrm lib/mozilla/chrome/overlayinfo/communicator
 @dirrm lib/mozilla/chrome/overlayinfo
+@dirrm lib/mozilla/chrome/icons/default
+@dirrm lib/mozilla/chrome/icons
 @dirrm lib/mozilla/chrome
 @dirrm lib/mozilla
diff --git a/www/mozilla-embedded-devel/pkg-plist b/www/mozilla-embedded-devel/pkg-plist
index 0be0c86cb571..df5249c807f8 100644
--- a/www/mozilla-embedded-devel/pkg-plist
+++ b/www/mozilla-embedded-devel/pkg-plist
@@ -3,13 +3,14 @@ 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/messenger/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/component.reg
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
 lib/mozilla-embedded/components/chrome.xpt
+lib/mozilla-embedded/components/compreg.dat
 lib/mozilla-embedded/components/content_base.xpt
 lib/mozilla-embedded/components/docshell.xpt
 lib/mozilla-embedded/components/dom.xpt
@@ -44,6 +45,7 @@ lib/mozilla-embedded/components/libgfx2.so
 lib/mozilla-embedded/components/libgfx_gtk.so
 lib/mozilla-embedded/components/libgkcontent.so
 lib/mozilla-embedded/components/libgklayout.so
+lib/mozilla-embedded/components/libgkplugin.so
 lib/mozilla-embedded/components/libgkview.so
 lib/mozilla-embedded/components/libhtmlpars.so
 lib/mozilla-embedded/components/libimggif.so
@@ -58,6 +60,7 @@ lib/mozilla-embedded/components/liblwbrk.so
 lib/mozilla-embedded/components/libmozbrwsr.so
 lib/mozilla-embedded/components/libnecko.so
 lib/mozilla-embedded/components/libnecko2.so
+lib/mozilla-embedded/components/libnkcache.so
 lib/mozilla-embedded/components/libnsappshell.so
 lib/mozilla-embedded/components/libnslocale.so
 lib/mozilla-embedded/components/libpipboot.so
@@ -99,11 +102,10 @@ lib/mozilla-embedded/components/necko_strconv.xpt
 lib/mozilla-embedded/components/pipboot.xpt
 lib/mozilla-embedded/components/pipnss.xpt
 lib/mozilla-embedded/components/pippki.xpt
-lib/mozilla-embedded/components/pref.xpt
+lib/mozilla-embedded/components/plugin.xpt
 lib/mozilla-embedded/components/profile.xpt
 lib/mozilla-embedded/components/rdf.xpt
 lib/mozilla-embedded/components/shistory.xpt
-lib/mozilla-embedded/components/txtsvc.xpt
 lib/mozilla-embedded/components/uconv.xpt
 lib/mozilla-embedded/components/unicharutil.xpt
 lib/mozilla-embedded/components/uriloader.xpt
@@ -120,7 +122,6 @@ lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
 lib/mozilla-embedded/components/xpti.dat
 lib/mozilla-embedded/defaults/pref/all.js
-lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/libgkgfx.so
@@ -144,7 +145,6 @@ lib/mozilla-embedded/res/arrowd.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
 lib/mozilla-embedded/res/charsetData.properties
 lib/mozilla-embedded/res/charsetalias.properties
 lib/mozilla-embedded/res/dtd/mathml.dtd
@@ -154,6 +154,7 @@ lib/mozilla-embedded/res/entityTables/html40Latin1.properties
 lib/mozilla-embedded/res/entityTables/html40Special.properties
 lib/mozilla-embedded/res/entityTables/html40Symbols.properties
 lib/mozilla-embedded/res/entityTables/htmlEntityVersions.properties
+lib/mozilla-embedded/res/entityTables/mathml20.properties
 lib/mozilla-embedded/res/entityTables/transliterate.properties
 lib/mozilla-embedded/res/fonts/mathfont.properties
 lib/mozilla-embedded/res/fonts/mathfontCMEX10.properties
@@ -187,6 +188,8 @@ lib/mozilla-embedded/run-mozilla.sh
 @dirrm lib/mozilla-embedded/components
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator/content
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/messenger/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/messenger
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator/content
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator
 @dirrm lib/mozilla-embedded/chrome/overlayinfo
diff --git a/www/mozilla-embedded-vendor/pkg-plist b/www/mozilla-embedded-vendor/pkg-plist
index 0be0c86cb571..df5249c807f8 100644
--- a/www/mozilla-embedded-vendor/pkg-plist
+++ b/www/mozilla-embedded-vendor/pkg-plist
@@ -3,13 +3,14 @@ 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/messenger/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/component.reg
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
 lib/mozilla-embedded/components/chrome.xpt
+lib/mozilla-embedded/components/compreg.dat
 lib/mozilla-embedded/components/content_base.xpt
 lib/mozilla-embedded/components/docshell.xpt
 lib/mozilla-embedded/components/dom.xpt
@@ -44,6 +45,7 @@ lib/mozilla-embedded/components/libgfx2.so
 lib/mozilla-embedded/components/libgfx_gtk.so
 lib/mozilla-embedded/components/libgkcontent.so
 lib/mozilla-embedded/components/libgklayout.so
+lib/mozilla-embedded/components/libgkplugin.so
 lib/mozilla-embedded/components/libgkview.so
 lib/mozilla-embedded/components/libhtmlpars.so
 lib/mozilla-embedded/components/libimggif.so
@@ -58,6 +60,7 @@ lib/mozilla-embedded/components/liblwbrk.so
 lib/mozilla-embedded/components/libmozbrwsr.so
 lib/mozilla-embedded/components/libnecko.so
 lib/mozilla-embedded/components/libnecko2.so
+lib/mozilla-embedded/components/libnkcache.so
 lib/mozilla-embedded/components/libnsappshell.so
 lib/mozilla-embedded/components/libnslocale.so
 lib/mozilla-embedded/components/libpipboot.so
@@ -99,11 +102,10 @@ lib/mozilla-embedded/components/necko_strconv.xpt
 lib/mozilla-embedded/components/pipboot.xpt
 lib/mozilla-embedded/components/pipnss.xpt
 lib/mozilla-embedded/components/pippki.xpt
-lib/mozilla-embedded/components/pref.xpt
+lib/mozilla-embedded/components/plugin.xpt
 lib/mozilla-embedded/components/profile.xpt
 lib/mozilla-embedded/components/rdf.xpt
 lib/mozilla-embedded/components/shistory.xpt
-lib/mozilla-embedded/components/txtsvc.xpt
 lib/mozilla-embedded/components/uconv.xpt
 lib/mozilla-embedded/components/unicharutil.xpt
 lib/mozilla-embedded/components/uriloader.xpt
@@ -120,7 +122,6 @@ lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
 lib/mozilla-embedded/components/xpti.dat
 lib/mozilla-embedded/defaults/pref/all.js
-lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/libgkgfx.so
@@ -144,7 +145,6 @@ lib/mozilla-embedded/res/arrowd.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
 lib/mozilla-embedded/res/charsetData.properties
 lib/mozilla-embedded/res/charsetalias.properties
 lib/mozilla-embedded/res/dtd/mathml.dtd
@@ -154,6 +154,7 @@ lib/mozilla-embedded/res/entityTables/html40Latin1.properties
 lib/mozilla-embedded/res/entityTables/html40Special.properties
 lib/mozilla-embedded/res/entityTables/html40Symbols.properties
 lib/mozilla-embedded/res/entityTables/htmlEntityVersions.properties
+lib/mozilla-embedded/res/entityTables/mathml20.properties
 lib/mozilla-embedded/res/entityTables/transliterate.properties
 lib/mozilla-embedded/res/fonts/mathfont.properties
 lib/mozilla-embedded/res/fonts/mathfontCMEX10.properties
@@ -187,6 +188,8 @@ lib/mozilla-embedded/run-mozilla.sh
 @dirrm lib/mozilla-embedded/components
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator/content
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/messenger/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/messenger
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator/content
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator
 @dirrm lib/mozilla-embedded/chrome/overlayinfo
diff --git a/www/mozilla-embedded/pkg-plist b/www/mozilla-embedded/pkg-plist
index 0be0c86cb571..df5249c807f8 100644
--- a/www/mozilla-embedded/pkg-plist
+++ b/www/mozilla-embedded/pkg-plist
@@ -3,13 +3,14 @@ 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/messenger/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/component.reg
 lib/mozilla-embedded/components/appshell.xpt
 lib/mozilla-embedded/components/caps.xpt
 lib/mozilla-embedded/components/chrome.xpt
+lib/mozilla-embedded/components/compreg.dat
 lib/mozilla-embedded/components/content_base.xpt
 lib/mozilla-embedded/components/docshell.xpt
 lib/mozilla-embedded/components/dom.xpt
@@ -44,6 +45,7 @@ lib/mozilla-embedded/components/libgfx2.so
 lib/mozilla-embedded/components/libgfx_gtk.so
 lib/mozilla-embedded/components/libgkcontent.so
 lib/mozilla-embedded/components/libgklayout.so
+lib/mozilla-embedded/components/libgkplugin.so
 lib/mozilla-embedded/components/libgkview.so
 lib/mozilla-embedded/components/libhtmlpars.so
 lib/mozilla-embedded/components/libimggif.so
@@ -58,6 +60,7 @@ lib/mozilla-embedded/components/liblwbrk.so
 lib/mozilla-embedded/components/libmozbrwsr.so
 lib/mozilla-embedded/components/libnecko.so
 lib/mozilla-embedded/components/libnecko2.so
+lib/mozilla-embedded/components/libnkcache.so
 lib/mozilla-embedded/components/libnsappshell.so
 lib/mozilla-embedded/components/libnslocale.so
 lib/mozilla-embedded/components/libpipboot.so
@@ -99,11 +102,10 @@ lib/mozilla-embedded/components/necko_strconv.xpt
 lib/mozilla-embedded/components/pipboot.xpt
 lib/mozilla-embedded/components/pipnss.xpt
 lib/mozilla-embedded/components/pippki.xpt
-lib/mozilla-embedded/components/pref.xpt
+lib/mozilla-embedded/components/plugin.xpt
 lib/mozilla-embedded/components/profile.xpt
 lib/mozilla-embedded/components/rdf.xpt
 lib/mozilla-embedded/components/shistory.xpt
-lib/mozilla-embedded/components/txtsvc.xpt
 lib/mozilla-embedded/components/uconv.xpt
 lib/mozilla-embedded/components/unicharutil.xpt
 lib/mozilla-embedded/components/uriloader.xpt
@@ -120,7 +122,6 @@ lib/mozilla-embedded/components/xpcom_xpti.xpt
 lib/mozilla-embedded/components/xpconnect.xpt
 lib/mozilla-embedded/components/xpti.dat
 lib/mozilla-embedded/defaults/pref/all.js
-lib/mozilla-embedded/defaults/pref/initpref.js
 lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/libgkgfx.so
@@ -144,7 +145,6 @@ lib/mozilla-embedded/res/arrowd.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
 lib/mozilla-embedded/res/charsetData.properties
 lib/mozilla-embedded/res/charsetalias.properties
 lib/mozilla-embedded/res/dtd/mathml.dtd
@@ -154,6 +154,7 @@ lib/mozilla-embedded/res/entityTables/html40Latin1.properties
 lib/mozilla-embedded/res/entityTables/html40Special.properties
 lib/mozilla-embedded/res/entityTables/html40Symbols.properties
 lib/mozilla-embedded/res/entityTables/htmlEntityVersions.properties
+lib/mozilla-embedded/res/entityTables/mathml20.properties
 lib/mozilla-embedded/res/entityTables/transliterate.properties
 lib/mozilla-embedded/res/fonts/mathfont.properties
 lib/mozilla-embedded/res/fonts/mathfontCMEX10.properties
@@ -187,6 +188,8 @@ lib/mozilla-embedded/run-mozilla.sh
 @dirrm lib/mozilla-embedded/components
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator/content
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/messenger/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/messenger
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator/content
 @dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator
 @dirrm lib/mozilla-embedded/chrome/overlayinfo
diff --git a/www/mozilla-headers-devel/pkg-plist b/www/mozilla-headers-devel/pkg-plist
index 3a2caff9ac3b..2660c51e457d 100644
--- a/www/mozilla-headers-devel/pkg-plist
+++ b/www/mozilla-headers-devel/pkg-plist
@@ -10,13 +10,23 @@ include/mozilla/absyncsvc/nsIAbSyncMojo.h
 include/mozilla/absyncsvc/nsIAbSyncPostEngine.h
 include/mozilla/absyncsvc/nsIAbSyncPostListener.h
 include/mozilla/absyncsvc/nsSyncDecoderRing.h
+include/mozilla/accessibility/nsAccessibleEventData.h
 include/mozilla/accessibility/nsIAccessibilityService.h
 include/mozilla/accessibility/nsIAccessible.h
+include/mozilla/accessibility/nsIAccessibleAction.h
+include/mozilla/accessibility/nsIAccessibleCaret.h
 include/mozilla/accessibility/nsIAccessibleDocument.h
+include/mozilla/accessibility/nsIAccessibleEditableText.h
 include/mozilla/accessibility/nsIAccessibleEventListener.h
 include/mozilla/accessibility/nsIAccessibleEventReceiver.h
+include/mozilla/accessibility/nsIAccessibleHyperLink.h
+include/mozilla/accessibility/nsIAccessibleHyperText.h
 include/mozilla/accessibility/nsIAccessibleProvider.h
 include/mozilla/accessibility/nsIAccessibleSelectable.h
+include/mozilla/accessibility/nsIAccessibleTable.h
+include/mozilla/accessibility/nsIAccessibleText.h
+include/mozilla/accessibility/nsIAccessibleValue.h
+include/mozilla/accessibility/nsIAccessibleWin32Object.h
 include/mozilla/accessibility/nsRootAccessible.h
 include/mozilla/addrbook/nsAbAddressCollecter.h
 include/mozilla/addrbook/nsAbAutoCompleteSession.h
@@ -88,7 +98,6 @@ include/mozilla/appcomps/nsIAutoCompleteResults.h
 include/mozilla/appcomps/nsIAutoCompleteSession.h
 include/mozilla/appcomps/nsIBookmarksService.h
 include/mozilla/appcomps/nsIBrowserHistory.h
-include/mozilla/appcomps/nsIFindComponent.h
 include/mozilla/appcomps/nsIFindService.h
 include/mozilla/appcomps/nsIGlobalHistory.h
 include/mozilla/appcomps/nsIHTTPIndex.h
@@ -99,6 +108,7 @@ include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
 include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
+include/mozilla/appcomps/nsIWindowDataSource.h
 include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
@@ -111,6 +121,7 @@ include/mozilla/appshell/nsITimingService.h
 include/mozilla/appshell/nsIUserInfo.h
 include/mozilla/appshell/nsIWebShellWindow.h
 include/mozilla/appshell/nsIWindowMediator.h
+include/mozilla/appshell/nsIWindowMediatorListener.h
 include/mozilla/appshell/nsIXULWindow.h
 include/mozilla/autoconfig/nsIAutoConfig.h
 include/mozilla/autoconfig/nsILDAPSyncQuery.h
@@ -151,6 +162,7 @@ include/mozilla/commandhandler/nsIControllerCommand.h
 include/mozilla/commandhandler/nsIControllerCommandManager.h
 include/mozilla/commandhandler/nsPICommandUpdater.h
 include/mozilla/composer/nsIEditingSession.h
+include/mozilla/content/mozISanitizingSerializer.h
 include/mozilla/content/nsBidiUtils.h
 include/mozilla/content/nsCSSAtomList.h
 include/mozilla/content/nsCSSAtoms.h
@@ -195,6 +207,7 @@ include/mozilla/content/nsIDocument.h
 include/mozilla/content/nsIDocumentContainer.h
 include/mozilla/content/nsIDocumentEncoder.h
 include/mozilla/content/nsIDocumentObserver.h
+include/mozilla/content/nsIDocumentTransformer.h
 include/mozilla/content/nsIDocumentViewer.h
 include/mozilla/content/nsIDragDropHandler.h
 include/mozilla/content/nsIDragDropOverride.h
@@ -204,7 +217,9 @@ include/mozilla/content/nsIEventStateManager.h
 include/mozilla/content/nsIForm.h
 include/mozilla/content/nsIFormControl.h
 include/mozilla/content/nsIFormSubmission.h
+include/mozilla/content/nsIFrameLoader.h
 include/mozilla/content/nsIHTMLCSSStyleSheet.h
+include/mozilla/content/nsIHTMLContent.h
 include/mozilla/content/nsIHTMLContentContainer.h
 include/mozilla/content/nsIHTMLDocument.h
 include/mozilla/content/nsIHTMLTableCellElement.h
@@ -226,6 +241,7 @@ include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRadioControlElement.h
+include/mozilla/content/nsIRadioGroupContainer.h
 include/mozilla/content/nsIRadioVisitor.h
 include/mozilla/content/nsIRangeUtils.h
 include/mozilla/content/nsISVGAttribute.h
@@ -249,6 +265,8 @@ include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextAreaElement.h
 include/mozilla/content/nsITextContent.h
 include/mozilla/content/nsITextControlElement.h
+include/mozilla/content/nsITransformMediator.h
+include/mozilla/content/nsITransformObserver.h
 include/mozilla/content/nsIWyciwygChannel.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
@@ -270,14 +288,13 @@ include/mozilla/content/nsSVGAtomList.h
 include/mozilla/content/nsSVGAtoms.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
+include/mozilla/content/nsStyleStructList.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
 include/mozilla/content/nsXBLAtomList.h
 include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
-include/mozilla/content_xsl/nsIDocumentTransformer.h
-include/mozilla/content_xsl/nsITransformMediator.h
 include/mozilla/cookie/nsCCookie.h
 include/mozilla/cookie/nsCCookieManager.h
 include/mozilla/cookie/nsCookieHTTPNotify.h
@@ -334,6 +351,7 @@ include/mozilla/dom/nsIDOMCSSStyleRule.h
 include/mozilla/dom/nsIDOMCSSStyleSheet.h
 include/mozilla/dom/nsIDOMCSSUnknownRule.h
 include/mozilla/dom/nsIDOMCSSValue.h
+include/mozilla/dom/nsIDOMCSSValueList.h
 include/mozilla/dom/nsIDOMCharacterData.h
 include/mozilla/dom/nsIDOMChromeWindow.h
 include/mozilla/dom/nsIDOMClassInfo.h
@@ -589,6 +607,7 @@ include/mozilla/editor/nsIURIRefObject.h
 include/mozilla/editor/nsPIEditorTransaction.h
 include/mozilla/embed_base/nsEmbedAPI.h
 include/mozilla/embed_base/nsIWindowCreator.h
+include/mozilla/embed_base/nsIWindowCreator2.h
 include/mozilla/embedcomponents/nsIAppStartupNotifier.h
 include/mozilla/expat/xmlparse.h
 include/mozilla/exthandler/nsCExternalHandlerService.h
@@ -628,7 +647,9 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSession.h
 include/mozilla/gfx/nsIPrintSettings.h
+include/mozilla/gfx/nsIPrintSettingsService.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -724,12 +745,6 @@ include/mozilla/java/jri.h
 include/mozilla/java/jri_md.h
 include/mozilla/java/jriext.h
 include/mozilla/java/jritypes.h
-include/mozilla/java/jsjava.h
-include/mozilla/java/netscape_javascript_JSException.h
-include/mozilla/java/netscape_javascript_JSObject.h
-include/mozilla/java/nsILiveconnect.h
-include/mozilla/java/nsISecureLiveconnect.h
-include/mozilla/java/nsISecurityContext.h
 include/mozilla/java/nspr_md.h
 include/mozilla/java/oobj.h
 include/mozilla/java/sysmacros_md.h
@@ -788,6 +803,7 @@ include/mozilla/jsurl/nsJSProtocolHandler.h
 include/mozilla/layout/nsBidi.h
 include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
+include/mozilla/layout/nsCompatibility.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
 include/mozilla/layout/nsGrid.h
@@ -815,18 +831,16 @@ include/mozilla/layout/nsIComboboxControlFrame.h
 include/mozilla/layout/nsIEditorBoxObject.h
 include/mozilla/layout/nsIFocusTracker.h
 include/mozilla/layout/nsIFormControlFrame.h
-include/mozilla/layout/nsIFormManager.h
 include/mozilla/layout/nsIFormProcessor.h
 include/mozilla/layout/nsIFormSubmitObserver.h
 include/mozilla/layout/nsIFrame.h
+include/mozilla/layout/nsIFrameFrame.h
 include/mozilla/layout/nsIFrameDebug.h
 include/mozilla/layout/nsIFrameManager.h
 include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
-include/mozilla/layout/nsIGfxTextControlFrame.h
 include/mozilla/layout/nsIGridPart.h
-include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
 include/mozilla/layout/nsIImageControlFrame.h
@@ -867,6 +881,7 @@ include/mozilla/layout/nsITextFrame.h
 include/mozilla/layout/nsITreeBoxObject.h
 include/mozilla/layout/nsITreeColFrame.h
 include/mozilla/layout/nsITreeContentView.h
+include/mozilla/layout/nsITextControlFrame.h
 include/mozilla/layout/nsITreeSelection.h
 include/mozilla/layout/nsITreeView.h
 include/mozilla/layout/nsLayoutCID.h
@@ -926,6 +941,12 @@ 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/liveconnect/jsjava.h
+include/mozilla/liveconnect/netscape_javascript_JSException.h
+include/mozilla/liveconnect/netscape_javascript_JSObject.h
+include/mozilla/liveconnect/nsILiveconnect.h
+include/mozilla/liveconnect/nsISecureLiveconnect.h
+include/mozilla/liveconnect/nsISecurityContext.h
 include/mozilla/locale/nsCollation.h
 include/mozilla/locale/nsCollationCID.h
 include/mozilla/locale/nsDateTimeFormatCID.h
@@ -938,6 +959,7 @@ include/mozilla/locale/nsILanguageAtom.h
 include/mozilla/locale/nsILanguageAtomService.h
 include/mozilla/locale/nsILocale.h
 include/mozilla/locale/nsILocaleService.h
+include/mozilla/locale/nsIMacLocale.h
 include/mozilla/locale/nsIOS2Locale.h
 include/mozilla/locale/nsIPosixLocale.h
 include/mozilla/locale/nsIScriptableDateFormat.h
@@ -999,6 +1021,7 @@ include/mozilla/mng/libmng_types.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
+include/mozilla/mozldap/nsILDAPBERValue.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -1008,8 +1031,6 @@ include/mozilla/mozldap/nsILDAPServer.h
 include/mozilla/mozldap/nsILDAPService.h
 include/mozilla/mozldap/nsILDAPURL.h
 include/mozilla/mozldap/nsLDAP.h
-include/mozilla/mozxfer/nsIStreamTransfer.h
-include/mozilla/mozxfer/nsIStreamTransferOperation.h
 include/mozilla/mpfilelocprovider/nsMPFileLocProvider.h
 include/mozilla/msgbase/msgCore.h
 include/mozilla/msgbase/nsCopyMessageStreamListener.h
@@ -1273,6 +1294,8 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsEncryptedSMIMEURIsService.h
+include/mozilla/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
 include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
 include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
 include/mozilla/msgsmime/nsISMimeJSHelper.h
@@ -1389,7 +1412,6 @@ include/mozilla/nkcache/nsICacheVisitor.h
 include/mozilla/nsBuildID.h
 include/mozilla/nspr/md/_aix.h
 include/mozilla/nspr/md/_aix32.cfg
-include/mozilla/nspr/md/_aix32in6.cfg
 include/mozilla/nspr/md/_aix64.cfg
 include/mozilla/nspr/md/_beos.cfg
 include/mozilla/nspr/md/_beos.h
@@ -1589,6 +1611,7 @@ include/mozilla/plugin/nsIWindowlessPlugInstPeer.h
 include/mozilla/plugin/nsPIPluginHost.h
 include/mozilla/plugin/nsPluginError.h
 include/mozilla/plugin/nsPluginLogging.h
+include/mozilla/plugin/nsPluginViewer.h
 include/mozilla/plugin/nsPluginsCID.h
 include/mozilla/plugin/nsplugin.h
 include/mozilla/plugin/nsplugindefs.h
@@ -1677,7 +1700,6 @@ include/mozilla/txmgr/nsITransactionList.h
 include/mozilla/txmgr/nsITransactionListener.h
 include/mozilla/txmgr/nsITransactionManager.h
 include/mozilla/txmgr/nsTransactionManagerCID.h
-include/mozilla/txtsvc/nsIFindAndReplace.h
 include/mozilla/txtsvc/nsISpellChecker.h
 include/mozilla/txtsvc/nsITextService.h
 include/mozilla/txtsvc/nsITextServicesDocument.h
@@ -1754,6 +1776,8 @@ include/mozilla/webbrwsr/nsICommandHandler.h
 include/mozilla/webbrwsr/nsIContextMenuListener.h
 include/mozilla/webbrwsr/nsIEmbeddingSiteWindow.h
 include/mozilla/webbrwsr/nsIEmbeddingSiteWindow2.h
+include/mozilla/webbrwsr/nsIPrintingPrompt.h
+include/mozilla/webbrwsr/nsIPrintingPromptService.h
 include/mozilla/webbrwsr/nsITooltipListener.h
 include/mozilla/webbrwsr/nsITooltipTextProvider.h
 include/mozilla/webbrwsr/nsIWebBrowser.h
@@ -1901,11 +1925,11 @@ include/mozilla/xpcom/nsIBinaryInputStream.h
 include/mozilla/xpcom/nsIBinaryOutputStream.h
 include/mozilla/xpcom/nsIByteArrayInputStream.h
 include/mozilla/xpcom/nsIByteBuffer.h
-include/mozilla/xpcom/nsICategoryHandler.h
 include/mozilla/xpcom/nsICategoryManager.h
 include/mozilla/xpcom/nsIClassInfo.h
 include/mozilla/xpcom/nsICollection.h
 include/mozilla/xpcom/nsIComponentLoader.h
+include/mozilla/xpcom/nsIComponentLoaderManager.h
 include/mozilla/xpcom/nsIComponentManager.h
 include/mozilla/xpcom/nsIComponentManagerObsolete.h
 include/mozilla/xpcom/nsIComponentRegistrar.h
@@ -1954,6 +1978,7 @@ include/mozilla/xpcom/nsIProperties.h
 include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
+include/mozilla/xpcom/nsIRecyclingAllocator.h
 include/mozilla/xpcom/nsIRegistry.h
 include/mozilla/xpcom/nsIRegistryUtils.h
 include/mozilla/xpcom/nsIRunnable.h
@@ -2000,6 +2025,7 @@ include/mozilla/xpcom/nsObsoleteModuleLoading.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
+include/mozilla/xpcom/nsProxyRelease.h
 include/mozilla/xpcom/nsQuickSort.h
 include/mozilla/xpcom/nsRecyclingAllocator.h
 include/mozilla/xpcom/nsScriptableInputStream.h
@@ -2022,6 +2048,7 @@ include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
 include/mozilla/xpcom/nsXPCOM.h
+include/mozilla/xpcom/nsXPCOMGlue.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
 include/mozilla/xpcom/nsrootidl.h
@@ -2140,7 +2167,6 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/msgbaseutil
 @dirrm include/mozilla/msgbase
 @dirrm include/mozilla/mpfilelocprovider
-@dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mng
@@ -2150,6 +2176,7 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/mailnews
 @dirrm include/mozilla/lwbrk
 @dirrm include/mozilla/locale
+@dirrm include/mozilla/liveconnect
 @dirrm include/mozilla/libreg
 @dirrm include/mozilla/libart_lgpl
 @dirrm include/mozilla/layout
@@ -2182,7 +2209,6 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/docshell
 @dirrm include/mozilla/dbm
 @dirrm include/mozilla/cookie
-@dirrm include/mozilla/content_xsl
 @dirrm include/mozilla/content
 @dirrm include/mozilla/composer
 @dirrm include/mozilla/commandhandler
diff --git a/www/mozilla-headers-vendor/pkg-plist b/www/mozilla-headers-vendor/pkg-plist
index 3a2caff9ac3b..2660c51e457d 100644
--- a/www/mozilla-headers-vendor/pkg-plist
+++ b/www/mozilla-headers-vendor/pkg-plist
@@ -10,13 +10,23 @@ include/mozilla/absyncsvc/nsIAbSyncMojo.h
 include/mozilla/absyncsvc/nsIAbSyncPostEngine.h
 include/mozilla/absyncsvc/nsIAbSyncPostListener.h
 include/mozilla/absyncsvc/nsSyncDecoderRing.h
+include/mozilla/accessibility/nsAccessibleEventData.h
 include/mozilla/accessibility/nsIAccessibilityService.h
 include/mozilla/accessibility/nsIAccessible.h
+include/mozilla/accessibility/nsIAccessibleAction.h
+include/mozilla/accessibility/nsIAccessibleCaret.h
 include/mozilla/accessibility/nsIAccessibleDocument.h
+include/mozilla/accessibility/nsIAccessibleEditableText.h
 include/mozilla/accessibility/nsIAccessibleEventListener.h
 include/mozilla/accessibility/nsIAccessibleEventReceiver.h
+include/mozilla/accessibility/nsIAccessibleHyperLink.h
+include/mozilla/accessibility/nsIAccessibleHyperText.h
 include/mozilla/accessibility/nsIAccessibleProvider.h
 include/mozilla/accessibility/nsIAccessibleSelectable.h
+include/mozilla/accessibility/nsIAccessibleTable.h
+include/mozilla/accessibility/nsIAccessibleText.h
+include/mozilla/accessibility/nsIAccessibleValue.h
+include/mozilla/accessibility/nsIAccessibleWin32Object.h
 include/mozilla/accessibility/nsRootAccessible.h
 include/mozilla/addrbook/nsAbAddressCollecter.h
 include/mozilla/addrbook/nsAbAutoCompleteSession.h
@@ -88,7 +98,6 @@ include/mozilla/appcomps/nsIAutoCompleteResults.h
 include/mozilla/appcomps/nsIAutoCompleteSession.h
 include/mozilla/appcomps/nsIBookmarksService.h
 include/mozilla/appcomps/nsIBrowserHistory.h
-include/mozilla/appcomps/nsIFindComponent.h
 include/mozilla/appcomps/nsIFindService.h
 include/mozilla/appcomps/nsIGlobalHistory.h
 include/mozilla/appcomps/nsIHTTPIndex.h
@@ -99,6 +108,7 @@ include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
 include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
+include/mozilla/appcomps/nsIWindowDataSource.h
 include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
@@ -111,6 +121,7 @@ include/mozilla/appshell/nsITimingService.h
 include/mozilla/appshell/nsIUserInfo.h
 include/mozilla/appshell/nsIWebShellWindow.h
 include/mozilla/appshell/nsIWindowMediator.h
+include/mozilla/appshell/nsIWindowMediatorListener.h
 include/mozilla/appshell/nsIXULWindow.h
 include/mozilla/autoconfig/nsIAutoConfig.h
 include/mozilla/autoconfig/nsILDAPSyncQuery.h
@@ -151,6 +162,7 @@ include/mozilla/commandhandler/nsIControllerCommand.h
 include/mozilla/commandhandler/nsIControllerCommandManager.h
 include/mozilla/commandhandler/nsPICommandUpdater.h
 include/mozilla/composer/nsIEditingSession.h
+include/mozilla/content/mozISanitizingSerializer.h
 include/mozilla/content/nsBidiUtils.h
 include/mozilla/content/nsCSSAtomList.h
 include/mozilla/content/nsCSSAtoms.h
@@ -195,6 +207,7 @@ include/mozilla/content/nsIDocument.h
 include/mozilla/content/nsIDocumentContainer.h
 include/mozilla/content/nsIDocumentEncoder.h
 include/mozilla/content/nsIDocumentObserver.h
+include/mozilla/content/nsIDocumentTransformer.h
 include/mozilla/content/nsIDocumentViewer.h
 include/mozilla/content/nsIDragDropHandler.h
 include/mozilla/content/nsIDragDropOverride.h
@@ -204,7 +217,9 @@ include/mozilla/content/nsIEventStateManager.h
 include/mozilla/content/nsIForm.h
 include/mozilla/content/nsIFormControl.h
 include/mozilla/content/nsIFormSubmission.h
+include/mozilla/content/nsIFrameLoader.h
 include/mozilla/content/nsIHTMLCSSStyleSheet.h
+include/mozilla/content/nsIHTMLContent.h
 include/mozilla/content/nsIHTMLContentContainer.h
 include/mozilla/content/nsIHTMLDocument.h
 include/mozilla/content/nsIHTMLTableCellElement.h
@@ -226,6 +241,7 @@ include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRadioControlElement.h
+include/mozilla/content/nsIRadioGroupContainer.h
 include/mozilla/content/nsIRadioVisitor.h
 include/mozilla/content/nsIRangeUtils.h
 include/mozilla/content/nsISVGAttribute.h
@@ -249,6 +265,8 @@ include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextAreaElement.h
 include/mozilla/content/nsITextContent.h
 include/mozilla/content/nsITextControlElement.h
+include/mozilla/content/nsITransformMediator.h
+include/mozilla/content/nsITransformObserver.h
 include/mozilla/content/nsIWyciwygChannel.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
@@ -270,14 +288,13 @@ include/mozilla/content/nsSVGAtomList.h
 include/mozilla/content/nsSVGAtoms.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
+include/mozilla/content/nsStyleStructList.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
 include/mozilla/content/nsXBLAtomList.h
 include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
-include/mozilla/content_xsl/nsIDocumentTransformer.h
-include/mozilla/content_xsl/nsITransformMediator.h
 include/mozilla/cookie/nsCCookie.h
 include/mozilla/cookie/nsCCookieManager.h
 include/mozilla/cookie/nsCookieHTTPNotify.h
@@ -334,6 +351,7 @@ include/mozilla/dom/nsIDOMCSSStyleRule.h
 include/mozilla/dom/nsIDOMCSSStyleSheet.h
 include/mozilla/dom/nsIDOMCSSUnknownRule.h
 include/mozilla/dom/nsIDOMCSSValue.h
+include/mozilla/dom/nsIDOMCSSValueList.h
 include/mozilla/dom/nsIDOMCharacterData.h
 include/mozilla/dom/nsIDOMChromeWindow.h
 include/mozilla/dom/nsIDOMClassInfo.h
@@ -589,6 +607,7 @@ include/mozilla/editor/nsIURIRefObject.h
 include/mozilla/editor/nsPIEditorTransaction.h
 include/mozilla/embed_base/nsEmbedAPI.h
 include/mozilla/embed_base/nsIWindowCreator.h
+include/mozilla/embed_base/nsIWindowCreator2.h
 include/mozilla/embedcomponents/nsIAppStartupNotifier.h
 include/mozilla/expat/xmlparse.h
 include/mozilla/exthandler/nsCExternalHandlerService.h
@@ -628,7 +647,9 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSession.h
 include/mozilla/gfx/nsIPrintSettings.h
+include/mozilla/gfx/nsIPrintSettingsService.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -724,12 +745,6 @@ include/mozilla/java/jri.h
 include/mozilla/java/jri_md.h
 include/mozilla/java/jriext.h
 include/mozilla/java/jritypes.h
-include/mozilla/java/jsjava.h
-include/mozilla/java/netscape_javascript_JSException.h
-include/mozilla/java/netscape_javascript_JSObject.h
-include/mozilla/java/nsILiveconnect.h
-include/mozilla/java/nsISecureLiveconnect.h
-include/mozilla/java/nsISecurityContext.h
 include/mozilla/java/nspr_md.h
 include/mozilla/java/oobj.h
 include/mozilla/java/sysmacros_md.h
@@ -788,6 +803,7 @@ include/mozilla/jsurl/nsJSProtocolHandler.h
 include/mozilla/layout/nsBidi.h
 include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
+include/mozilla/layout/nsCompatibility.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
 include/mozilla/layout/nsGrid.h
@@ -815,18 +831,16 @@ include/mozilla/layout/nsIComboboxControlFrame.h
 include/mozilla/layout/nsIEditorBoxObject.h
 include/mozilla/layout/nsIFocusTracker.h
 include/mozilla/layout/nsIFormControlFrame.h
-include/mozilla/layout/nsIFormManager.h
 include/mozilla/layout/nsIFormProcessor.h
 include/mozilla/layout/nsIFormSubmitObserver.h
 include/mozilla/layout/nsIFrame.h
+include/mozilla/layout/nsIFrameFrame.h
 include/mozilla/layout/nsIFrameDebug.h
 include/mozilla/layout/nsIFrameManager.h
 include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
-include/mozilla/layout/nsIGfxTextControlFrame.h
 include/mozilla/layout/nsIGridPart.h
-include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
 include/mozilla/layout/nsIImageControlFrame.h
@@ -867,6 +881,7 @@ include/mozilla/layout/nsITextFrame.h
 include/mozilla/layout/nsITreeBoxObject.h
 include/mozilla/layout/nsITreeColFrame.h
 include/mozilla/layout/nsITreeContentView.h
+include/mozilla/layout/nsITextControlFrame.h
 include/mozilla/layout/nsITreeSelection.h
 include/mozilla/layout/nsITreeView.h
 include/mozilla/layout/nsLayoutCID.h
@@ -926,6 +941,12 @@ 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/liveconnect/jsjava.h
+include/mozilla/liveconnect/netscape_javascript_JSException.h
+include/mozilla/liveconnect/netscape_javascript_JSObject.h
+include/mozilla/liveconnect/nsILiveconnect.h
+include/mozilla/liveconnect/nsISecureLiveconnect.h
+include/mozilla/liveconnect/nsISecurityContext.h
 include/mozilla/locale/nsCollation.h
 include/mozilla/locale/nsCollationCID.h
 include/mozilla/locale/nsDateTimeFormatCID.h
@@ -938,6 +959,7 @@ include/mozilla/locale/nsILanguageAtom.h
 include/mozilla/locale/nsILanguageAtomService.h
 include/mozilla/locale/nsILocale.h
 include/mozilla/locale/nsILocaleService.h
+include/mozilla/locale/nsIMacLocale.h
 include/mozilla/locale/nsIOS2Locale.h
 include/mozilla/locale/nsIPosixLocale.h
 include/mozilla/locale/nsIScriptableDateFormat.h
@@ -999,6 +1021,7 @@ include/mozilla/mng/libmng_types.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
+include/mozilla/mozldap/nsILDAPBERValue.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -1008,8 +1031,6 @@ include/mozilla/mozldap/nsILDAPServer.h
 include/mozilla/mozldap/nsILDAPService.h
 include/mozilla/mozldap/nsILDAPURL.h
 include/mozilla/mozldap/nsLDAP.h
-include/mozilla/mozxfer/nsIStreamTransfer.h
-include/mozilla/mozxfer/nsIStreamTransferOperation.h
 include/mozilla/mpfilelocprovider/nsMPFileLocProvider.h
 include/mozilla/msgbase/msgCore.h
 include/mozilla/msgbase/nsCopyMessageStreamListener.h
@@ -1273,6 +1294,8 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsEncryptedSMIMEURIsService.h
+include/mozilla/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
 include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
 include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
 include/mozilla/msgsmime/nsISMimeJSHelper.h
@@ -1389,7 +1412,6 @@ include/mozilla/nkcache/nsICacheVisitor.h
 include/mozilla/nsBuildID.h
 include/mozilla/nspr/md/_aix.h
 include/mozilla/nspr/md/_aix32.cfg
-include/mozilla/nspr/md/_aix32in6.cfg
 include/mozilla/nspr/md/_aix64.cfg
 include/mozilla/nspr/md/_beos.cfg
 include/mozilla/nspr/md/_beos.h
@@ -1589,6 +1611,7 @@ include/mozilla/plugin/nsIWindowlessPlugInstPeer.h
 include/mozilla/plugin/nsPIPluginHost.h
 include/mozilla/plugin/nsPluginError.h
 include/mozilla/plugin/nsPluginLogging.h
+include/mozilla/plugin/nsPluginViewer.h
 include/mozilla/plugin/nsPluginsCID.h
 include/mozilla/plugin/nsplugin.h
 include/mozilla/plugin/nsplugindefs.h
@@ -1677,7 +1700,6 @@ include/mozilla/txmgr/nsITransactionList.h
 include/mozilla/txmgr/nsITransactionListener.h
 include/mozilla/txmgr/nsITransactionManager.h
 include/mozilla/txmgr/nsTransactionManagerCID.h
-include/mozilla/txtsvc/nsIFindAndReplace.h
 include/mozilla/txtsvc/nsISpellChecker.h
 include/mozilla/txtsvc/nsITextService.h
 include/mozilla/txtsvc/nsITextServicesDocument.h
@@ -1754,6 +1776,8 @@ include/mozilla/webbrwsr/nsICommandHandler.h
 include/mozilla/webbrwsr/nsIContextMenuListener.h
 include/mozilla/webbrwsr/nsIEmbeddingSiteWindow.h
 include/mozilla/webbrwsr/nsIEmbeddingSiteWindow2.h
+include/mozilla/webbrwsr/nsIPrintingPrompt.h
+include/mozilla/webbrwsr/nsIPrintingPromptService.h
 include/mozilla/webbrwsr/nsITooltipListener.h
 include/mozilla/webbrwsr/nsITooltipTextProvider.h
 include/mozilla/webbrwsr/nsIWebBrowser.h
@@ -1901,11 +1925,11 @@ include/mozilla/xpcom/nsIBinaryInputStream.h
 include/mozilla/xpcom/nsIBinaryOutputStream.h
 include/mozilla/xpcom/nsIByteArrayInputStream.h
 include/mozilla/xpcom/nsIByteBuffer.h
-include/mozilla/xpcom/nsICategoryHandler.h
 include/mozilla/xpcom/nsICategoryManager.h
 include/mozilla/xpcom/nsIClassInfo.h
 include/mozilla/xpcom/nsICollection.h
 include/mozilla/xpcom/nsIComponentLoader.h
+include/mozilla/xpcom/nsIComponentLoaderManager.h
 include/mozilla/xpcom/nsIComponentManager.h
 include/mozilla/xpcom/nsIComponentManagerObsolete.h
 include/mozilla/xpcom/nsIComponentRegistrar.h
@@ -1954,6 +1978,7 @@ include/mozilla/xpcom/nsIProperties.h
 include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
+include/mozilla/xpcom/nsIRecyclingAllocator.h
 include/mozilla/xpcom/nsIRegistry.h
 include/mozilla/xpcom/nsIRegistryUtils.h
 include/mozilla/xpcom/nsIRunnable.h
@@ -2000,6 +2025,7 @@ include/mozilla/xpcom/nsObsoleteModuleLoading.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
+include/mozilla/xpcom/nsProxyRelease.h
 include/mozilla/xpcom/nsQuickSort.h
 include/mozilla/xpcom/nsRecyclingAllocator.h
 include/mozilla/xpcom/nsScriptableInputStream.h
@@ -2022,6 +2048,7 @@ include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
 include/mozilla/xpcom/nsXPCOM.h
+include/mozilla/xpcom/nsXPCOMGlue.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
 include/mozilla/xpcom/nsrootidl.h
@@ -2140,7 +2167,6 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/msgbaseutil
 @dirrm include/mozilla/msgbase
 @dirrm include/mozilla/mpfilelocprovider
-@dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mng
@@ -2150,6 +2176,7 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/mailnews
 @dirrm include/mozilla/lwbrk
 @dirrm include/mozilla/locale
+@dirrm include/mozilla/liveconnect
 @dirrm include/mozilla/libreg
 @dirrm include/mozilla/libart_lgpl
 @dirrm include/mozilla/layout
@@ -2182,7 +2209,6 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/docshell
 @dirrm include/mozilla/dbm
 @dirrm include/mozilla/cookie
-@dirrm include/mozilla/content_xsl
 @dirrm include/mozilla/content
 @dirrm include/mozilla/composer
 @dirrm include/mozilla/commandhandler
diff --git a/www/mozilla-headers/pkg-plist b/www/mozilla-headers/pkg-plist
index 3a2caff9ac3b..2660c51e457d 100644
--- a/www/mozilla-headers/pkg-plist
+++ b/www/mozilla-headers/pkg-plist
@@ -10,13 +10,23 @@ include/mozilla/absyncsvc/nsIAbSyncMojo.h
 include/mozilla/absyncsvc/nsIAbSyncPostEngine.h
 include/mozilla/absyncsvc/nsIAbSyncPostListener.h
 include/mozilla/absyncsvc/nsSyncDecoderRing.h
+include/mozilla/accessibility/nsAccessibleEventData.h
 include/mozilla/accessibility/nsIAccessibilityService.h
 include/mozilla/accessibility/nsIAccessible.h
+include/mozilla/accessibility/nsIAccessibleAction.h
+include/mozilla/accessibility/nsIAccessibleCaret.h
 include/mozilla/accessibility/nsIAccessibleDocument.h
+include/mozilla/accessibility/nsIAccessibleEditableText.h
 include/mozilla/accessibility/nsIAccessibleEventListener.h
 include/mozilla/accessibility/nsIAccessibleEventReceiver.h
+include/mozilla/accessibility/nsIAccessibleHyperLink.h
+include/mozilla/accessibility/nsIAccessibleHyperText.h
 include/mozilla/accessibility/nsIAccessibleProvider.h
 include/mozilla/accessibility/nsIAccessibleSelectable.h
+include/mozilla/accessibility/nsIAccessibleTable.h
+include/mozilla/accessibility/nsIAccessibleText.h
+include/mozilla/accessibility/nsIAccessibleValue.h
+include/mozilla/accessibility/nsIAccessibleWin32Object.h
 include/mozilla/accessibility/nsRootAccessible.h
 include/mozilla/addrbook/nsAbAddressCollecter.h
 include/mozilla/addrbook/nsAbAutoCompleteSession.h
@@ -88,7 +98,6 @@ include/mozilla/appcomps/nsIAutoCompleteResults.h
 include/mozilla/appcomps/nsIAutoCompleteSession.h
 include/mozilla/appcomps/nsIBookmarksService.h
 include/mozilla/appcomps/nsIBrowserHistory.h
-include/mozilla/appcomps/nsIFindComponent.h
 include/mozilla/appcomps/nsIFindService.h
 include/mozilla/appcomps/nsIGlobalHistory.h
 include/mozilla/appcomps/nsIHTTPIndex.h
@@ -99,6 +108,7 @@ include/mozilla/appcomps/nsISearchContext.h
 include/mozilla/appcomps/nsISearchService.h
 include/mozilla/appcomps/nsITimeBomb.h
 include/mozilla/appcomps/nsIUrlbarHistory.h
+include/mozilla/appcomps/nsIWindowDataSource.h
 include/mozilla/appcomps/nsTimeBomb.h
 include/mozilla/appshell/nsAppShellCIDs.h
 include/mozilla/appshell/nsIAppShellService.h
@@ -111,6 +121,7 @@ include/mozilla/appshell/nsITimingService.h
 include/mozilla/appshell/nsIUserInfo.h
 include/mozilla/appshell/nsIWebShellWindow.h
 include/mozilla/appshell/nsIWindowMediator.h
+include/mozilla/appshell/nsIWindowMediatorListener.h
 include/mozilla/appshell/nsIXULWindow.h
 include/mozilla/autoconfig/nsIAutoConfig.h
 include/mozilla/autoconfig/nsILDAPSyncQuery.h
@@ -151,6 +162,7 @@ include/mozilla/commandhandler/nsIControllerCommand.h
 include/mozilla/commandhandler/nsIControllerCommandManager.h
 include/mozilla/commandhandler/nsPICommandUpdater.h
 include/mozilla/composer/nsIEditingSession.h
+include/mozilla/content/mozISanitizingSerializer.h
 include/mozilla/content/nsBidiUtils.h
 include/mozilla/content/nsCSSAtomList.h
 include/mozilla/content/nsCSSAtoms.h
@@ -195,6 +207,7 @@ include/mozilla/content/nsIDocument.h
 include/mozilla/content/nsIDocumentContainer.h
 include/mozilla/content/nsIDocumentEncoder.h
 include/mozilla/content/nsIDocumentObserver.h
+include/mozilla/content/nsIDocumentTransformer.h
 include/mozilla/content/nsIDocumentViewer.h
 include/mozilla/content/nsIDragDropHandler.h
 include/mozilla/content/nsIDragDropOverride.h
@@ -204,7 +217,9 @@ include/mozilla/content/nsIEventStateManager.h
 include/mozilla/content/nsIForm.h
 include/mozilla/content/nsIFormControl.h
 include/mozilla/content/nsIFormSubmission.h
+include/mozilla/content/nsIFrameLoader.h
 include/mozilla/content/nsIHTMLCSSStyleSheet.h
+include/mozilla/content/nsIHTMLContent.h
 include/mozilla/content/nsIHTMLContentContainer.h
 include/mozilla/content/nsIHTMLDocument.h
 include/mozilla/content/nsIHTMLTableCellElement.h
@@ -226,6 +241,7 @@ include/mozilla/content/nsIPrivateDOMImplementation.h
 include/mozilla/content/nsIPrivateTextEvent.h
 include/mozilla/content/nsIPrivateTextRange.h
 include/mozilla/content/nsIRadioControlElement.h
+include/mozilla/content/nsIRadioGroupContainer.h
 include/mozilla/content/nsIRadioVisitor.h
 include/mozilla/content/nsIRangeUtils.h
 include/mozilla/content/nsISVGAttribute.h
@@ -249,6 +265,8 @@ include/mozilla/content/nsIStyledContent.h
 include/mozilla/content/nsITextAreaElement.h
 include/mozilla/content/nsITextContent.h
 include/mozilla/content/nsITextControlElement.h
+include/mozilla/content/nsITransformMediator.h
+include/mozilla/content/nsITransformObserver.h
 include/mozilla/content/nsIWyciwygChannel.h
 include/mozilla/content/nsIXBLBinding.h
 include/mozilla/content/nsIXBLBindingAttachedHandler.h
@@ -270,14 +288,13 @@ include/mozilla/content/nsSVGAtomList.h
 include/mozilla/content/nsSVGAtoms.h
 include/mozilla/content/nsStyleCoord.h
 include/mozilla/content/nsStyleStruct.h
+include/mozilla/content/nsStyleStructList.h
 include/mozilla/content/nsStyleUtil.h
 include/mozilla/content/nsTextFragment.h
 include/mozilla/content/nsXBLAtomList.h
 include/mozilla/content/nsXBLAtoms.h
 include/mozilla/content/nsXULAtomList.h
 include/mozilla/content/nsXULAtoms.h
-include/mozilla/content_xsl/nsIDocumentTransformer.h
-include/mozilla/content_xsl/nsITransformMediator.h
 include/mozilla/cookie/nsCCookie.h
 include/mozilla/cookie/nsCCookieManager.h
 include/mozilla/cookie/nsCookieHTTPNotify.h
@@ -334,6 +351,7 @@ include/mozilla/dom/nsIDOMCSSStyleRule.h
 include/mozilla/dom/nsIDOMCSSStyleSheet.h
 include/mozilla/dom/nsIDOMCSSUnknownRule.h
 include/mozilla/dom/nsIDOMCSSValue.h
+include/mozilla/dom/nsIDOMCSSValueList.h
 include/mozilla/dom/nsIDOMCharacterData.h
 include/mozilla/dom/nsIDOMChromeWindow.h
 include/mozilla/dom/nsIDOMClassInfo.h
@@ -589,6 +607,7 @@ include/mozilla/editor/nsIURIRefObject.h
 include/mozilla/editor/nsPIEditorTransaction.h
 include/mozilla/embed_base/nsEmbedAPI.h
 include/mozilla/embed_base/nsIWindowCreator.h
+include/mozilla/embed_base/nsIWindowCreator2.h
 include/mozilla/embedcomponents/nsIAppStartupNotifier.h
 include/mozilla/expat/xmlparse.h
 include/mozilla/exthandler/nsCExternalHandlerService.h
@@ -628,7 +647,9 @@ include/mozilla/gfx/nsIFontMetrics.h
 include/mozilla/gfx/nsIGraphics.h
 include/mozilla/gfx/nsIImage.h
 include/mozilla/gfx/nsIPrintOptions.h
+include/mozilla/gfx/nsIPrintSession.h
 include/mozilla/gfx/nsIPrintSettings.h
+include/mozilla/gfx/nsIPrintSettingsService.h
 include/mozilla/gfx/nsIRegion.h
 include/mozilla/gfx/nsIRenderingContext.h
 include/mozilla/gfx/nsIScreen.h
@@ -724,12 +745,6 @@ include/mozilla/java/jri.h
 include/mozilla/java/jri_md.h
 include/mozilla/java/jriext.h
 include/mozilla/java/jritypes.h
-include/mozilla/java/jsjava.h
-include/mozilla/java/netscape_javascript_JSException.h
-include/mozilla/java/netscape_javascript_JSObject.h
-include/mozilla/java/nsILiveconnect.h
-include/mozilla/java/nsISecureLiveconnect.h
-include/mozilla/java/nsISecurityContext.h
 include/mozilla/java/nspr_md.h
 include/mozilla/java/oobj.h
 include/mozilla/java/sysmacros_md.h
@@ -788,6 +803,7 @@ include/mozilla/jsurl/nsJSProtocolHandler.h
 include/mozilla/layout/nsBidi.h
 include/mozilla/layout/nsBidiFrames.h
 include/mozilla/layout/nsBidiPresUtils.h
+include/mozilla/layout/nsCompatibility.h
 include/mozilla/layout/nsFrameList.h
 include/mozilla/layout/nsFrameTraversal.h
 include/mozilla/layout/nsGrid.h
@@ -815,18 +831,16 @@ include/mozilla/layout/nsIComboboxControlFrame.h
 include/mozilla/layout/nsIEditorBoxObject.h
 include/mozilla/layout/nsIFocusTracker.h
 include/mozilla/layout/nsIFormControlFrame.h
-include/mozilla/layout/nsIFormManager.h
 include/mozilla/layout/nsIFormProcessor.h
 include/mozilla/layout/nsIFormSubmitObserver.h
 include/mozilla/layout/nsIFrame.h
+include/mozilla/layout/nsIFrameFrame.h
 include/mozilla/layout/nsIFrameDebug.h
 include/mozilla/layout/nsIFrameManager.h
 include/mozilla/layout/nsIFrameSelection.h
 include/mozilla/layout/nsIFrameTraversal.h
 include/mozilla/layout/nsIFrameUtil.h
-include/mozilla/layout/nsIGfxTextControlFrame.h
 include/mozilla/layout/nsIGridPart.h
-include/mozilla/layout/nsIHTMLContent.h
 include/mozilla/layout/nsIHTMLStyleSheet.h
 include/mozilla/layout/nsIIFrameBoxObject.h
 include/mozilla/layout/nsIImageControlFrame.h
@@ -867,6 +881,7 @@ include/mozilla/layout/nsITextFrame.h
 include/mozilla/layout/nsITreeBoxObject.h
 include/mozilla/layout/nsITreeColFrame.h
 include/mozilla/layout/nsITreeContentView.h
+include/mozilla/layout/nsITextControlFrame.h
 include/mozilla/layout/nsITreeSelection.h
 include/mozilla/layout/nsITreeView.h
 include/mozilla/layout/nsLayoutCID.h
@@ -926,6 +941,12 @@ 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/liveconnect/jsjava.h
+include/mozilla/liveconnect/netscape_javascript_JSException.h
+include/mozilla/liveconnect/netscape_javascript_JSObject.h
+include/mozilla/liveconnect/nsILiveconnect.h
+include/mozilla/liveconnect/nsISecureLiveconnect.h
+include/mozilla/liveconnect/nsISecurityContext.h
 include/mozilla/locale/nsCollation.h
 include/mozilla/locale/nsCollationCID.h
 include/mozilla/locale/nsDateTimeFormatCID.h
@@ -938,6 +959,7 @@ include/mozilla/locale/nsILanguageAtom.h
 include/mozilla/locale/nsILanguageAtomService.h
 include/mozilla/locale/nsILocale.h
 include/mozilla/locale/nsILocaleService.h
+include/mozilla/locale/nsIMacLocale.h
 include/mozilla/locale/nsIOS2Locale.h
 include/mozilla/locale/nsIPosixLocale.h
 include/mozilla/locale/nsIScriptableDateFormat.h
@@ -999,6 +1021,7 @@ include/mozilla/mng/libmng_types.h
 include/mozilla/mork/mdb.h
 include/mozilla/mork/nsIMdbFactoryFactory.h
 include/mozilla/mork/nsMorkCID.h
+include/mozilla/mozldap/nsILDAPBERValue.h
 include/mozilla/mozldap/nsILDAPConnection.h
 include/mozilla/mozldap/nsILDAPErrors.h
 include/mozilla/mozldap/nsILDAPMessage.h
@@ -1008,8 +1031,6 @@ include/mozilla/mozldap/nsILDAPServer.h
 include/mozilla/mozldap/nsILDAPService.h
 include/mozilla/mozldap/nsILDAPURL.h
 include/mozilla/mozldap/nsLDAP.h
-include/mozilla/mozxfer/nsIStreamTransfer.h
-include/mozilla/mozxfer/nsIStreamTransferOperation.h
 include/mozilla/mpfilelocprovider/nsMPFileLocProvider.h
 include/mozilla/msgbase/msgCore.h
 include/mozilla/msgbase/nsCopyMessageStreamListener.h
@@ -1273,6 +1294,8 @@ include/mozilla/msgnews/nsNewsUtils.h
 include/mozilla/msgnews/nsNntpIncomingServer.h
 include/mozilla/msgnews/nsNntpService.h
 include/mozilla/msgnews/nsNntpUrl.h
+include/mozilla/msgsmime/nsEncryptedSMIMEURIsService.h
+include/mozilla/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
 include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
 include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
 include/mozilla/msgsmime/nsISMimeJSHelper.h
@@ -1389,7 +1412,6 @@ include/mozilla/nkcache/nsICacheVisitor.h
 include/mozilla/nsBuildID.h
 include/mozilla/nspr/md/_aix.h
 include/mozilla/nspr/md/_aix32.cfg
-include/mozilla/nspr/md/_aix32in6.cfg
 include/mozilla/nspr/md/_aix64.cfg
 include/mozilla/nspr/md/_beos.cfg
 include/mozilla/nspr/md/_beos.h
@@ -1589,6 +1611,7 @@ include/mozilla/plugin/nsIWindowlessPlugInstPeer.h
 include/mozilla/plugin/nsPIPluginHost.h
 include/mozilla/plugin/nsPluginError.h
 include/mozilla/plugin/nsPluginLogging.h
+include/mozilla/plugin/nsPluginViewer.h
 include/mozilla/plugin/nsPluginsCID.h
 include/mozilla/plugin/nsplugin.h
 include/mozilla/plugin/nsplugindefs.h
@@ -1677,7 +1700,6 @@ include/mozilla/txmgr/nsITransactionList.h
 include/mozilla/txmgr/nsITransactionListener.h
 include/mozilla/txmgr/nsITransactionManager.h
 include/mozilla/txmgr/nsTransactionManagerCID.h
-include/mozilla/txtsvc/nsIFindAndReplace.h
 include/mozilla/txtsvc/nsISpellChecker.h
 include/mozilla/txtsvc/nsITextService.h
 include/mozilla/txtsvc/nsITextServicesDocument.h
@@ -1754,6 +1776,8 @@ include/mozilla/webbrwsr/nsICommandHandler.h
 include/mozilla/webbrwsr/nsIContextMenuListener.h
 include/mozilla/webbrwsr/nsIEmbeddingSiteWindow.h
 include/mozilla/webbrwsr/nsIEmbeddingSiteWindow2.h
+include/mozilla/webbrwsr/nsIPrintingPrompt.h
+include/mozilla/webbrwsr/nsIPrintingPromptService.h
 include/mozilla/webbrwsr/nsITooltipListener.h
 include/mozilla/webbrwsr/nsITooltipTextProvider.h
 include/mozilla/webbrwsr/nsIWebBrowser.h
@@ -1901,11 +1925,11 @@ include/mozilla/xpcom/nsIBinaryInputStream.h
 include/mozilla/xpcom/nsIBinaryOutputStream.h
 include/mozilla/xpcom/nsIByteArrayInputStream.h
 include/mozilla/xpcom/nsIByteBuffer.h
-include/mozilla/xpcom/nsICategoryHandler.h
 include/mozilla/xpcom/nsICategoryManager.h
 include/mozilla/xpcom/nsIClassInfo.h
 include/mozilla/xpcom/nsICollection.h
 include/mozilla/xpcom/nsIComponentLoader.h
+include/mozilla/xpcom/nsIComponentLoaderManager.h
 include/mozilla/xpcom/nsIComponentManager.h
 include/mozilla/xpcom/nsIComponentManagerObsolete.h
 include/mozilla/xpcom/nsIComponentRegistrar.h
@@ -1954,6 +1978,7 @@ include/mozilla/xpcom/nsIProperties.h
 include/mozilla/xpcom/nsIPropertyBag.h
 include/mozilla/xpcom/nsIProxyCreateInstance.h
 include/mozilla/xpcom/nsIProxyObjectManager.h
+include/mozilla/xpcom/nsIRecyclingAllocator.h
 include/mozilla/xpcom/nsIRegistry.h
 include/mozilla/xpcom/nsIRegistryUtils.h
 include/mozilla/xpcom/nsIRunnable.h
@@ -2000,6 +2025,7 @@ include/mozilla/xpcom/nsObsoleteModuleLoading.h
 include/mozilla/xpcom/nsProcess.h
 include/mozilla/xpcom/nsProxiedService.h
 include/mozilla/xpcom/nsProxyEvent.h
+include/mozilla/xpcom/nsProxyRelease.h
 include/mozilla/xpcom/nsQuickSort.h
 include/mozilla/xpcom/nsRecyclingAllocator.h
 include/mozilla/xpcom/nsScriptableInputStream.h
@@ -2022,6 +2048,7 @@ include/mozilla/xpcom/nsVoidArray.h
 include/mozilla/xpcom/nsWeakPtr.h
 include/mozilla/xpcom/nsWeakReference.h
 include/mozilla/xpcom/nsXPCOM.h
+include/mozilla/xpcom/nsXPCOMGlue.h
 include/mozilla/xpcom/nsXPComFactory.h
 include/mozilla/xpcom/nscore.h
 include/mozilla/xpcom/nsrootidl.h
@@ -2140,7 +2167,6 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/msgbaseutil
 @dirrm include/mozilla/msgbase
 @dirrm include/mozilla/mpfilelocprovider
-@dirrm include/mozilla/mozxfer
 @dirrm include/mozilla/mozldap
 @dirrm include/mozilla/mork
 @dirrm include/mozilla/mng
@@ -2150,6 +2176,7 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/mailnews
 @dirrm include/mozilla/lwbrk
 @dirrm include/mozilla/locale
+@dirrm include/mozilla/liveconnect
 @dirrm include/mozilla/libreg
 @dirrm include/mozilla/libart_lgpl
 @dirrm include/mozilla/layout
@@ -2182,7 +2209,6 @@ include/mozilla/zlib/zlib.h
 @dirrm include/mozilla/docshell
 @dirrm include/mozilla/dbm
 @dirrm include/mozilla/cookie
-@dirrm include/mozilla/content_xsl
 @dirrm include/mozilla/content
 @dirrm include/mozilla/composer
 @dirrm include/mozilla/commandhandler
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 08fc786e13f1..9bc3db95e4e5 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
-		http://people.FreeBSD.org/~sobomax/:local
+		http://people.FreeBSD.org/~marcus/:local
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
-		sobomax/:local
+		marcus/:local
 DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
 		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
 
@@ -28,9 +27,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
+#WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
-USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -114,9 +112,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
-	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
+	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \
+	  ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf)
 	${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
 
diff --git a/www/mozilla-vendor/distinfo b/www/mozilla-vendor/distinfo
index e145e2426723..9d2cce22c437 100644
--- a/www/mozilla-vendor/distinfo
+++ b/www/mozilla-vendor/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.0.tar.bz2) = 033da936e48336aa2c5d8bf0aa039056
-MD5 (libart_lgpl-1.0.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
+MD5 (mozilla-source-1.1.tar.gz) = f23ae90817506559da3bdf07fdf7c2a8
+MD5 (libart_lgpl-1.1.tar.gz) = 276f65c384d020c36003260689806735
diff --git a/www/mozilla-vendor/files/patch-Makefile.in b/www/mozilla-vendor/files/patch-Makefile.in
index f65ae1be8d13..43fa34684782 100644
--- a/www/mozilla-vendor/files/patch-Makefile.in
+++ b/www/mozilla-vendor/files/patch-Makefile.in
@@ -1,25 +1,22 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/12/25 21:00:23	1.1
-+++ Makefile.in	2001/12/26 06:40:16
-@@ -64,8 +64,7 @@
- DIRS = $(NSPRPUB_DIR) \
+--- Makefile.in.orig	Thu May 30 20:39:07 2002
++++ Makefile.in	Wed Aug 28 13:55:32 2002
+@@ -70,8 +70,7 @@
  	$(tier_0_dirs) \
  	$(tier_1_dirs) \
+ 	$(tier_2_dirs) \
 -	$(tier_9_dirs) \
 -	$(NULL)
 +	$(tier_9_dirs)
  
- ifdef MOZ_LDAP_XPCOM
- DIRS += directory/c-sdk/ldap
-@@ -81,7 +80,8 @@
+ ifdef GC_LEAK_DETECTOR
+ DIRS += gc/boehm
+@@ -90,7 +89,8 @@
  DIRS += $(tier_98_dirs)
  endif
  
 -DIRS	+= $(tier_99_dirs)
 +DIRS	+= $(tier_99_dirs) \
-+	    $(NULL)
++		$(NULL)
  
  #
  # tier 0 - base build config dirs
diff --git a/www/mozilla-vendor/files/patch-nsFontMetricsGTK.cpp b/www/mozilla-vendor/files/patch-nsFontMetricsGTK.cpp
deleted file mode 100644
index 3bab909b5a89..000000000000
--- a/www/mozilla-vendor/files/patch-nsFontMetricsGTK.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/gtk/nsFontMetricsGTK.cpp	Mon Jun 10 01:02:08 2002
-+++ gfx/src/gtk/nsFontMetricsGTK.cpp	Thu Jun 13 00:06:33 2002
-@@ -87,6 +87,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1276,7 +1282,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(gdk_screen_height() * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla-vendor/files/patch-nsFontMetricsXlib.cpp b/www/mozilla-vendor/files/patch-nsFontMetricsXlib.cpp
deleted file mode 100644
index fd470f66d234..000000000000
--- a/www/mozilla-vendor/files/patch-nsFontMetricsXlib.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/xlib/nsFontMetricsXlib.cpp	Tue Jun 11 16:20:31 2002
-+++ gfx/src/xlib/nsFontMetricsXlib.cpp	Thu Jun 13 00:05:47 2002
-@@ -99,6 +99,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1480,7 +1486,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(XHeightOfScreen(xxlib_rgb_get_screen(gXlibRgbHandle)) * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // Normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla-vendor/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla-vendor/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
deleted file mode 100644
index 2224e67cc95b..000000000000
--- a/www/mozilla-vendor/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
-@@ -94,8 +94,16 @@
-  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
-  * can also identify the period of time that 4.0-CURRENT used thunks.
-  */
--#if defined(__FreeBSD_cc_version) && \
--    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
-+
-+/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
-+ * This solves a problem wherein regxpcom and/or regchrome would seg fault
-+ * after running for a while.  This problem has also exhibited itself on 
-+ * the alpha platform.  Therefore, use thunks on all versions of
-+ * -CURRENT that are using gcc-3.1.
-+ */
-+#if defined(__FreeBSD_cc_version) && \
-+    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
-+    (__FreeBSD_cc_version < 500003)
- #define CFRONT_STYLE_THIS_ADJUST
- #else
- #define THUNK_BASED_THIS_ADJUST
diff --git a/www/mozilla-vendor/pkg-plist b/www/mozilla-vendor/pkg-plist
index 1eaf93402b43..5b76f7163ace 100644
--- a/www/mozilla-vendor/pkg-plist
+++ b/www/mozilla-vendor/pkg-plist
@@ -21,6 +21,40 @@ lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/forms.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/icons/default/abcardWindow.xpm
+lib/mozilla/chrome/icons/default/abcardWindow16.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow16.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow16.xpm
+lib/mozilla/chrome/icons/default/bookmark-window.xpm
+lib/mozilla/chrome/icons/default/bookmark-window16.xpm
+lib/mozilla/chrome/icons/default/calendar-window.xpm
+lib/mozilla/chrome/icons/default/calendar-window16.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window16.xpm
+lib/mozilla/chrome/icons/default/downloadManager.xpm
+lib/mozilla/chrome/icons/default/downloadManager16.xpm
+lib/mozilla/chrome/icons/default/editorWindow.xpm
+lib/mozilla/chrome/icons/default/editorWindow16.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow16.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow16.xpm
+lib/mozilla/chrome/icons/default/history-window.xpm
+lib/mozilla/chrome/icons/default/history-window16.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow16.xpm
+lib/mozilla/chrome/icons/default/main-window.xpm
+lib/mozilla/chrome/icons/default/main-window16.xpm
+lib/mozilla/chrome/icons/default/messengerWindow.xpm
+lib/mozilla/chrome/icons/default/messengerWindow16.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow16.xpm
+lib/mozilla/chrome/icons/default/venkman-window.xpm
+lib/mozilla/chrome/icons/default/venkman-window16.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain16.xpm
 lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 %%MOZILLAMAILNEWS%%lib/mozilla/chrome/messenger.jar
@@ -35,8 +69,9 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
+lib/mozilla/chrome/user-locales.rdf
+lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/xmlterm.jar
-lib/mozilla/component.reg
 %%MOZILLAMAILNEWS%%lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/addrbook.xpt
@@ -50,10 +85,11 @@ lib/mozilla/components/chardet.xpt
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/commandhandler.xpt
 lib/mozilla/components/composer.xpt
+lib/mozilla/components/compreg.dat
 lib/mozilla/components/content.xpt
+lib/mozilla/components/content_xslt.xpt
 lib/mozilla/components/content_base.xpt
 lib/mozilla/components/content_html.xpt
-lib/mozilla/components/content_xsl.xpt
 lib/mozilla/components/cookie.xpt
 lib/mozilla/components/directory.xpt
 lib/mozilla/components/docshell.xpt
@@ -125,6 +161,7 @@ lib/mozilla/components/libimglib2.so
 lib/mozilla/components/libimgmng.so
 lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
+lib/mozilla/components/libimgxbm.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpComm4xMail.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpText.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimport.so
@@ -143,7 +180,6 @@ lib/mozilla/components/libmork.so
 lib/mozilla/components/libmozbrwsr.so
 lib/mozilla/components/libmozfind.so
 %%MOZILLALDAP%%lib/mozilla/components/libmozldap.so
-lib/mozilla/components/libmozxfer.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgcompose.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgdb.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgimap.so
@@ -200,7 +236,6 @@ lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
 lib/mozilla/components/mozfind.xpt
 %%MOZILLALDAP%%lib/mozilla/components/mozldap.xpt
-lib/mozilla/components/mozxfer.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgbase.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgcompose.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgdb.xpt
@@ -256,7 +291,6 @@ lib/mozilla/components/signonviewer.xpt
 lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
-lib/mozilla/components/txtsvc.xpt
 lib/mozilla/components/uconv.xpt
 lib/mozilla/components/unicharutil.xpt
 lib/mozilla/components/uriloader.xpt
@@ -270,6 +304,7 @@ lib/mozilla/components/webBrowser_core.xpt
 lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
+lib/mozilla/components/windowds.xpt
 lib/mozilla/components/windowwatcher.xpt
 lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
@@ -289,11 +324,10 @@ lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
+lib/mozilla/defaults/autoconfig/platform.js
 lib/mozilla/defaults/autoconfig/prefcalls.js
 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
 %%MOZILLAMAILNEWS%%lib/mozilla/defaults/pref/mdn.js
@@ -364,7 +398,6 @@ lib/mozilla/res/arrowd.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
 lib/mozilla/res/charsetData.properties
 lib/mozilla/res/charsetalias.properties
 lib/mozilla/res/cmessage.txt
@@ -375,6 +408,7 @@ lib/mozilla/res/entityTables/html40Latin1.properties
 lib/mozilla/res/entityTables/html40Special.properties
 lib/mozilla/res/entityTables/html40Symbols.properties
 lib/mozilla/res/entityTables/htmlEntityVersions.properties
+lib/mozilla/res/entityTables/mathml20.properties
 lib/mozilla/res/entityTables/transliterate.properties
 lib/mozilla/res/fonts/mathfont.properties
 lib/mozilla/res/fonts/mathfontCMEX10.properties
@@ -551,7 +585,7 @@ lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
 @unexec rm -f %D/lib/mozilla/chrome/chrome.rdf || true
-@unexec rm -f %D/lib/mozilla/component.reg || true
+@unexec rm -f %D/lib/mozilla/compreg.dat || true
 @unexec rm -f %D/lib/mozilla/components/xpti.dat || true
 @dirrm lib/mozilla/searchplugins
 @dirrm lib/mozilla/res/throbber
@@ -590,5 +624,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
 @dirrm lib/mozilla/chrome/overlayinfo/communicator
 @dirrm lib/mozilla/chrome/overlayinfo
+@dirrm lib/mozilla/chrome/icons/default
+@dirrm lib/mozilla/chrome/icons
 @dirrm lib/mozilla/chrome
 @dirrm lib/mozilla
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 08fc786e13f1..9bc3db95e4e5 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
-		http://people.FreeBSD.org/~sobomax/:local
+		http://people.FreeBSD.org/~marcus/:local
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
-		sobomax/:local
+		marcus/:local
 DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
 		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
 
@@ -28,9 +27,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
+#WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
-USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -114,9 +112,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
-	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
+	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \
+	  ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf)
 	${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
 
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index e145e2426723..9d2cce22c437 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.0.tar.bz2) = 033da936e48336aa2c5d8bf0aa039056
-MD5 (libart_lgpl-1.0.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
+MD5 (mozilla-source-1.1.tar.gz) = f23ae90817506559da3bdf07fdf7c2a8
+MD5 (libart_lgpl-1.1.tar.gz) = 276f65c384d020c36003260689806735
diff --git a/www/mozilla/files/patch-Makefile.in b/www/mozilla/files/patch-Makefile.in
index f65ae1be8d13..43fa34684782 100644
--- a/www/mozilla/files/patch-Makefile.in
+++ b/www/mozilla/files/patch-Makefile.in
@@ -1,25 +1,22 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/12/25 21:00:23	1.1
-+++ Makefile.in	2001/12/26 06:40:16
-@@ -64,8 +64,7 @@
- DIRS = $(NSPRPUB_DIR) \
+--- Makefile.in.orig	Thu May 30 20:39:07 2002
++++ Makefile.in	Wed Aug 28 13:55:32 2002
+@@ -70,8 +70,7 @@
  	$(tier_0_dirs) \
  	$(tier_1_dirs) \
+ 	$(tier_2_dirs) \
 -	$(tier_9_dirs) \
 -	$(NULL)
 +	$(tier_9_dirs)
  
- ifdef MOZ_LDAP_XPCOM
- DIRS += directory/c-sdk/ldap
-@@ -81,7 +80,8 @@
+ ifdef GC_LEAK_DETECTOR
+ DIRS += gc/boehm
+@@ -90,7 +89,8 @@
  DIRS += $(tier_98_dirs)
  endif
  
 -DIRS	+= $(tier_99_dirs)
 +DIRS	+= $(tier_99_dirs) \
-+	    $(NULL)
++		$(NULL)
  
  #
  # tier 0 - base build config dirs
diff --git a/www/mozilla/files/patch-nsFontMetricsGTK.cpp b/www/mozilla/files/patch-nsFontMetricsGTK.cpp
deleted file mode 100644
index 3bab909b5a89..000000000000
--- a/www/mozilla/files/patch-nsFontMetricsGTK.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/gtk/nsFontMetricsGTK.cpp	Mon Jun 10 01:02:08 2002
-+++ gfx/src/gtk/nsFontMetricsGTK.cpp	Thu Jun 13 00:06:33 2002
-@@ -87,6 +87,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1276,7 +1282,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(gdk_screen_height() * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla/files/patch-nsFontMetricsXlib.cpp b/www/mozilla/files/patch-nsFontMetricsXlib.cpp
deleted file mode 100644
index fd470f66d234..000000000000
--- a/www/mozilla/files/patch-nsFontMetricsXlib.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/xlib/nsFontMetricsXlib.cpp	Tue Jun 11 16:20:31 2002
-+++ gfx/src/xlib/nsFontMetricsXlib.cpp	Thu Jun 13 00:05:47 2002
-@@ -99,6 +99,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1480,7 +1486,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(XHeightOfScreen(xxlib_rgb_get_screen(gXlibRgbHandle)) * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // Normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
deleted file mode 100644
index 2224e67cc95b..000000000000
--- a/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
-@@ -94,8 +94,16 @@
-  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
-  * can also identify the period of time that 4.0-CURRENT used thunks.
-  */
--#if defined(__FreeBSD_cc_version) && \
--    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
-+
-+/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
-+ * This solves a problem wherein regxpcom and/or regchrome would seg fault
-+ * after running for a while.  This problem has also exhibited itself on 
-+ * the alpha platform.  Therefore, use thunks on all versions of
-+ * -CURRENT that are using gcc-3.1.
-+ */
-+#if defined(__FreeBSD_cc_version) && \
-+    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
-+    (__FreeBSD_cc_version < 500003)
- #define CFRONT_STYLE_THIS_ADJUST
- #else
- #define THUNK_BASED_THIS_ADJUST
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 1eaf93402b43..5b76f7163ace 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -21,6 +21,40 @@ lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/forms.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/icons/default/abcardWindow.xpm
+lib/mozilla/chrome/icons/default/abcardWindow16.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow16.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow16.xpm
+lib/mozilla/chrome/icons/default/bookmark-window.xpm
+lib/mozilla/chrome/icons/default/bookmark-window16.xpm
+lib/mozilla/chrome/icons/default/calendar-window.xpm
+lib/mozilla/chrome/icons/default/calendar-window16.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window16.xpm
+lib/mozilla/chrome/icons/default/downloadManager.xpm
+lib/mozilla/chrome/icons/default/downloadManager16.xpm
+lib/mozilla/chrome/icons/default/editorWindow.xpm
+lib/mozilla/chrome/icons/default/editorWindow16.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow16.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow16.xpm
+lib/mozilla/chrome/icons/default/history-window.xpm
+lib/mozilla/chrome/icons/default/history-window16.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow16.xpm
+lib/mozilla/chrome/icons/default/main-window.xpm
+lib/mozilla/chrome/icons/default/main-window16.xpm
+lib/mozilla/chrome/icons/default/messengerWindow.xpm
+lib/mozilla/chrome/icons/default/messengerWindow16.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow16.xpm
+lib/mozilla/chrome/icons/default/venkman-window.xpm
+lib/mozilla/chrome/icons/default/venkman-window16.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain16.xpm
 lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 %%MOZILLAMAILNEWS%%lib/mozilla/chrome/messenger.jar
@@ -35,8 +69,9 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
+lib/mozilla/chrome/user-locales.rdf
+lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/xmlterm.jar
-lib/mozilla/component.reg
 %%MOZILLAMAILNEWS%%lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/addrbook.xpt
@@ -50,10 +85,11 @@ lib/mozilla/components/chardet.xpt
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/commandhandler.xpt
 lib/mozilla/components/composer.xpt
+lib/mozilla/components/compreg.dat
 lib/mozilla/components/content.xpt
+lib/mozilla/components/content_xslt.xpt
 lib/mozilla/components/content_base.xpt
 lib/mozilla/components/content_html.xpt
-lib/mozilla/components/content_xsl.xpt
 lib/mozilla/components/cookie.xpt
 lib/mozilla/components/directory.xpt
 lib/mozilla/components/docshell.xpt
@@ -125,6 +161,7 @@ lib/mozilla/components/libimglib2.so
 lib/mozilla/components/libimgmng.so
 lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
+lib/mozilla/components/libimgxbm.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpComm4xMail.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpText.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimport.so
@@ -143,7 +180,6 @@ lib/mozilla/components/libmork.so
 lib/mozilla/components/libmozbrwsr.so
 lib/mozilla/components/libmozfind.so
 %%MOZILLALDAP%%lib/mozilla/components/libmozldap.so
-lib/mozilla/components/libmozxfer.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgcompose.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgdb.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgimap.so
@@ -200,7 +236,6 @@ lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
 lib/mozilla/components/mozfind.xpt
 %%MOZILLALDAP%%lib/mozilla/components/mozldap.xpt
-lib/mozilla/components/mozxfer.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgbase.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgcompose.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgdb.xpt
@@ -256,7 +291,6 @@ lib/mozilla/components/signonviewer.xpt
 lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
-lib/mozilla/components/txtsvc.xpt
 lib/mozilla/components/uconv.xpt
 lib/mozilla/components/unicharutil.xpt
 lib/mozilla/components/uriloader.xpt
@@ -270,6 +304,7 @@ lib/mozilla/components/webBrowser_core.xpt
 lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
+lib/mozilla/components/windowds.xpt
 lib/mozilla/components/windowwatcher.xpt
 lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
@@ -289,11 +324,10 @@ lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
+lib/mozilla/defaults/autoconfig/platform.js
 lib/mozilla/defaults/autoconfig/prefcalls.js
 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
 %%MOZILLAMAILNEWS%%lib/mozilla/defaults/pref/mdn.js
@@ -364,7 +398,6 @@ lib/mozilla/res/arrowd.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
 lib/mozilla/res/charsetData.properties
 lib/mozilla/res/charsetalias.properties
 lib/mozilla/res/cmessage.txt
@@ -375,6 +408,7 @@ lib/mozilla/res/entityTables/html40Latin1.properties
 lib/mozilla/res/entityTables/html40Special.properties
 lib/mozilla/res/entityTables/html40Symbols.properties
 lib/mozilla/res/entityTables/htmlEntityVersions.properties
+lib/mozilla/res/entityTables/mathml20.properties
 lib/mozilla/res/entityTables/transliterate.properties
 lib/mozilla/res/fonts/mathfont.properties
 lib/mozilla/res/fonts/mathfontCMEX10.properties
@@ -551,7 +585,7 @@ lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
 @unexec rm -f %D/lib/mozilla/chrome/chrome.rdf || true
-@unexec rm -f %D/lib/mozilla/component.reg || true
+@unexec rm -f %D/lib/mozilla/compreg.dat || true
 @unexec rm -f %D/lib/mozilla/components/xpti.dat || true
 @dirrm lib/mozilla/searchplugins
 @dirrm lib/mozilla/res/throbber
@@ -590,5 +624,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
 @dirrm lib/mozilla/chrome/overlayinfo/communicator
 @dirrm lib/mozilla/chrome/overlayinfo
+@dirrm lib/mozilla/chrome/icons/default
+@dirrm lib/mozilla/chrome/icons
 @dirrm lib/mozilla/chrome
 @dirrm lib/mozilla