Update firefox & firefox-gtk1 to 1.5

Including fix for long title & history file problem. http://www.mozilla.org/security/history-title.html https://bugzilla.mozilla.org/show_bug.cgi?id=319004 What's New in Firefox 1.5 Firefox 1.5 is the next version of our award-winning Web browser. Here's what's new in Firefox 1.5: * Automated update to streamline product upgrades. Notification of an update is more prominent, and updates to Firefox may now be half a megabyte or smaller. Updating extensions has also improved. * Faster browser navigation with improvements to back and forward button performance. * Drag and drop reordering for browser tabs. * Improvements to popup blocking. * Clear Private Data feature provides an easy way to quickly remove personal data through a menu item or keyboard shortcut. * Answers.com is added to the search engine list. * Improvements to product usability including descriptive error pages, redesigned options menu, RSS discovery, and "Safe Mode" experience. * Better accessibility including support for DHTML accessibility and assistive technologies such as the Window-Eyes 5.5 beta screen reader for Microsoft Windows. Screen readers read aloud all available information in applications and documents or show the information on a Braille display, enabling blind and visually impaired users to use equivalent software functionality as their sighted peers. * Report a broken Web site wizard to report Web sites that are not working in Firefox. * Better support for Mac OS X (10.2 and greater) including profile migration from Safari and Mac Internet Explorer. * New support for Web Standards including SVG, CSS 2 and CSS 3, and JavaScript 1.6. * Many security enhancements. The Burning Edge has more detailed lists of new features and notable bug fixes. http://www.squarefree.com/burningedge/releases/1.5-comprehensive.html
author: taya <taya@pkgsrc.org> 2005-12-10 13:47:22 +0000
committer: taya <taya@pkgsrc.org> 2005-12-10 13:47:22 +0000
commit: 807dc5f4057d42a22c957de5a36373542fc11392 (patch)
tree: e69235e91274f0f0485b590fbac7eb0ca0017eea /www/firefox
parent: 7fae724dadf872358e248fcb52a265309b3c1618 (diff)
download: pkgsrc-807dc5f4057d42a22c957de5a36373542fc11392.tar.gz
69 files changed, 1285 insertions, 827 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index ca5dc204c0a..687a987dad3 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/08 09:52:16 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/10 13:47:22 taya Exp $
 
 MOZILLA=	firefox
 PKGREVISION=	1
@@ -8,11 +8,5 @@ COMMENT=	Lightweight gecko-based web browser
 _MOZILLA_USE_GTK2=	# defined
 MOZILLA_USE_XFT=	YES
 
-# Some .pc files are filled in by the build process, so we can't fix the
-# rpaths until this has happened.
-#
-PKGCONFIG_OVERRIDE_STAGE=	post-build
-PKGCONFIG_OVERRIDE+=		build/unix/*.pc
-
 .include "../../www/firefox/Makefile-firefox.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 3476c60a2b4..fb0aa0e5fb7 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.23 2005/12/05 23:55:22 rillig Exp $
+# $NetBSD: Makefile-firefox.common,v 1.24 2005/12/10 13:47:22 taya Exp $
 
 MOZILLA_BIN=	firefox-bin
-MOZ_VER=	1.0.7
+MOZ_VER=	1.5
 EXTRACT_SUFX=	.tar.bz2
 
 DISTNAME=	firefox-${MOZ_VER}-source
@@ -17,27 +17,21 @@ HOMEPAGE=	http://www.mozilla.org/projects/firefox/
 DISTINFO_FILE=	${.CURDIR}/../../www/firefox/distinfo
 PATCHDIR=	${.CURDIR}/../../www/firefox/patches
 
-CONFIGURE_ENV+=	MOZ_PHOENIX=1
-MAKE_ENV+=	MOZ_PHOENIX=1
-
-CONFIGURE_ARGS+=	--disable-mailnews
-CONFIGURE_ARGS+=	--disable-composer
+CONFIGURE_ARGS+=	--enable-application=browser
 CONFIGURE_ARGS+=	--enable-single-profile
 CONFIGURE_ARGS+=	--without-gssapi
 
-MOZILLA_EXTENSIONS=	cookie,gnomevfs,inspector,negotiateauth,pref,transformiix,universalchardet,webservices,xml-rpc,xmlextras
+CONFIGURE_ARGS+=	--enable-canvas
+
+MOZILLA_EXTENSIONS=	default
 CONFIGURE_ARGS+=	--enable-extensions=${MOZILLA_EXTENSIONS:Q}
 
 USE_LANGUAGES+=		c++
+BUILD_SVG=		# defined
 BUILD_MATHML=		# defined
 MESSAGE=		${.CURDIR}/../../www/firefox/MESSAGE
 
-.include "../../www/mozilla/Makefile.common"
+# 
+.include "../../www/firefox/Makefile.common"
 
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../www/firefox/INSTALL
-
-pre-install:
-	cd ${WRKSRC}/dist/bin/defaults/profile/ && \
-		${PAX} -Lrw extensions ${WRKSRC}/dist/bin
-	${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
-		${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common
new file mode 100644
index 00000000000..5f7238fc080
--- /dev/null
+++ b/www/firefox/Makefile.common
@@ -0,0 +1,198 @@
+# $NetBSD: Makefile.common,v 1.1 2005/12/10 13:47:22 taya Exp $
+
+MOZ_DIST_VER?=	${MOZ_VER}
+DISTNAME?=	mozilla-${MOZ_DIST_VER}-source
+PKGNAME=	${MOZILLA}-${MOZ_VER}
+MASTER_SITES?=	${MASTER_SITE_MOZILLA:=mozilla${MOZ_DIST_VER}/source/}
+CATEGORIES=	www
+
+MAINTAINER=	taya@NetBSD.org
+HOMEPAGE?=	http://www.mozilla.org/
+
+FILESDIR=	${.CURDIR}/../../www/mozilla/files
+
+BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
+
+WRKSRC=		${WRKDIR}/mozilla
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	autoconf213 gmake perl pkg-config
+GNU_CONFIGURE=	yes
+
+USE_PKGINSTALL=		yes
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/../../www/mozilla/INSTALL
+
+CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
+CONFIG_GUESS_OVERRIDE+=	directory/c-sdk/config/autoconf/config.guess
+CONFIG_SUB_OVERRIDE=	build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=	nsprpub/build/autoconf/config.sub
+CONFIG_SUB_OVERRIDE+=	directory/c-sdk/config/autoconf/config.sub
+CONFIG_STATUS_OVERRIDE=		build/config.status
+CONFIG_STATUS_OVERRIDE+=	nsprpub/config.status
+CONFIG_STATUS_OVERRIDE+=	directory/c-sdk/config.status
+
+# Some .pc files are filled in by the build process, so we can't fix the
+# rpaths until this has happened.
+PKGCONFIG_OVERRIDE_STAGE=	post-build
+PKGCONFIG_OVERRIDE=		build/unix/*.pc
+
+CONFIGURE_ARGS+= --disable-tests \
+		--disable-pedantic \
+		--with-system-jpeg=${BUILDLINK_PREFIX.jpeg} \
+		--with-system-png=${BUILDLINK_PREFIX.png} \
+		--enable-crypto
+
+SHAREMODE?=	644
+BUILD_TARGET=	# empty
+
+UNLIMIT_RESOURCES=	datasize memorysize stacksize
+
+.include	"../../graphics/jpeg/buildlink3.mk"
+.include	"../../graphics/png/buildlink3.mk"
+.ifdef _MOZILLA_USE_GTK2
+.include	"../../net/libIDL/buildlink3.mk"
+.include	"../../x11/gtk2/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs
+.else
+.include	"../../graphics/freetype2/buildlink3.mk"
+.include	"../../graphics/gdk-pixbuf/buildlink3.mk"
+.include	"../../net/ORBit/buildlink3.mk"
+.include	"../../x11/gtk/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-default-toolkit=gtk
+.endif
+
+# NetBSD-*-m68k builds, but "regchrome" dumps core.
+NOT_FOR_PLATFORM=	NetBSD-1.4.*-* NetBSD-*-m68k
+
+MAKE_ENV+=	MOZILLA_PKG_NAME=${MOZILLA}
+
+MOZ_LIBDIR=	${PREFIX}/lib/${MOZILLA}
+MAKE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
+CONFIGURE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
+
+.ifdef BUILD_SVG
+CONFIGURE_ARGS+=	--enable-svg
+CONFIGURE_ARGS+=	--enable-svg-renderer=cairo
+.include	"../../graphics/cairo/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-system-cairo
+.endif
+
+.ifdef BUILD_CALENDAR
+CONFIGURE_ARGS+=	--enable-calendar
+.endif
+
+.ifdef BUILD_MATHML
+CONFIGURE_ARGS+=	--enable-mathml
+.endif
+
+.if exists(${X11BASE}/include/X11/extensions/Xinerama.h) && \
+	exists(${X11BASE}/lib/libXinerama.so)
+CONFIGURE_ARGS+=	--enable-xinerama
+.endif
+
+# avoid creating a .mozilla directory in the users home
+# directory
+SCRIPTS_ENV+=	HOME="${WRKDIR}"
+
+PLIST_SUBST+=	MOZILLA=${MOZILLA}
+PLIST_SUBST+=	MOZILLA_BIN=${MOZILLA_BIN}
+FILES_SUBST+=	MOZILLA=${MOZILLA}
+FILES_SUBST+=	MOZILLA_BIN=${MOZILLA_BIN}
+.if ${OBJECT_FMT} == "ELF"
+SO_SUFFIX=	so
+SCRIPTS_ENV+=	MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
+.elif ${OBJECT_FMT} == "Mach-O"
+SO_SUFFIX=	dylib
+SCRIPTS_ENV+=	MOZ_INSTALL_LIB="${INSTALL_LIB}"
+.else
+SO_SUFFIX=	so.1.0
+SCRIPTS_ENV+=	MOZ_INSTALL_LIB="${INSTALL_PROGRAM}"
+.endif
+PLIST_SUBST+=	SO_SUFFIX=${SO_SUFFIX}
+
+.if (${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc")
+SUNOSLIB=
+.else
+SUNOSLIB=	"@comment "
+.endif
+PLIST_SUBST+=	SUNOSLIB=${SUNOSLIB}
+
+SCRIPTS_ENV+=	OBJECT_FMT=${OBJECT_FMT:Q}
+SCRIPTS_ENV+=	PLIST_SRC=${PLIST_SRC:Q}
+SCRIPTS_ENV+=	SED=${SED:Q}
+SCRIPTS_ENV+=	RM=${RM:Q}
+SCRIPTS_ENV+=	EGREP=${EGREP:Q}
+SCRIPTS_ENV+=	CHOWN=${CHOWN:Q}
+SCRIPTS_ENV+=	CHGRP=${CHGRP:Q}
+SCRIPTS_ENV+=	CHMOD=${CHMOD:Q}
+SCRIPTS_ENV+=	BINOWN=${BINOWN:Q}
+SCRIPTS_ENV+=	BINGRP=${BINGRP:Q}
+SCRIPTS_ENV+=	BINMODE=${BINMODE:Q}
+SCRIPTS_ENV+=	SETENV=${SETENV:Q}
+SCRIPTS_ENV+=   MOZILLA=${MOZILLA:Q}
+SCRIPTS_ENV+=   MOZILLA_BIN=${MOZILLA_BIN:Q}
+SCRIPTS_ENV+=	SO_SUFFIX=${SO_SUFFIX:Q}
+SCRIPTS_ENV+=	SUNOSLIB=${SUNOSLIB}
+
+PTHREAD_OPTS+=	native optional
+
+.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64")
+GCC_REQD+=	3.4
+.endif
+
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc*)
+COPTS?=			-O2
+.endif
+CONFIGURE_ARGS+=	--enable-optimize=${COPTS:Q}
+
+XPTCFILES+=	xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
+XPTCFILES+=	xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
+
+.if ${OPSYS} == "Darwin"
+BUILDLINK_PASSTHRU_DIRS+=/Developer
+.endif
+
+post-extract:
+.for F in ${XPTCFILES}
+	${CP} ${FILESDIR}/${F} ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/${F}
+.endfor
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC}/nsprpub && autoconf
+	cd ${WRKSRC}/directory/c-sdk && autoconf
+
+post-build:
+	${ECHO} skin,install,select,classic/1.0 >> \
+		${WRKSRC}/dist/bin/chrome/installed-chrome.txt
+	${ECHO} locale,install,select,en-US >> \
+		${WRKSRC}/dist/bin/chrome/installed-chrome.txt
+
+do-install:
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
+CONFIGURE_ARGS+= --without-pthreads
+.else
+CONFIGURE_ARGS+= --with-pthreads
+.endif
+
+.if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h)
+CONFIGURE_ARGS+=	--enable-xft
+# pkgconfig defaults to a "build" dependency, which is what we want.
+.include "../../fonts/Xft2/buildlink3.mk"
+.endif
+
+# Fix for firefox* packages.
+SUBST_CLASSES=		pc
+SUBST_STAGE.pc=		post-extract
+SUBST_FILES.pc=		build/unix/*.pc.in
+SUBST_SED.pc=		-e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \
+			-e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g"
+SUBST_MESSAGE.pc=	"Fixing pkgconfig files."
+
+.include "../../www/mozilla/options.mk"
diff --git a/www/firefox/PLIST b/www/firefox/PLIST
index 009aa18cda2..50ecf326b76 100644
--- a/www/firefox/PLIST
+++ b/www/firefox/PLIST
@@ -1,13 +1,10 @@
-@comment $NetBSD: PLIST,v 1.18 2005/09/22 14:14:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.19 2005/12/10 13:47:22 taya Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
-lib/${MOZILLA}/dirver
 lib/${MOZILLA}/mangle
-lib/${MOZILLA}/mozilla-ipcd
 lib/${MOZILLA}/mozilla-xremote-client
 lib/${MOZILLA}/nsinstall
-lib/${MOZILLA}/regchrome
 lib/${MOZILLA}/regxpcom
 lib/${MOZILLA}/shlibsign
 lib/${MOZILLA}/xpcshell
@@ -22,10 +19,13 @@ lib/${MOZILLA}/firefox-config
 @comment begin DSO
 lib/${MOZILLA}/components/libaccessibility.${SO_SUFFIX}
 lib/${MOZILLA}/components/libappcomps.${SO_SUFFIX}
+lib/${MOZILLA}/components/libauth.${SO_SUFFIX}
 lib/${MOZILLA}/components/libautoconfig.${SO_SUFFIX}
 lib/${MOZILLA}/components/libbrowsercomps.${SO_SUFFIX}
+lib/${MOZILLA}/components/libbrowserdirprovider.${SO_SUFFIX}
 lib/${MOZILLA}/components/libcaps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libchrome.${SO_SUFFIX}
+lib/${MOZILLA}/components/libcommandlines.${SO_SUFFIX}
 lib/${MOZILLA}/components/libcomposer.${SO_SUFFIX}
 lib/${MOZILLA}/components/libcookie.${SO_SUFFIX}
 lib/${MOZILLA}/components/libdocshell.${SO_SUFFIX}
@@ -34,28 +34,27 @@ lib/${MOZILLA}/components/libembedcomponents.${SO_SUFFIX}
 lib/${MOZILLA}/components/libfileview.${SO_SUFFIX}
 lib/${MOZILLA}/components/libgfx_gtk.${SO_SUFFIX}
 lib/${MOZILLA}/components/libgfxps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgfxxprint.${SO_SUFFIX}
 lib/${MOZILLA}/components/libgklayout.${SO_SUFFIX}
 lib/${MOZILLA}/components/libgkplugin.${SO_SUFFIX}
 lib/${MOZILLA}/components/libhtmlpars.${SO_SUFFIX}
 lib/${MOZILLA}/components/libi18n.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libinspector.${SO_SUFFIX}
-lib/${MOZILLA}/components/libipcdc.${SO_SUFFIX}
 lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
 lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
 lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmozldap.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
 lib/${MOZILLA}/components/libnsappshell.${SO_SUFFIX}
 lib/${MOZILLA}/components/liboji.${SO_SUFFIX}
+lib/${MOZILLA}/components/libpermissions.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpipboot.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpipnss.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpippki.${SO_SUFFIX}
 lib/${MOZILLA}/components/libpref.${SO_SUFFIX}
 lib/${MOZILLA}/components/librdf.${SO_SUFFIX}
+lib/${MOZILLA}/components/libremoteservice.${SO_SUFFIX}
+lib/${MOZILLA}/components/libsearchservice.${SO_SUFFIX}
 lib/${MOZILLA}/components/libsystem-pref.${SO_SUFFIX}
 lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libtransformiix.${SO_SUFFIX}
@@ -70,15 +69,12 @@ lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxremote_client.${SO_SUFFIX}
-lib/${MOZILLA}/components/libxremoteservice.${SO_SUFFIX}
-lib/${MOZILLA}/ipc/modules/liblockmodule.${SO_SUFFIX}
-lib/${MOZILLA}/ipc/modules/libtransmgr.${SO_SUFFIX}
+lib/${MOZILLA}/extensions/inspector@mozilla.org/components/libinspector.${SO_SUFFIX}
+lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkxtbin.${SO_SUFFIX}
 lib/${MOZILLA}/libjsj.${SO_SUFFIX}
-lib/${MOZILLA}/libldap50.${SO_SUFFIX}
 lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
 lib/${MOZILLA}/libmozz.${SO_SUFFIX}
 lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
@@ -86,63 +82,64 @@ lib/${MOZILLA}/libnss3.${SO_SUFFIX}
 lib/${MOZILLA}/libnssckbi.${SO_SUFFIX}
 lib/${MOZILLA}/libplc4.${SO_SUFFIX}
 lib/${MOZILLA}/libplds4.${SO_SUFFIX}
-lib/${MOZILLA}/libprldap50.${SO_SUFFIX}
 lib/${MOZILLA}/libsmime3.${SO_SUFFIX}
 lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX}
 lib/${MOZILLA}/libssl3.${SO_SUFFIX}
-lib/${MOZILLA}/libxlibrgb.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
+lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX}
 lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
-${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
+lib/${MOZILLA}/plugins/libunixprintplugin.${SO_SUFFIX}
 @comment end DSO
-@comment begin PKGCONFIG
-lib/pkgconfig/firefox-gtkmozembed.pc
-lib/pkgconfig/firefox-js.pc
-lib/pkgconfig/firefox-nspr.pc
-lib/pkgconfig/firefox-nss.pc
-lib/pkgconfig/firefox-plugin.pc
-lib/pkgconfig/firefox-xpcom.pc
-@comment end PKGCONFIG
 @comment begin DATA
 lib/${MOZILLA}/LICENSE
 lib/${MOZILLA}/README.txt
 lib/${MOZILLA}/bloaturls.txt
 lib/${MOZILLA}/browserconfig.properties
 lib/${MOZILLA}/chrome/browser.jar
+lib/${MOZILLA}/chrome/browser.manifest
 lib/${MOZILLA}/chrome/chromelist.txt
 lib/${MOZILLA}/chrome/classic.jar
+lib/${MOZILLA}/chrome/classic.manifest
 lib/${MOZILLA}/chrome/comm.jar
-lib/${MOZILLA}/chrome/embed-sample.jar
+lib/${MOZILLA}/chrome/comm.manifest
 lib/${MOZILLA}/chrome/en-US.jar
-lib/${MOZILLA}/chrome/help.jar
+lib/${MOZILLA}/chrome/en-US.manifest
 lib/${MOZILLA}/chrome/icons/default/default.xpm
-lib/${MOZILLA}/chrome/inspector.jar
 lib/${MOZILLA}/chrome/installed-chrome.txt
-lib/${MOZILLA}/chrome/modern.jar
-lib/${MOZILLA}/chrome/pipnss.jar
 lib/${MOZILLA}/chrome/pippki.jar
+lib/${MOZILLA}/chrome/pippki.manifest
+lib/${MOZILLA}/chrome/reporter.jar
+lib/${MOZILLA}/chrome/reporter.manifest
 lib/${MOZILLA}/chrome/toolkit.jar
+lib/${MOZILLA}/chrome/toolkit.manifest
 lib/${MOZILLA}/components/accessibility-atk.xpt
 lib/${MOZILLA}/components/accessibility.xpt
+lib/${MOZILLA}/components/alerts.xpt
 lib/${MOZILLA}/components/appshell.xpt
+lib/${MOZILLA}/components/appstartup.xpt
 lib/${MOZILLA}/components/autocomplete.xpt
 lib/${MOZILLA}/components/autoconfig.xpt
 lib/${MOZILLA}/components/bookmarks.xpt
+lib/${MOZILLA}/components/browsercompsbase.xpt
 lib/${MOZILLA}/components/caps.xpt
 lib/${MOZILLA}/components/chardet.xpt
+lib/${MOZILLA}/components/chrome.xpt
 lib/${MOZILLA}/components/commandhandler.xpt
+lib/${MOZILLA}/components/commandlines.xpt
 lib/${MOZILLA}/components/composer.xpt
 lib/${MOZILLA}/components/content_base.xpt
 lib/${MOZILLA}/components/content_html.xpt
 lib/${MOZILLA}/components/content_htmldoc.xpt
 lib/${MOZILLA}/components/content_xmldoc.xpt
 lib/${MOZILLA}/components/content_xslt.xpt
+lib/${MOZILLA}/components/content_xtf.xpt
 lib/${MOZILLA}/components/cookie.xpt
 lib/${MOZILLA}/components/directory.xpt
 lib/${MOZILLA}/components/docshell.xpt
 lib/${MOZILLA}/components/dom.xpt
 lib/${MOZILLA}/components/dom_base.xpt
+lib/${MOZILLA}/components/dom_canvas.xpt
 lib/${MOZILLA}/components/dom_core.xpt
 lib/${MOZILLA}/components/dom_css.xpt
 lib/${MOZILLA}/components/dom_events.xpt
@@ -150,6 +147,7 @@ lib/${MOZILLA}/components/dom_html.xpt
 lib/${MOZILLA}/components/dom_loadsave.xpt
 lib/${MOZILLA}/components/dom_range.xpt
 lib/${MOZILLA}/components/dom_stylesheets.xpt
+lib/${MOZILLA}/components/dom_svg.xpt
 lib/${MOZILLA}/components/dom_traversal.xpt
 lib/${MOZILLA}/components/dom_views.xpt
 lib/${MOZILLA}/components/dom_xbl.xpt
@@ -164,20 +162,17 @@ lib/${MOZILLA}/components/fastfind.xpt
 lib/${MOZILLA}/components/filepicker.xpt
 lib/${MOZILLA}/components/find.xpt
 lib/${MOZILLA}/components/gfx.xpt
-lib/${MOZILLA}/components/helperAppDlg.xpt
+lib/${MOZILLA}/components/gksvgrenderer.xpt
 lib/${MOZILLA}/components/history.xpt
 lib/${MOZILLA}/components/htmlparser.xpt
 lib/${MOZILLA}/components/imglib2.xpt
-lib/${MOZILLA}/components/inspector-cmdline.js
-lib/${MOZILLA}/components/inspector.xpt
 lib/${MOZILLA}/components/intl.xpt
-lib/${MOZILLA}/components/ipcd.xpt
 lib/${MOZILLA}/components/jar.xpt
 lib/${MOZILLA}/components/jsconsole-clhandler.js
 lib/${MOZILLA}/components/jsconsole.xpt
 lib/${MOZILLA}/components/jsdservice.xpt
-lib/${MOZILLA}/components/jsurl.xpt
 lib/${MOZILLA}/components/layout_base.xpt
+lib/${MOZILLA}/components/layout_printing.xpt
 lib/${MOZILLA}/components/layout_xul.xpt
 lib/${MOZILLA}/components/layout_xul_tree.xpt
 lib/${MOZILLA}/components/locale.xpt
@@ -187,7 +182,6 @@ lib/${MOZILLA}/components/mimetype.xpt
 lib/${MOZILLA}/components/mozbrwsr.xpt
 lib/${MOZILLA}/components/mozfind.xpt
 lib/${MOZILLA}/components/mozgnome.xpt
-lib/${MOZILLA}/components/mozldap.xpt
 lib/${MOZILLA}/components/necko.xpt
 lib/${MOZILLA}/components/necko_about.xpt
 lib/${MOZILLA}/components/necko_cache.xpt
@@ -197,12 +191,14 @@ lib/${MOZILLA}/components/necko_dns.xpt
 lib/${MOZILLA}/components/necko_file.xpt
 lib/${MOZILLA}/components/necko_ftp.xpt
 lib/${MOZILLA}/components/necko_http.xpt
-lib/${MOZILLA}/components/necko_jar.xpt
 lib/${MOZILLA}/components/necko_res.xpt
 lib/${MOZILLA}/components/necko_socket.xpt
 lib/${MOZILLA}/components/necko_strconv.xpt
 lib/${MOZILLA}/components/necko_viewsource.xpt
+lib/${MOZILLA}/components/nsBrowserContentHandler.js
+lib/${MOZILLA}/components/nsBrowserGlue.js
 lib/${MOZILLA}/components/nsCloseAllWindows.js
+lib/${MOZILLA}/components/nsDefaultCLH.js
 lib/${MOZILLA}/components/nsDictionary.js
 lib/${MOZILLA}/components/nsExtensionManager.js
 lib/${MOZILLA}/components/nsFilePicker.js
@@ -225,7 +221,6 @@ lib/${MOZILLA}/components/plugin.xpt
 lib/${MOZILLA}/components/pref.xpt
 lib/${MOZILLA}/components/prefetch.xpt
 lib/${MOZILLA}/components/profile.xpt
-lib/${MOZILLA}/components/profilesharingsetup.xpt
 lib/${MOZILLA}/components/progressDlg.xpt
 lib/${MOZILLA}/components/proxyObjInst.xpt
 lib/${MOZILLA}/components/rdf.xpt
@@ -235,6 +230,7 @@ lib/${MOZILLA}/components/shellservice.xpt
 lib/${MOZILLA}/components/shistory.xpt
 lib/${MOZILLA}/components/sidebar.xpt
 lib/${MOZILLA}/components/toolkitprofile.xpt
+lib/${MOZILLA}/components/toolkitremote.xpt
 lib/${MOZILLA}/components/txmgr.xpt
 lib/${MOZILLA}/components/txtsvc.xpt
 lib/${MOZILLA}/components/uconv.xpt
@@ -259,29 +255,36 @@ lib/${MOZILLA}/components/xpcom_threads.xpt
 lib/${MOZILLA}/components/xpcom_xpti.xpt
 lib/${MOZILLA}/components/xpconnect.xpt
 lib/${MOZILLA}/components/xpinstall.xpt
-lib/${MOZILLA}/components/xremoteservice.xpt
+lib/${MOZILLA}/components/xulapp.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/channel-prefs.js
 lib/${MOZILLA}/defaults/pref/firefox-l10n.js
 lib/${MOZILLA}/defaults/pref/firefox.js
-lib/${MOZILLA}/defaults/pref/inspector.js
+lib/${MOZILLA}/defaults/pref/reporter.js
 lib/${MOZILLA}/defaults/profile/bookmarks.html
 lib/${MOZILLA}/defaults/profile/chrome/userChrome-example.css
 lib/${MOZILLA}/defaults/profile/chrome/userContent-example.css
-lib/${MOZILLA}/defaults/profile/extensions/Extensions.rdf
-lib/${MOZILLA}/defaults/profile/extensions/installed-extensions.txt
-lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 lib/${MOZILLA}/defaults/profile/localstore.rdf
 lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
 lib/${MOZILLA}/defaults/profile/prefs.js
 lib/${MOZILLA}/defaults/profile/search.rdf
+lib/${MOZILLA}/dependentlibs.list
+lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome.manifest
+lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome/chromelist.txt
+lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome/inspector.jar
+lib/${MOZILLA}/extensions/inspector@mozilla.org/components/inspector-cmdline.js
+lib/${MOZILLA}/extensions/inspector@mozilla.org/components/inspector.xpt
+lib/${MOZILLA}/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+lib/${MOZILLA}/extensions/inspector@mozilla.org/install.rdf
+lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 lib/${MOZILLA}/greprefs/all.js
-lib/${MOZILLA}/greprefs/non-shared.txt
 lib/${MOZILLA}/greprefs/security-prefs.js
 lib/${MOZILLA}/greprefs/xpinstall.js
 lib/${MOZILLA}/icons/document.png
+lib/${MOZILLA}/icons/mozicon128.png
 lib/${MOZILLA}/icons/mozicon16.xpm
 lib/${MOZILLA}/icons/mozicon50.xpm
 lib/${MOZILLA}/init.d/README
@@ -312,6 +315,7 @@ lib/${MOZILLA}/res/fonts/mathfontMath2.properties
 lib/${MOZILLA}/res/fonts/mathfontMath4.properties
 lib/${MOZILLA}/res/fonts/mathfontPUA.properties
 lib/${MOZILLA}/res/fonts/mathfontSymbol.properties
+lib/${MOZILLA}/res/fonts/pangoFontEncoding.properties
 lib/${MOZILLA}/res/forms.css
 lib/${MOZILLA}/res/grabber.gif
 lib/${MOZILLA}/res/hiddenWindow.html
@@ -326,19 +330,11 @@ lib/${MOZILLA}/res/html/gopher-sound.gif
 lib/${MOZILLA}/res/html/gopher-telnet.gif
 lib/${MOZILLA}/res/html/gopher-text.gif
 lib/${MOZILLA}/res/html/gopher-unknown.gif
-lib/${MOZILLA}/res/inspector/search-registry.rdf
-lib/${MOZILLA}/res/inspector/viewer-registry.rdf
 lib/${MOZILLA}/res/langGroups.properties
 lib/${MOZILLA}/res/language.properties
 lib/${MOZILLA}/res/loading-image.gif
 lib/${MOZILLA}/res/mathml.css
-lib/${MOZILLA}/res/platform-forms.css
 lib/${MOZILLA}/res/quirk.css
-lib/${MOZILLA}/res/rdf/dom-test-4.css
-lib/${MOZILLA}/res/rdf/folder-closed.gif
-lib/${MOZILLA}/res/rdf/folder-open.gif
-lib/${MOZILLA}/res/rdf/ignore-test.xul
-lib/${MOZILLA}/res/rdf/loading.gif
 lib/${MOZILLA}/res/sample.unixpsfonts.properties
 lib/${MOZILLA}/res/samples/Anieyes.gif
 lib/${MOZILLA}/res/samples/aform.css
@@ -394,6 +390,7 @@ lib/${MOZILLA}/res/samples/toolbarTest1.xul
 lib/${MOZILLA}/res/samples/treeTest1.css
 lib/${MOZILLA}/res/samples/treeTest1.xul
 lib/${MOZILLA}/res/samples/xulTest.css
+lib/${MOZILLA}/res/svg.css
 lib/${MOZILLA}/res/table-add-column-after-active.gif
 lib/${MOZILLA}/res/table-add-column-after-hover.gif
 lib/${MOZILLA}/res/table-add-column-after.gif
@@ -449,16 +446,18 @@ lib/${MOZILLA}/res/viewer.properties
 lib/${MOZILLA}/res/viewsource.css
 lib/${MOZILLA}/searchplugins/amazondotcom.png
 lib/${MOZILLA}/searchplugins/amazondotcom.src
+lib/${MOZILLA}/searchplugins/answers.png
+lib/${MOZILLA}/searchplugins/answers.src
 lib/${MOZILLA}/searchplugins/creativecommons.png
 lib/${MOZILLA}/searchplugins/creativecommons.src
-lib/${MOZILLA}/searchplugins/dictionary.png
-lib/${MOZILLA}/searchplugins/dictionary.src
 lib/${MOZILLA}/searchplugins/eBay.gif
 lib/${MOZILLA}/searchplugins/eBay.src
 lib/${MOZILLA}/searchplugins/google.gif
 lib/${MOZILLA}/searchplugins/google.src
 lib/${MOZILLA}/searchplugins/yahoo.gif
 lib/${MOZILLA}/searchplugins/yahoo.src
+lib/${MOZILLA}/updater
+lib/${MOZILLA}/updater.ini
 @comment end DATA
 @comment begin INCLUDE
 include/${MOZILLA}/accessibility/nsAccessNode.h
@@ -482,6 +481,7 @@ include/${MOZILLA}/accessibility/nsIAccessibleRetrieval.h
 include/${MOZILLA}/accessibility/nsIAccessibleSelectable.h
 include/${MOZILLA}/accessibility/nsIAccessibleTable.h
 include/${MOZILLA}/accessibility/nsIAccessibleText.h
+include/${MOZILLA}/accessibility/nsIAccessibleTreeCache.h
 include/${MOZILLA}/accessibility/nsIAccessibleValue.h
 include/${MOZILLA}/accessibility/nsPIAccessNode.h
 include/${MOZILLA}/accessibility/nsPIAccessible.h
@@ -489,25 +489,26 @@ include/${MOZILLA}/accessibility/nsPIAccessibleDocument.h
 include/${MOZILLA}/accessibility/nsRootAccessible.h
 include/${MOZILLA}/accessibility/nsRootAccessibleWrap.h
 include/${MOZILLA}/accessibility/nsTextAccessibleWrap.h
+include/${MOZILLA}/accessibility/nsXULMenuAccessibleWrap.h
+include/${MOZILLA}/accessibility/nsXULTreeAccessibleWrap.h
+include/${MOZILLA}/alerts/nsIAlertsService.h
 include/${MOZILLA}/appcomps/nsCharsetMenu.h
 include/${MOZILLA}/appcomps/nsFontPackageHandler.h
+include/${MOZILLA}/appcomps/nsIAppStartup.h
+include/${MOZILLA}/appcomps/nsICloseAllWindows.h
 include/${MOZILLA}/appcomps/nsIFindService.h
 include/${MOZILLA}/appcomps/nsIHTTPIndex.h
 include/${MOZILLA}/appcomps/nsISearchContext.h
 include/${MOZILLA}/appcomps/nsISearchService.h
+include/${MOZILLA}/appcomps/nsIUserInfo.h
 include/${MOZILLA}/appcomps/nsIWindowDataSource.h
-include/${MOZILLA}/appshell/nsAppShellCIDs.h
+include/${MOZILLA}/appcomps/nsXPFEComponentsCID.h
+include/${MOZILLA}/appshell/nsAppShellCID.h
 include/${MOZILLA}/appshell/nsIAppShellService.h
-include/${MOZILLA}/appshell/nsICloseAllWindows.h
-include/${MOZILLA}/appshell/nsICmdLineHandler.h
-include/${MOZILLA}/appshell/nsICmdLineService.h
-include/${MOZILLA}/appshell/nsINativeAppSupport.h
 include/${MOZILLA}/appshell/nsIPopupWindowManager.h
-include/${MOZILLA}/appshell/nsISplashScreen.h
-include/${MOZILLA}/appshell/nsIUserInfo.h
-include/${MOZILLA}/appshell/nsIWebShellWindow.h
 include/${MOZILLA}/appshell/nsIWindowMediator.h
 include/${MOZILLA}/appshell/nsIWindowMediatorListener.h
+include/${MOZILLA}/appshell/nsIXULBrowserWindow.h
 include/${MOZILLA}/appshell/nsIXULWindow.h
 include/${MOZILLA}/autocomplete/nsIAutoCompleteController.h
 include/${MOZILLA}/autocomplete/nsIAutoCompleteInput.h
@@ -520,12 +521,12 @@ include/${MOZILLA}/autoconfig/nsILDAPSyncQuery.h
 include/${MOZILLA}/autoconfig/nsIReadConfig.h
 include/${MOZILLA}/bookmarks/nsIBookmarksService.h
 include/${MOZILLA}/browser/nsIBrowserInstance.h
-include/${MOZILLA}/browser/nsIXULBrowserWindow.h
 include/${MOZILLA}/browsercomps/nsBrowserCompsCID.h
+include/${MOZILLA}/browsercomps/nsIBrowserGlue.h
+include/${MOZILLA}/browsercomps/nsIBrowserHandler.h
+include/${MOZILLA}/caps/nsICryptoHash.h
 include/${MOZILLA}/caps/nsIPrincipal.h
-include/${MOZILLA}/caps/nsIPrincipalObsolete.h
 include/${MOZILLA}/caps/nsIScriptSecurityManager.h
-include/${MOZILLA}/caps/nsIScriptSecurityManagerObsolete.h
 include/${MOZILLA}/caps/nsISecurityCheckedComponent.h
 include/${MOZILLA}/caps/nsISignatureVerifier.h
 include/${MOZILLA}/caps/nsJSPrincipals.h
@@ -543,6 +544,7 @@ include/${MOZILLA}/chardet/nsIStringCharsetDetector.h
 include/${MOZILLA}/chardet/nsIXMLEncodingService.h
 include/${MOZILLA}/chardet/nsMetaCharsetCID.h
 include/${MOZILLA}/chardet/nsXMLEncodingCID.h
+include/${MOZILLA}/chrome/nsIToolkitChromeRegistry.h
 include/${MOZILLA}/commandhandler/nsICommandManager.h
 include/${MOZILLA}/commandhandler/nsICommandParams.h
 include/${MOZILLA}/commandhandler/nsIControllerCommand.h
@@ -550,91 +552,55 @@ include/${MOZILLA}/commandhandler/nsIControllerCommandTable.h
 include/${MOZILLA}/commandhandler/nsIControllerContext.h
 include/${MOZILLA}/commandhandler/nsPICommandUpdater.h
 include/${MOZILLA}/composer/nsIEditingSession.h
+include/${MOZILLA}/content/mozFlushType.h
 include/${MOZILLA}/content/mozISanitizingSerializer.h
 include/${MOZILLA}/content/nsAtomListUtils.h
-include/${MOZILLA}/content/nsBidiUtils.h
-include/${MOZILLA}/content/nsCSSAnonBoxList.h
-include/${MOZILLA}/content/nsCSSAnonBoxes.h
-include/${MOZILLA}/content/nsCSSKeywordList.h
-include/${MOZILLA}/content/nsCSSKeywords.h
-include/${MOZILLA}/content/nsCSSPropList.h
-include/${MOZILLA}/content/nsCSSProperty.h
-include/${MOZILLA}/content/nsCSSProps.h
-include/${MOZILLA}/content/nsCSSPseudoClassList.h
-include/${MOZILLA}/content/nsCSSPseudoClasses.h
-include/${MOZILLA}/content/nsCSSPseudoElementList.h
-include/${MOZILLA}/content/nsCSSPseudoElements.h
-include/${MOZILLA}/content/nsCSSStruct.h
-include/${MOZILLA}/content/nsCSSValue.h
-include/${MOZILLA}/content/nsChangeHint.h
 include/${MOZILLA}/content/nsContentCID.h
+include/${MOZILLA}/content/nsContentCreatorFunctions.h
 include/${MOZILLA}/content/nsContentErrors.h
+include/${MOZILLA}/content/nsContentList.h
 include/${MOZILLA}/content/nsContentPolicyUtils.h
 include/${MOZILLA}/content/nsContentUtils.h
-include/${MOZILLA}/content/nsDOMCSSDeclaration.h
-include/${MOZILLA}/content/nsFrameManager.h
-include/${MOZILLA}/content/nsFrameManagerBase.h
+include/${MOZILLA}/content/nsCopySupport.h
 include/${MOZILLA}/content/nsHTMLAtomList.h
 include/${MOZILLA}/content/nsHTMLAtoms.h
-include/${MOZILLA}/content/nsHTMLValue.h
 include/${MOZILLA}/content/nsIAttribute.h
 include/${MOZILLA}/content/nsIBindingManager.h
-include/${MOZILLA}/content/nsICSSGroupRule.h
-include/${MOZILLA}/content/nsICSSImportRule.h
-include/${MOZILLA}/content/nsICSSLoader.h
-include/${MOZILLA}/content/nsICSSLoaderObserver.h
-include/${MOZILLA}/content/nsICSSMediaRule.h
-include/${MOZILLA}/content/nsICSSNameSpaceRule.h
-include/${MOZILLA}/content/nsICSSOMFactory.h
-include/${MOZILLA}/content/nsICSSParser.h
-include/${MOZILLA}/content/nsICSSPseudoComparator.h
-include/${MOZILLA}/content/nsICSSRule.h
-include/${MOZILLA}/content/nsICSSStyleRule.h
-include/${MOZILLA}/content/nsICSSStyleRuleDOMWrapper.h
-include/${MOZILLA}/content/nsICSSStyleRuleProcessor.h
-include/${MOZILLA}/content/nsICSSStyleSheet.h
+include/${MOZILLA}/content/nsICanvasElement.h
+include/${MOZILLA}/content/nsICanvasRenderingContextInternal.h
 include/${MOZILLA}/content/nsIChromeRegistry.h
-include/${MOZILLA}/content/nsIComputedDOMStyle.h
 include/${MOZILLA}/content/nsIContent.h
 include/${MOZILLA}/content/nsIContentIterator.h
-include/${MOZILLA}/content/nsIContentList.h
 include/${MOZILLA}/content/nsIContentPolicy.h
 include/${MOZILLA}/content/nsIContentSerializer.h
+include/${MOZILLA}/content/nsIDOMSVGListener.h
+include/${MOZILLA}/content/nsIDOMSVGZoomListener.h
 include/${MOZILLA}/content/nsIDocument.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/nsIElementFactory.h
 include/${MOZILLA}/content/nsIEventListenerManager.h
 include/${MOZILLA}/content/nsIEventStateManager.h
 include/${MOZILLA}/content/nsIFIXptr.h
 include/${MOZILLA}/content/nsIForm.h
 include/${MOZILLA}/content/nsIFormControl.h
+include/${MOZILLA}/content/nsIFormProcessor.h
 include/${MOZILLA}/content/nsIFormSubmission.h
+include/${MOZILLA}/content/nsIFormSubmitObserver.h
 include/${MOZILLA}/content/nsIFrameLoader.h
 include/${MOZILLA}/content/nsIFrameSetElement.h
-include/${MOZILLA}/content/nsIHTMLCSSStyleSheet.h
-include/${MOZILLA}/content/nsIHTMLContent.h
 include/${MOZILLA}/content/nsIHTMLDocument.h
-include/${MOZILLA}/content/nsIHTMLTableCellElement.h
-include/${MOZILLA}/content/nsIHTMLTableColElement.h
 include/${MOZILLA}/content/nsIHTMLToTextSink.h
 include/${MOZILLA}/content/nsIImageDocument.h
 include/${MOZILLA}/content/nsIImageLoadingContent.h
-include/${MOZILLA}/content/nsIInspectorCSSUtils.h
 include/${MOZILLA}/content/nsILink.h
-include/${MOZILLA}/content/nsIMediaList.h
 include/${MOZILLA}/content/nsIModifyableXPointer.h
-include/${MOZILLA}/content/nsINameSpace.h
 include/${MOZILLA}/content/nsINameSpaceManager.h
 include/${MOZILLA}/content/nsINodeInfo.h
 include/${MOZILLA}/content/nsIOptionElement.h
 include/${MOZILLA}/content/nsIPhonetic.h
-include/${MOZILLA}/content/nsIPrintProgress.h
-include/${MOZILLA}/content/nsIPrintProgressParams.h
-include/${MOZILLA}/content/nsIPrintStatusFeedback.h
+include/${MOZILLA}/content/nsIPluginElement.h
 include/${MOZILLA}/content/nsIPrivateCompositionEvent.h
 include/${MOZILLA}/content/nsIPrivateDOMEvent.h
 include/${MOZILLA}/content/nsIPrivateDOMImplementation.h
@@ -644,6 +610,10 @@ include/${MOZILLA}/content/nsIRadioControlElement.h
 include/${MOZILLA}/content/nsIRadioGroupContainer.h
 include/${MOZILLA}/content/nsIRadioVisitor.h
 include/${MOZILLA}/content/nsIRangeUtils.h
+include/${MOZILLA}/content/nsISVGTextContentMetrics.h
+include/${MOZILLA}/content/nsISVGValue.h
+include/${MOZILLA}/content/nsISVGValueObserver.h
+include/${MOZILLA}/content/nsISVGValueUtils.h
 include/${MOZILLA}/content/nsIScriptElement.h
 include/${MOZILLA}/content/nsIScriptEventHandler.h
 include/${MOZILLA}/content/nsIScriptEventManager.h
@@ -655,48 +625,63 @@ include/${MOZILLA}/content/nsISelectionController.h
 include/${MOZILLA}/content/nsISelectionDisplay.h
 include/${MOZILLA}/content/nsISelectionListener.h
 include/${MOZILLA}/content/nsISelectionPrivate.h
-include/${MOZILLA}/content/nsIStyleRule.h
-include/${MOZILLA}/content/nsIStyleRuleProcessor.h
-include/${MOZILLA}/content/nsIStyleRuleSupplier.h
-include/${MOZILLA}/content/nsIStyleSheet.h
 include/${MOZILLA}/content/nsIStyleSheetLinkingElement.h
 include/${MOZILLA}/content/nsIStyledContent.h
 include/${MOZILLA}/content/nsISyncLoadDOMService.h
 include/${MOZILLA}/content/nsITextContent.h
 include/${MOZILLA}/content/nsITextControlElement.h
 include/${MOZILLA}/content/nsIWyciwygChannel.h
-include/${MOZILLA}/content/nsIXBLBinding.h
 include/${MOZILLA}/content/nsIXBLDocumentInfo.h
 include/${MOZILLA}/content/nsIXBLService.h
 include/${MOZILLA}/content/nsIXMLContent.h
+include/${MOZILLA}/content/nsIXMLContentBuilder.h
 include/${MOZILLA}/content/nsIXMLContentSink.h
 include/${MOZILLA}/content/nsIXPathEvaluatorInternal.h
 include/${MOZILLA}/content/nsIXPointer.h
 include/${MOZILLA}/content/nsIXSLTException.h
 include/${MOZILLA}/content/nsIXSLTProcessor.h
 include/${MOZILLA}/content/nsIXSLTProcessorObsolete.h
+include/${MOZILLA}/content/nsIXTFAttributeHandler.h
+include/${MOZILLA}/content/nsIXTFBindableElement.h
+include/${MOZILLA}/content/nsIXTFBindableElementWrapper.h
+include/${MOZILLA}/content/nsIXTFElement.h
+include/${MOZILLA}/content/nsIXTFElementFactory.h
+include/${MOZILLA}/content/nsIXTFElementWrapper.h
+include/${MOZILLA}/content/nsIXTFElementWrapperPrivate.h
+include/${MOZILLA}/content/nsIXTFGenericElement.h
+include/${MOZILLA}/content/nsIXTFGenericElementWrapper.h
+include/${MOZILLA}/content/nsIXTFPrivate.h
+include/${MOZILLA}/content/nsIXTFSVGVisual.h
+include/${MOZILLA}/content/nsIXTFSVGVisualWrapper.h
+include/${MOZILLA}/content/nsIXTFService.h
+include/${MOZILLA}/content/nsIXTFStyledElementWrapper.h
+include/${MOZILLA}/content/nsIXTFVisual.h
+include/${MOZILLA}/content/nsIXTFVisualWrapperPrivate.h
+include/${MOZILLA}/content/nsIXTFXMLVisual.h
+include/${MOZILLA}/content/nsIXTFXMLVisualWrapper.h
+include/${MOZILLA}/content/nsIXTFXULVisual.h
+include/${MOZILLA}/content/nsIXTFXULVisualWrapper.h
 include/${MOZILLA}/content/nsImageMapUtils.h
-include/${MOZILLA}/content/nsLayoutAtomList.h
-include/${MOZILLA}/content/nsLayoutAtoms.h
-include/${MOZILLA}/content/nsLayoutStylesheetCache.h
 include/${MOZILLA}/content/nsMutationEvent.h
-include/${MOZILLA}/content/nsRuleNode.h
-include/${MOZILLA}/content/nsRuleWalker.h
+include/${MOZILLA}/content/nsNodeInfoManager.h
+include/${MOZILLA}/content/nsPLDOMEvent.h
+include/${MOZILLA}/content/nsPropertyTable.h
+include/${MOZILLA}/content/nsSVGAtomList.h
+include/${MOZILLA}/content/nsSVGAtoms.h
+include/${MOZILLA}/content/nsSVGCoordCtx.h
+include/${MOZILLA}/content/nsSVGCoordCtxProvider.h
+include/${MOZILLA}/content/nsSVGMatrix.h
+include/${MOZILLA}/content/nsSVGNumber.h
+include/${MOZILLA}/content/nsSVGPoint.h
+include/${MOZILLA}/content/nsSVGRect.h
+include/${MOZILLA}/content/nsSVGTypeCIDs.h
 include/${MOZILLA}/content/nsStubDocumentObserver.h
-include/${MOZILLA}/content/nsStyleContext.h
-include/${MOZILLA}/content/nsStyleCoord.h
-include/${MOZILLA}/content/nsStyleSet.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/nsXMLNameSpaceMap.h
 include/${MOZILLA}/cookie/nsICookieAcceptDialog.h
 include/${MOZILLA}/cookie/nsICookiePromptService.h
-include/${MOZILLA}/cookie/nsIImgManager.h
 include/${MOZILLA}/cookie/nsIPermission.h
 include/${MOZILLA}/dbm/cdefs.h
 include/${MOZILLA}/dbm/mcom_db.h
@@ -713,11 +698,8 @@ include/${MOZILLA}/docshell/nsIDocShell.h
 include/${MOZILLA}/docshell/nsIDocShellHistory.h
 include/${MOZILLA}/docshell/nsIDocShellLoadInfo.h
 include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
-include/${MOZILLA}/docshell/nsIDocShellTreeItemTmp.h
 include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
-include/${MOZILLA}/docshell/nsIDocShellTreeNodeTmp.h
 include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
-include/${MOZILLA}/docshell/nsIDocShellTreeOwnerTmp.h
 include/${MOZILLA}/docshell/nsIEditorDocShell.h
 include/${MOZILLA}/docshell/nsIGlobalHistory.h
 include/${MOZILLA}/docshell/nsIGlobalHistory2.h
@@ -726,6 +708,7 @@ include/${MOZILLA}/docshell/nsIScrollable.h
 include/${MOZILLA}/docshell/nsITextScroll.h
 include/${MOZILLA}/docshell/nsIURIFixup.h
 include/${MOZILLA}/docshell/nsIWebNavigation.h
+include/${MOZILLA}/docshell/nsIWebNavigationInfo.h
 include/${MOZILLA}/docshell/nsIWebPageDescriptor.h
 include/${MOZILLA}/dom/domstubs.h
 include/${MOZILLA}/dom/nsDOMCID.h
@@ -740,6 +723,7 @@ include/${MOZILLA}/dom/nsIDOM3Node.h
 include/${MOZILLA}/dom/nsIDOMAbstractView.h
 include/${MOZILLA}/dom/nsIDOMAttr.h
 include/${MOZILLA}/dom/nsIDOMBarProp.h
+include/${MOZILLA}/dom/nsIDOMBeforeUnloadEvent.h
 include/${MOZILLA}/dom/nsIDOMCDATASection.h
 include/${MOZILLA}/dom/nsIDOMCRMFObject.h
 include/${MOZILLA}/dom/nsIDOMCSS2Properties.h
@@ -747,6 +731,7 @@ include/${MOZILLA}/dom/nsIDOMCSSCharsetRule.h
 include/${MOZILLA}/dom/nsIDOMCSSFontFaceRule.h
 include/${MOZILLA}/dom/nsIDOMCSSImportRule.h
 include/${MOZILLA}/dom/nsIDOMCSSMediaRule.h
+include/${MOZILLA}/dom/nsIDOMCSSMozDocumentRule.h
 include/${MOZILLA}/dom/nsIDOMCSSPageRule.h
 include/${MOZILLA}/dom/nsIDOMCSSPrimitiveValue.h
 include/${MOZILLA}/dom/nsIDOMCSSRule.h
@@ -757,6 +742,7 @@ include/${MOZILLA}/dom/nsIDOMCSSStyleSheet.h
 include/${MOZILLA}/dom/nsIDOMCSSUnknownRule.h
 include/${MOZILLA}/dom/nsIDOMCSSValue.h
 include/${MOZILLA}/dom/nsIDOMCSSValueList.h
+include/${MOZILLA}/dom/nsIDOMCanvasRenderingContext2D.h
 include/${MOZILLA}/dom/nsIDOMCharacterData.h
 include/${MOZILLA}/dom/nsIDOMChromeWindow.h
 include/${MOZILLA}/dom/nsIDOMClassInfo.h
@@ -793,6 +779,7 @@ include/${MOZILLA}/dom/nsIDOMEventReceiver.h
 include/${MOZILLA}/dom/nsIDOMEventTarget.h
 include/${MOZILLA}/dom/nsIDOMFocusListener.h
 include/${MOZILLA}/dom/nsIDOMFormListener.h
+include/${MOZILLA}/dom/nsIDOMGetSVGDocument.h
 include/${MOZILLA}/dom/nsIDOMHTMLAnchorElement.h
 include/${MOZILLA}/dom/nsIDOMHTMLAppletElement.h
 include/${MOZILLA}/dom/nsIDOMHTMLAreaElement.h
@@ -801,6 +788,7 @@ include/${MOZILLA}/dom/nsIDOMHTMLBaseElement.h
 include/${MOZILLA}/dom/nsIDOMHTMLBaseFontElement.h
 include/${MOZILLA}/dom/nsIDOMHTMLBodyElement.h
 include/${MOZILLA}/dom/nsIDOMHTMLButtonElement.h
+include/${MOZILLA}/dom/nsIDOMHTMLCanvasElement.h
 include/${MOZILLA}/dom/nsIDOMHTMLCollection.h
 include/${MOZILLA}/dom/nsIDOMHTMLDListElement.h
 include/${MOZILLA}/dom/nsIDOMHTMLDirectoryElement.h
@@ -877,8 +865,10 @@ include/${MOZILLA}/dom/nsIDOMMutationEvent.h
 include/${MOZILLA}/dom/nsIDOMMutationListener.h
 include/${MOZILLA}/dom/nsIDOMNSDocument.h
 include/${MOZILLA}/dom/nsIDOMNSDocumentStyle.h
+include/${MOZILLA}/dom/nsIDOMNSEditableElement.h
 include/${MOZILLA}/dom/nsIDOMNSEvent.h
 include/${MOZILLA}/dom/nsIDOMNSEventTarget.h
+include/${MOZILLA}/dom/nsIDOMNSFeatureFactory.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLAnchorElement.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLAreaElement.h
 include/${MOZILLA}/dom/nsIDOMNSHTMLButtonElement.h
@@ -899,6 +889,7 @@ include/${MOZILLA}/dom/nsIDOMNSLocation.h
 include/${MOZILLA}/dom/nsIDOMNSRange.h
 include/${MOZILLA}/dom/nsIDOMNSUIEvent.h
 include/${MOZILLA}/dom/nsIDOMNSXBLFormControl.h
+include/${MOZILLA}/dom/nsIDOMNSXPathExpression.h
 include/${MOZILLA}/dom/nsIDOMNameList.h
 include/${MOZILLA}/dom/nsIDOMNamedNodeMap.h
 include/${MOZILLA}/dom/nsIDOMNavigator.h
@@ -907,6 +898,8 @@ include/${MOZILLA}/dom/nsIDOMNodeFilter.h
 include/${MOZILLA}/dom/nsIDOMNodeIterator.h
 include/${MOZILLA}/dom/nsIDOMNodeList.h
 include/${MOZILLA}/dom/nsIDOMNotation.h
+include/${MOZILLA}/dom/nsIDOMPageTransitionEvent.h
+include/${MOZILLA}/dom/nsIDOMPageTransitionListener.h
 include/${MOZILLA}/dom/nsIDOMPaintListener.h
 include/${MOZILLA}/dom/nsIDOMPkcs11.h
 include/${MOZILLA}/dom/nsIDOMPlugin.h
@@ -917,15 +910,81 @@ include/${MOZILLA}/dom/nsIDOMRGBColor.h
 include/${MOZILLA}/dom/nsIDOMRange.h
 include/${MOZILLA}/dom/nsIDOMRangeException.h
 include/${MOZILLA}/dom/nsIDOMRect.h
+include/${MOZILLA}/dom/nsIDOMSVGAngle.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimPresAspRatio.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimTransformList.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedAngle.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedEnum.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedLength.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedLengthList.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedNumber.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedNumberList.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedPathData.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedPoints.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedRect.h
+include/${MOZILLA}/dom/nsIDOMSVGAnimatedString.h
+include/${MOZILLA}/dom/nsIDOMSVGCircleElement.h
+include/${MOZILLA}/dom/nsIDOMSVGClipPathElement.h
+include/${MOZILLA}/dom/nsIDOMSVGDefsElement.h
+include/${MOZILLA}/dom/nsIDOMSVGDescElement.h
+include/${MOZILLA}/dom/nsIDOMSVGDocument.h
+include/${MOZILLA}/dom/nsIDOMSVGElement.h
+include/${MOZILLA}/dom/nsIDOMSVGEllipseElement.h
+include/${MOZILLA}/dom/nsIDOMSVGEvent.h
+include/${MOZILLA}/dom/nsIDOMSVGException.h
+include/${MOZILLA}/dom/nsIDOMSVGFitToViewBox.h
+include/${MOZILLA}/dom/nsIDOMSVGForeignObjectElem.h
+include/${MOZILLA}/dom/nsIDOMSVGGElement.h
+include/${MOZILLA}/dom/nsIDOMSVGGradientElement.h
+include/${MOZILLA}/dom/nsIDOMSVGImageElement.h
+include/${MOZILLA}/dom/nsIDOMSVGLength.h
+include/${MOZILLA}/dom/nsIDOMSVGLengthList.h
+include/${MOZILLA}/dom/nsIDOMSVGLineElement.h
+include/${MOZILLA}/dom/nsIDOMSVGLocatable.h
+include/${MOZILLA}/dom/nsIDOMSVGMarkerElement.h
+include/${MOZILLA}/dom/nsIDOMSVGMatrix.h
+include/${MOZILLA}/dom/nsIDOMSVGMetadataElement.h
+include/${MOZILLA}/dom/nsIDOMSVGNumber.h
+include/${MOZILLA}/dom/nsIDOMSVGNumberList.h
+include/${MOZILLA}/dom/nsIDOMSVGPathElement.h
+include/${MOZILLA}/dom/nsIDOMSVGPathSeg.h
+include/${MOZILLA}/dom/nsIDOMSVGPathSegList.h
+include/${MOZILLA}/dom/nsIDOMSVGPoint.h
+include/${MOZILLA}/dom/nsIDOMSVGPointList.h
+include/${MOZILLA}/dom/nsIDOMSVGPolygonElement.h
+include/${MOZILLA}/dom/nsIDOMSVGPolylineElement.h
+include/${MOZILLA}/dom/nsIDOMSVGPresAspectRatio.h
+include/${MOZILLA}/dom/nsIDOMSVGRect.h
+include/${MOZILLA}/dom/nsIDOMSVGRectElement.h
+include/${MOZILLA}/dom/nsIDOMSVGSVGElement.h
+include/${MOZILLA}/dom/nsIDOMSVGScriptElement.h
+include/${MOZILLA}/dom/nsIDOMSVGStopElement.h
+include/${MOZILLA}/dom/nsIDOMSVGStylable.h
+include/${MOZILLA}/dom/nsIDOMSVGStyleElement.h
+include/${MOZILLA}/dom/nsIDOMSVGSymbolElement.h
+include/${MOZILLA}/dom/nsIDOMSVGTSpanElement.h
+include/${MOZILLA}/dom/nsIDOMSVGTextContentElement.h
+include/${MOZILLA}/dom/nsIDOMSVGTextElement.h
+include/${MOZILLA}/dom/nsIDOMSVGTextPositionElem.h
+include/${MOZILLA}/dom/nsIDOMSVGTitleElement.h
+include/${MOZILLA}/dom/nsIDOMSVGTransform.h
+include/${MOZILLA}/dom/nsIDOMSVGTransformList.h
+include/${MOZILLA}/dom/nsIDOMSVGTransformable.h
+include/${MOZILLA}/dom/nsIDOMSVGURIReference.h
+include/${MOZILLA}/dom/nsIDOMSVGUseElement.h
+include/${MOZILLA}/dom/nsIDOMSVGZoomAndPan.h
+include/${MOZILLA}/dom/nsIDOMSVGZoomEvent.h
 include/${MOZILLA}/dom/nsIDOMScreen.h
 include/${MOZILLA}/dom/nsIDOMScriptObjectFactory.h
 include/${MOZILLA}/dom/nsIDOMScrollListener.h
+include/${MOZILLA}/dom/nsIDOMSmartCardEvent.h
 include/${MOZILLA}/dom/nsIDOMStyleSheet.h
 include/${MOZILLA}/dom/nsIDOMStyleSheetList.h
 include/${MOZILLA}/dom/nsIDOMText.h
 include/${MOZILLA}/dom/nsIDOMTextListener.h
 include/${MOZILLA}/dom/nsIDOMTreeWalker.h
 include/${MOZILLA}/dom/nsIDOMUIEvent.h
+include/${MOZILLA}/dom/nsIDOMUIListener.h
 include/${MOZILLA}/dom/nsIDOMUserDataHandler.h
 include/${MOZILLA}/dom/nsIDOMViewCSS.h
 include/${MOZILLA}/dom/nsIDOMWindow.h
@@ -957,6 +1016,7 @@ include/${MOZILLA}/dom/nsIDOMXULPopupElement.h
 include/${MOZILLA}/dom/nsIDOMXULSelectCntrlEl.h
 include/${MOZILLA}/dom/nsIDOMXULSelectCntrlItemEl.h
 include/${MOZILLA}/dom/nsIDOMXULTextboxElement.h
+include/${MOZILLA}/dom/nsIDOMXULTreeElement.h
 include/${MOZILLA}/dom/nsIEntropyCollector.h
 include/${MOZILLA}/dom/nsIFocusController.h
 include/${MOZILLA}/dom/nsIJSEventListener.h
@@ -996,45 +1056,46 @@ include/${MOZILLA}/editor/nsITableEditor.h
 include/${MOZILLA}/editor/nsIURIRefObject.h
 include/${MOZILLA}/editor/nsPIEditorTransaction.h
 include/${MOZILLA}/embed_base/nsEmbedAPI.h
+include/${MOZILLA}/embed_base/nsEmbedCID.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}/expat/expat.h
+include/${MOZILLA}/expat/expat_config.h
 include/${MOZILLA}/extensions/nsIExtensionManager.h
 include/${MOZILLA}/exthandler/nsCExternalHandlerService.h
 include/${MOZILLA}/exthandler/nsIExternalHelperAppService.h
 include/${MOZILLA}/exthandler/nsIExternalProtocolService.h
+include/${MOZILLA}/exthandler/nsIHelperAppLauncherDialog.h
 include/${MOZILLA}/exthandler/nsOSHelperAppService.h
 include/${MOZILLA}/fastfind/nsITypeAheadFind.h
 include/${MOZILLA}/filepicker/nsIFileView.h
 include/${MOZILLA}/find/nsIFind.h
 include/${MOZILLA}/find/nsIWebBrowserFind.h
+include/${MOZILLA}/gfx/gfxCore.h
 include/${MOZILLA}/gfx/gfxIFormats.h
 include/${MOZILLA}/gfx/gfxIImageFrame.h
 include/${MOZILLA}/gfx/gfxtypes.h
+include/${MOZILLA}/gfx/nsCUPSShim.h
 include/${MOZILLA}/gfx/nsColor.h
 include/${MOZILLA}/gfx/nsColorNameList.h
 include/${MOZILLA}/gfx/nsColorNames.h
 include/${MOZILLA}/gfx/nsCoord.h
 include/${MOZILLA}/gfx/nsDeviceContext.h
+include/${MOZILLA}/gfx/nsEPSObjectPS.h
 include/${MOZILLA}/gfx/nsFont.h
 include/${MOZILLA}/gfx/nsGfxCIID.h
 include/${MOZILLA}/gfx/nsGfxPSCID.h
-include/${MOZILLA}/gfx/nsGfxXPrintCID.h
 include/${MOZILLA}/gfx/nsIBlender.h
 include/${MOZILLA}/gfx/nsIDeviceContext.h
 include/${MOZILLA}/gfx/nsIDeviceContextPS.h
 include/${MOZILLA}/gfx/nsIDeviceContextSpec.h
 include/${MOZILLA}/gfx/nsIDeviceContextSpecFactory.h
 include/${MOZILLA}/gfx/nsIDeviceContextSpecPS.h
-include/${MOZILLA}/gfx/nsIDeviceContextSpecXPrint.h
-include/${MOZILLA}/gfx/nsIDeviceContextXPrint.h
 include/${MOZILLA}/gfx/nsIDrawingSurface.h
-include/${MOZILLA}/gfx/nsIFontCatalogService.h
 include/${MOZILLA}/gfx/nsIFontEnumerator.h
 include/${MOZILLA}/gfx/nsIFontList.h
 include/${MOZILLA}/gfx/nsIFontMetrics.h
-include/${MOZILLA}/gfx/nsIFreeType2.h
 include/${MOZILLA}/gfx/nsIImage.h
 include/${MOZILLA}/gfx/nsIPrintOptions.h
 include/${MOZILLA}/gfx/nsIPrintSession.h
@@ -1047,6 +1108,7 @@ include/${MOZILLA}/gfx/nsIScreenManager.h
 include/${MOZILLA}/gfx/nsIScriptableRegion.h
 include/${MOZILLA}/gfx/nsITheme.h
 include/${MOZILLA}/gfx/nsMargin.h
+include/${MOZILLA}/gfx/nsPSPrinters.h
 include/${MOZILLA}/gfx/nsPaperPS.h
 include/${MOZILLA}/gfx/nsPoint.h
 include/${MOZILLA}/gfx/nsRect.h
@@ -1055,11 +1117,11 @@ include/${MOZILLA}/gfx/nsSize.h
 include/${MOZILLA}/gfx/nsTempfilePS.h
 include/${MOZILLA}/gfx/nsThemeConstants.h
 include/${MOZILLA}/gfx/nsTransform2D.h
+include/${MOZILLA}/gfx/psSharedCore.h
 include/${MOZILLA}/gtkembedmoz/gtkmozembed.h
 include/${MOZILLA}/gtkembedmoz/gtkmozembed_internal.h
 include/${MOZILLA}/gtkxtbin/gtk2xtbin.h
 include/${MOZILLA}/gtkxtbin/gtkxtbin.h
-include/${MOZILLA}/helperAppDlg/nsIHelperAppLauncherDialog.h
 include/${MOZILLA}/history/nsIBrowserHistory.h
 include/${MOZILLA}/htmlparser/nsHTMLTagList.h
 include/${MOZILLA}/htmlparser/nsHTMLTags.h
@@ -1068,8 +1130,8 @@ include/${MOZILLA}/htmlparser/nsIContentSink.h
 include/${MOZILLA}/htmlparser/nsIDTD.h
 include/${MOZILLA}/htmlparser/nsIElementObserver.h
 include/${MOZILLA}/htmlparser/nsIExpatSink.h
+include/${MOZILLA}/htmlparser/nsIFragmentContentSink.h
 include/${MOZILLA}/htmlparser/nsIHTMLContentSink.h
-include/${MOZILLA}/htmlparser/nsIHTMLFragmentContentSink.h
 include/${MOZILLA}/htmlparser/nsIParser.h
 include/${MOZILLA}/htmlparser/nsIParserFilter.h
 include/${MOZILLA}/htmlparser/nsIParserNode.h
@@ -1077,7 +1139,6 @@ include/${MOZILLA}/htmlparser/nsIParserService.h
 include/${MOZILLA}/htmlparser/nsITokenizer.h
 include/${MOZILLA}/htmlparser/nsParserCIID.h
 include/${MOZILLA}/htmlparser/nsParserDataListener.h
-include/${MOZILLA}/htmlparser/nsParserError.h
 include/${MOZILLA}/htmlparser/nsScannerString.h
 include/${MOZILLA}/htmlparser/nsToken.h
 include/${MOZILLA}/imglib2/ImageErrors.h
@@ -1101,19 +1162,10 @@ include/${MOZILLA}/inspector/inISearchObserver.h
 include/${MOZILLA}/inspector/inISearchProcess.h
 include/${MOZILLA}/intl/nsIStringBundle.h
 include/${MOZILLA}/intl/nsIStringBundleOverride.h
-include/${MOZILLA}/ipcd/ipcIClientObserver.h
-include/${MOZILLA}/ipcd/ipcIClientQueryHandler.h
-include/${MOZILLA}/ipcd/ipcILockNotify.h
-include/${MOZILLA}/ipcd/ipcILockService.h
-include/${MOZILLA}/ipcd/ipcIMessageObserver.h
-include/${MOZILLA}/ipcd/ipcIService.h
-include/${MOZILLA}/ipcd/ipcITransactionObserver.h
-include/${MOZILLA}/ipcd/ipcITransactionService.h
-include/${MOZILLA}/ipcd/ipcMessageReader.h
-include/${MOZILLA}/ipcd/ipcMessageWriter.h
-include/${MOZILLA}/ipcd/ipcModule.h
-include/${MOZILLA}/ipcd/ipcModuleUtil.h
 include/${MOZILLA}/jar/nsIJAR.h
+include/${MOZILLA}/jar/nsIJARChannel.h
+include/${MOZILLA}/jar/nsIJARProtocolHandler.h
+include/${MOZILLA}/jar/nsIJARURI.h
 include/${MOZILLA}/jar/nsIZipReader.h
 include/${MOZILLA}/jar/zipfile.h
 include/${MOZILLA}/jar/zipstruct.h
@@ -1181,17 +1233,36 @@ include/${MOZILLA}/js/jsstr.h
 include/${MOZILLA}/js/jstypes.h
 include/${MOZILLA}/js/jsutil.h
 include/${MOZILLA}/js/jsxdrapi.h
+include/${MOZILLA}/js/jsxml.h
 include/${MOZILLA}/jsconsole/nsIJSConsoleService.h
 include/${MOZILLA}/jsdebug/jsdIDebuggerService.h
 include/${MOZILLA}/jsdebug/jsdebug.h
-include/${MOZILLA}/jsurl/nsIEvaluateStringProxy.h
 include/${MOZILLA}/jsurl/nsJSProtocolHandler.h
 include/${MOZILLA}/layout/nsBidi.h
 include/${MOZILLA}/layout/nsBidiFrames.h
 include/${MOZILLA}/layout/nsBidiPresUtils.h
+include/${MOZILLA}/layout/nsBidiUtils.h
+include/${MOZILLA}/layout/nsCSSAnonBoxList.h
+include/${MOZILLA}/layout/nsCSSAnonBoxes.h
 include/${MOZILLA}/layout/nsCSSFrameConstructor.h
+include/${MOZILLA}/layout/nsCSSKeywordList.h
+include/${MOZILLA}/layout/nsCSSKeywords.h
+include/${MOZILLA}/layout/nsCSSPropList.h
+include/${MOZILLA}/layout/nsCSSProperty.h
+include/${MOZILLA}/layout/nsCSSProps.h
+include/${MOZILLA}/layout/nsCSSPseudoClassList.h
+include/${MOZILLA}/layout/nsCSSPseudoClasses.h
+include/${MOZILLA}/layout/nsCSSPseudoElementList.h
+include/${MOZILLA}/layout/nsCSSPseudoElements.h
+include/${MOZILLA}/layout/nsCSSStruct.h
+include/${MOZILLA}/layout/nsCSSValue.h
+include/${MOZILLA}/layout/nsChangeHint.h
 include/${MOZILLA}/layout/nsCompatibility.h
+include/${MOZILLA}/layout/nsContentDLF.h
+include/${MOZILLA}/layout/nsDOMCSSDeclaration.h
 include/${MOZILLA}/layout/nsFrameList.h
+include/${MOZILLA}/layout/nsFrameManager.h
+include/${MOZILLA}/layout/nsFrameManagerBase.h
 include/${MOZILLA}/layout/nsFrameTraversal.h
 include/${MOZILLA}/layout/nsGrid.h
 include/${MOZILLA}/layout/nsGridCell.h
@@ -1204,21 +1275,33 @@ include/${MOZILLA}/layout/nsGridRowLeafLayout.h
 include/${MOZILLA}/layout/nsHTMLParts.h
 include/${MOZILLA}/layout/nsHTMLReflowMetrics.h
 include/${MOZILLA}/layout/nsHTMLReflowState.h
-include/${MOZILLA}/layout/nsIAutoCopy.h
+include/${MOZILLA}/layout/nsIAnonymousContentCreator.h
 include/${MOZILLA}/layout/nsIBoxLayoutManager.h
 include/${MOZILLA}/layout/nsIBoxObject.h
 include/${MOZILLA}/layout/nsIBoxPaintManager.h
 include/${MOZILLA}/layout/nsIBrowserBoxObject.h
+include/${MOZILLA}/layout/nsICSSDeclaration.h
+include/${MOZILLA}/layout/nsICSSGroupRule.h
+include/${MOZILLA}/layout/nsICSSImportRule.h
+include/${MOZILLA}/layout/nsICSSLoader.h
+include/${MOZILLA}/layout/nsICSSLoaderObserver.h
+include/${MOZILLA}/layout/nsICSSNameSpaceRule.h
+include/${MOZILLA}/layout/nsICSSOMFactory.h
+include/${MOZILLA}/layout/nsICSSParser.h
+include/${MOZILLA}/layout/nsICSSPseudoComparator.h
+include/${MOZILLA}/layout/nsICSSRule.h
+include/${MOZILLA}/layout/nsICSSStyleRule.h
+include/${MOZILLA}/layout/nsICSSStyleRuleDOMWrapper.h
+include/${MOZILLA}/layout/nsICSSStyleSheet.h
 include/${MOZILLA}/layout/nsICanvasFrame.h
 include/${MOZILLA}/layout/nsICaret.h
 include/${MOZILLA}/layout/nsICheckboxControlFrame.h
 include/${MOZILLA}/layout/nsIChromeEventHandler.h
 include/${MOZILLA}/layout/nsIComboboxControlFrame.h
+include/${MOZILLA}/layout/nsIComputedDOMStyle.h
+include/${MOZILLA}/layout/nsIDocumentViewer.h
 include/${MOZILLA}/layout/nsIEditorBoxObject.h
-include/${MOZILLA}/layout/nsIFocusTracker.h
 include/${MOZILLA}/layout/nsIFormControlFrame.h
-include/${MOZILLA}/layout/nsIFormProcessor.h
-include/${MOZILLA}/layout/nsIFormSubmitObserver.h
 include/${MOZILLA}/layout/nsIFrame.h
 include/${MOZILLA}/layout/nsIFrameDebug.h
 include/${MOZILLA}/layout/nsIFrameFrame.h
@@ -1226,11 +1309,12 @@ include/${MOZILLA}/layout/nsIFrameSelection.h
 include/${MOZILLA}/layout/nsIFrameTraversal.h
 include/${MOZILLA}/layout/nsIFrameUtil.h
 include/${MOZILLA}/layout/nsIGridPart.h
-include/${MOZILLA}/layout/nsIHTMLStyleSheet.h
+include/${MOZILLA}/layout/nsIHTMLCSSStyleSheet.h
 include/${MOZILLA}/layout/nsIIFrameBoxObject.h
 include/${MOZILLA}/layout/nsIImageControlFrame.h
 include/${MOZILLA}/layout/nsIImageFrame.h
 include/${MOZILLA}/layout/nsIImageMap.h
+include/${MOZILLA}/layout/nsIInspectorCSSUtils.h
 include/${MOZILLA}/layout/nsILayoutDebugger.h
 include/${MOZILLA}/layout/nsILayoutHistoryState.h
 include/${MOZILLA}/layout/nsILineIterator.h
@@ -1239,19 +1323,31 @@ include/${MOZILLA}/layout/nsIListControlFrame.h
 include/${MOZILLA}/layout/nsIMenuBoxObject.h
 include/${MOZILLA}/layout/nsIMenuFrame.h
 include/${MOZILLA}/layout/nsIMenuParent.h
-include/${MOZILLA}/layout/nsIMutableStyleContext.h
 include/${MOZILLA}/layout/nsIObjectFrame.h
 include/${MOZILLA}/layout/nsIPageSequenceFrame.h
 include/${MOZILLA}/layout/nsIPercentHeightObserver.h
 include/${MOZILLA}/layout/nsIPopupBoxObject.h
 include/${MOZILLA}/layout/nsIPopupSetFrame.h
-include/${MOZILLA}/layout/nsIPresContext.h
 include/${MOZILLA}/layout/nsIPresShell.h
-include/${MOZILLA}/layout/nsIPresState.h
-include/${MOZILLA}/layout/nsIPrintContext.h
-include/${MOZILLA}/layout/nsIPrintPreviewContext.h
+include/${MOZILLA}/layout/nsIPrintProgress.h
+include/${MOZILLA}/layout/nsIPrintProgressParams.h
+include/${MOZILLA}/layout/nsIPrintStatusFeedback.h
 include/${MOZILLA}/layout/nsIRadioControlFrame.h
 include/${MOZILLA}/layout/nsIReflowCallback.h
+include/${MOZILLA}/layout/nsISVGGeometrySource.h
+include/${MOZILLA}/layout/nsISVGGlyphGeometrySource.h
+include/${MOZILLA}/layout/nsISVGGlyphMetricsSource.h
+include/${MOZILLA}/layout/nsISVGGradient.h
+include/${MOZILLA}/layout/nsISVGPathGeometrySource.h
+include/${MOZILLA}/layout/nsISVGRectangleSink.h
+include/${MOZILLA}/layout/nsISVGRenderer.h
+include/${MOZILLA}/layout/nsISVGRendererCanvas.h
+include/${MOZILLA}/layout/nsISVGRendererGlyphGeometry.h
+include/${MOZILLA}/layout/nsISVGRendererGlyphMetrics.h
+include/${MOZILLA}/layout/nsISVGRendererPathBuilder.h
+include/${MOZILLA}/layout/nsISVGRendererPathGeometry.h
+include/${MOZILLA}/layout/nsISVGRendererRegion.h
+include/${MOZILLA}/layout/nsISVGRendererSurface.h
 include/${MOZILLA}/layout/nsIScrollBoxObject.h
 include/${MOZILLA}/layout/nsIScrollableFrame.h
 include/${MOZILLA}/layout/nsIScrollableViewProvider.h
@@ -1259,26 +1355,46 @@ include/${MOZILLA}/layout/nsIScrollbarMediator.h
 include/${MOZILLA}/layout/nsISelectControlFrame.h
 include/${MOZILLA}/layout/nsISelectionImageService.h
 include/${MOZILLA}/layout/nsIStatefulFrame.h
+include/${MOZILLA}/layout/nsIStyleRule.h
+include/${MOZILLA}/layout/nsIStyleRuleProcessor.h
+include/${MOZILLA}/layout/nsIStyleRuleSupplier.h
+include/${MOZILLA}/layout/nsIStyleSheet.h
+include/${MOZILLA}/layout/nsIStyleSheetService.h
 include/${MOZILLA}/layout/nsITableCellLayout.h
 include/${MOZILLA}/layout/nsITableLayout.h
 include/${MOZILLA}/layout/nsITextControlFrame.h
 include/${MOZILLA}/layout/nsITreeBoxObject.h
+include/${MOZILLA}/layout/nsITreeColumns.h
 include/${MOZILLA}/layout/nsITreeContentView.h
 include/${MOZILLA}/layout/nsITreeSelection.h
 include/${MOZILLA}/layout/nsITreeView.h
+include/${MOZILLA}/layout/nsLayoutAtomList.h
+include/${MOZILLA}/layout/nsLayoutAtoms.h
 include/${MOZILLA}/layout/nsLayoutCID.h
 include/${MOZILLA}/layout/nsLayoutErrors.h
+include/${MOZILLA}/layout/nsLayoutStylesheetCache.h
 include/${MOZILLA}/layout/nsLayoutUtils.h
 include/${MOZILLA}/layout/nsPIBoxObject.h
+include/${MOZILLA}/layout/nsPresContext.h
+include/${MOZILLA}/layout/nsPresState.h
 include/${MOZILLA}/layout/nsReflowType.h
+include/${MOZILLA}/layout/nsRuleData.h
+include/${MOZILLA}/layout/nsRuleNode.h
+include/${MOZILLA}/layout/nsRuleWalker.h
+include/${MOZILLA}/layout/nsSVGUtils.h
 include/${MOZILLA}/layout/nsStyleChangeList.h
 include/${MOZILLA}/layout/nsStyleConsts.h
+include/${MOZILLA}/layout/nsStyleContext.h
+include/${MOZILLA}/layout/nsStyleCoord.h
+include/${MOZILLA}/layout/nsStyleSet.h
+include/${MOZILLA}/layout/nsStyleStruct.h
+include/${MOZILLA}/layout/nsStyleStructList.h
+include/${MOZILLA}/layout/nsStyleUtil.h
 include/${MOZILLA}/layout/nsTextTransformer.h
-include/${MOZILLA}/layout/nsTreeBodyFrame.h
 include/${MOZILLA}/layout/nsTreeColFrame.h
-include/${MOZILLA}/layout/nsTreeContentView.h
-include/${MOZILLA}/layout/nsTreeSelection.h
 include/${MOZILLA}/layout/nsTreeUtils.h
+include/${MOZILLA}/libbz2/bzlib.h
+include/${MOZILLA}/libmar/mar.h
 include/${MOZILLA}/libreg/NSReg.h
 include/${MOZILLA}/libreg/VerReg.h
 include/${MOZILLA}/liveconnect/jsjava.h
@@ -1295,7 +1411,6 @@ include/${MOZILLA}/locale/nsIDateTimeFormat.h
 include/${MOZILLA}/locale/nsIFontPackageHandler.h
 include/${MOZILLA}/locale/nsIFontPackageProxy.h
 include/${MOZILLA}/locale/nsIFontPackageService.h
-include/${MOZILLA}/locale/nsILanguageAtom.h
 include/${MOZILLA}/locale/nsILanguageAtomService.h
 include/${MOZILLA}/locale/nsILocale.h
 include/${MOZILLA}/locale/nsILocaleService.h
@@ -1325,22 +1440,14 @@ include/${MOZILLA}/mork/nsMorkCID.h
 include/${MOZILLA}/mozgnome/nsIGConfService.h
 include/${MOZILLA}/mozgnome/nsIGnomeVFSService.h
 include/${MOZILLA}/mozilla-config.h
-include/${MOZILLA}/mozldap/nsILDAPBERValue.h
-include/${MOZILLA}/mozldap/nsILDAPConnection.h
-include/${MOZILLA}/mozldap/nsILDAPErrors.h
-include/${MOZILLA}/mozldap/nsILDAPMessage.h
-include/${MOZILLA}/mozldap/nsILDAPMessageListener.h
-include/${MOZILLA}/mozldap/nsILDAPOperation.h
-include/${MOZILLA}/mozldap/nsILDAPServer.h
-include/${MOZILLA}/mozldap/nsILDAPService.h
-include/${MOZILLA}/mozldap/nsILDAPURL.h
-include/${MOZILLA}/mozldap/nsLDAP.h
 include/${MOZILLA}/necko/ftpCore.h
 include/${MOZILLA}/necko/mozITXTToHTMLConv.h
 include/${MOZILLA}/necko/necko-config.h
 include/${MOZILLA}/necko/netCore.h
+include/${MOZILLA}/necko/nsAboutProtocolUtils.h
 include/${MOZILLA}/necko/nsCPasswordManager.h
 include/${MOZILLA}/necko/nsCPasswordManagerInternal.h
+include/${MOZILLA}/necko/nsChannelProperties.h
 include/${MOZILLA}/necko/nsIAboutModule.h
 include/${MOZILLA}/necko/nsIAsyncStreamCopier.h
 include/${MOZILLA}/necko/nsIAuthModule.h
@@ -1349,7 +1456,9 @@ include/${MOZILLA}/necko/nsIAuthPromptProvider.h
 include/${MOZILLA}/necko/nsIBufferedStreams.h
 include/${MOZILLA}/necko/nsIByteRangeRequest.h
 include/${MOZILLA}/necko/nsICachingChannel.h
+include/${MOZILLA}/necko/nsICancelable.h
 include/${MOZILLA}/necko/nsIChannel.h
+include/${MOZILLA}/necko/nsIChannelEventSink.h
 include/${MOZILLA}/necko/nsIContentSniffer.h
 include/${MOZILLA}/necko/nsICookie.h
 include/${MOZILLA}/necko/nsICookie2.h
@@ -1361,12 +1470,10 @@ include/${MOZILLA}/necko/nsICookieService.h
 include/${MOZILLA}/necko/nsICryptoFIPSInfo.h
 include/${MOZILLA}/necko/nsIDNSListener.h
 include/${MOZILLA}/necko/nsIDNSRecord.h
-include/${MOZILLA}/necko/nsIDNSRequest.h
 include/${MOZILLA}/necko/nsIDNSService.h
 include/${MOZILLA}/necko/nsIDataChannel.h
 include/${MOZILLA}/necko/nsIDirIndex.h
 include/${MOZILLA}/necko/nsIDirIndexListener.h
-include/${MOZILLA}/necko/nsIDirectoryListing.h
 include/${MOZILLA}/necko/nsIDownloader.h
 include/${MOZILLA}/necko/nsIEncodedChannel.h
 include/${MOZILLA}/necko/nsIExternalProtocolHandler.h
@@ -1384,23 +1491,23 @@ include/${MOZILLA}/necko/nsIHttpHeaderVisitor.h
 include/${MOZILLA}/necko/nsIHttpProtocolHandler.h
 include/${MOZILLA}/necko/nsIIDNService.h
 include/${MOZILLA}/necko/nsIIOService.h
+include/${MOZILLA}/necko/nsIIncrementalDownload.h
 include/${MOZILLA}/necko/nsIInputStreamChannel.h
 include/${MOZILLA}/necko/nsIInputStreamPump.h
-include/${MOZILLA}/necko/nsIJARChannel.h
-include/${MOZILLA}/necko/nsIJARProtocolHandler.h
-include/${MOZILLA}/necko/nsIJARURI.h
 include/${MOZILLA}/necko/nsILoadGroup.h
 include/${MOZILLA}/necko/nsIMIMEInputStream.h
 include/${MOZILLA}/necko/nsIMultiPartChannel.h
+include/${MOZILLA}/necko/nsINetUtil.h
 include/${MOZILLA}/necko/nsIPasswordManager.h
 include/${MOZILLA}/necko/nsIPasswordManagerInternal.h
 include/${MOZILLA}/necko/nsIPermissionManager.h
 include/${MOZILLA}/necko/nsIProgressEventSink.h
 include/${MOZILLA}/necko/nsIPrompt.h
 include/${MOZILLA}/necko/nsIProtocolHandler.h
+include/${MOZILLA}/necko/nsIProtocolProxyCallback.h
+include/${MOZILLA}/necko/nsIProtocolProxyFilter.h
 include/${MOZILLA}/necko/nsIProtocolProxyService.h
 include/${MOZILLA}/necko/nsIProxiedProtocolHandler.h
-include/${MOZILLA}/necko/nsIProxy.h
 include/${MOZILLA}/necko/nsIProxyAutoConfig.h
 include/${MOZILLA}/necko/nsIProxyInfo.h
 include/${MOZILLA}/necko/nsIRequest.h
@@ -1408,10 +1515,8 @@ include/${MOZILLA}/necko/nsIRequestObserver.h
 include/${MOZILLA}/necko/nsIRequestObserverProxy.h
 include/${MOZILLA}/necko/nsIResProtocolHandler.h
 include/${MOZILLA}/necko/nsIResumableChannel.h
-include/${MOZILLA}/necko/nsIResumableEntityID.h
 include/${MOZILLA}/necko/nsISOCKSSocketInfo.h
 include/${MOZILLA}/necko/nsISSLSocketControl.h
-include/${MOZILLA}/necko/nsISSLSocketProvider.h
 include/${MOZILLA}/necko/nsISafeOutputStream.h
 include/${MOZILLA}/necko/nsISecretDecoderRing.h
 include/${MOZILLA}/necko/nsISecureBrowserUI.h
@@ -1443,10 +1548,13 @@ include/${MOZILLA}/necko/nsIUnicharStreamLoader.h
 include/${MOZILLA}/necko/nsIUploadChannel.h
 include/${MOZILLA}/necko/nsNetCID.h
 include/${MOZILLA}/necko/nsNetError.h
+include/${MOZILLA}/necko/nsNetStrings.h
 include/${MOZILLA}/necko/nsNetUtil.h
+include/${MOZILLA}/necko/nsPIDNSService.h
+include/${MOZILLA}/necko/nsPIProtocolProxyService.h
+include/${MOZILLA}/necko/nsPISocketTransportService.h
 include/${MOZILLA}/necko/nsReadLine.h
 include/${MOZILLA}/necko/nsURIHashKey.h
-include/${MOZILLA}/necko/nsUnixColorPrintf.h
 include/${MOZILLA}/necko2/nsIViewSourceChannel.h
 include/${MOZILLA}/nkcache/nsCacheService.h
 include/${MOZILLA}/nkcache/nsICache.h
@@ -1456,6 +1564,7 @@ include/${MOZILLA}/nkcache/nsICacheService.h
 include/${MOZILLA}/nkcache/nsICacheSession.h
 include/${MOZILLA}/nkcache/nsICacheVisitor.h
 include/${MOZILLA}/nsBuildID.h
+include/${MOZILLA}/nsStaticComponents.h
 include/${MOZILLA}/nspr/md/_aix.h
 include/${MOZILLA}/nspr/md/_aix32.cfg
 include/${MOZILLA}/nspr/md/_aix64.cfg
@@ -1506,11 +1615,12 @@ include/${MOZILLA}/nspr/md/_reliantunix.cfg
 include/${MOZILLA}/nspr/md/_reliantunix.h
 include/${MOZILLA}/nspr/md/_rhapsody.cfg
 include/${MOZILLA}/nspr/md/_rhapsody.h
+include/${MOZILLA}/nspr/md/_riscos.cfg
+include/${MOZILLA}/nspr/md/_riscos.h
 include/${MOZILLA}/nspr/md/_scoos.cfg
 include/${MOZILLA}/nspr/md/_scoos.h
+include/${MOZILLA}/nspr/md/_solaris.cfg
 include/${MOZILLA}/nspr/md/_solaris.h
-include/${MOZILLA}/nspr/md/_solaris32.cfg
-include/${MOZILLA}/nspr/md/_solaris64.cfg
 include/${MOZILLA}/nspr/md/_sony.cfg
 include/${MOZILLA}/nspr/md/_sony.h
 include/${MOZILLA}/nspr/md/_sunos4.cfg
@@ -1606,6 +1716,7 @@ include/${MOZILLA}/oji/nsJVMManager.h
 include/${MOZILLA}/oji/nsJVMPluginTagInfo.h
 include/${MOZILLA}/oji/nsjvm.h
 include/${MOZILLA}/passwordmgr/nsIPassword.h
+include/${MOZILLA}/passwordmgr/nsIPasswordInternal.h
 include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
 include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
 include/${MOZILLA}/pipboot/nsISecurityWarningDialogs.h
@@ -1629,7 +1740,6 @@ include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
 include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
 include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
 include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
-include/${MOZILLA}/pipnss/nsIHash.h
 include/${MOZILLA}/pipnss/nsIKeygenThread.h
 include/${MOZILLA}/pipnss/nsINSSCertCache.h
 include/${MOZILLA}/pipnss/nsIOCSPResponder.h
@@ -1661,12 +1771,12 @@ include/${MOZILLA}/plugin/nsIFileUtilities.h
 include/${MOZILLA}/plugin/nsIHTTPHeaderListener.h
 include/${MOZILLA}/plugin/nsIJRILiveConnectPIPeer.h
 include/${MOZILLA}/plugin/nsIJRILiveConnectPlugin.h
-include/${MOZILLA}/plugin/nsINPRuntimePlugin.h
 include/${MOZILLA}/plugin/nsIPlugin.h
 include/${MOZILLA}/plugin/nsIPluginDocument.h
 include/${MOZILLA}/plugin/nsIPluginHost.h
 include/${MOZILLA}/plugin/nsIPluginInputStream.h
 include/${MOZILLA}/plugin/nsIPluginInstance.h
+include/${MOZILLA}/plugin/nsIPluginInstanceInternal.h
 include/${MOZILLA}/plugin/nsIPluginInstanceOwner.h
 include/${MOZILLA}/plugin/nsIPluginInstancePeer.h
 include/${MOZILLA}/plugin/nsIPluginInstancePeer2.h
@@ -1689,11 +1799,13 @@ include/${MOZILLA}/plugin/nsplugindefs.h
 include/${MOZILLA}/plugin/nspluginroot.h
 include/${MOZILLA}/pref/nsIPref.h
 include/${MOZILLA}/pref/nsIPrefBranch.h
+include/${MOZILLA}/pref/nsIPrefBranch2.h
 include/${MOZILLA}/pref/nsIPrefBranchInternal.h
 include/${MOZILLA}/pref/nsIPrefLocalizedString.h
 include/${MOZILLA}/pref/nsIPrefService.h
 include/${MOZILLA}/pref/nsIRelativeFilePref.h
 include/${MOZILLA}/pref/nsISecurityPref.h
+include/${MOZILLA}/pref/nsPrefsCID.h
 include/${MOZILLA}/prefetch/nsCPrefetchService.h
 include/${MOZILLA}/prefetch/nsIPrefetchService.h
 include/${MOZILLA}/profdirserviceprovider/nsProfileDirServiceProvider.h
@@ -1701,8 +1813,8 @@ include/${MOZILLA}/profile/nsIProfile.h
 include/${MOZILLA}/profile/nsIProfileChangeStatus.h
 include/${MOZILLA}/profile/nsIProfileInternal.h
 include/${MOZILLA}/profile/nsIProfileStartupListener.h
+include/${MOZILLA}/profile/nsIProfileUnlocker.h
 include/${MOZILLA}/profile/nsISessionRoaming.h
-include/${MOZILLA}/profilesharingsetup/nsIProfileSharingSetup.h
 include/${MOZILLA}/progressDlg/nsIProgressDialog.h
 include/${MOZILLA}/rdf/nsILocalStore.h
 include/${MOZILLA}/rdf/nsIRDFCompositeDataSource.h
@@ -1728,6 +1840,9 @@ include/${MOZILLA}/rdf/nsIRDFXMLSink.h
 include/${MOZILLA}/rdf/nsIRDFXMLSource.h
 include/${MOZILLA}/rdf/nsRDFCID.h
 include/${MOZILLA}/rdf/rdf.h
+include/${MOZILLA}/rdf/rdfIDataSource.h
+include/${MOZILLA}/rdf/rdfISerializer.h
+include/${MOZILLA}/rdf/rdfITripleVisitor.h
 include/${MOZILLA}/rdfutil/nsRDFResource.h
 include/${MOZILLA}/satchel/nsIFormFillController.h
 include/${MOZILLA}/satchel/nsIFormHistory.h
@@ -1753,6 +1868,7 @@ include/${MOZILLA}/string/nsPromiseFlatString.h
 include/${MOZILLA}/string/nsReadableUtils.h
 include/${MOZILLA}/string/nsString.h
 include/${MOZILLA}/string/nsStringAPI.h
+include/${MOZILLA}/string/nsStringBuffer.h
 include/${MOZILLA}/string/nsStringFwd.h
 include/${MOZILLA}/string/nsStringIterator.h
 include/${MOZILLA}/string/nsSubstring.h
@@ -1772,12 +1888,19 @@ include/${MOZILLA}/string/string-template-def-unichar.h
 include/${MOZILLA}/string/string-template-undef.h
 include/${MOZILLA}/system-pref/nsSystemPrefLog.h
 include/${MOZILLA}/system-pref/nsSystemPrefService.h
+include/${MOZILLA}/toolkitcomps/nsICommandLine.h
+include/${MOZILLA}/toolkitcomps/nsICommandLineHandler.h
+include/${MOZILLA}/toolkitcomps/nsICommandLineRunner.h
+include/${MOZILLA}/toolkitcomps/nsIRemoteService.h
 include/${MOZILLA}/toolkitcomps/nsToolkitCompsCID.h
+include/${MOZILLA}/transformiix/nsIXFormsUtilityService.h
+include/${MOZILLA}/transformiix/nsIXFormsXPathEvaluator.h
 include/${MOZILLA}/txmgr/nsITransaction.h
 include/${MOZILLA}/txmgr/nsITransactionList.h
 include/${MOZILLA}/txmgr/nsITransactionListener.h
 include/${MOZILLA}/txmgr/nsITransactionManager.h
 include/${MOZILLA}/txmgr/nsTransactionManagerCID.h
+include/${MOZILLA}/txtsvc/nsIInlineSpellChecker.h
 include/${MOZILLA}/txtsvc/nsISpellChecker.h
 include/${MOZILLA}/txtsvc/nsITextService.h
 include/${MOZILLA}/txtsvc/nsITextServicesDocument.h
@@ -1787,7 +1910,6 @@ include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h
 include/${MOZILLA}/uconv/nsICharRepresentable.h
 include/${MOZILLA}/uconv/nsICharsetAlias.h
 include/${MOZILLA}/uconv/nsICharsetConverterManager.h
-include/${MOZILLA}/uconv/nsIConverterInputStream.h
 include/${MOZILLA}/uconv/nsICurrentCharsetListener.h
 include/${MOZILLA}/uconv/nsIMappingCache.h
 include/${MOZILLA}/uconv/nsIPlatformCharset.h
@@ -1809,6 +1931,7 @@ include/${MOZILLA}/ucvlatin/nsUCvLatinCID.h
 include/${MOZILLA}/ucvmath/nsUCvMathCID.h
 include/${MOZILLA}/ucvtw/nsUCvTWCID.h
 include/${MOZILLA}/ucvtw2/nsUCvTW2CID.h
+include/${MOZILLA}/unicharutil/cattable.h
 include/${MOZILLA}/unicharutil/nsCompressedCharMap.h
 include/${MOZILLA}/unicharutil/nsHankakuToZenkakuCID.h
 include/${MOZILLA}/unicharutil/nsICaseConversion.h
@@ -1816,7 +1939,6 @@ include/${MOZILLA}/unicharutil/nsIEntityConverter.h
 include/${MOZILLA}/unicharutil/nsIOrderIdFormater.h
 include/${MOZILLA}/unicharutil/nsISaveAsCharset.h
 include/${MOZILLA}/unicharutil/nsITextTransform.h
-include/${MOZILLA}/unicharutil/nsIUGenCategory.h
 include/${MOZILLA}/unicharutil/nsIUGenDetailCategory.h
 include/${MOZILLA}/unicharutil/nsIUnicodeNormalizer.h
 include/${MOZILLA}/unicharutil/nsUnicharUtilCIID.h
@@ -1827,10 +1949,12 @@ include/${MOZILLA}/uriloader/nsDocLoader.h
 include/${MOZILLA}/uriloader/nsIContentHandler.h
 include/${MOZILLA}/uriloader/nsIDocumentLoader.h
 include/${MOZILLA}/uriloader/nsIDownload.h
+include/${MOZILLA}/uriloader/nsITransfer.h
 include/${MOZILLA}/uriloader/nsIURIContentListener.h
 include/${MOZILLA}/uriloader/nsIURILoader.h
 include/${MOZILLA}/uriloader/nsIWebProgress.h
 include/${MOZILLA}/uriloader/nsIWebProgressListener.h
+include/${MOZILLA}/uriloader/nsIWebProgressListener2.h
 include/${MOZILLA}/uriloader/nsURILoader.h
 include/${MOZILLA}/util/nsTimer.h
 include/${MOZILLA}/util/stopwatch.h
@@ -1860,13 +1984,12 @@ include/${MOZILLA}/webbrwsr/nsIWebBrowserChromeFocus.h
 include/${MOZILLA}/webbrwsr/nsIWebBrowserFocus.h
 include/${MOZILLA}/webbrwsr/nsIWebBrowserPrint.h
 include/${MOZILLA}/webbrwsr/nsIWebBrowserSetup.h
+include/${MOZILLA}/webbrwsr/nsIWebBrowserStream.h
 include/${MOZILLA}/webshell/nsIClipboardCommands.h
 include/${MOZILLA}/webshell/nsIContentViewerContainer.h
-include/${MOZILLA}/webshell/nsIDocStreamLoaderFactory.h
 include/${MOZILLA}/webshell/nsIDocumentLoaderFactory.h
 include/${MOZILLA}/webshell/nsILinkHandler.h
 include/${MOZILLA}/webshell/nsIRefreshURI.h
-include/${MOZILLA}/webshell/nsIWebShell.h
 include/${MOZILLA}/webshell/nsIWebShellServices.h
 include/${MOZILLA}/websrvcs/nsIGenericInterfaceInfoSet.h
 include/${MOZILLA}/websrvcs/nsIInterfaceInfoToIDL.h
@@ -1896,6 +2019,7 @@ include/${MOZILLA}/websrvcs/nsIWSDLLoader.h
 include/${MOZILLA}/websrvcs/nsIWSDLSOAPBinding.h
 include/${MOZILLA}/websrvcs/nsIWSPInterfaceInfoService.h
 include/${MOZILLA}/websrvcs/nsIWebScriptsAccessService.h
+include/${MOZILLA}/websrvcs/nsIWebServiceErrorHandler.h
 include/${MOZILLA}/websrvcs/nsIWebServiceProxy.h
 include/${MOZILLA}/widget/mozcontainer.h
 include/${MOZILLA}/widget/mozdrawingarea.h
@@ -1913,6 +2037,7 @@ include/${MOZILLA}/widget/nsIClipboardHelper.h
 include/${MOZILLA}/widget/nsIClipboardOwner.h
 include/${MOZILLA}/widget/nsIDragService.h
 include/${MOZILLA}/widget/nsIDragSession.h
+include/${MOZILLA}/widget/nsIDragSessionBeOS.h
 include/${MOZILLA}/widget/nsIDragSessionGTK.h
 include/${MOZILLA}/widget/nsIDragSessionMac.h
 include/${MOZILLA}/widget/nsIDragSessionOS2.h
@@ -1921,6 +2046,7 @@ include/${MOZILLA}/widget/nsIEventListener.h
 include/${MOZILLA}/widget/nsIFilePicker.h
 include/${MOZILLA}/widget/nsIFormatConverter.h
 include/${MOZILLA}/widget/nsIFullScreen.h
+include/${MOZILLA}/widget/nsIGdkPixbufImage.h
 include/${MOZILLA}/widget/nsIKBStateControl.h
 include/${MOZILLA}/widget/nsILabel.h
 include/${MOZILLA}/widget/nsILookAndFeel.h
@@ -1939,19 +2065,16 @@ include/${MOZILLA}/widget/nsITextWidget.h
 include/${MOZILLA}/widget/nsIToolkit.h
 include/${MOZILLA}/widget/nsITransferable.h
 include/${MOZILLA}/widget/nsIWidget.h
-include/${MOZILLA}/widget/nsIXRemoteClient.h
-include/${MOZILLA}/widget/nsIXRemoteWidgetHelper.h
 include/${MOZILLA}/widget/nsStringUtil.h
 include/${MOZILLA}/widget/nsWidgetSupport.h
 include/${MOZILLA}/widget/nsWidgetsCID.h
-include/${MOZILLA}/widget/nsXRemoteClientCID.h
+include/${MOZILLA}/widget/widgetCore.h
 include/${MOZILLA}/windowwatcher/nsIAuthPromptWrapper.h
 include/${MOZILLA}/windowwatcher/nsIDialogParamBlock.h
 include/${MOZILLA}/windowwatcher/nsIPromptService.h
 include/${MOZILLA}/windowwatcher/nsIWindowWatcher.h
 include/${MOZILLA}/windowwatcher/nsPIPromptService.h
 include/${MOZILLA}/windowwatcher/nsPIWindowWatcher.h
-include/${MOZILLA}/xlibrgb/xlibrgb.h
 include/${MOZILLA}/xml-rpc/nsIDictionary.h
 include/${MOZILLA}/xml-rpc/nsIXmlRpcClient.h
 include/${MOZILLA}/xml-rpc/nsIXmlRpcClientListener.h
@@ -1974,8 +2097,6 @@ include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
 include/${MOZILLA}/xpcom/nsCheapSets.h
 include/${MOZILLA}/xpcom/nsClassHashtable.h
 include/${MOZILLA}/xpcom/nsCom.h
-include/${MOZILLA}/xpcom/nsComObsolete.h
-include/${MOZILLA}/xpcom/nsComponentManagerObsolete.h
 include/${MOZILLA}/xpcom/nsComponentManagerUtils.h
 include/${MOZILLA}/xpcom/nsCppSharedAllocator.h
 include/${MOZILLA}/xpcom/nsDataHashtable.h
@@ -1995,6 +2116,7 @@ include/${MOZILLA}/xpcom/nsFastLoadService.h
 include/${MOZILLA}/xpcom/nsFixedSizeAllocator.h
 include/${MOZILLA}/xpcom/nsGenericFactory.h
 include/${MOZILLA}/xpcom/nsHashKeys.h
+include/${MOZILLA}/xpcom/nsHashPropertyBag.h
 include/${MOZILLA}/xpcom/nsHashSets.h
 include/${MOZILLA}/xpcom/nsHashtable.h
 include/${MOZILLA}/xpcom/nsIAllocator.h
@@ -2018,8 +2140,11 @@ include/${MOZILLA}/xpcom/nsIComponentRegistrar.h
 include/${MOZILLA}/xpcom/nsIConsoleListener.h
 include/${MOZILLA}/xpcom/nsIConsoleMessage.h
 include/${MOZILLA}/xpcom/nsIConsoleService.h
+include/${MOZILLA}/xpcom/nsIConverterInputStream.h
+include/${MOZILLA}/xpcom/nsIConverterOutputStream.h
 include/${MOZILLA}/xpcom/nsID.h
 include/${MOZILLA}/xpcom/nsIDebug.h
+include/${MOZILLA}/xpcom/nsIDirectoryEnumerator.h
 include/${MOZILLA}/xpcom/nsIDirectoryService.h
 include/${MOZILLA}/xpcom/nsIEnumerator.h
 include/${MOZILLA}/xpcom/nsIEnvironment.h
@@ -2043,10 +2168,11 @@ include/${MOZILLA}/xpcom/nsIInterfaceRequestor.h
 include/${MOZILLA}/xpcom/nsIInterfaceRequestorUtils.h
 include/${MOZILLA}/xpcom/nsILineInputStream.h
 include/${MOZILLA}/xpcom/nsILocalFile.h
+include/${MOZILLA}/xpcom/nsILocalFileWin.h
 include/${MOZILLA}/xpcom/nsIMemory.h
 include/${MOZILLA}/xpcom/nsIModule.h
 include/${MOZILLA}/xpcom/nsIMultiplexInputStream.h
-include/${MOZILLA}/xpcom/nsINativeComponentLoader.h
+include/${MOZILLA}/xpcom/nsINIParser.h
 include/${MOZILLA}/xpcom/nsIObjectInputStream.h
 include/${MOZILLA}/xpcom/nsIObjectOutputStream.h
 include/${MOZILLA}/xpcom/nsIObserver.h
@@ -2057,7 +2183,9 @@ include/${MOZILLA}/xpcom/nsIPipe.h
 include/${MOZILLA}/xpcom/nsIProcess.h
 include/${MOZILLA}/xpcom/nsIProgrammingLanguage.h
 include/${MOZILLA}/xpcom/nsIProperties.h
+include/${MOZILLA}/xpcom/nsIProperty.h
 include/${MOZILLA}/xpcom/nsIPropertyBag.h
+include/${MOZILLA}/xpcom/nsIPropertyBag2.h
 include/${MOZILLA}/xpcom/nsIProxyCreateInstance.h
 include/${MOZILLA}/xpcom/nsIProxyObjectManager.h
 include/${MOZILLA}/xpcom/nsIRecyclingAllocator.h
@@ -2067,7 +2195,6 @@ include/${MOZILLA}/xpcom/nsISeekableStream.h
 include/${MOZILLA}/xpcom/nsISerializable.h
 include/${MOZILLA}/xpcom/nsIServiceManager.h
 include/${MOZILLA}/xpcom/nsIServiceManagerObsolete.h
-include/${MOZILLA}/xpcom/nsIServiceManagerUtils.h
 include/${MOZILLA}/xpcom/nsISimpleEnumerator.h
 include/${MOZILLA}/xpcom/nsIStorageStream.h
 include/${MOZILLA}/xpcom/nsIStreamBufferAccess.h
@@ -2080,6 +2207,7 @@ include/${MOZILLA}/xpcom/nsISupportsImpl.h
 include/${MOZILLA}/xpcom/nsISupportsIterators.h
 include/${MOZILLA}/xpcom/nsISupportsObsolete.h
 include/${MOZILLA}/xpcom/nsISupportsPrimitives.h
+include/${MOZILLA}/xpcom/nsISupportsPriority.h
 include/${MOZILLA}/xpcom/nsISupportsUtils.h
 include/${MOZILLA}/xpcom/nsIThread.h
 include/${MOZILLA}/xpcom/nsITimelineService.h
@@ -2089,16 +2217,23 @@ include/${MOZILLA}/xpcom/nsITimerManager.h
 include/${MOZILLA}/xpcom/nsITraceRefcnt.h
 include/${MOZILLA}/xpcom/nsIUnicharBuffer.h
 include/${MOZILLA}/xpcom/nsIUnicharInputStream.h
+include/${MOZILLA}/xpcom/nsIUnicharLineInputStream.h
+include/${MOZILLA}/xpcom/nsIUnicharOutputStream.h
 include/${MOZILLA}/xpcom/nsIVariant.h
+include/${MOZILLA}/xpcom/nsIVersionComparator.h
 include/${MOZILLA}/xpcom/nsIWeakReference.h
 include/${MOZILLA}/xpcom/nsIWeakReferenceUtils.h
+include/${MOZILLA}/xpcom/nsIWritablePropertyBag.h
+include/${MOZILLA}/xpcom/nsIWritablePropertyBag2.h
 include/${MOZILLA}/xpcom/nsIXPTLoader.h
 include/${MOZILLA}/xpcom/nsInt64.h
 include/${MOZILLA}/xpcom/nsInterfaceHashtable.h
+include/${MOZILLA}/xpcom/nsInterfaceRequestorAgg.h
 include/${MOZILLA}/xpcom/nsLinebreakConverter.h
 include/${MOZILLA}/xpcom/nsLocalFile.h
 include/${MOZILLA}/xpcom/nsLocalFileUnix.h
 include/${MOZILLA}/xpcom/nsMemory.h
+include/${MOZILLA}/xpcom/nsModule.h
 include/${MOZILLA}/xpcom/nsMultiplexInputStream.h
 include/${MOZILLA}/xpcom/nsNativeCharsetUtils.h
 include/${MOZILLA}/xpcom/nsNativeComponentLoader.h
@@ -2112,8 +2247,8 @@ include/${MOZILLA}/xpcom/nsQuickSort.h
 include/${MOZILLA}/xpcom/nsRecyclingAllocator.h
 include/${MOZILLA}/xpcom/nsRefPtrHashtable.h
 include/${MOZILLA}/xpcom/nsScriptableInputStream.h
+include/${MOZILLA}/xpcom/nsServiceManagerUtils.h
 include/${MOZILLA}/xpcom/nsStaticAtom.h
-include/${MOZILLA}/xpcom/nsStaticComponent.h
 include/${MOZILLA}/xpcom/nsStaticNameTable.h
 include/${MOZILLA}/xpcom/nsStorageStream.h
 include/${MOZILLA}/xpcom/nsStreamUtils.h
@@ -2130,6 +2265,7 @@ include/${MOZILLA}/xpcom/nsTraceRefcntImpl.h
 include/${MOZILLA}/xpcom/nsUnitConversion.h
 include/${MOZILLA}/xpcom/nsValueArray.h
 include/${MOZILLA}/xpcom/nsVariant.h
+include/${MOZILLA}/xpcom/nsVersionComparator.h
 include/${MOZILLA}/xpcom/nsVoidArray.h
 include/${MOZILLA}/xpcom/nsWeakPtr.h
 include/${MOZILLA}/xpcom/nsWeakReference.h
@@ -2184,13 +2320,15 @@ include/${MOZILLA}/xpinstall/nsPIXPIProxy.h
 include/${MOZILLA}/xpinstall/nsPIXPIStubHook.h
 include/${MOZILLA}/xpinstall/nsSoftwareUpdateIIDs.h
 include/${MOZILLA}/xpinstall/nsXPITriggerInfo.h
-include/${MOZILLA}/xprintutil/xprintutil.h
-include/${MOZILLA}/xremoteservice/nsIXRemoteService.h
-include/${MOZILLA}/xul/nsIXULContent.h
 include/${MOZILLA}/xul/nsIXULPopupListener.h
+include/${MOZILLA}/xul/nsXULAtomList.h
+include/${MOZILLA}/xul/nsXULAtoms.h
+include/${MOZILLA}/xulapp/nsINativeAppSupport.h
 include/${MOZILLA}/xulapp/nsIProfileMigrator.h
 include/${MOZILLA}/xulapp/nsIToolkitProfile.h
 include/${MOZILLA}/xulapp/nsIToolkitProfileService.h
+include/${MOZILLA}/xulapp/nsIXULAppInfo.h
+include/${MOZILLA}/xulapp/nsIXULRuntime.h
 include/${MOZILLA}/xulapp/nsXULAppAPI.h
 include/${MOZILLA}/xuldoc/nsIController.h
 include/${MOZILLA}/xuldoc/nsIControllers.h
@@ -2202,56 +2340,127 @@ include/${MOZILLA}/xuldoc/nsIXULPrototypeDocument.h
 include/${MOZILLA}/xultmpl/nsIXULBuilderListener.h
 include/${MOZILLA}/xultmpl/nsIXULSortService.h
 include/${MOZILLA}/xultmpl/nsIXULTemplateBuilder.h
+include/${MOZILLA}/zlib/mozzconf.h
 include/${MOZILLA}/zlib/zconf.h
 include/${MOZILLA}/zlib/zlib.h
 @comment end INCLUDE
-@unexec ${RM} %D/lib/${MOZILLA}/extensions/Extensions.rdf
-@unexec ${RM} %D/lib/${MOZILLA}/extensions/installed-extensions-processed.txt
-@unexec ${RM} %D/lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-@unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
-@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
-@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf
-@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/inspector/content/overlays.rdf
-@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/messenger/content/overlays.rdf
-@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/navigator/content/overlays.rdf
+@comment begin INCLUDE-PUBLIC
+include/${MOZILLA}/nss/base64.h
+include/${MOZILLA}/nss/blapit.h
+include/${MOZILLA}/nss/cert.h
+include/${MOZILLA}/nss/certdb.h
+include/${MOZILLA}/nss/certt.h
+include/${MOZILLA}/nss/ciferfam.h
+include/${MOZILLA}/nss/cmmf.h
+include/${MOZILLA}/nss/cmmft.h
+include/${MOZILLA}/nss/cms.h
+include/${MOZILLA}/nss/cmsreclist.h
+include/${MOZILLA}/nss/cmst.h
+include/${MOZILLA}/nss/crmf.h
+include/${MOZILLA}/nss/crmft.h
+include/${MOZILLA}/nss/cryptohi.h
+include/${MOZILLA}/nss/cryptoht.h
+include/${MOZILLA}/nss/ecl-exp.h
+include/${MOZILLA}/nss/hasht.h
+include/${MOZILLA}/nss/jar-ds.h
+include/${MOZILLA}/nss/jar.h
+include/${MOZILLA}/nss/jarfile.h
+include/${MOZILLA}/nss/key.h
+include/${MOZILLA}/nss/keyhi.h
+include/${MOZILLA}/nss/keyt.h
+include/${MOZILLA}/nss/keythi.h
+include/${MOZILLA}/nss/nss.h
+include/${MOZILLA}/nss/nssb64.h
+include/${MOZILLA}/nss/nssb64t.h
+include/${MOZILLA}/nss/nssbase.h
+include/${MOZILLA}/nss/nssbaset.h
+include/${MOZILLA}/nss/nssck.api
+include/${MOZILLA}/nss/nssckbi.h
+include/${MOZILLA}/nss/nssckepv.h
+include/${MOZILLA}/nss/nssckft.h
+include/${MOZILLA}/nss/nssckfw.h
+include/${MOZILLA}/nss/nssckfwc.h
+include/${MOZILLA}/nss/nssckfwt.h
+include/${MOZILLA}/nss/nssckg.h
+include/${MOZILLA}/nss/nssckmdt.h
+include/${MOZILLA}/nss/nssckt.h
+include/${MOZILLA}/nss/nssilckt.h
+include/${MOZILLA}/nss/nssilock.h
+include/${MOZILLA}/nss/nsslocks.h
+include/${MOZILLA}/nss/nssrwlk.h
+include/${MOZILLA}/nss/nssrwlkt.h
+include/${MOZILLA}/nss/ocsp.h
+include/${MOZILLA}/nss/ocspt.h
+include/${MOZILLA}/nss/p12.h
+include/${MOZILLA}/nss/p12plcy.h
+include/${MOZILLA}/nss/p12t.h
+include/${MOZILLA}/nss/pk11func.h
+include/${MOZILLA}/nss/pk11pqg.h
+include/${MOZILLA}/nss/pk11priv.h
+include/${MOZILLA}/nss/pk11pub.h
+include/${MOZILLA}/nss/pk11sdr.h
+include/${MOZILLA}/nss/pkcs11.h
+include/${MOZILLA}/nss/pkcs11f.h
+include/${MOZILLA}/nss/pkcs11n.h
+include/${MOZILLA}/nss/pkcs11p.h
+include/${MOZILLA}/nss/pkcs11t.h
+include/${MOZILLA}/nss/pkcs11u.h
+include/${MOZILLA}/nss/pkcs12.h
+include/${MOZILLA}/nss/pkcs12t.h
+include/${MOZILLA}/nss/pkcs7t.h
+include/${MOZILLA}/nss/portreg.h
+include/${MOZILLA}/nss/preenc.h
+include/${MOZILLA}/nss/secasn1.h
+include/${MOZILLA}/nss/secasn1t.h
+include/${MOZILLA}/nss/seccomon.h
+include/${MOZILLA}/nss/secder.h
+include/${MOZILLA}/nss/secdert.h
+include/${MOZILLA}/nss/secdig.h
+include/${MOZILLA}/nss/secdigt.h
+include/${MOZILLA}/nss/secerr.h
+include/${MOZILLA}/nss/sechash.h
+include/${MOZILLA}/nss/secitem.h
+include/${MOZILLA}/nss/secmime.h
+include/${MOZILLA}/nss/secmod.h
+include/${MOZILLA}/nss/secmodt.h
+include/${MOZILLA}/nss/secoid.h
+include/${MOZILLA}/nss/secoidt.h
+include/${MOZILLA}/nss/secpkcs5.h
+include/${MOZILLA}/nss/secpkcs7.h
+include/${MOZILLA}/nss/secport.h
+include/${MOZILLA}/nss/shsign.h
+include/${MOZILLA}/nss/smime.h
+include/${MOZILLA}/nss/ssl.h
+include/${MOZILLA}/nss/sslerr.h
+include/${MOZILLA}/nss/sslproto.h
+include/${MOZILLA}/nss/sslt.h
+include/${MOZILLA}/nss/swfort.h
+include/${MOZILLA}/nss/swfortt.h
+include/${MOZILLA}/nss/watcomfx.h
+@comment end INCLUDE-PUBLIC
+@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
 @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
 @unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
-@unexec ${RM} %D/lib/${MOZILLA}/components.ini
-@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/${MOZILLA}/extensions
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/navigator/content
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/navigator
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/messenger/content
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/messenger
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/inspector/content
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/inspector
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/communicator/content
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/communicator
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/browser/content
-@dirrm lib/${MOZILLA}/chrome/overlayinfo/browser
-@dirrm lib/${MOZILLA}/chrome/overlayinfo
 @comment begin DIRS
 @dirrm lib/${MOZILLA}/searchplugins
 @dirrm lib/${MOZILLA}/res/throbber
 @dirrm lib/${MOZILLA}/res/samples
-@dirrm lib/${MOZILLA}/res/rdf
-@dirrm lib/${MOZILLA}/res/inspector
 @dirrm lib/${MOZILLA}/res/html
 @dirrm lib/${MOZILLA}/res/fonts
 @dirrm lib/${MOZILLA}/res/entityTables
 @dirrm lib/${MOZILLA}/res/dtd
-@exec ${MKDIR} %D/lib/${MOZILLA}/res/builtin
-@dirrm lib/${MOZILLA}/res/builtin
 @dirrm lib/${MOZILLA}/res
-@exec ${MKDIR} %D/lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/plugins
-@dirrm lib/${MOZILLA}/ipc/modules
-@dirrm lib/${MOZILLA}/ipc
 @dirrm lib/${MOZILLA}/init.d
 @dirrm lib/${MOZILLA}/icons
 @dirrm lib/${MOZILLA}/greprefs
-@dirrm lib/${MOZILLA}/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/${MOZILLA}/defaults/profile/extensions
+@dirrm lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+@dirrm lib/${MOZILLA}/extensions/inspector@mozilla.org/defaults/preferences
+@dirrm lib/${MOZILLA}/extensions/inspector@mozilla.org/defaults
+@dirrm lib/${MOZILLA}/extensions/inspector@mozilla.org/components
+@dirrm lib/${MOZILLA}/extensions/inspector@mozilla.org/chrome
+@dirrm lib/${MOZILLA}/extensions/inspector@mozilla.org
+@dirrm lib/${MOZILLA}/extensions
 @dirrm lib/${MOZILLA}/defaults/profile/chrome
 @dirrm lib/${MOZILLA}/defaults/profile
 @dirrm lib/${MOZILLA}/defaults/pref
@@ -2267,15 +2476,12 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/xuldoc
 @dirrm include/${MOZILLA}/xulapp
 @dirrm include/${MOZILLA}/xul
-@dirrm include/${MOZILLA}/xremoteservice
-@dirrm include/${MOZILLA}/xprintutil
 @dirrm include/${MOZILLA}/xpinstall
 @dirrm include/${MOZILLA}/xpconnect
 @dirrm include/${MOZILLA}/xpcom_obsolete
 @dirrm include/${MOZILLA}/xpcom
 @dirrm include/${MOZILLA}/xmlextras
 @dirrm include/${MOZILLA}/xml-rpc
-@dirrm include/${MOZILLA}/xlibrgb
 @dirrm include/${MOZILLA}/windowwatcher
 @dirrm include/${MOZILLA}/widget
 @dirrm include/${MOZILLA}/websrvcs
@@ -2298,19 +2504,17 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/uconv
 @dirrm include/${MOZILLA}/txtsvc
 @dirrm include/${MOZILLA}/txmgr
+@dirrm include/${MOZILLA}/transformiix
 @dirrm include/${MOZILLA}/toolkitcomps
 @dirrm include/${MOZILLA}/system-pref
 @dirrm include/${MOZILLA}/string
 @dirrm include/${MOZILLA}/sidebar
 @dirrm include/${MOZILLA}/shistory
 @dirrm include/${MOZILLA}/shellservice
-@exec ${MKDIR} %D/include/${MOZILLA}/seccmd
-@dirrm include/${MOZILLA}/seccmd
 @dirrm include/${MOZILLA}/satchel
 @dirrm include/${MOZILLA}/rdfutil
 @dirrm include/${MOZILLA}/rdf
 @dirrm include/${MOZILLA}/progressDlg
-@dirrm include/${MOZILLA}/profilesharingsetup
 @dirrm include/${MOZILLA}/profile
 @dirrm include/${MOZILLA}/profdirserviceprovider
 @dirrm include/${MOZILLA}/prefetch
@@ -2321,6 +2525,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/pipboot
 @dirrm include/${MOZILLA}/passwordmgr
 @dirrm include/${MOZILLA}/oji
+@dirrm include/${MOZILLA}/nss
 @dirrm include/${MOZILLA}/nspr/private
 @dirrm include/${MOZILLA}/nspr/obsolete
 @dirrm include/${MOZILLA}/nspr/md
@@ -2328,7 +2533,6 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/nkcache
 @dirrm include/${MOZILLA}/necko2
 @dirrm include/${MOZILLA}/necko
-@dirrm include/${MOZILLA}/mozldap
 @dirrm include/${MOZILLA}/mozgnome
 @dirrm include/${MOZILLA}/mork
 @dirrm include/${MOZILLA}/mimetype
@@ -2337,6 +2541,8 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/locale
 @dirrm include/${MOZILLA}/liveconnect
 @dirrm include/${MOZILLA}/libreg
+@dirrm include/${MOZILLA}/libmar
+@dirrm include/${MOZILLA}/libbz2
 @dirrm include/${MOZILLA}/layout
 @dirrm include/${MOZILLA}/jsurl
 @dirrm include/${MOZILLA}/jsdebug
@@ -2344,13 +2550,11 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/js
 @dirrm include/${MOZILLA}/java
 @dirrm include/${MOZILLA}/jar
-@dirrm include/${MOZILLA}/ipcd
 @dirrm include/${MOZILLA}/intl
 @dirrm include/${MOZILLA}/inspector
 @dirrm include/${MOZILLA}/imglib2
 @dirrm include/${MOZILLA}/htmlparser
 @dirrm include/${MOZILLA}/history
-@dirrm include/${MOZILLA}/helperAppDlg
 @dirrm include/${MOZILLA}/gtkxtbin
 @dirrm include/${MOZILLA}/gtkembedmoz
 @dirrm include/${MOZILLA}/gfx
@@ -2371,6 +2575,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/content
 @dirrm include/${MOZILLA}/composer
 @dirrm include/${MOZILLA}/commandhandler
+@dirrm include/${MOZILLA}/chrome
 @dirrm include/${MOZILLA}/chardet
 @dirrm include/${MOZILLA}/caps
 @dirrm include/${MOZILLA}/browsercomps
@@ -2380,6 +2585,7 @@ include/${MOZILLA}/zlib/zlib.h
 @dirrm include/${MOZILLA}/autocomplete
 @dirrm include/${MOZILLA}/appshell
 @dirrm include/${MOZILLA}/appcomps
+@dirrm include/${MOZILLA}/alerts
 @dirrm include/${MOZILLA}/accessibility
 @dirrm include/${MOZILLA}
 @comment end DIRS
diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk
index 67c5535e903..da6ce24223a 100644
--- a/www/firefox/buildlink3.mk
+++ b/www/firefox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/07/20 23:33:30 taya Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/12/10 13:47:22 taya Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FIREFOX_BUILDLINK3_MK:=	${FIREFOX_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfirefox}
 BUILDLINK_PACKAGES+=	firefox
 
 .if !empty(FIREFOX_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.firefox+=	firefox>=1.0
-BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.0.6
+BUILDLINK_DEPENDS.firefox+=	firefox>=1.5
+BUILDLINK_RECOMMENDED.firefox+=	firefox>=1.5
 BUILDLINK_PKGSRCDIR.firefox?=	../../www/firefox
 .endif	# FIREFOX_BUILDLINK3_MK
 
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 7b013cbd24c..1757a08a480 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,66 +1,64 @@
-$NetBSD: distinfo,v 1.39 2005/10/12 16:39:24 joerg Exp $
+$NetBSD: distinfo,v 1.40 2005/12/10 13:47:22 taya Exp $
 
-SHA1 (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = ac7549f609db8dbea6db33b2ffb3ae546eea64df
-RMD160 (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = 8afafa2d772cabeacde5bad6dc053f9a0ee9a588
-Size (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = 32793876 bytes
-SHA1 (patch-aa) = 3684fbb59a56c03536686ca51876a01759b6f4b5
-SHA1 (patch-ab) = 00b9e799b390d3d7ca68c51d08816f8dcc674448
-SHA1 (patch-ac) = 242f2aa82d9518fc943879e3a0e73c32176ef69d
-SHA1 (patch-ad) = 213a9918f5a90e907b4b788c64cc01bfd8e55d3f
-SHA1 (patch-ae) = 6d26873efe3e6b2614ce71f784c27a6ce288f2b4
-SHA1 (patch-af) = a2dd473773b2960b3bd38943838139674725849d
-SHA1 (patch-ag) = ae4c234979b317ec33ef3a8fb7cd835336764fd2
-SHA1 (patch-ah) = 658e84218316f7db451129b846b869e73f799510
-SHA1 (patch-ai) = 74e87e7bfb098cd598ec30d21e9dc28fb4b99b7e
-SHA1 (patch-aj) = ebb3b4f8700dc179dfae31740e35984f58a5b638
-SHA1 (patch-ak) = 6f86b60fbe29db5d984fda06de0eff3ebf4de307
-SHA1 (patch-al) = 9bbbb2e3627a26f7a942d16ce927487bf0c81250
-SHA1 (patch-an) = 0ea10d371226ee8e7c2cbbbf291623ebbb31f1c3
-SHA1 (patch-ao) = 6f4bc48ed8eb507c43005ded5f000df05c21b5c9
-SHA1 (patch-ap) = 2fce6e5036d4e3d84c2767f8aaaaa0c75d5c6927
-SHA1 (patch-aq) = 9131a1a5d3614de98ca23c717b35ce86312bbd80
-SHA1 (patch-aw) = cb450d92a994267dc17dc1bc3161b3f8b4bfa9ee
-SHA1 (patch-ax) = 901af81169ce26f190594a3ae65ea16e53dcb48e
-SHA1 (patch-ba) = 241a37462541c824789c3d7cb732f88c0d2e888a
-SHA1 (patch-bb) = 9ff5bc4e799f29eec237d24ea6f8be2e63cbbf5b
-SHA1 (patch-bm) = fa85228b45f72e6f04cbf32635de9211dff7c1b9
-SHA1 (patch-bo) = d84fd3d978cb229948681ceee5ab3ffdb951e6f3
-SHA1 (patch-bq) = ca71c984b8c4099fa1af21542da6fd180fb62e10
-SHA1 (patch-br) = f3e5b80f1aa6ac3feac1888204421a69a87cec55
-SHA1 (patch-bs) = ac910aaf7eaaacc453c36ac099f3cca7496c9133
-SHA1 (patch-bt) = 7663b270c2b4eeb93a42e4a9b4b7691a7d384943
-SHA1 (patch-bu) = e90013f1dd881b26d96db858ec812ae71b867153
-SHA1 (patch-bv) = 70143d3ed461f1069ad7ff1ac95ff32c7eab66ef
-SHA1 (patch-bw) = 049625778a89067342ee776bd22874ce1858c586
-SHA1 (patch-bx) = eefa0a911dfbb7b3b156d2b1e604a3cb53e59428
-SHA1 (patch-by) = a4c05a0727488650d3644f532384c679e4d556a8
-SHA1 (patch-bz) = fa6c2340a5b7f43b29a8bd19efd55b6c541e3e5f
-SHA1 (patch-ca) = 39f776c2daf9d22b702b7edc888aa095511fe93c
-SHA1 (patch-cb) = 6bf3933689eba38f111914083bbffa8fd0abef48
-SHA1 (patch-cc) = ff5363411fce78bab406d86f13fc30e8397e668a
-SHA1 (patch-cd) = 42c857b9e4567f25bf6bea4abe958c83525ebbd9
-SHA1 (patch-ce) = 95d6f4adec6a5b9f9aa05635e68ccd3d4ec71f53
-SHA1 (patch-cf) = 380d628e368c9ca0da6f3e41ddaeff9e04f01d62
-SHA1 (patch-cg) = 3dd4c9ba21276436e416085d4551a6b6d9f12fe5
-SHA1 (patch-ch) = bd1c186d2b538ffe1e335e9f6a394fe926925f80
-SHA1 (patch-ci) = 843c875b37707249cba51328f81f5343b7a8769b
-SHA1 (patch-cj) = 9f90d4416640ad4a542a63ccdb68bda463b27ad8
-SHA1 (patch-ck) = 14eaaf75d3330d3efda0a1d746d345dca9ad84f6
-SHA1 (patch-cl) = c1c1c9e5c27b3c31ccbd12baa539e30139870b34
-SHA1 (patch-cm) = e8b3571a532e898f1eadfa0f2f1b116b1a590afd
-SHA1 (patch-db) = 2188ac37d5af04ab0022512b5a6486d18361d1d9
-SHA1 (patch-dc) = 3b1cf94da773f58194e75397ed8bd2ba8f636bc0
-SHA1 (patch-dd) = 3048d44c50cf85bf3dd3820213d7095bf2c7149f
-SHA1 (patch-df) = f9cb461b1f18f261af7115dc3b18fcbc1fef0a56
-SHA1 (patch-dh) = 500f8836d20ccab30f96215b18118f79a4f9ba2e
-SHA1 (patch-dj) = 73946a35ba6ac949c4717bb043fc63e4bcf60d4d
-SHA1 (patch-dk) = 2974c32601b0a793935d21e4f55a2eb3b20da915
-SHA1 (patch-dl) = 68287c1fe478eb221af4a43a3dea585b46ebe421
-SHA1 (patch-dm) = cfe45c664bafb035a00f4b346efb866d2079f5cb
-SHA1 (patch-do) = e12ba005ecbaf066275e5410ca97244cb8f729e7
-SHA1 (patch-dp) = b1087dc8f85ed18e54d371ddb2dc47b4b199da36
-SHA1 (patch-dr) = c35f305f63bcd5ddc3e55725ddcb9f03c0ea29c0
-SHA1 (patch-ds) = 2d101e4ceeba746f92896c1134eb303cb682cb4a
-SHA1 (patch-dt) = 8e70ff6babd4b236d51bcf6d47f2b26c4c643369
-SHA1 (patch-du) = 7a499969651573d923b6e40d06d9c3ae467ad6ce
-SHA1 (patch-dv) = 5baa26fcf9295b776a0ac08386d10dcb005ab0f7
+SHA1 (firefox-1.5/firefox-1.5-source.tar.bz2) = 7437c6a351787ec8762e598ae1852e22bcca3220
+RMD160 (firefox-1.5/firefox-1.5-source.tar.bz2) = 5e7475846e9c92e36167a384e1e8a3d699b0b62f
+Size (firefox-1.5/firefox-1.5-source.tar.bz2) = 34491496 bytes
+SHA1 (patch-bugzilla-�319004) = d13f4c20cd74bfd6f8caae4a135f7f82361ce986
+SHA1 (patch-bugzilla-319004) = d13f4c20cd74bfd6f8caae4a135f7f82361ce986
+SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
+SHA1 (patch-ab) = bcc480ab0f7d1760bf4f26b6464db6b69fa3b4d6
+SHA1 (patch-ac) = d35b8da8ee1a6b42068ece31a1f4659e153b29cd
+SHA1 (patch-ad) = 20f2184a7e5e98b065e884c67e4c17fc52019a79
+SHA1 (patch-ae) = fea251aabc772c3d4ad3044c8295af45cc9cab2d
+SHA1 (patch-af) = 01e10664fbf20dffa53ecb94be24a421c39b838b
+SHA1 (patch-ag) = 1266333a482483f786d5f00e92e641e282266442
+SHA1 (patch-ah) = c737519c8ab8a66993d4892a6efac73e2da979f5
+SHA1 (patch-ai) = 58d7d87295cfbcaeba3e6a27457e15533d4b8e78
+SHA1 (patch-aj) = 84a5e3630c7dd9532bbb20e7444ff9582631ea24
+SHA1 (patch-ak) = aa54e2c4d2f1c0d40bbbfcd6e3e55b44c3c549ff
+SHA1 (patch-al) = e5fc425630a5363807bf1cc2c648d5eb31d0e40e
+SHA1 (patch-an) = 8b855be2d22422fcbf9293717ee45a8115e15bff
+SHA1 (patch-ao) = f7221f4135c8bb5adc154f523cef7ff0ef42e602
+SHA1 (patch-ap) = 0a99d04b6746cf85e73a3a9a1e6fed118495c6a5
+SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf
+SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a
+SHA1 (patch-ax) = 90bb18ed68a7e266e153b537bf85e082296ade47
+SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071
+SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037
+SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85
+SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
+SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
+SHA1 (patch-br) = 943b38fef5e7070de7af8a055f05e576039ad8bb
+SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
+SHA1 (patch-bu) = 0714f658001c363f4abbfb248ac77c4862e3ccf9
+SHA1 (patch-bugzilla-319004) = d13f4c20cd74bfd6f8caae4a135f7f82361ce986
+SHA1 (patch-bv) = ef06a6a774c9d4da7b3fbf6f4e274ab042926e49
+SHA1 (patch-bx) = 7d524d6d46593ba54f12a75c57822518feee84d0
+SHA1 (patch-by) = a6eeccfee4e7e3620be41b315c357575c8bd0635
+SHA1 (patch-bz) = 7f939c1717b2df473217da9cf703a37e459731c7
+SHA1 (patch-ca) = 264d83ff1fc38d5f754b62507615aff6c353dd26
+SHA1 (patch-cb) = 0929baadba9271ee8960a01997c2ded445fe39a2
+SHA1 (patch-cd) = f07c2fafd4427b4a429f8f01f0c321eb802cfaec
+SHA1 (patch-cg) = 867f8642eacc0b46999eefc4c3566e340939fd68
+SHA1 (patch-ch) = a5220e0a20269271656cfa954f3b1005807f7cd3
+SHA1 (patch-ci) = 2c9817c7431840928cdc7bfc2e033b0050ad04b4
+SHA1 (patch-cj) = 3ae48c9a906f47cf32706a1d2b3b6b44918e99f4
+SHA1 (patch-ck) = 18e6c412399c8b5b89941d818cf2589711f35472
+SHA1 (patch-cl) = a08ba37aa7ac7806123aa21b6ff8055c6ded6449
+SHA1 (patch-cm) = 7da6e9da803407b25bf4b707562777e8429a37a4
+SHA1 (patch-cn) = 56e346b892c475d8b8e5c7521a34700338186437
+SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
+SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
+SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7
+SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b
+SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
+SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
+SHA1 (patch-dk) = 183fa0d6a9040f53d9988fcc8868bdf83229803b
+SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab
+SHA1 (patch-dm) = eb86aee54fd213eb64a89e5bc2754971db9648f4
+SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
+SHA1 (patch-dr) = 377b1d83079ada4d819b6702c1010cdd900575fc
+SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
+SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
+SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
+SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa
index 9ca093d7a39..3b8517eb686 100644
--- a/www/firefox/patches/patch-aa
+++ b/www/firefox/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.2 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/10 13:47:22 taya Exp $
 
---- config/autoconf.mk.in.orig	2004-10-31 04:29:54.000000000 +0000
-+++ config/autoconf.mk.in
-@@ -32,13 +32,13 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNA
+diff -ruN ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in
+--- ../Orig/mozilla/config/autoconf.mk.in	2005-08-18 02:17:17.000000000 +0900
++++ ./config/autoconf.mk.in	2005-12-04 19:02:42.000000000 +0900
+@@ -54,13 +54,13 @@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
diff --git a/www/firefox/patches/patch-ab b/www/firefox/patches/patch-ab
index 45fa51a7844..72d7644050d 100644
--- a/www/firefox/patches/patch-ab
+++ b/www/firefox/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.4 2005/10/12 16:39:24 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2005/12/10 13:47:22 taya Exp $
 
-diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2004-05-14 06:57:46.000000000 +0900
-+++ ./configure.in	2004-06-15 23:55:39.000000000 +0900
-@@ -1008,7 +1008,7 @@
+diff -ruN ../Orig/mozilla/configure.in ./configure.in
+--- ../Orig/mozilla/configure.in	2005-10-04 14:53:49.000000000 +0900
++++ ./configure.in	2005-12-04 19:02:51.000000000 +0900
+@@ -1360,7 +1360,7 @@
      esac
      ;;
  
@@ -12,7 +12,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1017,6 +1017,9 @@
+@@ -1374,6 +1374,9 @@
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -22,7 +22,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;; 
  
  *-hpux*)
-@@ -1308,6 +1311,13 @@
+@@ -1768,6 +1771,13 @@
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -36,7 +36,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
-@@ -1531,7 +1541,7 @@
+@@ -1993,7 +2003,7 @@
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
@@ -45,9 +45,9 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
-@@ -4280,7 +4290,7 @@ dnl = Enable code optimization. OFF by d
+@@ -5205,7 +5215,7 @@
+ dnl = Enable code optimization. ON by default.
  dnl ========================================================
- MOZ_OPTIMIZE=
  if test -z "$MOZ_OPTIMIZE_FLAGS"; then
 -	MOZ_OPTIMIZE_FLAGS="-O"
 +	MOZ_OPTIMIZE_FLAGS=""
diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac
index 0f0e2c83f2c..84bdf567e4c 100644
--- a/www/firefox/patches/patch-ac
+++ b/www/firefox/patches/patch-ac
@@ -1,8 +1,9 @@
-$NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $
+$NetBSD: patch-ac,v 1.7 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2005-04-28 16:01:33.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -45,10 +45,13 @@
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2005-06-15 17:32:21.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in	2005-12-04 19:03:04.000000000 +0900
+@@ -61,10 +61,13 @@
  #
  # Lots of Unixish x86 flavors
  #
@@ -17,7 +18,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $
  endif
  #
  # New code for Linux, et. al., with gcc
-@@ -140,7 +143,7 @@
+@@ -157,7 +160,7 @@
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -26,7 +27,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -174,7 +177,7 @@
+@@ -191,7 +194,7 @@
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -35,7 +36,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -257,6 +260,7 @@
+@@ -274,6 +277,7 @@
  ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
  CPPSRCS		:= xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
@@ -43,7 +44,7 @@ $NetBSD: patch-ac,v 1.6 2005/10/12 16:39:24 joerg Exp $
  endif
  
  #
-@@ -305,6 +309,13 @@
+@@ -322,6 +326,13 @@
  CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
diff --git a/www/firefox/patches/patch-ad b/www/firefox/patches/patch-ad
index 635354f2a3d..f6da3476929 100644
--- a/www/firefox/patches/patch-ad
+++ b/www/firefox/patches/patch-ad
@@ -1,8 +1,9 @@
-$NetBSD: patch-ad,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	2001-09-28 20:12:51.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
-@@ -132,6 +132,15 @@ extern "C" {
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2004-04-18 23:18:18.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2005-12-04 19:03:09.000000000 +0900
+@@ -132,6 +132,15 @@
      }
  }
  
@@ -18,7 +19,7 @@ $NetBSD: patch-ad,v 1.3 2005/09/22 14:14:04 jlam Exp $
  XPTC_PUBLIC_API(nsresult)
  XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
                     PRUint32 paramCount, nsXPTCVariant* params)
-@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+@@ -139,30 +148,30 @@
      PRUint32 result;
  
   __asm__ __volatile__(
diff --git a/www/firefox/patches/patch-ae b/www/firefox/patches/patch-ae
index 9a6e166b0d2..31762cbdcd1 100644
--- a/www/firefox/patches/patch-ae
+++ b/www/firefox/patches/patch-ae
@@ -1,8 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig	2001-09-28 20:12:52.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
-@@ -123,17 +123,27 @@ extern "C" {
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2004-04-18 23:18:18.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2005-12-04 19:03:11.000000000 +0900
+@@ -123,17 +123,27 @@
      }
  }
  
diff --git a/www/firefox/patches/patch-af b/www/firefox/patches/patch-af
index d6a45cac0f9..2f2c7f9f9b7 100644
--- a/www/firefox/patches/patch-af
+++ b/www/firefox/patches/patch-af
@@ -1,16 +1,17 @@
-$NetBSD: patch-af,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-af,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- security/nss/lib/freebl/unix_rand.c.orig	2003-05-30 23:31:19.000000000 +0000
-+++ security/nss/lib/freebl/unix_rand.c
-@@ -32,6 +32,7 @@
-  */
+diff -ruN ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c
+--- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c	2005-10-11 08:22:50.000000000 +0900
++++ ./security/nss/lib/freebl/unix_rand.c	2005-12-04 19:04:32.000000000 +0900
+@@ -35,6 +35,7 @@
+  * ***** END LICENSE BLOCK ***** */
  
  #include <stdio.h>
 +#include <fcntl.h>
  #include <string.h>
  #include <signal.h>
  #include <unistd.h>
-@@ -691,7 +692,11 @@ safe_popen(char *cmd)
+@@ -694,7 +695,11 @@
  	/* dup write-side of pipe to stderr and stdout */
  	if (p[1] != 1) dup2(p[1], 1);
  	if (p[1] != 2) dup2(p[1], 2);
@@ -20,6 +21,6 @@ $NetBSD: patch-af,v 1.3 2005/09/22 14:14:04 jlam Exp $
 +	    dup2(fd, 0);
 +	    close(fd);
 +	}
- 	for (fd = getdtablesize(); --fd > 2; close(fd))
- 	    ;
- 
+         {
+             int ndesc = getdtablesize();
+             for (fd = PR_MIN(65536, ndesc); --fd > 2; close(fd));
diff --git a/www/firefox/patches/patch-ag b/www/firefox/patches/patch-ag
index a5455a29e36..b3a282e0c2f 100644
--- a/www/firefox/patches/patch-ag
+++ b/www/firefox/patches/patch-ag
@@ -1,14 +1,15 @@
-$NetBSD: patch-ag,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/base/ErrorObserver.h.orig	2003-01-17 12:39:36.000000000 +0000
-+++ extensions/transformiix/source/base/ErrorObserver.h
-@@ -28,7 +28,8 @@
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h
+--- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h	2004-05-21 19:41:22.000000000 +0900
++++ ./extensions/transformiix/source/base/ErrorObserver.h	2005-12-04 19:05:55.000000000 +0900
+@@ -41,7 +41,8 @@
  
- #include "baseutils.h"
- #include "txError.h"
+ #include "txCore.h"
+ #ifdef TX_EXE
 -#include <iostream.h>
 +#include <iostream>
 +using namespace std;
- class nsAString;
+ #endif
  
  /**
diff --git a/www/firefox/patches/patch-ah b/www/firefox/patches/patch-ah
index 8f5f89ca784..ed74dbd66b0 100644
--- a/www/firefox/patches/patch-ah
+++ b/www/firefox/patches/patch-ah
@@ -1,8 +1,9 @@
-$NetBSD: patch-ah,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ah,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- gfx/idl/nsIFreeType2.idl.orig	2004-04-16 01:09:33.000000000 +0000
-+++ gfx/idl/nsIFreeType2.idl
-@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
+diff -ruN ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
+--- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 08:30:02.000000000 +0900
++++ ./gfx/idl/nsIFreeType2.idl	2005-12-04 19:06:04.000000000 +0900
+@@ -76,10 +76,11 @@
  native FT_Sfnt_Tag(FT_Sfnt_Tag);
  native FT_Size(FT_Size);
  
@@ -16,7 +17,7 @@ $NetBSD: patch-ah,v 1.3 2005/09/22 14:14:04 jlam Exp $
  native FTC_Manager(FTC_Manager);
  
  // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
+@@ -99,7 +100,7 @@
  
      readonly attribute FT_Library library;
      readonly attribute FTC_Manager FTCacheManager;
@@ -25,7 +26,7 @@ $NetBSD: patch-ah,v 1.3 2005/09/22 14:14:04 jlam Exp $
  
      void    doneFace(in FT_Face face);
      void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
+@@ -115,16 +116,16 @@
      void    outlineDecompose(in FT_Outline_p outline,
                               in const_FT_Outline_Funcs_p funcs, in voidPtr p);
      void    setCharmap(in FT_Face face, in FT_CharMap charmap);
diff --git a/www/firefox/patches/patch-ai b/www/firefox/patches/patch-ai
index ead13b82750..5ced0003483 100644
--- a/www/firefox/patches/patch-ai
+++ b/www/firefox/patches/patch-ai
@@ -1,8 +1,9 @@
-$NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ai,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	2004-02-05 01:57:05.000000000 +0000
-+++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	2005-04-28 17:04:00.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.cpp	2005-12-04 19:06:07.000000000 +0900
+@@ -1859,10 +1859,10 @@
    
    mPixelSize = NSToIntRound(app2dev * mFont->size);
  
@@ -17,7 +18,7 @@ $NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $
  
    nsresult rv;
    mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1190,7 +1190,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1896,7 +1896,7 @@
    if (!face)
      return 0;
  
@@ -26,7 +27,7 @@ $NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $
    nsresult rv = mFt2->GetImageCache(&iCache);
    if (NS_FAILED(rv)) {
      NS_ERROR("Failed to get Image Cache");
-@@ -1228,8 +1228,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1934,8 +1934,8 @@
    
    FTC_Manager cManager;
    mFt2->GetFTCacheManager(&cManager);
@@ -37,7 +38,7 @@ $NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $
    NS_ASSERTION(rv==0, "failed to get face/size");
    if (rv)
      return nsnull;
-@@ -1622,16 +1622,16 @@ void nsFT2Type8Generator::GeneratePSFont
+@@ -2379,16 +2379,16 @@
    mEntry->GetFamilyName(fontName);
    mEntry->GetStyleName(styleName);
    
diff --git a/www/firefox/patches/patch-aj b/www/firefox/patches/patch-aj
index 4bc7669d9bb..46a37e8d58e 100644
--- a/www/firefox/patches/patch-aj
+++ b/www/firefox/patches/patch-aj
@@ -1,8 +1,9 @@
-$NetBSD: patch-aj,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-aj,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- gfx/src/freetype/nsFreeType.h.orig	2004-04-16 21:31:42.000000000 +0000
-+++ gfx/src/freetype/nsFreeType.h
-@@ -104,13 +104,13 @@ typedef FT_Error (*FT_Outline_Decompose_
+diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h	2005-05-02 02:36:19.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.h	2005-12-04 19:06:10.000000000 +0900
+@@ -120,13 +120,13 @@
  typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
  typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
  typedef FT_Error (*FTC_Image_Cache_Lookup_t)
@@ -20,7 +21,7 @@ $NetBSD: patch-aj,v 1.3 2005/09/22 14:14:04 jlam Exp $
  // #ifdef MOZ_SVG
  typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
  typedef FT_Error (*FT_Get_Kerning_t)
-@@ -165,7 +165,7 @@ protected:
+@@ -181,7 +181,7 @@
    FT_Outline_Decompose_t    nsFT_Outline_Decompose;
    FT_Set_Charmap_t          nsFT_Set_Charmap;
    FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
@@ -29,7 +30,7 @@ $NetBSD: patch-aj,v 1.3 2005/09/22 14:14:04 jlam Exp $
    FTC_Manager_Done_t        nsFTC_Manager_Done;
    FTC_Manager_New_t         nsFTC_Manager_New;
    FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -213,7 +213,7 @@ protected:
+@@ -229,7 +229,7 @@
    PRLibrary      *mSharedLib;
    FT_Library      mFreeTypeLibrary;
    FTC_Manager     mFTCacheManager;
diff --git a/www/firefox/patches/patch-ak b/www/firefox/patches/patch-ak
index 4c95e50f99a..ccf9b14e424 100644
--- a/www/firefox/patches/patch-ak
+++ b/www/firefox/patches/patch-ak
@@ -1,8 +1,9 @@
-$NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ak,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- gfx/src/freetype/nsFreeType.cpp.orig	2004-02-07 15:22:30.000000000 +0000
-+++ gfx/src/freetype/nsFreeType.cpp
-@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
+diff -ruN ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
+--- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp	2005-07-14 03:21:10.000000000 +0900
++++ ./gfx/src/freetype/nsFreeType.cpp	2005-12-04 19:06:15.000000000 +0900
+@@ -110,11 +110,11 @@
    {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
    {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
    {"FT_Set_Charmap",          NS_FT2_OFFSET(nsFT_Set_Charmap),          PR_TRUE},
@@ -17,7 +18,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $
  // #ifdef MOZ_SVG
    {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
    {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
+@@ -288,7 +288,7 @@
  } 
   
  NS_IMETHODIMP
@@ -26,7 +27,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $
                                FT_UInt glyphID, FT_Glyph *glyph)
  { 
    // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
+@@ -297,11 +297,11 @@
  } 
   
  NS_IMETHODIMP
@@ -41,7 +42,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $
    return error ? NS_ERROR_FAILURE : NS_OK;
  } 
   
-@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
+@@ -326,7 +326,7 @@
  } 
   
  NS_IMETHODIMP
@@ -50,7 +51,7 @@ $NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $
  { 
    // call the FreeType2 function via the function pointer
    FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
+@@ -395,7 +395,7 @@
  } 
   
  NS_IMETHODIMP
diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al
index 0e31e2dc2e1..0d285db22bc 100644
--- a/www/firefox/patches/patch-al
+++ b/www/firefox/patches/patch-al
@@ -1,22 +1,24 @@
-$NetBSD: patch-al,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-al,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- gfx/src/ps/nsFontMetricsPS.h.orig	2003-04-22 16:25:09.000000000 +0000
-+++ gfx/src/ps/nsFontMetricsPS.h
-@@ -320,7 +320,7 @@ protected:
+diff -ruN ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h
+--- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h	2005-06-29 03:29:10.000000000 +0900
++++ ./gfx/src/ps/nsFontMetricsPS.h	2005-12-04 19:07:24.000000000 +0900
+@@ -424,7 +424,8 @@
    nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
    nsCOMPtr<nsIFreeType2> mFt2;
    PRUint16        mPixelSize;
 -  FTC_Image_Desc  mImageDesc;
 +  FTC_ImageType   mImageDesc;
++
+   nsCString       mFontNameBase;   // the base name of type 1 (sub) fonts
+   nscoord         mHeight; 
  
- 
-   static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont,
-@@ -363,7 +363,7 @@ public:
+@@ -493,7 +494,7 @@
  protected:
    nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
    nsCOMPtr<nsIFreeType2> mFt2;
 -  FTC_Image_Desc  mImageDesc;
 +  FTC_ImageType   mImageDesc;
  };
- #endif
- 
+ #endif   // MOZ_ENABLE_FREETYPE2
+ #endif   // MOZ_ENABLE_XFT
diff --git a/www/firefox/patches/patch-an b/www/firefox/patches/patch-an
index ee000e43a55..b62e7969221 100644
--- a/www/firefox/patches/patch-an
+++ b/www/firefox/patches/patch-an
@@ -1,8 +1,9 @@
-$NetBSD: patch-an,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-an,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- gfx/src/x11shared/nsFontFreeType.h.orig	2003-04-22 16:25:13.000000000 +0000
-+++ gfx/src/x11shared/nsFontFreeType.h
-@@ -110,7 +110,7 @@ protected:
+diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h	2004-04-18 06:52:34.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.h	2005-12-04 19:07:46.000000000 +0900
+@@ -110,7 +110,7 @@
    XImage *GetXImage(PRUint32 width, PRUint32 height);
    nsITrueTypeFontCatalogEntry *mFaceID;
    PRUint16        mPixelSize;
diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao
index 5ee8adeb651..f18212998d5 100644
--- a/www/firefox/patches/patch-ao
+++ b/www/firefox/patches/patch-ao
@@ -1,8 +1,9 @@
-$NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ao,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- gfx/src/x11shared/nsFontFreeType.cpp.orig	2003-12-25 08:24:52.000000000 +0000
-+++ gfx/src/x11shared/nsFontFreeType.cpp
-@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
+diff -ruN ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
+--- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2004-04-18 06:52:34.000000000 +0900
++++ ./gfx/src/x11shared/nsFontFreeType.cpp	2005-12-04 19:07:49.000000000 +0900
+@@ -177,7 +177,7 @@
    FTC_Manager mgr;
    nsresult rv;
    mFt2->GetFTCacheManager(&mgr);
@@ -11,7 +12,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $
    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
    if (NS_FAILED(rv))
      return nsnull;
-@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
+@@ -191,22 +191,15 @@
    PRBool embedded_bimap = PR_FALSE;
    mFaceID = aFaceID;
    mPixelSize = aPixelSize;
@@ -38,7 +39,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $
    PRUint32  num_embedded_bitmaps, i;
    PRInt32*  embedded_bitmapheights;
    mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
+@@ -218,7 +211,6 @@
          if (embedded_bitmapheights[i] == aPixelSize) {
            embedded_bimap = PR_TRUE;
            // unhinted must be set for embedded bitmaps to be used
@@ -46,7 +47,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $
            break;
          }
        }
-@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
+@@ -312,7 +304,7 @@
    if (!face)
      return NS_ERROR_FAILURE;
  
@@ -55,7 +56,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $
    mFt2->GetImageCache(&icache);
    if (!icache)
      return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
+@@ -401,7 +393,7 @@
    if (!face)
      return 0;
  
@@ -64,7 +65,7 @@ $NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $
    mFt2->GetImageCache(&icache);
    if (!icache)
      return 0;
-@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
+@@ -723,7 +715,7 @@
      if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
  #endif
  
diff --git a/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap
index af3365dadd6..40210afbd5d 100644
--- a/www/firefox/patches/patch-ap
+++ b/www/firefox/patches/patch-ap
@@ -1,8 +1,9 @@
-$NetBSD: patch-ap,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ap,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- security/coreconf/command.mk.orig	2002-02-15 22:53:12.000000000 +0000
-+++ security/coreconf/command.mk
-@@ -42,7 +42,7 @@ CCF           = $(CC) $(CFLAGS)
+diff -ruN ../Orig/mozilla/security/coreconf/command.mk ./security/coreconf/command.mk
+--- ../Orig/mozilla/security/coreconf/command.mk	2004-04-26 00:02:17.000000000 +0900
++++ ./security/coreconf/command.mk	2005-12-04 19:07:51.000000000 +0900
+@@ -46,7 +46,7 @@
  LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
  LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
  NFSPWD        = $(NSINSTALL_DIR)/nfspwd
diff --git a/www/firefox/patches/patch-aq b/www/firefox/patches/patch-aq
index e3c12669934..1d24715cc59 100644
--- a/www/firefox/patches/patch-aq
+++ b/www/firefox/patches/patch-aq
@@ -1,8 +1,9 @@
-$NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $
+$NetBSD: patch-aq,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- directory/c-sdk/configure.in.orig	2004-09-14 20:59:40.000000000 +0000
-+++ directory/c-sdk/configure.in
-@@ -52,7 +52,7 @@ USE_64=
+diff -ruN ../Orig/mozilla/directory/c-sdk/configure.in ./directory/c-sdk/configure.in
+--- ../Orig/mozilla/directory/c-sdk/configure.in	2005-06-15 06:27:33.000000000 +0900
++++ ./directory/c-sdk/configure.in	2005-12-04 19:07:54.000000000 +0900
+@@ -54,7 +54,7 @@
  USE_CPLUS=
  USE_IPV6=
  USE_MDUPDATE=
@@ -11,7 +12,7 @@ $NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $
  _DEBUG_FLAGS=-g
  MOZ_DEBUG=1
  MOZ_OPTIMIZE=
-@@ -888,7 +888,7 @@ case "$target" in
+@@ -907,7 +907,7 @@
      PR_MD_CSRCS=dgux.c
      ;;
  
@@ -20,7 +21,7 @@ $NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $
      if test -z "$USE_NSPR_THREADS"; then
          USE_PTHREADS=1
      fi
-@@ -2046,7 +2046,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2061,7 +2061,7 @@
              _PTHREAD_LDFLAGS=
          fi
  	    ;;
@@ -29,7 +30,7 @@ $NetBSD: patch-aq,v 1.3 2005/10/12 16:39:24 joerg Exp $
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
  	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-@@ -2099,7 +2099,7 @@ case "$target" in
+@@ -2114,7 +2114,7 @@
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
diff --git a/www/firefox/patches/patch-aw b/www/firefox/patches/patch-aw
index b70c1b8ba64..702e71424d8 100644
--- a/www/firefox/patches/patch-aw
+++ b/www/firefox/patches/patch-aw
@@ -1,11 +1,12 @@
-$NetBSD: patch-aw,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-aw,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- widget/src/gtksuperwin/Makefile.in.orig	2004-01-07 13:36:54.000000000 +0000
-+++ widget/src/gtksuperwin/Makefile.in
-@@ -25,6 +25,7 @@ include $(DEPTH)/config/autoconf.mk
- MODULE		= widget
+diff -ruN ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in
+--- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in	2004-12-15 14:52:41.000000000 +0900
++++ ./widget/src/gtksuperwin/Makefile.in	2005-12-04 19:08:57.000000000 +0900
+@@ -46,6 +46,7 @@
  LIBRARY_NAME	= gtksuperwin
  EXPORT_LIBRARY = 1
+ LIBXUL_LIBRARY = 1
 +MKSHLIB		= $(MKCSHLIB)
  
  PACKAGE_FILE = gtksuperwin.pkg
diff --git a/www/firefox/patches/patch-ax b/www/firefox/patches/patch-ax
index 08d5d0c92cc..0efd5869071 100644
--- a/www/firefox/patches/patch-ax
+++ b/www/firefox/patches/patch-ax
@@ -1,8 +1,9 @@
-$NetBSD: patch-ax,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ax,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- security/coreconf/SunOS5.mk.orig	2004-10-15 22:22:17.000000000 +0000
-+++ security/coreconf/SunOS5.mk
-@@ -181,6 +181,10 @@ endif
+diff -ruN ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk
+--- ../Orig/mozilla/security/coreconf/SunOS5.mk	2004-10-11 11:15:42.000000000 +0900
++++ ./security/coreconf/SunOS5.mk	2005-12-04 19:09:09.000000000 +0900
+@@ -182,6 +182,10 @@
  	DSO_LDOPTS += -G -h $(notdir $@)
  endif
  
diff --git a/www/firefox/patches/patch-ba b/www/firefox/patches/patch-ba
index a8aa3e38cf0..dc6dc3c3f24 100644
--- a/www/firefox/patches/patch-ba
+++ b/www/firefox/patches/patch-ba
@@ -1,8 +1,9 @@
-$NetBSD: patch-ba,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ba,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- nsprpub/pr/include/md/_netbsd.cfg.orig	2000-12-01 21:29:17.000000000 +0000
-+++ nsprpub/pr/include/md/_netbsd.cfg
-@@ -45,7 +45,8 @@
+diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	2004-04-28 09:33:44.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.cfg	2005-12-04 19:09:16.000000000 +0900
+@@ -48,7 +48,8 @@
  
  #define PR_AF_INET6 24  /* same as AF_INET6 */
  
@@ -12,7 +13,7 @@ $NetBSD: patch-ba,v 1.4 2005/09/22 14:14:04 jlam Exp $
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
-@@ -91,7 +92,53 @@
+@@ -94,7 +95,53 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
  
@@ -67,7 +68,7 @@ $NetBSD: patch-ba,v 1.4 2005/09/22 14:14:04 jlam Exp $
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
-@@ -184,6 +231,55 @@
+@@ -187,6 +234,55 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
  
diff --git a/www/firefox/patches/patch-bb b/www/firefox/patches/patch-bb
index cb18f32520a..fdcd37c1c2a 100644
--- a/www/firefox/patches/patch-bb
+++ b/www/firefox/patches/patch-bb
@@ -1,36 +1,19 @@
-$NetBSD: patch-bb,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bb,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- nsprpub/pr/include/md/_netbsd.h.orig	2003-09-11 17:24:53.000000000 +0000
-+++ nsprpub/pr/include/md/_netbsd.h
-@@ -44,16 +44,26 @@
+diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h
+--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h	2004-05-20 00:37:10.000000000 +0900
++++ ./nsprpub/pr/include/md/_netbsd.h	2005-12-04 19:14:22.000000000 +0900
+@@ -44,6 +44,8 @@
  #define _PR_SI_ARCHITECTURE "x86"
  #elif defined(__alpha__)
  #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__)
++#elif defined(__amd64__) 
 +#define _PR_SI_ARCHITECTURE "amd64"
  #elif defined(__m68k__)
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
- #define _PR_SI_ARCHITECTURE "powerpc"
-+#elif defined(__sparc_v9__)
-+#define _PR_SI_ARCHITECTURE "sparc64"
- #elif defined(__sparc__)
- #define _PR_SI_ARCHITECTURE "sparc"
- #elif defined(__mips__)
- #define _PR_SI_ARCHITECTURE "mips"
- #elif defined(__arm32__)
- #define _PR_SI_ARCHITECTURE "arm32"
-+#elif defined(__ARMEL__)
-+#define _PR_SI_ARCHITECTURE "armel"
-+#elif defined(__ARMEL__)
-+#define _PR_SI_ARCHITECTURE "armeb"
-+#elif defined(__arm__)
-+#define _PR_SI_ARCHITECTURE "arm"
- #endif
- 
- #if defined(__ELF__)
-@@ -86,6 +96,12 @@
- #define _PR_INET6_PROBE
+@@ -95,6 +97,12 @@
+ #define _PR_HAVE_GETPROTO_R_INT
  #endif
  
 +#if __NetBSD_Version__ >= 106370000
@@ -42,31 +25,3 @@ $NetBSD: patch-bb,v 1.4 2005/09/22 14:14:04 jlam Exp $
  #define USE_SETJMP
  
  #ifndef _PR_PTHREADS
-@@ -108,7 +124,17 @@
- }
- #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
- #endif
--#ifdef __sparc__
-+#ifdef __sparc_v9__
-+#define _MD_INIT_CONTEXT(_thread, _sp, _main, status)                  \
-+{                                                                      \
-+    sigsetjmp(CONTEXT(_thread), 1);                                    \
-+    CONTEXT(_thread)[1] = (unsigned char*) ((_sp) - 176 - 0x7ff);      \
-+    CONTEXT(_thread)[2] = (long) _main;                                \
-+    CONTEXT(_thread)[3] = (long) _main + 4;                            \
-+    *status = PR_TRUE;                                                 \
-+}
-+#define        _MD_GET_SP(_thread)     (CONTEXT(_thread)[2]+0x7ff)
-+#elif defined(__sparc__)
- #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
- {									\
-     sigsetjmp(CONTEXT(_thread), 1);					\
-@@ -150,7 +176,7 @@
- }
- #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
- #endif
--#ifdef __arm32__
-+#ifdef __arm__
- #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
- {									\
-     sigsetjmp(CONTEXT(_thread), 1);					\
diff --git a/www/firefox/patches/patch-bm b/www/firefox/patches/patch-bm
index 5280435c2bb..4e1b2f236e3 100644
--- a/www/firefox/patches/patch-bm
+++ b/www/firefox/patches/patch-bm
@@ -1,8 +1,9 @@
-$NetBSD: patch-bm,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bm,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig	2001-09-28 20:12:52.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
-@@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2004-04-18 23:18:18.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2005-12-04 19:17:13.000000000 +0900
+@@ -118,18 +118,23 @@
   * so they are contiguous with values passed on the stack, and then calls
   * PrepareAndDispatch() to do the dirty work.
   */
diff --git a/www/firefox/patches/patch-bo b/www/firefox/patches/patch-bo
index 3a939415f52..0364c4722fd 100644
--- a/www/firefox/patches/patch-bo
+++ b/www/firefox/patches/patch-bo
@@ -1,17 +1,18 @@
-$NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $
+$NetBSD: patch-bo,v 1.6 2005/12/10 13:47:22 taya Exp $
 
---- nsprpub/configure.in.orig	2004-09-14 22:59:41.000000000 +0200
-+++ nsprpub/configure.in
-@@ -56,7 +56,7 @@ USE_CPLUS=
+diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
+--- ../Orig/mozilla/nsprpub/configure.in	2005-09-16 07:37:52.000000000 +0900
++++ ./nsprpub/configure.in	2005-12-04 19:17:56.000000000 +0900
+@@ -57,7 +57,7 @@
  USE_IPV6=
  USE_MDUPDATE=
- MACOS_DEPLOYMENT_TARGET=
+ _MACOSX_DEPLOYMENT_TARGET=
 -_OPTIMIZE_FLAGS=-O
 +_OPTIMIZE_FLAGS=
  _DEBUG_FLAGS=-g
  MOZ_DEBUG=1
  MOZ_OPTIMIZE=
-@@ -933,6 +933,34 @@ case "$target" in
+@@ -1045,6 +1045,34 @@
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -46,7 +47,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $
      ;;
  
  *-hpux*)
-@@ -1417,6 +1445,7 @@ mips-nec-sysv*)
+@@ -1544,6 +1572,7 @@
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)
@@ -54,7 +55,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $
      USE_NSPR_THREADS=1
      MDCPUCFG_H=_netbsd.cfg
      PR_MD_CSRCS=netbsd.c
-@@ -2149,7 +2178,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2307,7 +2336,7 @@
  	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  	    ac_cv_have_dash_pthread=yes
  		case "$target_os" in
@@ -63,7 +64,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $
  # Freebsd doesn't use -pthread for compiles, it uses them for linking
              ;;
  	    *)
-@@ -2187,7 +2216,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2345,7 +2374,7 @@
              _PTHREAD_LDFLAGS=
          fi
  	    ;;
@@ -72,7 +73,7 @@ $NetBSD: patch-bo,v 1.5 2005/10/12 16:39:24 joerg Exp $
  	    AC_DEFINE(_REENTRANT)
  	    AC_DEFINE(_THREAD_SAFE)
  	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2269,7 +2298,7 @@ case "$target" in
+@@ -2426,7 +2455,7 @@
          AC_DEFINE(_PR_NEED_PTHREAD_INIT)
      fi
      ;;
diff --git a/www/firefox/patches/patch-bq b/www/firefox/patches/patch-bq
index bcaae295c68..d5724b6e9fd 100644
--- a/www/firefox/patches/patch-bq
+++ b/www/firefox/patches/patch-bq
@@ -1,8 +1,9 @@
-$NetBSD: patch-bq,v 1.5 2005/10/12 16:39:24 joerg Exp $
+$NetBSD: patch-bq,v 1.6 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/io/nsLocalFileUnix.h.orig	2004-01-15 06:14:13.000000000 +0000
-+++ xpcom/io/nsLocalFileUnix.h
-@@ -57,7 +57,7 @@
+diff -ruN ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h
+--- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h	2004-04-18 23:18:14.000000000 +0900
++++ ./xpcom/io/nsLocalFileUnix.h	2005-12-04 19:18:04.000000000 +0900
+@@ -73,7 +73,7 @@
  #endif
  
  // so we can statfs on freebsd
diff --git a/www/firefox/patches/patch-br b/www/firefox/patches/patch-br
index 575795e2195..2e7ccd84162 100644
--- a/www/firefox/patches/patch-br
+++ b/www/firefox/patches/patch-br
@@ -1,8 +1,9 @@
-$NetBSD: patch-br,v 1.5 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-br,v 1.6 2005/12/10 13:47:22 taya Exp $
 
---- nsprpub/pr/src/misc/prnetdb.c.orig	2004-09-01 23:07:28.000000000 +0000
-+++ nsprpub/pr/src/misc/prnetdb.c
-@@ -2098,7 +2098,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+diff -ruN ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
+--- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c	2005-08-19 02:24:38.000000000 +0900
++++ ./nsprpub/pr/src/misc/prnetdb.c	2005-12-04 19:18:10.000000000 +0900
+@@ -2110,7 +2110,17 @@
           */
          hints.ai_socktype = SOCK_STREAM;
  
diff --git a/www/firefox/patches/patch-bs b/www/firefox/patches/patch-bs
index 021111ebd35..9291cacab71 100644
--- a/www/firefox/patches/patch-bs
+++ b/www/firefox/patches/patch-bs
@@ -1,7 +1,8 @@
-$NetBSD: patch-bs,v 1.4 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-bs,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- config/mkdepend/imakemdep.h.orig	1998-09-05 06:22:25.000000000 +0200
-+++ config/mkdepend/imakemdep.h	2004-11-17 10:33:27.000000000 +0100
+diff -ruN ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h
+--- ../Orig/mozilla/config/mkdepend/imakemdep.h	2004-04-21 06:38:14.000000000 +0900
++++ ./config/mkdepend/imakemdep.h	2005-12-04 19:21:01.000000000 +0900
 @@ -235,7 +235,7 @@
  #ifdef _CRAY
  #define DEFAULT_CPP "/lib/pcpp"
@@ -11,7 +12,7 @@ $NetBSD: patch-bs,v 1.4 2005/10/12 16:39:25 joerg Exp $
  #define DEFAULT_CPP "/usr/libexec/cpp"
  #endif
  #ifdef	MACH
-@@ -273,10 +273,13 @@
+@@ -273,7 +273,7 @@
  #ifdef unix
  	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
  #endif
@@ -20,13 +21,7 @@ $NetBSD: patch-bs,v 1.4 2005/10/12 16:39:25 joerg Exp $
  # ifdef __i386__
  	"-D__i386__",
  # endif
-+# if defined(__amd64__) || defined(__x86_64__)
-+	"-D__amd64__ -D__x86_64__",
-+# endif
- # ifdef __GNUC__
- 	"-traditional",
- # endif
-@@ -710,6 +713,9 @@
+@@ -713,6 +713,9 @@
  #ifdef __sgi
  	{"__sgi", "1"},
  #endif
diff --git a/www/firefox/patches/patch-bt b/www/firefox/patches/patch-bt
deleted file mode 100644
index 7b77e00dbc9..00000000000
--- a/www/firefox/patches/patch-bt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bt,v 1.4 2005/09/22 14:14:04 jlam Exp $
-
---- nsprpub/pr/src/io/prprf.c.orig	2004-03-09 03:18:19.000000000 +0000
-+++ nsprpub/pr/src/io/prprf.c
-@@ -53,6 +53,11 @@
- */
- #if (defined(LINUX) && defined(__x86_64__))
- #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
-+#elif (defined (__NetBSD__) && \
-+	(defined(__amd64__) || \
-+	(defined(__powerpc__) && __NetBSD_Version__ >= 105000000)))
-+#include <stdarg.h>
-+#define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
- #elif (defined(LINUX) && defined(__powerpc__)) || \
-     (defined(LINUX) && defined(__s390__)) || \
-     (defined(LINUX) && defined(__s390x__)) || \
diff --git a/www/firefox/patches/patch-bu b/www/firefox/patches/patch-bu
index a6f683b6b8d..f3cf45e935c 100644
--- a/www/firefox/patches/patch-bu
+++ b/www/firefox/patches/patch-bu
@@ -1,7 +1,8 @@
-$NetBSD: patch-bu,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bu,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig	2005-09-21 22:14:53.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp	1970-01-01 09:00:00.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp	2005-12-07 00:07:35.000000000 +0900
 @@ -0,0 +1,174 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +// Platform specific code to invoke XPCOM methods on native objects
diff --git a/www/firefox/patches/patch-bugzilla-319004 b/www/firefox/patches/patch-bugzilla-319004
new file mode 100644
index 00000000000..2bac02d9a52
--- /dev/null
+++ b/www/firefox/patches/patch-bugzilla-319004
@@ -0,0 +1,128 @@
+$NetBSD: patch-bugzilla-319004,v 1.1 2005/12/10 13:47:22 taya Exp $
+
+Index: toolkit/components/history/src/nsGlobalHistory.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v
+retrieving revision 1.63
+diff -u -8 -r1.63 nsGlobalHistory.cpp
+--- toolkit/components/history/src/nsGlobalHistory.cpp	17 Nov 2005 00:23:09 -0000	1.63
++++ toolkit/components/history/src/nsGlobalHistory.cpp	9 Dec 2005 08:30:42 -0000
+@@ -108,16 +108,20 @@
+ 
+ #define PREF_BRANCH_BASE                        "browser."
+ #define PREF_BROWSER_HISTORY_EXPIRE_DAYS        "history_expire_days"
+ #define PREF_AUTOCOMPLETE_ONLY_TYPED            "urlbar.matchOnlyTyped"
+ #define PREF_AUTOCOMPLETE_ENABLED               "urlbar.autocomplete.enabled"
+ 
+ #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
+ 
++// see bug #319004 -- clamp title and URL to generously-large but not too large
++// length
++#define HISTORY_STRING_LENGTH_MAX 65536
++
+ // sync history every 10 seconds
+ #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
+ //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
+ 
+ // the value of mLastNow expires every 3 seconds
+ #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC)
+ 
+ #define MSECS_PER_DAY (PR_MSEC_PER_SEC * 60 * 60 * 24)
+@@ -1105,30 +1109,33 @@
+ }
+ 
+ NS_IMETHODIMP
+ nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle)
+ {
+   nsresult rv;
+   NS_ENSURE_ARG_POINTER(aURI);
+ 
+-  const nsAFlatString& titleString = PromiseFlatString(aTitle);
++  nsAutoString titleString(Substring(aTitle, 0, HISTORY_STRING_LENGTH_MAX));
+ 
+   // skip about: URIs to avoid reading in the db (about:blank, especially)
+   PRBool isAbout;
+   rv = aURI->SchemeIs("about", &isAbout);
+   NS_ENSURE_SUCCESS(rv, rv);
+   if (isAbout) return NS_OK;
+ 
+   NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE);
+   
+   nsCAutoString URISpec;
+   rv = aURI->GetSpec(URISpec);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
++  if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX)
++    URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX);
++
+   nsCOMPtr<nsIMdbRow> row;
+   rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row));
+ 
+   // if the row doesn't exist, we silently succeed
+   if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK;
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   // Get the old title so we can notify observers
+Index: xpfe/components/history/src/nsGlobalHistory.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v
+retrieving revision 1.213
+diff -u -8 -p -r1.213 nsGlobalHistory.cpp
+--- xpfe/components/history/src/nsGlobalHistory.cpp	26 Oct 2005 16:50:47 -0000	1.213
++++ xpfe/components/history/src/nsGlobalHistory.cpp	9 Dec 2005 08:47:37 -0000
+@@ -106,16 +106,20 @@ nsIPrefBranch* nsGlobalHistory::gPrefBra
+ 
+ #define PREF_BRANCH_BASE                        "browser."
+ #define PREF_BROWSER_HISTORY_EXPIRE_DAYS        "history_expire_days"
+ #define PREF_AUTOCOMPLETE_ONLY_TYPED            "urlbar.matchOnlyTyped"
+ #define PREF_AUTOCOMPLETE_ENABLED               "urlbar.autocomplete.enabled"
+ 
+ #define FIND_BY_AGEINDAYS_PREFIX "find:datasource=history&match=AgeInDays&method="
+ 
++// see bug #319004 -- clamp title and URL to generously-large but not too large
++// length
++#define HISTORY_STRING_LENGTH_MAX 65536
++
+ // sync history every 10 seconds
+ #define HISTORY_SYNC_TIMEOUT (10 * PR_MSEC_PER_SEC)
+ //#define HISTORY_SYNC_TIMEOUT 3000 // every 3 seconds - testing only!
+ 
+ // the value of mLastNow expires every 3 seconds
+ #define HISTORY_EXPIRE_NOW_TIMEOUT (3 * PR_MSEC_PER_SEC)
+ 
+ static const PRInt64 MSECS_PER_DAY = LL_INIT(20, 500654080);  // (1000000LL * 60 * 60 * 24)
+@@ -1028,30 +1032,33 @@ nsGlobalHistory::GetCount(PRUint32* aCou
+ }
+ 
+ NS_IMETHODIMP
+ nsGlobalHistory::SetPageTitle(nsIURI *aURI, const nsAString& aTitle)
+ {
+   nsresult rv;
+   NS_ENSURE_ARG_POINTER(aURI);
+ 
+-  const nsAFlatString& titleString = PromiseFlatString(aTitle);
++  nsAutoString titleString(Substring(aTitle, 0, HISTORY_STRING_LENGTH_MAX));
+ 
+   // skip about: URIs to avoid reading in the db (about:blank, especially)
+   PRBool isAbout;
+   rv = aURI->SchemeIs("about", &isAbout);
+   NS_ENSURE_SUCCESS(rv, rv);
+   if (isAbout) return NS_OK;
+ 
+   NS_ENSURE_SUCCESS(OpenDB(), NS_ERROR_FAILURE);
+   
+   nsCAutoString URISpec;
+   rv = aURI->GetSpec(URISpec);
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
++  if (URISpec.Length() > HISTORY_STRING_LENGTH_MAX)
++    URISpec.Left(URISpec, HISTORY_STRING_LENGTH_MAX);
++
+   nsCOMPtr<nsIMdbRow> row;
+   rv = FindRow(kToken_URLColumn, URISpec.get(), getter_AddRefs(row));
+ 
+   // if the row doesn't exist, we silently succeed
+   if (rv == NS_ERROR_NOT_AVAILABLE) return NS_OK;
+   NS_ENSURE_SUCCESS(rv, rv);
+ 
+   // Get the old title so we can notify observers
diff --git a/www/firefox/patches/patch-bv b/www/firefox/patches/patch-bv
index eb5db4e529c..31a30729aa0 100644
--- a/www/firefox/patches/patch-bv
+++ b/www/firefox/patches/patch-bv
@@ -1,7 +1,8 @@
-$NetBSD: patch-bv,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bv,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig	2005-09-21 22:14:53.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp	1970-01-01 09:00:00.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp	2005-12-04 19:32:22.000000000 +0900
 @@ -0,0 +1,206 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +
diff --git a/www/firefox/patches/patch-bw b/www/firefox/patches/patch-bw
deleted file mode 100644
index b8d1bd2f2d1..00000000000
--- a/www/firefox/patches/patch-bw
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-bw,v 1.4 2005/09/22 14:14:04 jlam Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp.orig	2001-09-28 20:12:52.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp
-@@ -188,6 +188,50 @@ __asm__(
-  * nsresult nsXPTCStubBase::Stub##n()
-  *  Sets register $1 to "methodIndex" and jumps to SharedStub.
-  */
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+#define STUB_ENTRY(n)					\
-+__asm__(						\
-+"#### Stub"#n" ####\n"					\
-+".text\n"						\
-+"	.align 5\n"					\
-+"	.if "#n" < 10 \n"				\
-+"	.globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n"	\
-+"	.ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n"		\
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n"			\
-+"	.frame $30,0,$26,0\n"				\
-+"	ldgp $29,0($27)\n"				\
-+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n"		\
-+"	.prologue 1\n"					\
-+"	lda $1,"#n"\n"					\
-+"	br $31,$SharedStub..ng\n"			\
-+"	.end _ZN14nsXPTCStubBase5Stub"#n"Ev\n"		\
-+"      .elseif  "#n" < 100 \n"				\
-+"	.globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n"	\
-+"	.ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n"		\
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n"			\
-+"	.frame $30,0,$26,0\n"				\
-+"	ldgp $29,0($27)\n"				\
-+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n"		\
-+"	.prologue 1\n"					\
-+"	lda $1,"#n"\n"					\
-+"	br $31,$SharedStub..ng\n"			\
-+"	.end _ZN14nsXPTCStubBase6Stub"#n"Ev\n"		\
-+"	.elseif "#n" < 1000 \n"				\
-+"	.globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n"	\
-+"	.ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n"		\
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n"			\
-+"	.frame $30,0,$26,0\n"				\
-+"	ldgp $29,0($27)\n"				\
-+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n"		\
-+"	.prologue 1\n"					\
-+"	lda $1,"#n"\n"					\
-+"	br $31,$SharedStub..ng\n"			\
-+"	.end _ZN14nsXPTCStubBase7Stub"#n"Ev\n"		\
-+"	.else\n"					\
-+"	.err \"stub number "#n"> 1000 not yet supported\"\n" \
-+"	.endif\n"					\
-+    );
-+#else /* G++2.95 ABI */
- #define STUB_ENTRY(n) \
- __asm__( \
-     "#### Stub"#n" ####\n" \
-@@ -204,6 +248,7 @@ __asm__( \
-     "br $31,$SharedStub..ng\n\t" \
-     ".end Stub"#n"__14nsXPTCStubBase" \
-     );
-+#endif
- 
- #define SENTINEL_ENTRY(n) \
- nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/www/firefox/patches/patch-bx b/www/firefox/patches/patch-bx
index af3b53b75dd..f0ec02b98c5 100644
--- a/www/firefox/patches/patch-bx
+++ b/www/firefox/patches/patch-bx
@@ -1,8 +1,9 @@
-$NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bx,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2001-09-28 20:12:53.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
-@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp	2004-04-18 23:18:18.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp	2005-12-04 19:34:41.000000000 +0900
+@@ -119,8 +119,10 @@
                  if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
                  dp->val.d = *(double*) ap;
                  ap += 2;
@@ -13,7 +14,7 @@ $NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $
              }
              continue;
          }
-@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -130,8 +132,10 @@
              else {
                  dp->val.f = *(float*) ap;
  		ap += 1;
@@ -24,7 +25,7 @@ $NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $
              }
              continue;
          }
-@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -195,7 +199,9 @@
  // however, it's quick, dirty, and'll break when the ABI changes on
  // us, which is what we want ;-).
  
@@ -35,7 +36,7 @@ $NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $
  __asm__ (                                                   \
          ".section \".text\" \n\t"                           \
          ".align 2 \n\t"                                     \
-@@ -206,6 +212,46 @@ __asm__ (                               
+@@ -206,6 +212,46 @@
  	"li     11,"#n" \n\t"                               \
  	"b      SharedStub@local \n"                        \
  );
diff --git a/www/firefox/patches/patch-by b/www/firefox/patches/patch-by
index 268544a8d08..de9a3b89b3b 100644
--- a/www/firefox/patches/patch-by
+++ b/www/firefox/patches/patch-by
@@ -1,8 +1,9 @@
-$NetBSD: patch-by,v 1.3 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-by,v 1.4 2005/12/10 13:47:22 taya Exp $
 
---- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig	2004-03-19 01:36:16.000000000 +0000
-+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
-@@ -155,15 +155,15 @@ void NS_InitSVGLibartGlyphMetricsFTGloba
+diff -ruN ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
+--- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-11-24 03:01:01.000000000 +0900
++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2005-12-04 19:34:45.000000000 +0900
+@@ -155,15 +155,15 @@
  
    static NS_NAMED_LITERAL_STRING(arial, "arial");
    nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
@@ -21,7 +22,7 @@ $NetBSD: patch-by,v 1.3 2005/09/22 14:14:04 jlam Exp $
  }
  
  void NS_FreeSVGLibartGlyphMetricsFTGlobals()
-@@ -440,19 +440,19 @@ nsSVGLibartGlyphMetricsFT::InitializeFac
+@@ -440,19 +440,19 @@
      return;
    }
  
diff --git a/www/firefox/patches/patch-bz b/www/firefox/patches/patch-bz
index abfe6c91725..3baa5fe3bb7 100644
--- a/www/firefox/patches/patch-bz
+++ b/www/firefox/patches/patch-bz
@@ -1,7 +1,8 @@
-$NetBSD: patch-bz,v 1.2 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-bz,v 1.3 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig	2001-03-11 17:22:22.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s	2001-03-12 02:22:22.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s	2005-12-04 19:34:51.000000000 +0900
 @@ -1,27 +1,27 @@
 -# -*- Mode: Asm -*-
 -#
@@ -88,7 +89,7 @@ $NetBSD: patch-bz,v 1.2 2005/09/22 14:14:04 jlam Exp $
  	stfd	f2,48(sp)
  	stfd	f3,56(sp)
  	stfd	f4,64(sp)
-@@ -69,21 +69,20 @@ SharedStub:
+@@ -69,21 +69,20 @@
  	stfd	f7,88(sp)
  	stfd	f8,96(sp)
  
diff --git a/www/firefox/patches/patch-ca b/www/firefox/patches/patch-ca
index 2c5c40f0076..78bccd76b8d 100644
--- a/www/firefox/patches/patch-ca
+++ b/www/firefox/patches/patch-ca
@@ -1,7 +1,8 @@
-$NetBSD: patch-ca,v 1.2 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ca,v 1.3 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2001-03-11 17:22:17.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s	2001-03-12 02:22:17.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s	2005-12-04 19:34:59.000000000 +0900
 @@ -1,27 +1,28 @@
 -# -*- Mode: Asm -*-
 -#
@@ -116,7 +117,7 @@ $NetBSD: patch-ca,v 1.2 2005/09/22 14:14:04 jlam Exp $
  	lfd     f2,40(r30)   
  	lfd     f3,48(r30)  
  	lfd     f4,56(r30)  
-@@ -82,18 +83,18 @@ XPTC_InvokeByIndex:
+@@ -82,18 +83,18 @@
  	lfd     f7,80(r30)  
  	lfd     f8,88(r30)
  
@@ -146,7 +147,7 @@ $NetBSD: patch-ca,v 1.2 2005/09/22 14:14:04 jlam Exp $
  	lwz     r5,8(r30)   
  	lwz     r6,12(r30)  
  	lwz     r7,16(r30)  
-@@ -101,13 +102,13 @@ XPTC_InvokeByIndex:
+@@ -101,13 +102,13 @@
  	lwz     r9,24(r30)  
  	lwz     r10,28(r30)
  
diff --git a/www/firefox/patches/patch-cb b/www/firefox/patches/patch-cb
index 479a817caef..562d8c13ed7 100644
--- a/www/firefox/patches/patch-cb
+++ b/www/firefox/patches/patch-cb
@@ -1,8 +1,9 @@
-$NetBSD: patch-cb,v 1.2 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-cb,v 1.3 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2001-09-28 20:12:52.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
-@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d,
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp	2004-04-18 23:18:18.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp	2005-12-04 19:35:01.000000000 +0900
+@@ -104,8 +104,10 @@
                  if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
                  *((double*) d) = s->val.d;
                  d += 2;
@@ -13,7 +14,7 @@ $NetBSD: patch-cb,v 1.2 2005/09/22 14:14:04 jlam Exp $
              }
          }
          else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d,
+@@ -114,8 +116,10 @@
              else {
                  *((float*) d) = s->val.f;
  		d += 1;
diff --git a/www/firefox/patches/patch-cc b/www/firefox/patches/patch-cc
deleted file mode 100644
index aec53df7634..00000000000
--- a/www/firefox/patches/patch-cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cc,v 1.2 2005/09/22 14:14:04 jlam Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp.orig	2001-09-28 20:12:51.000000000 +0000
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp
-@@ -163,7 +163,11 @@ __asm__(
-     "bis $16,$16,$1\n\t"    /* load "this" */
-     "ldq $2,16($15)\n\t"    /* load "methodIndex" */
-     "ldq $1,0($1)\n\t"      /* load vtable */
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+    "s8addq $2,0,$2\n\t"   /* vtable index = "methodIndex" * 8 */
-+#else /* G++2.95 ABI */
-     "s8addq $2,16,$2\n\t"   /* vtable index = "methodIndex" * 8 + 16 */
-+#endif
-     "addq $1,$2,$1\n\t"
-     "ldq $27,0($1)\n\t"     /* load address of function */
-     "jsr $26,($27),0\n\t"   /* call virtual function */
diff --git a/www/firefox/patches/patch-cd b/www/firefox/patches/patch-cd
index 5ec1cc84f1b..9921bad5a51 100644
--- a/www/firefox/patches/patch-cd
+++ b/www/firefox/patches/patch-cd
@@ -1,19 +1,9 @@
-$NetBSD: patch-cd,v 1.2 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-cd,v 1.3 2005/12/10 13:47:22 taya Exp $
 
---- modules/plugin/base/public/nptypes.h.orig	2004-09-01 16:59:55.000000000 +0000
-+++ modules/plugin/base/public/nptypes.h
-@@ -78,8 +78,10 @@
-     typedef int bool;
-   #endif
-   #else /* OPENBSD is defined, so use its bool */
-+  #if !defined(__cplusplus)
-     #include <stdbool.h>
-   #endif
-+  #endif
-   #else
-   /*
-    * FreeBSD defines uint32_t and bool.
-@@ -97,6 +99,7 @@
+diff -ruN ../Orig/mozilla/modules/plugin/base/public/nptypes.h ./modules/plugin/base/public/nptypes.h
+--- ../Orig/mozilla/modules/plugin/base/public/nptypes.h	2005-05-20 06:49:42.000000000 +0900
++++ ./modules/plugin/base/public/nptypes.h	2005-12-04 19:35:14.000000000 +0900
+@@ -93,6 +93,7 @@
     */
    #include <stdint.h>
  
@@ -21,7 +11,7 @@ $NetBSD: patch-cd,v 1.2 2005/09/22 14:14:04 jlam Exp $
    #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
      #include <stdbool.h>
    #else
-@@ -106,4 +109,5 @@
+@@ -102,4 +103,5 @@
       */
      #define bool int
    #endif
diff --git a/www/firefox/patches/patch-ce b/www/firefox/patches/patch-ce
deleted file mode 100644
index a2f76330a1a..00000000000
--- a/www/firefox/patches/patch-ce
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ce,v 1.2 2005/09/22 14:14:04 jlam Exp $
-
---- toolkit/mozapps/installer/unix/wizard/Makefile.in.orig	2004-10-25 08:23:28.000000000 +0000
-+++ toolkit/mozapps/installer/unix/wizard/Makefile.in
-@@ -60,6 +60,10 @@ LIBS        = \
-         -lpthread \
-         $(NULL)
- 
-+ifeq ($(OS_ARCH),SunOS)
-+LIBS    += -lnsl
-+endif
-+
- EXTRA_DEPS = \
- 	$(DIST)/lib/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \
- 	$(DIST)/lib/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \
diff --git a/www/firefox/patches/patch-cf b/www/firefox/patches/patch-cf
deleted file mode 100644
index 6362bc99e63..00000000000
--- a/www/firefox/patches/patch-cf
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cf,v 1.2 2005/09/22 14:14:04 jlam Exp $
-
---- browser/config/mozconfig.orig	2004-07-07 08:31:10.000000000 +0000
-+++ browser/config/mozconfig
-@@ -3,7 +3,8 @@
- #  . $topsrcdir/browser/config/mozconfig
- # to the top of your mozconfig file.
- 
--export MOZ_PHOENIX=1
-+MOZ_PHOENIX=1
-+export MOZ_PHOENIX
- mk_add_options MOZ_PHOENIX=1
- 
- ac_add_options --disable-ldap
diff --git a/www/firefox/patches/patch-cg b/www/firefox/patches/patch-cg
index 65949f22a66..822370bb201 100644
--- a/www/firefox/patches/patch-cg
+++ b/www/firefox/patches/patch-cg
@@ -1,8 +1,9 @@
-$NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-cg,v 1.7 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/base/Double.cpp.orig	2004-01-15 21:23:18.000000000 +0000
-+++ extensions/transformiix/source/base/Double.cpp
-@@ -48,8 +48,40 @@
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp ./extensions/transformiix/source/base/Double.cpp
+--- ../Orig/mozilla/extensions/transformiix/source/base/Double.cpp	2004-06-17 09:12:42.000000000 +0900
++++ ./extensions/transformiix/source/base/Double.cpp	2005-12-04 19:39:05.000000000 +0900
+@@ -49,8 +49,40 @@
   * Utility class for doubles
   */
  
@@ -44,7 +45,7 @@ $NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $
  #include <ieeefp.h>
  #ifdef __alpha__
  fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -127,9 +159,20 @@ const PRUint32 infMask[2] =    {0, TX_DO
+@@ -128,9 +160,20 @@
  const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
  #endif
  
@@ -68,7 +69,7 @@ $NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $
  
  /*
   * Determines whether the given double represents positive or negative
-@@ -157,6 +200,7 @@ MBool Double::isNeg(double aDbl)
+@@ -158,6 +201,7 @@
  {
      return (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_SIGNBIT) != 0;
  }
@@ -76,7 +77,7 @@ $NetBSD: patch-cg,v 1.6 2005/10/12 16:39:25 joerg Exp $
  
  /*
   * Converts the given String to a double, if the String value does not
-@@ -244,7 +288,7 @@ public:
+@@ -245,7 +289,7 @@
      {
          if (mState == eIllegal || mBuffer.IsEmpty() ||
              (mBuffer.Length() == 1 && mBuffer[0] == '.')) {
diff --git a/www/firefox/patches/patch-ch b/www/firefox/patches/patch-ch
index 05603afbc8e..f09bae9b3bc 100644
--- a/www/firefox/patches/patch-ch
+++ b/www/firefox/patches/patch-ch
@@ -1,12 +1,12 @@
-$NetBSD: patch-ch,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ch,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/base/primitives.h.orig	2003-01-17 12:43:05.000000000 +0000
-+++ extensions/transformiix/source/base/primitives.h
-@@ -51,10 +51,9 @@ public:
-     /*
-      * Usefull constants
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/base/txCore.h ./extensions/transformiix/source/base/txCore.h
+--- ../Orig/mozilla/extensions/transformiix/source/base/txCore.h	2004-05-26 20:54:37.000000000 +0900
++++ ./extensions/transformiix/source/base/txCore.h	2005-12-04 19:42:43.000000000 +0900
+@@ -65,9 +65,9 @@
+     /**
+      * Useful constants
       */
--
 -    static const double NaN;
 -    static const double POSITIVE_INFINITY;
 -    static const double NEGATIVE_INFINITY;
@@ -14,5 +14,5 @@ $NetBSD: patch-ch,v 1.4 2005/09/22 14:14:04 jlam Exp $
 +    static double PositiveInfinity();
 +    static double NegativeInfinity();
  
-     /*
+     /**
       * Determines whether the given double represents positive or negative
diff --git a/www/firefox/patches/patch-ci b/www/firefox/patches/patch-ci
index ae46908f973..f13de9f21cc 100644
--- a/www/firefox/patches/patch-ci
+++ b/www/firefox/patches/patch-ci
@@ -1,8 +1,9 @@
-$NetBSD: patch-ci,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ci,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/xpath/FunctionCall.cpp.orig	2003-11-04 15:13:03.000000000 +0000
-+++ extensions/transformiix/source/xpath/FunctionCall.cpp
-@@ -92,7 +92,7 @@ double FunctionCall::evaluateToNumber(Ex
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp ./extensions/transformiix/source/xpath/FunctionCall.cpp
+--- ../Orig/mozilla/extensions/transformiix/source/xpath/FunctionCall.cpp	2005-01-29 20:07:14.000000000 +0900
++++ ./extensions/transformiix/source/xpath/FunctionCall.cpp	2005-12-04 19:43:01.000000000 +0900
+@@ -105,7 +105,7 @@
      nsRefPtr<txAExprResult> exprResult;
      nsresult rv = aExpr->evaluate(aContext, getter_AddRefs(exprResult));
      if (NS_FAILED(rv))
diff --git a/www/firefox/patches/patch-cj b/www/firefox/patches/patch-cj
index e60c57e185e..a45def763d6 100644
--- a/www/firefox/patches/patch-cj
+++ b/www/firefox/patches/patch-cj
@@ -1,8 +1,9 @@
-$NetBSD: patch-cj,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-cj,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/xpath/MultiplicativeExpr.cpp.orig	2003-11-19 23:06:14.000000000 +0000
-+++ extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
-@@ -71,22 +71,22 @@ MultiplicativeExpr::evaluate(txIEvalCont
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp ./extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
+--- ../Orig/mozilla/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp	2004-06-17 09:12:43.000000000 +0900
++++ ./extensions/transformiix/source/xpath/MultiplicativeExpr.cpp	2005-12-04 19:43:04.000000000 +0900
+@@ -79,22 +79,22 @@
  #if defined(XP_WIN)
                  /* XXX MSVC miscompiles such that (NaN == 0) */
                  if (Double::isNaN(rightDbl))
diff --git a/www/firefox/patches/patch-ck b/www/firefox/patches/patch-ck
index f253c9592cb..12628eed38a 100644
--- a/www/firefox/patches/patch-ck
+++ b/www/firefox/patches/patch-ck
@@ -1,8 +1,9 @@
-$NetBSD: patch-ck,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-ck,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp.orig	2003-06-16 22:31:17.000000000 +0000
-+++ extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp
-@@ -112,12 +112,12 @@ txFormatNumberFunctionCall::evaluate(txI
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp ./extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp
+--- ../Orig/mozilla/extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp	2004-06-17 09:12:44.000000000 +0900
++++ ./extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp	2005-12-04 19:43:07.000000000 +0900
+@@ -114,12 +114,12 @@
          return aContext->recycler()->getStringResult(format->mNaN, aResult);
      }
  
diff --git a/www/firefox/patches/patch-cl b/www/firefox/patches/patch-cl
index 0a955c3dd44..0864987237d 100644
--- a/www/firefox/patches/patch-cl
+++ b/www/firefox/patches/patch-cl
@@ -1,8 +1,9 @@
-$NetBSD: patch-cl,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-cl,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp.orig	2004-01-29 22:04:29.000000000 +0000
-+++ extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp
-@@ -258,7 +258,7 @@ getNumberAttr(txStylesheetAttr* aAttribu
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp ./extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp
+--- ../Orig/mozilla/extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp	2005-01-24 19:50:39.000000000 +0900
++++ ./extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp	2005-12-04 19:44:00.000000000 +0900
+@@ -279,7 +279,7 @@
                txStylesheetCompilerState& aState,
                double& aNumber)
  {
@@ -11,16 +12,16 @@ $NetBSD: patch-cl,v 1.4 2005/09/22 14:14:04 jlam Exp $
      txStylesheetAttr* attr = nsnull;
      nsresult rv = getStyleAttr(aAttributes, aAttrCount, kNameSpaceID_None,
                                 aName, aRequired, &attr);
-@@ -479,7 +479,7 @@ txFnStartLREStylesheet(PRInt32 aNamespac
+@@ -500,7 +500,7 @@
      NS_ENSURE_SUCCESS(rv, rv);
  
      txExpandedName nullExpr;
 -    double prio = Double::NaN;
 +    double prio = Double::NaN();
-     nsAutoPtr<txPattern> match(new txRootPattern(MB_TRUE));
-     NS_ENSURE_TRUE(match, NS_ERROR_OUT_OF_MEMORY);
  
-@@ -1038,7 +1038,7 @@ txFnStartTemplate(PRInt32 aNamespaceID,
+     nsAutoPtr<txPattern> match(new txRootPattern());
+     NS_ENSURE_TRUE(match, NS_ERROR_OUT_OF_MEMORY);
+@@ -1060,7 +1060,7 @@
                        aState, mode);
      NS_ENSURE_SUCCESS(rv, rv);
  
diff --git a/www/firefox/patches/patch-cm b/www/firefox/patches/patch-cm
index b42b25ce8be..ed0338c42b9 100644
--- a/www/firefox/patches/patch-cm
+++ b/www/firefox/patches/patch-cm
@@ -1,8 +1,9 @@
-$NetBSD: patch-cm,v 1.4 2005/09/22 14:14:04 jlam Exp $
+$NetBSD: patch-cm,v 1.5 2005/12/10 13:47:22 taya Exp $
 
---- extensions/transformiix/source/xslt/txXSLTPatterns.cpp.orig	2003-11-18 22:56:46.000000000 +0000
-+++ extensions/transformiix/source/xslt/txXSLTPatterns.cpp
-@@ -99,7 +99,7 @@ nsresult txUnionPattern::addPattern(txPa
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp ./extensions/transformiix/source/xslt/txXSLTPatterns.cpp
+--- ../Orig/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp	2005-01-16 06:30:39.000000000 +0900
++++ ./extensions/transformiix/source/xslt/txXSLTPatterns.cpp	2005-12-04 19:44:15.000000000 +0900
+@@ -98,7 +98,7 @@
  double txUnionPattern::getDefaultPriority()
  {
      NS_ASSERTION(0, "Don't call getDefaultPriority on txUnionPattern");
diff --git a/www/firefox/patches/patch-cn b/www/firefox/patches/patch-cn
new file mode 100644
index 00000000000..d0834bda32e
--- /dev/null
+++ b/www/firefox/patches/patch-cn
@@ -0,0 +1,86 @@
+$NetBSD: patch-cn,v 1.1 2005/12/10 13:47:22 taya Exp $
+
+diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCall.cpp ./extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
+--- ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCall.cpp	2005-08-05 06:15:37.000000000 +0900
++++ ./extensions/transformiix/source/xpath/XFormsFunctionCall.cpp	2005-12-04 21:35:33.000000000 +0900
+@@ -104,7 +104,7 @@
+         res = (res/i);
+       }
+       else {
+-        res = Double::NaN;
++        res = Double::NaN();
+       }
+       return aContext->recycler()->getNumberResult(res, aResult);
+     }
+@@ -159,7 +159,7 @@
+       NS_ENSURE_SUCCESS(rv, rv);
+ 
+       PRInt32 result = 0;
+-      double res = Double::NaN;
++      double res = Double::NaN();
+       nsresult rv = xformsService->GetDaysFromDateTime(date, &result);
+       if (NS_SUCCEEDED(rv)) {
+         res = result;
+@@ -345,7 +345,7 @@
+                                       getter_AddRefs(nodes));
+       NS_ENSURE_SUCCESS(rv, rv);
+    
+-      double res = Double::NaN;
++      double res = Double::NaN();
+       PRInt32 i;
+       for (i = 0; i < nodes->size(); ++i) {
+         double test;
+@@ -353,7 +353,7 @@
+         txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
+         test = Double::toDouble(resultStr);
+         if (Double::isNaN(test)) {
+-          res = Double::NaN;
++          res = Double::NaN();
+           break;
+         }
+         if (test > res || i == 0) {
+@@ -373,7 +373,7 @@
+                                       getter_AddRefs(nodes));
+       NS_ENSURE_SUCCESS(rv, rv);
+    
+-      double res = Double::NaN;
++      double res = Double::NaN();
+       PRInt32 i;
+       for (i = 0; i < nodes->size(); ++i) {
+         double test;
+@@ -381,7 +381,7 @@
+         txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
+         test = Double::toDouble(resultStr);
+         if (Double::isNaN(test)) {
+-          res = Double::NaN;
++          res = Double::NaN();
+           break;
+         }
+         if ((test < res) || (i==0)) {
+@@ -404,7 +404,7 @@
+       NS_ENSURE_SUCCESS(rv, rv);
+ 
+       PRInt32 result = 0;
+-      double res = Double::NaN;
++      double res = Double::NaN();
+       nsresult rv = xformsService->GetMonths(duration, &result);
+       if (NS_SUCCEEDED(rv)) {
+         res = result;
+@@ -480,7 +480,7 @@
+           // up the chain
+           return rv;
+         }
+-        res = Double::NaN;
++        res = Double::NaN();
+       }
+ 
+       return aContext->recycler()->getNumberResult(res, aResult);
+@@ -505,7 +505,7 @@
+           // up the chain
+           return rv;
+         }
+-        res = Double::NaN;
++        res = Double::NaN();
+       }
+ 
+       return aContext->recycler()->getNumberResult(res, aResult);
diff --git a/www/firefox/patches/patch-db b/www/firefox/patches/patch-db
index 1dae0b3acef..3db56098bbc 100644
--- a/www/firefox/patches/patch-db
+++ b/www/firefox/patches/patch-db
@@ -1,7 +1,8 @@
-$NetBSD: patch-db,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-db,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- gc/boehm/gcconfig.h.orig	2004-11-17 10:31:05.000000000 +0100
-+++ gc/boehm/gcconfig.h	2004-11-17 10:31:15.000000000 +0100
+diff -ruN ../Orig/mozilla/gc/boehm/gcconfig.h ./gc/boehm/gcconfig.h
+--- ../Orig/mozilla/gc/boehm/gcconfig.h	2000-08-11 09:13:36.000000000 +0900
++++ ./gc/boehm/gcconfig.h	2005-12-04 19:44:25.000000000 +0900
 @@ -183,7 +183,7 @@
  #   define OPENBSD
  #   define mach_type_known
diff --git a/www/firefox/patches/patch-dc b/www/firefox/patches/patch-dc
index eaa2dbae6e4..df331dbbb0a 100644
--- a/www/firefox/patches/patch-dc
+++ b/www/firefox/patches/patch-dc
@@ -1,7 +1,8 @@
-$NetBSD: patch-dc,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dc,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- gc/boehm/mach_dep.c.orig	2004-11-17 10:30:03.000000000 +0100
-+++ gc/boehm/mach_dep.c	2004-11-17 10:30:50.000000000 +0100
+diff -ruN ../Orig/mozilla/gc/boehm/mach_dep.c ./gc/boehm/mach_dep.c
+--- ../Orig/mozilla/gc/boehm/mach_dep.c	1999-09-30 11:25:45.000000000 +0900
++++ ./gc/boehm/mach_dep.c	2005-12-04 19:44:28.000000000 +0900
 @@ -206,7 +206,7 @@
  	&& !defined(SCO) && !defined(SCO_ELF) \
   	&& !(defined(LINUX)       && defined(__ELF__)) \
diff --git a/www/firefox/patches/patch-dd b/www/firefox/patches/patch-dd
index e4ba7358cd7..38004eb12b8 100644
--- a/www/firefox/patches/patch-dd
+++ b/www/firefox/patches/patch-dd
@@ -1,7 +1,8 @@
-$NetBSD: patch-dd,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dd,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- mailnews/movemail/src/movemail.c.orig	2004-11-17 10:29:29.000000000 +0100
-+++ mailnews/movemail/src/movemail.c	2004-11-17 10:29:43.000000000 +0100
+diff -ruN ../Orig/mozilla/mailnews/movemail/src/movemail.c ./mailnews/movemail/src/movemail.c
+--- ../Orig/mozilla/mailnews/movemail/src/movemail.c	2004-04-18 03:33:14.000000000 +0900
++++ ./mailnews/movemail/src/movemail.c	2005-12-04 19:44:32.000000000 +0900
 @@ -52,7 +52,7 @@
  #define LINUX_GLIBC_2
  
diff --git a/www/firefox/patches/patch-df b/www/firefox/patches/patch-df
index ec1378115d7..ab716fa7c8e 100644
--- a/www/firefox/patches/patch-df
+++ b/www/firefox/patches/patch-df
@@ -1,8 +1,9 @@
-$NetBSD: patch-df,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-df,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- nsprpub/pr/include/md/_freebsd.h.orig	2003-11-16 00:36:13.000000000 +0100
-+++ nsprpub/pr/include/md/_freebsd.h	2004-11-17 10:19:00.000000000 +0100
-@@ -72,7 +76,7 @@
+diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h ./nsprpub/pr/include/md/_freebsd.h
+--- ../Orig/mozilla/nsprpub/pr/include/md/_freebsd.h	2004-11-24 06:22:35.000000000 +0900
++++ ./nsprpub/pr/include/md/_freebsd.h	2005-12-04 19:44:37.000000000 +0900
+@@ -79,7 +79,7 @@
  #define _PR_NO_LARGE_FILES
  
  #if defined(_PR_PTHREADS)
@@ -11,7 +12,7 @@ $NetBSD: patch-df,v 1.1 2005/10/12 16:39:25 joerg Exp $
  /*
   * libc_r before this version of FreeBSD doesn't have poll().
   * Although libc has poll(), it is not thread-safe so we can't
-@@ -81,7 +85,7 @@
+@@ -88,7 +88,7 @@
  #define _PR_POLL_AVAILABLE
  #endif
  #else
@@ -20,7 +21,7 @@ $NetBSD: patch-df,v 1.1 2005/10/12 16:39:25 joerg Exp $
  #define _PR_POLL_AVAILABLE
  #define _PR_USE_POLL
  #endif
-@@ -90,7 +94,7 @@
+@@ -97,7 +97,7 @@
  #define _PR_HAVE_SYSV_SEMAPHORES
  #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
  
diff --git a/www/firefox/patches/patch-dh b/www/firefox/patches/patch-dh
index 60774902429..3cadbe26368 100644
--- a/www/firefox/patches/patch-dh
+++ b/www/firefox/patches/patch-dh
@@ -1,7 +1,8 @@
-$NetBSD: patch-dh,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dh,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	2004-11-17 11:30:31.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2004-11-17 11:30:50.000000000 +0100
+diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
+--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2004-04-18 23:18:18.000000000 +0900
++++ ./xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	2005-12-04 19:44:41.000000000 +0900
 @@ -77,6 +77,13 @@
  #define THUNK_BASED_THIS_ADJUST
  #endif
diff --git a/www/firefox/patches/patch-dj b/www/firefox/patches/patch-dj
index 45358bbc705..883fbeb8003 100644
--- a/www/firefox/patches/patch-dj
+++ b/www/firefox/patches/patch-dj
@@ -1,7 +1,8 @@
-$NetBSD: patch-dj,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dj,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- dbm/src/mktemp.c.orig	2005-05-23 21:26:42.000000000 +0200
-+++ dbm/src/mktemp.c	2005-05-23 21:27:08.000000000 +0200
+diff -ruN ../Orig/mozilla/dbm/src/mktemp.c ./dbm/src/mktemp.c
+--- ../Orig/mozilla/dbm/src/mktemp.c	2003-01-21 08:13:37.000000000 +0900
++++ ./dbm/src/mktemp.c	2005-12-04 19:44:43.000000000 +0900
 @@ -98,7 +98,7 @@
  static int 
  _gettemp(char *path, register int *doopen, int extraFlags)
diff --git a/www/firefox/patches/patch-dk b/www/firefox/patches/patch-dk
index 3a5be31ec05..0685dc302c7 100644
--- a/www/firefox/patches/patch-dk
+++ b/www/firefox/patches/patch-dk
@@ -1,8 +1,9 @@
-$NetBSD: patch-dk,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dk,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- security/coreconf/config.mk.orig	2005-05-24 01:20:38.000000000 +0200
-+++ security/coreconf/config.mk	2005-05-24 01:20:09.000000000 +0200
-@@ -59,7 +59,7 @@
+diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk
+--- ../Orig/mozilla/security/coreconf/config.mk	2004-04-26 00:02:17.000000000 +0900
++++ ./security/coreconf/config.mk	2005-12-04 19:44:47.000000000 +0900
+@@ -63,7 +63,7 @@
  #######################################################################
  
  TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
diff --git a/www/firefox/patches/patch-dl b/www/firefox/patches/patch-dl
index 5bc7ff098f8..3cc23e2fca0 100644
--- a/www/firefox/patches/patch-dl
+++ b/www/firefox/patches/patch-dl
@@ -1,7 +1,8 @@
-$NetBSD: patch-dl,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dl,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- /dev/null	2005-05-24 01:23:34.000000000 +0200
-+++ security/coreconf/DragonFly.mk	2005-05-24 01:23:34.000000000 +0200
+diff -ruN ../Orig/mozilla/security/coreconf/DragonFly.mk ./security/coreconf/DragonFly.mk
+--- ../Orig/mozilla/security/coreconf/DragonFly.mk	1970-01-01 09:00:00.000000000 +0900
++++ ./security/coreconf/DragonFly.mk	2005-12-04 19:44:48.000000000 +0900
 @@ -0,0 +1,83 @@
 +#
 +# The contents of this file are subject to the Mozilla Public
diff --git a/www/firefox/patches/patch-dm b/www/firefox/patches/patch-dm
index 8c3444430da..17714b5d77c 100644
--- a/www/firefox/patches/patch-dm
+++ b/www/firefox/patches/patch-dm
@@ -1,8 +1,9 @@
-$NetBSD: patch-dm,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dm,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- security/nss/cmd/platlibs.mk.orig	2005-05-24 14:48:31.000000000 +0200
-+++ security/nss/cmd/platlibs.mk	2005-05-24 14:48:38.000000000 +0200
-@@ -182,8 +182,8 @@ endif
+diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk
+--- ../Orig/mozilla/security/nss/cmd/platlibs.mk	2005-04-07 06:35:41.000000000 +0900
++++ ./security/nss/cmd/platlibs.mk	2005-12-04 19:44:52.000000000 +0900
+@@ -186,8 +186,8 @@
  # If GNU ld is used, we must use the -rpath-link option to tell
  # the linker where to find libsoftokn3.so, an implicit dependency
  # of libnss3.so.
diff --git a/www/firefox/patches/patch-do b/www/firefox/patches/patch-do
index ce52f010d38..2cc9352ab45 100644
--- a/www/firefox/patches/patch-do
+++ b/www/firefox/patches/patch-do
@@ -1,7 +1,8 @@
-$NetBSD: patch-do,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-do,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- /dev/null	2005-05-24 23:07:26.000000000 +0200
-+++ directory/c-sdk/config/DragonFly.mk	2005-05-25 00:01:24.000000000 +0200
+diff -ruN ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk ./directory/c-sdk/config/DragonFly.mk
+--- ../Orig/mozilla/directory/c-sdk/config/DragonFly.mk	1970-01-01 09:00:00.000000000 +0900
++++ ./directory/c-sdk/config/DragonFly.mk	2005-12-04 19:44:55.000000000 +0900
 @@ -0,0 +1,82 @@
 +# 
 +# The contents of this file are subject to the Mozilla Public
diff --git a/www/firefox/patches/patch-dp b/www/firefox/patches/patch-dp
deleted file mode 100644
index 516468d98f9..00000000000
--- a/www/firefox/patches/patch-dp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dp,v 1.1 2005/10/12 16:39:25 joerg Exp $
-
---- other-licenses/libical/src/libical/Makefile.in.orig	2005-05-25 00:03:42.000000000 +0200
-+++ other-licenses/libical/src/libical/Makefile.in	2005-05-25 00:03:51.000000000 +0200
-@@ -179,7 +179,7 @@
- 	$(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl  -i $(srcdir)/icalrestriction.c.in \
-                 $(DESIGNDATA)/restrictions.csv > icalrestriction.c
- 
--ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
-+ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD DragonFly,$(OS_ARCH)))
- DEFINES	+= -D__USE_BSD=1
- endif
- 
diff --git a/www/firefox/patches/patch-dr b/www/firefox/patches/patch-dr
index 851184af5e0..8ac5764c933 100644
--- a/www/firefox/patches/patch-dr
+++ b/www/firefox/patches/patch-dr
@@ -1,8 +1,9 @@
-$NetBSD: patch-dr,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dr,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- config/config.mk.orig	2005-05-25 00:07:14.000000000 +0200
-+++ config/config.mk	2005-05-25 00:07:26.000000000 +0200
-@@ -146,7 +146,7 @@
+diff -ruN ../Orig/mozilla/config/config.mk ./config/config.mk
+--- ../Orig/mozilla/config/config.mk	2005-07-29 04:48:11.000000000 +0900
++++ ./config/config.mk	2005-12-04 19:45:20.000000000 +0900
+@@ -121,7 +121,7 @@
  # but save the version to allow multiple versions of the same base
  # platform to be built in the same tree.
  #
diff --git a/www/firefox/patches/patch-ds b/www/firefox/patches/patch-ds
index d4a469b5e0d..7c45dc8d4c0 100644
--- a/www/firefox/patches/patch-ds
+++ b/www/firefox/patches/patch-ds
@@ -1,8 +1,9 @@
-$NetBSD: patch-ds,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-ds,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- security/coreconf/arch.mk.orig	2005-06-03 20:57:46.000000000 +0200
-+++ security/coreconf/arch.mk
-@@ -141,7 +141,7 @@ endif
+diff -ruN ../Orig/mozilla/security/coreconf/arch.mk ./security/coreconf/arch.mk
+--- ../Orig/mozilla/security/coreconf/arch.mk	2005-10-11 08:30:12.000000000 +0900
++++ ./security/coreconf/arch.mk	2005-12-04 19:45:28.000000000 +0900
+@@ -145,7 +145,7 @@
  # IRIX 6.5-ALPHA-1289139620.
  #
  
diff --git a/www/firefox/patches/patch-dt b/www/firefox/patches/patch-dt
index e08e1fe2fdf..1caa16ebaed 100644
--- a/www/firefox/patches/patch-dt
+++ b/www/firefox/patches/patch-dt
@@ -1,8 +1,9 @@
-$NetBSD: patch-dt,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dt,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- directory/c-sdk/config/arch.mk.orig	2005-06-03 20:59:03.000000000 +0200
-+++ directory/c-sdk/config/arch.mk
-@@ -138,7 +138,7 @@ endif
+diff -ruN ../Orig/mozilla/directory/c-sdk/config/arch.mk ./directory/c-sdk/config/arch.mk
+--- ../Orig/mozilla/directory/c-sdk/config/arch.mk	2002-03-27 06:51:57.000000000 +0900
++++ ./directory/c-sdk/config/arch.mk	2005-12-04 19:45:29.000000000 +0900
+@@ -138,7 +138,7 @@
  # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3
  #
  
diff --git a/www/firefox/patches/patch-du b/www/firefox/patches/patch-du
index c5e3b876383..b36a107e0d5 100644
--- a/www/firefox/patches/patch-du
+++ b/www/firefox/patches/patch-du
@@ -1,8 +1,9 @@
-$NetBSD: patch-du,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-du,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- config/rules.mk.orig	2005-06-03 21:08:53.000000000 +0200
-+++ config/rules.mk
-@@ -444,6 +444,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+diff -ruN ../Orig/mozilla/config/rules.mk ./config/rules.mk
+--- ../Orig/mozilla/config/rules.mk	2005-10-11 08:16:39.000000000 +0900
++++ ./config/rules.mk	2005-12-04 19:45:31.000000000 +0900
+@@ -447,6 +447,12 @@
  endif
  endif
  
diff --git a/www/firefox/patches/patch-dv b/www/firefox/patches/patch-dv
index f8d8fee4bec..41ebac2bbe5 100644
--- a/www/firefox/patches/patch-dv
+++ b/www/firefox/patches/patch-dv
@@ -1,8 +1,9 @@
-$NetBSD: patch-dv,v 1.1 2005/10/12 16:39:25 joerg Exp $
+$NetBSD: patch-dv,v 1.2 2005/12/10 13:47:22 taya Exp $
 
---- js/src/Makefile.in.orig	2005-06-03 21:11:22.000000000 +0200
-+++ js/src/Makefile.in
-@@ -250,6 +250,9 @@ endif # WINNT
+diff -ruN ../Orig/mozilla/js/src/Makefile.in ./js/src/Makefile.in
+--- ../Orig/mozilla/js/src/Makefile.in	2005-06-01 23:26:26.000000000 +0900
++++ ./js/src/Makefile.in	2005-12-04 19:45:33.000000000 +0900
+@@ -256,6 +256,9 @@
  ifeq ($(OS_ARCH),FreeBSD)
  LDFLAGS		+= -pthread
  endif
author	taya <taya@pkgsrc.org>	2005-12-10 13:47:22 +0000
committer	taya <taya@pkgsrc.org>	2005-12-10 13:47:22 +0000
commit	807dc5f4057d42a22c957de5a36373542fc11392 (patch)
tree	e69235e91274f0f0485b590fbac7eb0ca0017eea /www/firefox
parent	7fae724dadf872358e248fcb52a265309b3c1618 (diff)
download	pkgsrc-807dc5f4057d42a22c957de5a36373542fc11392.tar.gz