update to thunderbird-3.0rc1.

The 2.x version is still available in mail/thunderbird2.

Major changes:
- New Mail Account Setup Wizard
- Redesigned Mail Toolbar
- Tabbed Email Messages
- Smart Folders
- New Message Summary View
- Column Headings
- Message Archive
- Activity Manager
- New Add-ons Manager
- Improved Address Book
- Improved Gmail Integration

Full release notes:
http://www.mozillamessaging.com/en-US/thunderbird/3.0rc1/releasenotes/

61 files changed, 644 insertions, 5335 deletions

diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
deleted file mode 100644
index 4f85fda97b0..00000000000
--- a/mail/thunderbird/INSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2008/12/19 07:59:26 roy Exp $
-
-MOZILLA="@MOZILLA@"
-MOZILLA_BIN="@MOZILLA_BIN@"
-MOZILLA_FIVE_HOME="${PKG_PREFIX}/lib/${MOZILLA}"
-export MOZILLA_FIVE_HOME
-
-case ${STAGE} in
-POST-INSTALL)
-	${MKDIR} -p "./tmpdir-${PKGNAME}"
-	LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}:${PKG_PREFIX}/lib" HOME="./tmpdir-${PKGNAME}" \
-		${MOZILLA_FIVE_HOME}/${MOZILLA_BIN} -register
-	${RM} -fr "./tmpdir-${PKGNAME}"
-	;;
-esac
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 31597d6bacc..f609dcff7d1 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,13 +1,64 @@
-# $NetBSD: Makefile,v 1.39 2009/10/03 13:18:23 ghen Exp $
+# $NetBSD: Makefile,v 1.40 2009/11/29 03:06:42 tnn Exp $
+#
 
-MOZILLA=		thunderbird
-COMMENT=		Mozilla mail client
+DISTNAME=	thunderbird-${TB_VER}.source
+PKGNAME=	thunderbird-${TB_VER}
+TB_VER=		3.0rc1
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
+EXTRACT_SUFX=	.tar.bz2
 
-MOZILLA_USE_GTK2=	# yes
-MOZILLA_USE_XFT=	YES
+MAINTAINER=	tnn@NetBSD.org
+HOMEPAGE=	http://www.mozillamessaging.com/en-US/thunderbird/
+COMMENT=	Organize, secure and customize your mail
 
-# thunderbird passes LD_LIBRARY_PATH to mime handlers, making them fail:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=392327
+WRKSRC=		${WRKDIR}/comm-1.9.1
+MOZILLA_DIR=	mozilla/
 
-.include "../../mail/thunderbird/Makefile-thunderbird.common"
+CONFIG_GUESS_OVERRIDE+=	directory/c-sdk/config/autoconf/config.guess
+CONFIG_SUB_OVERRIDE+=	directory/c-sdk/config/autoconf/config.sub
+
+CONFIGURE_ARGS+=	--enable-application=mail
+CONFIGURE_ARGS+=	--enable-static
+
+ALL_ENV+=		MOZILLA_PKG_NAME=thunderbird
+
+MOZILLA_PATCHES=	${.CURDIR}/../../devel/xulrunner/patches/patch-*
+pre-patch:
+	@${STEP_MSG} "Applying common mozilla patches from devel/xulrunner"
+.for i in ${MOZILLA_PATCHES}
+	${RUN} ${CAT} ${i} | ${PATCH} -s -p0 -d ${WRKSRC}/${MOZILLA_DIR} || \
+	  { ${ERROR_MSG} "Patch ${i} failed"; ${_PKGSRC_PATCH_FAIL}; }
+.endfor
+
+pre-configure:
+	cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
+	cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf
+	cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf
+	cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${CONFIGURE_ENV} autoconf
+	cd ${WRKSRC}/directory/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf
+
+do-build:
+# XXX for some reason it doesn't work unless -j is explicitly specified
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
+
+MOZILLA=thunderbird
+MOZILLA_NAME=Thunderbird
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pixmaps
+	${SED}  -e 's|@MOZILLA@|${MOZILLA}|g'				\
+	  -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'			\
+	  -e 's|@MOZILLA_ICON@|${MOZILLA}.png|g'			\
+	  < ${FILESDIR}/desktop.in					\
+	  > ${WRKDIR}/desktop
+	${INSTALL_DATA} ${WRKDIR}/desktop				\
+	  ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
+	${INSTALL_DATA} ${WRKSRC}/mail/branding/nightly/mailicon48.png	\
+	  ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
+
+.include "../../devel/xulrunner/mozilla-common.mk"
+.include "options.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
deleted file mode 100644
index 182b16fbc58..00000000000
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.49 2009/10/03 13:18:23 ghen Exp $
-# used by mail/thunderbird/Makefile
-# used by mail/thunderbird-gtk1/Makefile
-
-MOZILLA_BIN=		thunderbird-bin
-MOZ_VER=		2.0.0.23
-EXTRACT_SUFX=		.tar.bz2
-DISTNAME=		thunderbird-${MOZ_VER}-source
-CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_MOZILLA:=thunderbird/releases/${MOZ_VER}/source/}
-
-HOMEPAGE=		http://www.mozilla.com/en-US/thunderbird/
-
-CONFIGURE_ENV+=		MOZ_THUNDERBIRD=1
-MAKE_ENV+=		MOZ_THUNDERBIRD=1
-
-DISTINFO_FILE=		${.CURDIR}/../../mail/thunderbird/distinfo
-PATCHDIR=		${.CURDIR}/../../mail/thunderbird/patches
-
-CONFIGURE_ARGS+=	--enable-application=mail
-CONFIGURE_ARGS+=	--enable-debug=-g
-
-CHECK_FILES_SKIP+=	${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
-CHECK_FILES_SKIP+=	${PREFIX}/lib/${MOZILLA}/components/compreg.dat
-CHECK_FILES_SKIP+=	${PREFIX}/lib/${MOZILLA}/components/xpti.dat
-
-
-.PHONY: install-desktop
-post-install: install-desktop
-install-desktop:
-	${SED}		\
-		-e 's|@MOZILLA@|${MOZILLA}|g' \
-		-e 's|@MOZILLA_NAME@|Thunderbird|g' \
-		-e 's|@MOZILLA_ICON@|${MOZILLA}.xpm|g' \
-		< ${.CURDIR}/../../mail/thunderbird/files/thunderbird.desktop.in \
-		> ${WRKDIR}/${MOZILLA}.desktop
-	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop \
-	    ${DESTDIR:Q}${PREFIX:Q}/share/applications/${MOZILLA}.desktop
-	${LN} -sf ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/chrome/icons/default/default.xpm \
-	    ${DESTDIR:Q}${PREFIX:Q}/share/pixmaps/${MOZILLA}.xpm
-
-INSTALLATION_DIRS+=	share/applications share/pixmaps
-PKG_DESTDIR_SUPPORT=    user-destdir
-
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../www/seamonkey/Makefile.common"
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 9c881541a53..ded674316cd 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,2818 +1,402 @@
-@comment $NetBSD: PLIST,v 1.29 2009/10/03 13:18:23 ghen Exp $
-bin/${MOZILLA}
-@comment begin PROGRAMS
-lib/${MOZILLA}/${MOZILLA_BIN}
-lib/${MOZILLA}/dirver
-lib/${MOZILLA}/mangle
-lib/${MOZILLA}/mozilla-xremote-client
-lib/${MOZILLA}/nsinstall
-lib/${MOZILLA}/regxpcom
-lib/${MOZILLA}/shlibsign
-lib/${MOZILLA}/xpcshell
-lib/${MOZILLA}/xpicleanup
-lib/${MOZILLA}/xpidl
-lib/${MOZILLA}/xpt_dump
-lib/${MOZILLA}/xpt_link
-@comment end PROGRAMS
-@comment begin SCRIPTS
-lib/${MOZILLA}/thunderbird-config
-@comment end SCRIPTS
-@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/libcaps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libchrome.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcommandlines.${SO_SUFFIX}
-lib/${MOZILLA}/components/libcomposer.${SO_SUFFIX}
-lib/${MOZILLA}/components/libdocshell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libeditor.${SO_SUFFIX}
-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/libgklayout.${SO_SUFFIX}
-lib/${MOZILLA}/components/libhtmlpars.${SO_SUFFIX}
-lib/${MOZILLA}/components/libi18n.${SO_SUFFIX}
-lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libimport.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjar50.${SO_SUFFIX}
-lib/${MOZILLA}/components/libjsd.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmail.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmailcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmork.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmozfind.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmozldap.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmsgsmime.${SO_SUFFIX}
-lib/${MOZILLA}/components/libmyspell.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnecko.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnecko2.${SO_SUFFIX}
-lib/${MOZILLA}/components/libnsappshell.${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/libspellchecker.${SO_SUFFIX}
-lib/${MOZILLA}/components/libstoragecomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libsystem-pref.${SO_SUFFIX}
-lib/${MOZILLA}/components/libtoolkitcomps.${SO_SUFFIX}
-lib/${MOZILLA}/components/libtransformiix.${SO_SUFFIX}
-lib/${MOZILLA}/components/libtxmgr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libuconv.${SO_SUFFIX}
-lib/${MOZILLA}/components/libuniversalchardet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwebsrvcs.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwidget_gtk2.${SO_SUFFIX}
-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}
-@comment libfreebl
-lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
-lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
-lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
-lib/${MOZILLA}/libgtkxtbin.${SO_SUFFIX}
-lib/${MOZILLA}/libldap50.${SO_SUFFIX}
-lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
-lib/${MOZILLA}/libmozz.${SO_SUFFIX}
-lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
-lib/${MOZILLA}/libnss3.${SO_SUFFIX}
-lib/${MOZILLA}/libnssckbi.${SO_SUFFIX}
-lib/${MOZILLA}/libnssdbm3.${SO_SUFFIX}
-lib/${MOZILLA}/libnssutil3.${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}/libsqlite3.${SO_SUFFIX}
-lib/${MOZILLA}/libssl3.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
-lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX}
-lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
-@comment end DSO
-@comment begin DATA
-lib/${MOZILLA}/LICENSE.txt
-lib/${MOZILLA}/README.txt
-lib/${MOZILLA}/bloaturls.txt
-lib/${MOZILLA}/chrome/US.jar
-lib/${MOZILLA}/chrome/chromelist.txt
-lib/${MOZILLA}/chrome/classic.jar
-lib/${MOZILLA}/chrome/classic.manifest
-lib/${MOZILLA}/chrome/comm.jar
-lib/${MOZILLA}/chrome/comm.manifest
-lib/${MOZILLA}/chrome/en-US.jar
-lib/${MOZILLA}/chrome/en-US.manifest
-lib/${MOZILLA}/chrome/icons/default/abcardWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/abcardWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/addressbookWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/addressbookWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/default.xpm
-lib/${MOZILLA}/chrome/icons/default/messengerWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/messengerWindow16.xpm
-lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow.xpm
-lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow16.xpm
-lib/${MOZILLA}/chrome/installed-chrome.txt
-lib/${MOZILLA}/chrome/messenger.jar
-lib/${MOZILLA}/chrome/messenger.manifest
-lib/${MOZILLA}/chrome/newsblog.jar
-lib/${MOZILLA}/chrome/newsblog.manifest
-lib/${MOZILLA}/chrome/pippki.jar
-lib/${MOZILLA}/chrome/pippki.manifest
-lib/${MOZILLA}/chrome/toolkit.jar
-lib/${MOZILLA}/chrome/toolkit.manifest
-lib/${MOZILLA}/components/FeedProcessor.js
-lib/${MOZILLA}/components/accessibility-atk.xpt
-lib/${MOZILLA}/components/accessibility.xpt
-lib/${MOZILLA}/components/addrbook.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/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/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
-lib/${MOZILLA}/components/dom_html.xpt
-lib/${MOZILLA}/components/dom_loadsave.xpt
-lib/${MOZILLA}/components/dom_range.xpt
-lib/${MOZILLA}/components/dom_sidebar.xpt
-lib/${MOZILLA}/components/dom_storage.xpt
-lib/${MOZILLA}/components/dom_stylesheets.xpt
-lib/${MOZILLA}/components/dom_traversal.xpt
-lib/${MOZILLA}/components/dom_views.xpt
-lib/${MOZILLA}/components/dom_xbl.xpt
-lib/${MOZILLA}/components/dom_xpath.xpt
-lib/${MOZILLA}/components/dom_xul.xpt
-lib/${MOZILLA}/components/downloads.xpt
-lib/${MOZILLA}/components/editor.xpt
-lib/${MOZILLA}/components/embed_base.xpt
-lib/${MOZILLA}/components/extensions.xpt
-lib/${MOZILLA}/components/exthandler.xpt
-lib/${MOZILLA}/components/fastfind.xpt
-lib/${MOZILLA}/components/feeds.xpt
-lib/${MOZILLA}/components/filepicker.xpt
-lib/${MOZILLA}/components/find.xpt
-lib/${MOZILLA}/components/gfx.xpt
-lib/${MOZILLA}/components/history.xpt
-lib/${MOZILLA}/components/htmlparser.xpt
-lib/${MOZILLA}/components/imglib2.xpt
-lib/${MOZILLA}/components/impComm4xMail.xpt
-lib/${MOZILLA}/components/import.xpt
-lib/${MOZILLA}/components/inspector.xpt
-lib/${MOZILLA}/components/intl.xpt
-lib/${MOZILLA}/components/jar.xpt
-lib/${MOZILLA}/components/jsconsole-clhandler.js
-lib/${MOZILLA}/components/jsconsole.xpt
-lib/${MOZILLA}/components/jsdservice.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
-lib/${MOZILLA}/components/lwbrk.xpt
-lib/${MOZILLA}/components/mailnews.xpt
-lib/${MOZILLA}/components/mailprofilemigration.xpt
-lib/${MOZILLA}/components/mailview.xpt
-lib/${MOZILLA}/components/mdn-service.js
-lib/${MOZILLA}/components/mime.xpt
-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/msgbase.xpt
-lib/${MOZILLA}/components/msgcompose.xpt
-lib/${MOZILLA}/components/msgdb.xpt
-lib/${MOZILLA}/components/msgimap.xpt
-lib/${MOZILLA}/components/msglocal.xpt
-lib/${MOZILLA}/components/msgnews.xpt
-lib/${MOZILLA}/components/msgsearch.xpt
-lib/${MOZILLA}/components/msgsmime.xpt
-lib/${MOZILLA}/components/necko.xpt
-lib/${MOZILLA}/components/necko_about.xpt
-lib/${MOZILLA}/components/necko_cache.xpt
-lib/${MOZILLA}/components/necko_cookie.xpt
-lib/${MOZILLA}/components/necko_data.xpt
-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_res.xpt
-lib/${MOZILLA}/components/necko_socket.xpt
-lib/${MOZILLA}/components/necko_strconv.xpt
-lib/${MOZILLA}/components/necko_viewsource.xpt
-lib/${MOZILLA}/components/newsblog.js
-lib/${MOZILLA}/components/nsAbLDAPAttributeMap.js
-lib/${MOZILLA}/components/nsCloseAllWindows.js
-lib/${MOZILLA}/components/nsComposerCmdLineHandler.js
-lib/${MOZILLA}/components/nsDefaultCLH.js
-lib/${MOZILLA}/components/nsExtensionManager.js
-lib/${MOZILLA}/components/nsFilePicker.js
-lib/${MOZILLA}/components/nsHelperAppDlg.js
-lib/${MOZILLA}/components/nsInterfaceInfoToIDL.js
-lib/${MOZILLA}/components/nsLDAPPrefsService.js
-lib/${MOZILLA}/components/nsMailDefaultHandler.js
-lib/${MOZILLA}/components/nsPhishingProtectionApplication.js
-lib/${MOZILLA}/components/nsProgressDialog.js
-lib/${MOZILLA}/components/nsProxyAutoConfig.js
-lib/${MOZILLA}/components/nsSetDefaultMail.js
-lib/${MOZILLA}/components/nsURLFormatter.js
-lib/${MOZILLA}/components/nsUpdateService.js
-lib/${MOZILLA}/components/nsUrlClassifierLib.js
-lib/${MOZILLA}/components/nsUrlClassifierListManager.js
-lib/${MOZILLA}/components/nsUrlClassifierTable.js
-lib/${MOZILLA}/components/offlineStartup.js
-lib/${MOZILLA}/components/pipboot.xpt
-lib/${MOZILLA}/components/pipnss.xpt
-lib/${MOZILLA}/components/pippki.xpt
-lib/${MOZILLA}/components/pref.xpt
-lib/${MOZILLA}/components/prefetch.xpt
-lib/${MOZILLA}/components/profile.xpt
-lib/${MOZILLA}/components/progressDlg.xpt
-lib/${MOZILLA}/components/proxyObjInst.xpt
-lib/${MOZILLA}/components/rdf.xpt
-lib/${MOZILLA}/components/saxparser.xpt
-lib/${MOZILLA}/components/shellservice.xpt
-lib/${MOZILLA}/components/shistory.xpt
-lib/${MOZILLA}/components/signonviewer.xpt
-lib/${MOZILLA}/components/smime-service.js
-lib/${MOZILLA}/components/spellchecker.xpt
-lib/${MOZILLA}/components/storage.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
-lib/${MOZILLA}/components/unicharutil.xpt
-lib/${MOZILLA}/components/update.xpt
-lib/${MOZILLA}/components/uriloader.xpt
-lib/${MOZILLA}/components/url-classifier.xpt
-lib/${MOZILLA}/components/urlformatter.xpt
-lib/${MOZILLA}/components/wallet.xpt
-lib/${MOZILLA}/components/walleteditor.xpt
-lib/${MOZILLA}/components/walletpreview.xpt
-lib/${MOZILLA}/components/webBrowser_core.xpt
-lib/${MOZILLA}/components/webbrowserpersist.xpt
-lib/${MOZILLA}/components/webshell_idls.xpt
-lib/${MOZILLA}/components/websrvcs.xpt
-lib/${MOZILLA}/components/widget.xpt
-lib/${MOZILLA}/components/windowds.xpt
-lib/${MOZILLA}/components/windowwatcher.xpt
-lib/${MOZILLA}/components/xpautocomplete.xpt
-lib/${MOZILLA}/components/xpcom_base.xpt
-lib/${MOZILLA}/components/xpcom_components.xpt
-lib/${MOZILLA}/components/xpcom_ds.xpt
-lib/${MOZILLA}/components/xpcom_io.xpt
-lib/${MOZILLA}/components/xpcom_obsolete.xpt
-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/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/messenger/US/mailViews.dat
-lib/${MOZILLA}/defaults/messenger/mailViews.dat
-lib/${MOZILLA}/defaults/pref/all-l10n.js
-lib/${MOZILLA}/defaults/pref/all-thunderbird.js
-lib/${MOZILLA}/defaults/pref/channel-prefs.js
-lib/${MOZILLA}/defaults/pref/composer.js
-lib/${MOZILLA}/defaults/pref/mailnews.js
-lib/${MOZILLA}/defaults/pref/mdn.js
-lib/${MOZILLA}/defaults/pref/smime.js
-lib/${MOZILLA}/defaults/pref/thunderbird-branding.js
-lib/${MOZILLA}/defaults/profile/US/localstore.rdf
-lib/${MOZILLA}/defaults/profile/US/mimeTypes.rdf
-lib/${MOZILLA}/defaults/profile/localstore.rdf
-lib/${MOZILLA}/defaults/profile/mimeTypes.rdf
-lib/${MOZILLA}/defaults/profile/prefs.js
-lib/${MOZILLA}/defaults/wallet/DistinguishedSchema.tbl
-lib/${MOZILLA}/defaults/wallet/FieldSchema.tbl
-lib/${MOZILLA}/defaults/wallet/PositionalSchema.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaConcat.tbl
-lib/${MOZILLA}/defaults/wallet/SchemaStrings.tbl
-lib/${MOZILLA}/defaults/wallet/StateSchema.tbl
-lib/${MOZILLA}/defaults/wallet/VcardSchema.tbl
-lib/${MOZILLA}/dependentlibs.list
-lib/${MOZILLA}/dictionaries/en-US.aff
-lib/${MOZILLA}/dictionaries/en-US.dic
-lib/${MOZILLA}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
-lib/${MOZILLA}/greprefs/all.js
-lib/${MOZILLA}/greprefs/security-prefs.js
-lib/${MOZILLA}/greprefs/xpinstall.js
-lib/${MOZILLA}/icons/mozicon16.xpm
-lib/${MOZILLA}/icons/mozicon50.xpm
-lib/${MOZILLA}/init.d/README
-@comment libfreebl.chk
-lib/${MOZILLA}/isp/SpamAssassin.sfd
-lib/${MOZILLA}/isp/SpamPal.sfd
-lib/${MOZILLA}/isp/en-US/gmail.rdf
-lib/${MOZILLA}/isp/movemail.rdf
-lib/${MOZILLA}/isp/rss.rdf
-lib/${MOZILLA}/libsoftokn3.chk
-lib/${MOZILLA}/license.html
-lib/${MOZILLA}/res/EditorOverride.css
-lib/${MOZILLA}/res/arrow.gif
-lib/${MOZILLA}/res/arrowd.gif
-lib/${MOZILLA}/res/bloatcycle.html
-lib/${MOZILLA}/res/broken-image.gif
-lib/${MOZILLA}/res/charsetData.properties
-lib/${MOZILLA}/res/charsetalias.properties
-lib/${MOZILLA}/res/cmessage.txt
-lib/${MOZILLA}/res/dtd/xhtml11.dtd
-lib/${MOZILLA}/res/entityTables/html40Latin1.properties
-lib/${MOZILLA}/res/entityTables/html40Special.properties
-lib/${MOZILLA}/res/entityTables/html40Symbols.properties
-lib/${MOZILLA}/res/entityTables/htmlEntityVersions.properties
-lib/${MOZILLA}/res/entityTables/transliterate.properties
-lib/${MOZILLA}/res/fonts/fontEncoding.properties
-lib/${MOZILLA}/res/fonts/pangoFontEncoding.properties
-lib/${MOZILLA}/res/forms.css
-lib/${MOZILLA}/res/grabber.gif
-lib/${MOZILLA}/res/hiddenWindow.html
-lib/${MOZILLA}/res/html.css
-lib/${MOZILLA}/res/html/gopher-audio.gif
-lib/${MOZILLA}/res/html/gopher-binary.gif
-lib/${MOZILLA}/res/html/gopher-find.gif
-lib/${MOZILLA}/res/html/gopher-image.gif
-lib/${MOZILLA}/res/html/gopher-menu.gif
-lib/${MOZILLA}/res/html/gopher-movie.gif
-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/langGroups.properties
-lib/${MOZILLA}/res/language.properties
-lib/${MOZILLA}/res/loading-image.gif
-lib/${MOZILLA}/res/quirk.css
-lib/${MOZILLA}/res/sample.unixpsfonts.properties
-lib/${MOZILLA}/res/samples/Anieyes.gif
-lib/${MOZILLA}/res/samples/aform.css
-lib/${MOZILLA}/res/samples/beeptest.html
-lib/${MOZILLA}/res/samples/bform.css
-lib/${MOZILLA}/res/samples/bg.jpg
-lib/${MOZILLA}/res/samples/cform.css
-lib/${MOZILLA}/res/samples/checkboxTest.xul
-lib/${MOZILLA}/res/samples/colorpicker.xul
-lib/${MOZILLA}/res/samples/demoform.css
-lib/${MOZILLA}/res/samples/dexopenchrome.xul
-lib/${MOZILLA}/res/samples/dexparamdialog.html
-lib/${MOZILLA}/res/samples/dexparamdialog.xul
-lib/${MOZILLA}/res/samples/find.html
-lib/${MOZILLA}/res/samples/gear1.gif
-lib/${MOZILLA}/res/samples/hidetoolicon.css
-lib/${MOZILLA}/res/samples/hidetoolicon.xul
-lib/${MOZILLA}/res/samples/image_props.html
-lib/${MOZILLA}/res/samples/mozform.css
-lib/${MOZILLA}/res/samples/printsetup.html
-lib/${MOZILLA}/res/samples/raptor.jpg
-lib/${MOZILLA}/res/samples/rock_gra.gif
-lib/${MOZILLA}/res/samples/sampleimages/bongo.gif
-lib/${MOZILLA}/res/samples/sampleimages/down.gif
-lib/${MOZILLA}/res/samples/sampleimages/left.gif
-lib/${MOZILLA}/res/samples/sampleimages/right.gif
-lib/${MOZILLA}/res/samples/sampleimages/up.gif
-lib/${MOZILLA}/res/samples/scrollbarTest1.xul
-lib/${MOZILLA}/res/samples/scrollbarTest2.xul
-lib/${MOZILLA}/res/samples/sliderTest1.xul
-lib/${MOZILLA}/res/samples/soundtest.html
-lib/${MOZILLA}/res/samples/tab.xul
-lib/${MOZILLA}/res/samples/test.wav
-lib/${MOZILLA}/res/samples/test0.html
-lib/${MOZILLA}/res/samples/test1.html
-lib/${MOZILLA}/res/samples/test10.html
-lib/${MOZILLA}/res/samples/test11.html
-lib/${MOZILLA}/res/samples/test12.html
-lib/${MOZILLA}/res/samples/test13.html
-lib/${MOZILLA}/res/samples/test14.html
-lib/${MOZILLA}/res/samples/test15.html
-lib/${MOZILLA}/res/samples/test16.html
-lib/${MOZILLA}/res/samples/test2.html
-lib/${MOZILLA}/res/samples/test3.html
-lib/${MOZILLA}/res/samples/test4.html
-lib/${MOZILLA}/res/samples/test5.html
-lib/${MOZILLA}/res/samples/test6.html
-lib/${MOZILLA}/res/samples/test7.html
-lib/${MOZILLA}/res/samples/test8-1.html
-lib/${MOZILLA}/res/samples/test8.html
-lib/${MOZILLA}/res/samples/test8dom.html
-lib/${MOZILLA}/res/samples/test8sca.html
-lib/${MOZILLA}/res/samples/test8siz.html
-lib/${MOZILLA}/res/samples/test8tab.html
-lib/${MOZILLA}/res/samples/test9.html
-lib/${MOZILLA}/res/samples/test9a.html
-lib/${MOZILLA}/res/samples/test9b.html
-lib/${MOZILLA}/res/samples/test_ed.html
-lib/${MOZILLA}/res/samples/test_form.html
-lib/${MOZILLA}/res/samples/test_gfx.html
-lib/${MOZILLA}/res/samples/test_lbox.html
-lib/${MOZILLA}/res/samples/test_pr.html
-lib/${MOZILLA}/res/samples/test_weight.html
-lib/${MOZILLA}/res/samples/toolbarTest1.xul
-lib/${MOZILLA}/res/samples/treeTest1.css
-lib/${MOZILLA}/res/samples/treeTest1.xul
-lib/${MOZILLA}/res/samples/widgets.xul
-lib/${MOZILLA}/res/samples/xpmenu.xul
-lib/${MOZILLA}/res/samples/xulTest.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
-lib/${MOZILLA}/res/table-add-column-before-active.gif
-lib/${MOZILLA}/res/table-add-column-before-hover.gif
-lib/${MOZILLA}/res/table-add-column-before.gif
-lib/${MOZILLA}/res/table-add-row-after-active.gif
-lib/${MOZILLA}/res/table-add-row-after-hover.gif
-lib/${MOZILLA}/res/table-add-row-after.gif
-lib/${MOZILLA}/res/table-add-row-before-active.gif
-lib/${MOZILLA}/res/table-add-row-before-hover.gif
-lib/${MOZILLA}/res/table-add-row-before.gif
-lib/${MOZILLA}/res/table-remove-column-active.gif
-lib/${MOZILLA}/res/table-remove-column-hover.gif
-lib/${MOZILLA}/res/table-remove-column.gif
-lib/${MOZILLA}/res/table-remove-row-active.gif
-lib/${MOZILLA}/res/table-remove-row-hover.gif
-lib/${MOZILLA}/res/table-remove-row.gif
-lib/${MOZILLA}/res/throbber/anim.gif
-lib/${MOZILLA}/res/throbber/anims00.gif
-lib/${MOZILLA}/res/throbber/anims01.gif
-lib/${MOZILLA}/res/throbber/anims02.gif
-lib/${MOZILLA}/res/throbber/anims03.gif
-lib/${MOZILLA}/res/throbber/anims04.gif
-lib/${MOZILLA}/res/throbber/anims05.gif
-lib/${MOZILLA}/res/throbber/anims06.gif
-lib/${MOZILLA}/res/throbber/anims07.gif
-lib/${MOZILLA}/res/throbber/anims08.gif
-lib/${MOZILLA}/res/throbber/anims09.gif
-lib/${MOZILLA}/res/throbber/anims10.gif
-lib/${MOZILLA}/res/throbber/anims11.gif
-lib/${MOZILLA}/res/throbber/anims12.gif
-lib/${MOZILLA}/res/throbber/anims13.gif
-lib/${MOZILLA}/res/throbber/anims14.gif
-lib/${MOZILLA}/res/throbber/anims15.gif
-lib/${MOZILLA}/res/throbber/anims16.gif
-lib/${MOZILLA}/res/throbber/anims17.gif
-lib/${MOZILLA}/res/throbber/anims18.gif
-lib/${MOZILLA}/res/throbber/anims19.gif
-lib/${MOZILLA}/res/throbber/anims20.gif
-lib/${MOZILLA}/res/throbber/anims21.gif
-lib/${MOZILLA}/res/throbber/anims22.gif
-lib/${MOZILLA}/res/throbber/anims23.gif
-lib/${MOZILLA}/res/throbber/anims24.gif
-lib/${MOZILLA}/res/throbber/anims25.gif
-lib/${MOZILLA}/res/throbber/anims26.gif
-lib/${MOZILLA}/res/throbber/anims27.gif
-lib/${MOZILLA}/res/throbber/anims28.gif
-lib/${MOZILLA}/res/throbber/anims29.gif
-lib/${MOZILLA}/res/ua.css
-lib/${MOZILLA}/res/unixcharset.properties
-lib/${MOZILLA}/res/viewer.properties
-lib/${MOZILLA}/res/viewsource.css
-lib/${MOZILLA}/updater
-lib/${MOZILLA}/updater.ini
-@comment end DATA
-@comment begin INCLUDE
-include/${MOZILLA}/accessibility/nsAccessNode.h
-include/${MOZILLA}/accessibility/nsAccessNodeWrap.h
-include/${MOZILLA}/accessibility/nsAccessibleEventData.h
-include/${MOZILLA}/accessibility/nsAccessibleText.h
-include/${MOZILLA}/accessibility/nsAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsDocAccessibleWrap.h
-include/${MOZILLA}/accessibility/nsIAccessNode.h
-include/${MOZILLA}/accessibility/nsIAccessibilityService.h
-include/${MOZILLA}/accessibility/nsIAccessible.h
-include/${MOZILLA}/accessibility/nsIAccessibleAction.h
-include/${MOZILLA}/accessibility/nsIAccessibleCaret.h
-include/${MOZILLA}/accessibility/nsIAccessibleDocument.h
-include/${MOZILLA}/accessibility/nsIAccessibleEditableText.h
-include/${MOZILLA}/accessibility/nsIAccessibleEvent.h
-include/${MOZILLA}/accessibility/nsIAccessibleHyperLink.h
-include/${MOZILLA}/accessibility/nsIAccessibleHyperText.h
-include/${MOZILLA}/accessibility/nsIAccessibleProvider.h
-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
-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}/addrbook/nsAbBaseCID.h
-include/${MOZILLA}/addrbook/nsAbCardProperty.h
-include/${MOZILLA}/addrbook/nsAbMDBCardProperty.h
-include/${MOZILLA}/addrbook/nsDirPrefs.h
-include/${MOZILLA}/addrbook/nsIAbAddressCollecter.h
-include/${MOZILLA}/addrbook/nsIAbAutoCompleteSession.h
-include/${MOZILLA}/addrbook/nsIAbBase.h
-include/${MOZILLA}/addrbook/nsIAbBooleanExpression.h
-include/${MOZILLA}/addrbook/nsIAbCard.h
-include/${MOZILLA}/addrbook/nsIAbDirFactory.h
-include/${MOZILLA}/addrbook/nsIAbDirFactoryService.h
-include/${MOZILLA}/addrbook/nsIAbDirectory.h
-include/${MOZILLA}/addrbook/nsIAbDirectoryQuery.h
-include/${MOZILLA}/addrbook/nsIAbDirectoryQueryProxy.h
-include/${MOZILLA}/addrbook/nsIAbDirectorySearch.h
-include/${MOZILLA}/addrbook/nsIAbLDAPAttributeMap.h
-include/${MOZILLA}/addrbook/nsIAbLDAPAutoCompFormatter.h
-include/${MOZILLA}/addrbook/nsIAbLDAPDirectory.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationData.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationQuery.h
-include/${MOZILLA}/addrbook/nsIAbLDAPReplicationService.h
-include/${MOZILLA}/addrbook/nsIAbLDIFService.h
-include/${MOZILLA}/addrbook/nsIAbListener.h
-include/${MOZILLA}/addrbook/nsIAbMDBCard.h
-include/${MOZILLA}/addrbook/nsIAbMDBDirectory.h
-include/${MOZILLA}/addrbook/nsIAbUpgrader.h
-include/${MOZILLA}/addrbook/nsIAbView.h
-include/${MOZILLA}/addrbook/nsIAddbookUrl.h
-include/${MOZILLA}/addrbook/nsIAddrBookSession.h
-include/${MOZILLA}/addrbook/nsIAddrDBAnnouncer.h
-include/${MOZILLA}/addrbook/nsIAddrDBListener.h
-include/${MOZILLA}/addrbook/nsIAddrDatabase.h
-include/${MOZILLA}/addrbook/nsIAddressBook.h
-include/${MOZILLA}/addrbook/nsILDAPPrefsService.h
-include/${MOZILLA}/addrbook/nsIMsgVCardService.h
-include/${MOZILLA}/addrbook/nsVCardObj.h
-include/${MOZILLA}/alerts/nsIAlertsService.h
-include/${MOZILLA}/appcomps/nsCharsetMenu.h
-include/${MOZILLA}/appcomps/nsFontPackageHandler.h
-include/${MOZILLA}/appcomps/nsIAppStartup.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteListener.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteResults.h
-include/${MOZILLA}/appcomps/nsIAutoCompleteSession.h
-include/${MOZILLA}/appcomps/nsIBookmarksService.h
-include/${MOZILLA}/appcomps/nsICloseAllWindows.h
-include/${MOZILLA}/appcomps/nsIFindService.h
-include/${MOZILLA}/appcomps/nsILDAPAutoCompFormatter.h
-include/${MOZILLA}/appcomps/nsILDAPAutoCompleteSession.h
-include/${MOZILLA}/appcomps/nsISearchContext.h
-include/${MOZILLA}/appcomps/nsIUserInfo.h
-include/${MOZILLA}/appcomps/nsIWindowDataSource.h
-include/${MOZILLA}/appcomps/nsXPFEComponentsCID.h
-include/${MOZILLA}/appshell/nsAppShellCID.h
-include/${MOZILLA}/appshell/nsIAppShellService.h
-include/${MOZILLA}/appshell/nsIPopupWindowManager.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
-include/${MOZILLA}/autocomplete/nsIAutoCompletePopup.h
-include/${MOZILLA}/autocomplete/nsIAutoCompleteResult.h
-include/${MOZILLA}/autocomplete/nsIAutoCompleteResultTypes.h
-include/${MOZILLA}/autocomplete/nsIAutoCompleteSearch.h
-include/${MOZILLA}/autocomplete/nsIAutoCompleteSimpleResult.h
-include/${MOZILLA}/autoconfig/nsIAutoConfig.h
-include/${MOZILLA}/autoconfig/nsILDAPSyncQuery.h
-include/${MOZILLA}/autoconfig/nsIReadConfig.h
-include/${MOZILLA}/bayesflt/nsBayesianFilter.h
-include/${MOZILLA}/bayesflt/nsBayesianFilterCID.h
-include/${MOZILLA}/browser/nsIBrowserInstance.h
-include/${MOZILLA}/caps/nsICryptoHash.h
-include/${MOZILLA}/caps/nsIPrincipal.h
-include/${MOZILLA}/caps/nsIScriptSecurityManager.h
-include/${MOZILLA}/caps/nsISecurityCheckedComponent.h
-include/${MOZILLA}/caps/nsISignatureVerifier.h
-include/${MOZILLA}/caps/nsJSPrincipals.h
-include/${MOZILLA}/chardet/nsCharsetDetectionAdaptorCID.h
-include/${MOZILLA}/chardet/nsDetectionConfident.h
-include/${MOZILLA}/chardet/nsDocumentCharsetInfoCID.h
-include/${MOZILLA}/chardet/nsICharsetDetectionAdaptor.h
-include/${MOZILLA}/chardet/nsICharsetDetectionObserver.h
-include/${MOZILLA}/chardet/nsICharsetDetector.h
-include/${MOZILLA}/chardet/nsICharsetResolver.h
-include/${MOZILLA}/chardet/nsIDocCharset.h
-include/${MOZILLA}/chardet/nsIDocumentCharsetInfo.h
-include/${MOZILLA}/chardet/nsIMetaCharsetService.h
-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
-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/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/nsCopySupport.h
-include/${MOZILLA}/content/nsHTMLAtomList.h
-include/${MOZILLA}/content/nsHTMLAtoms.h
-include/${MOZILLA}/content/nsIAttribute.h
-include/${MOZILLA}/content/nsIBindingManager.h
-include/${MOZILLA}/content/nsICanvasElement.h
-include/${MOZILLA}/content/nsICanvasRenderingContextInternal.h
-include/${MOZILLA}/content/nsIChromeRegistry.h
-include/${MOZILLA}/content/nsIContent.h
-include/${MOZILLA}/content/nsIContentIterator.h
-include/${MOZILLA}/content/nsIContentPolicy.h
-include/${MOZILLA}/content/nsIContentSerializer.h
-include/${MOZILLA}/content/nsIDOMGCParticipant.h
-include/${MOZILLA}/content/nsIDOMParser.h
-include/${MOZILLA}/content/nsIDOMSerializer.h
-include/${MOZILLA}/content/nsIDocument.h
-include/${MOZILLA}/content/nsIDocumentEncoder.h
-include/${MOZILLA}/content/nsIDocumentObserver.h
-include/${MOZILLA}/content/nsIDocumentTransformer.h
-include/${MOZILLA}/content/nsIDragDropHandler.h
-include/${MOZILLA}/content/nsIEventListenerManager.h
-include/${MOZILLA}/content/nsIEventStateManager.h
-include/${MOZILLA}/content/nsIFIXptr.h
-include/${MOZILLA}/content/nsIFileControlElement.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/nsIHTMLDocument.h
-include/${MOZILLA}/content/nsIHTMLToTextSink.h
-include/${MOZILLA}/content/nsIImageDocument.h
-include/${MOZILLA}/content/nsIImageLoadingContent.h
-include/${MOZILLA}/content/nsILink.h
-include/${MOZILLA}/content/nsIModifyableXPointer.h
-include/${MOZILLA}/content/nsINameSpaceManager.h
-include/${MOZILLA}/content/nsINodeInfo.h
-include/${MOZILLA}/content/nsIOptionElement.h
-include/${MOZILLA}/content/nsIPhonetic.h
-include/${MOZILLA}/content/nsIPluginElement.h
-include/${MOZILLA}/content/nsIPrivateCompositionEvent.h
-include/${MOZILLA}/content/nsIPrivateDOMEvent.h
-include/${MOZILLA}/content/nsIPrivateDOMImplementation.h
-include/${MOZILLA}/content/nsIPrivateTextEvent.h
-include/${MOZILLA}/content/nsIPrivateTextRange.h
-include/${MOZILLA}/content/nsIRadioControlElement.h
-include/${MOZILLA}/content/nsIRadioGroupContainer.h
-include/${MOZILLA}/content/nsIRadioVisitor.h
-include/${MOZILLA}/content/nsIRangeUtils.h
-include/${MOZILLA}/content/nsIScriptElement.h
-include/${MOZILLA}/content/nsIScriptEventHandler.h
-include/${MOZILLA}/content/nsIScriptEventManager.h
-include/${MOZILLA}/content/nsIScriptLoader.h
-include/${MOZILLA}/content/nsIScriptLoaderObserver.h
-include/${MOZILLA}/content/nsISelectElement.h
-include/${MOZILLA}/content/nsISelection.h
-include/${MOZILLA}/content/nsISelection2.h
-include/${MOZILLA}/content/nsISelectionController.h
-include/${MOZILLA}/content/nsISelectionDisplay.h
-include/${MOZILLA}/content/nsISelectionListener.h
-include/${MOZILLA}/content/nsISelectionPrivate.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/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/nsIXMLHttpRequest.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/nsIXSLTProcessorPrivate.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/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/nsMutationEvent.h
-include/${MOZILLA}/content/nsNodeInfoManager.h
-include/${MOZILLA}/content/nsPLDOMEvent.h
-include/${MOZILLA}/content/nsPropertyTable.h
-include/${MOZILLA}/content/nsStubDocumentObserver.h
-include/${MOZILLA}/content/nsTextFragment.h
-include/${MOZILLA}/content/nsXBLAtomList.h
-include/${MOZILLA}/content/nsXBLAtoms.h
-include/${MOZILLA}/content/nsXMLNameSpaceMap.h
-include/${MOZILLA}/dbm/cdefs.h
-include/${MOZILLA}/dbm/mcom_db.h
-include/${MOZILLA}/dbm/ncompat.h
-include/${MOZILLA}/dbm/nsres.h
-include/${MOZILLA}/dbm/winfile.h
-include/${MOZILLA}/docshell/nsCDefaultURIFixup.h
-include/${MOZILLA}/docshell/nsCDocShell.h
-include/${MOZILLA}/docshell/nsDocShellCID.h
-include/${MOZILLA}/docshell/nsDocShellLoadTypes.h
-include/${MOZILLA}/docshell/nsIContentViewer.h
-include/${MOZILLA}/docshell/nsIContentViewerEdit.h
-include/${MOZILLA}/docshell/nsIContentViewerFile.h
-include/${MOZILLA}/docshell/nsIDocShell.h
-include/${MOZILLA}/docshell/nsIDocShellHistory.h
-include/${MOZILLA}/docshell/nsIDocShellLoadInfo.h
-include/${MOZILLA}/docshell/nsIDocShellTreeItem.h
-include/${MOZILLA}/docshell/nsIDocShellTreeNode.h
-include/${MOZILLA}/docshell/nsIDocShellTreeOwner.h
-include/${MOZILLA}/docshell/nsIEditorDocShell.h
-include/${MOZILLA}/docshell/nsIGlobalHistory.h
-include/${MOZILLA}/docshell/nsIGlobalHistory2.h
-include/${MOZILLA}/docshell/nsIGlobalHistory3.h
-include/${MOZILLA}/docshell/nsIMarkupDocumentViewer.h
-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
-include/${MOZILLA}/dom/nsDOMError.h
-include/${MOZILLA}/dom/nsDOMString.h
-include/${MOZILLA}/dom/nsIBaseDOMException.h
-include/${MOZILLA}/dom/nsIBrowserDOMWindow.h
-include/${MOZILLA}/dom/nsIDOM3Document.h
-include/${MOZILLA}/dom/nsIDOM3DocumentEvent.h
-include/${MOZILLA}/dom/nsIDOM3EventTarget.h
-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
-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
-include/${MOZILLA}/dom/nsIDOMCSSRuleList.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleDeclaration.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleRule.h
-include/${MOZILLA}/dom/nsIDOMCSSStyleSheet.h
-include/${MOZILLA}/dom/nsIDOMCSSUnknownRule.h
-include/${MOZILLA}/dom/nsIDOMCSSValue.h
-include/${MOZILLA}/dom/nsIDOMCSSValueList.h
-include/${MOZILLA}/dom/nsIDOMCanvasRenderingContext2D.h
-include/${MOZILLA}/dom/nsIDOMCharacterData.h
-include/${MOZILLA}/dom/nsIDOMChromeWindow.h
-include/${MOZILLA}/dom/nsIDOMClassInfo.h
-include/${MOZILLA}/dom/nsIDOMClientInformation.h
-include/${MOZILLA}/dom/nsIDOMComment.h
-include/${MOZILLA}/dom/nsIDOMCompositionListener.h
-include/${MOZILLA}/dom/nsIDOMConstructor.h
-include/${MOZILLA}/dom/nsIDOMContextMenuListener.h
-include/${MOZILLA}/dom/nsIDOMCounter.h
-include/${MOZILLA}/dom/nsIDOMCrypto.h
-include/${MOZILLA}/dom/nsIDOMCustomEvent.h
-include/${MOZILLA}/dom/nsIDOMDOMConfiguration.h
-include/${MOZILLA}/dom/nsIDOMDOMException.h
-include/${MOZILLA}/dom/nsIDOMDOMImplementation.h
-include/${MOZILLA}/dom/nsIDOMDOMImplementationLS.h
-include/${MOZILLA}/dom/nsIDOMDOMStringList.h
-include/${MOZILLA}/dom/nsIDOMDocument.h
-include/${MOZILLA}/dom/nsIDOMDocumentCSS.h
-include/${MOZILLA}/dom/nsIDOMDocumentEvent.h
-include/${MOZILLA}/dom/nsIDOMDocumentFragment.h
-include/${MOZILLA}/dom/nsIDOMDocumentRange.h
-include/${MOZILLA}/dom/nsIDOMDocumentStyle.h
-include/${MOZILLA}/dom/nsIDOMDocumentTraversal.h
-include/${MOZILLA}/dom/nsIDOMDocumentType.h
-include/${MOZILLA}/dom/nsIDOMDocumentView.h
-include/${MOZILLA}/dom/nsIDOMDocumentXBL.h
-include/${MOZILLA}/dom/nsIDOMDragListener.h
-include/${MOZILLA}/dom/nsIDOMElement.h
-include/${MOZILLA}/dom/nsIDOMElementCSSInlineStyle.h
-include/${MOZILLA}/dom/nsIDOMEntity.h
-include/${MOZILLA}/dom/nsIDOMEntityReference.h
-include/${MOZILLA}/dom/nsIDOMEvent.h
-include/${MOZILLA}/dom/nsIDOMEventGroup.h
-include/${MOZILLA}/dom/nsIDOMEventListener.h
-include/${MOZILLA}/dom/nsIDOMEventReceiver.h
-include/${MOZILLA}/dom/nsIDOMEventTarget.h
-include/${MOZILLA}/dom/nsIDOMFocusListener.h
-include/${MOZILLA}/dom/nsIDOMFormListener.h
-include/${MOZILLA}/dom/nsIDOMHTMLAnchorElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLAppletElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLAreaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLBRElement.h
-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
-include/${MOZILLA}/dom/nsIDOMHTMLDivElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLDocument.h
-include/${MOZILLA}/dom/nsIDOMHTMLElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLEmbedElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFieldSetElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFontElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFormElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFrameElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLFrameSetElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHRElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHeadElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHeadingElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLHtmlElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLIFrameElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLImageElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLInputElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLIsIndexElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLIElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLabelElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLegendElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLLinkElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMapElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMenuElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLMetaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLModElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOListElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLObjectElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptGroupElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptionElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLOptionsCollection.h
-include/${MOZILLA}/dom/nsIDOMHTMLParagraphElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLParamElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLPreElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLQuoteElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLScriptElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLSelectElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLStyleElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableCaptionElem.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableCellElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableColElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableRowElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTableSectionElem.h
-include/${MOZILLA}/dom/nsIDOMHTMLTextAreaElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLTitleElement.h
-include/${MOZILLA}/dom/nsIDOMHTMLUListElement.h
-include/${MOZILLA}/dom/nsIDOMHistory.h
-include/${MOZILLA}/dom/nsIDOMJSWindow.h
-include/${MOZILLA}/dom/nsIDOMKeyEvent.h
-include/${MOZILLA}/dom/nsIDOMKeyListener.h
-include/${MOZILLA}/dom/nsIDOMLSException.h
-include/${MOZILLA}/dom/nsIDOMLSInput.h
-include/${MOZILLA}/dom/nsIDOMLSLoadEvent.h
-include/${MOZILLA}/dom/nsIDOMLSOutput.h
-include/${MOZILLA}/dom/nsIDOMLSParser.h
-include/${MOZILLA}/dom/nsIDOMLSParserFilter.h
-include/${MOZILLA}/dom/nsIDOMLSProgressEvent.h
-include/${MOZILLA}/dom/nsIDOMLSResourceResolver.h
-include/${MOZILLA}/dom/nsIDOMLSSerializer.h
-include/${MOZILLA}/dom/nsIDOMLSSerializerFilter.h
-include/${MOZILLA}/dom/nsIDOMLinkStyle.h
-include/${MOZILLA}/dom/nsIDOMLoadListener.h
-include/${MOZILLA}/dom/nsIDOMLocation.h
-include/${MOZILLA}/dom/nsIDOMMediaList.h
-include/${MOZILLA}/dom/nsIDOMMimeType.h
-include/${MOZILLA}/dom/nsIDOMMimeTypeArray.h
-include/${MOZILLA}/dom/nsIDOMMouseEvent.h
-include/${MOZILLA}/dom/nsIDOMMouseListener.h
-include/${MOZILLA}/dom/nsIDOMMouseMotionListener.h
-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
-include/${MOZILLA}/dom/nsIDOMNSHTMLDocument.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFormControlList.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFormElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLFrameElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLHRElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLImageElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLInputElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLOptionCollectn.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLOptionElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLSelectElement.h
-include/${MOZILLA}/dom/nsIDOMNSHTMLTextAreaElement.h
-include/${MOZILLA}/dom/nsIDOMNSHistory.h
-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
-include/${MOZILLA}/dom/nsIDOMNode.h
-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
-include/${MOZILLA}/dom/nsIDOMPluginArray.h
-include/${MOZILLA}/dom/nsIDOMPopupBlockedEvent.h
-include/${MOZILLA}/dom/nsIDOMProcessingInstruction.h
-include/${MOZILLA}/dom/nsIDOMRGBColor.h
-include/${MOZILLA}/dom/nsIDOMRange.h
-include/${MOZILLA}/dom/nsIDOMRangeException.h
-include/${MOZILLA}/dom/nsIDOMRect.h
-include/${MOZILLA}/dom/nsIDOMScreen.h
-include/${MOZILLA}/dom/nsIDOMScriptObjectFactory.h
-include/${MOZILLA}/dom/nsIDOMScrollListener.h
-include/${MOZILLA}/dom/nsIDOMSmartCardEvent.h
-include/${MOZILLA}/dom/nsIDOMStorage.h
-include/${MOZILLA}/dom/nsIDOMStorageEvent.h
-include/${MOZILLA}/dom/nsIDOMStorageItem.h
-include/${MOZILLA}/dom/nsIDOMStorageList.h
-include/${MOZILLA}/dom/nsIDOMStorageWindow.h
-include/${MOZILLA}/dom/nsIDOMStyleSheet.h
-include/${MOZILLA}/dom/nsIDOMStyleSheetList.h
-include/${MOZILLA}/dom/nsIDOMText.h
-include/${MOZILLA}/dom/nsIDOMTextListener.h
-include/${MOZILLA}/dom/nsIDOMToString.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
-include/${MOZILLA}/dom/nsIDOMWindow2.h
-include/${MOZILLA}/dom/nsIDOMWindowCollection.h
-include/${MOZILLA}/dom/nsIDOMWindowInternal.h
-include/${MOZILLA}/dom/nsIDOMWindowUtils.h
-include/${MOZILLA}/dom/nsIDOMXMLDocument.h
-include/${MOZILLA}/dom/nsIDOMXPathEvaluator.h
-include/${MOZILLA}/dom/nsIDOMXPathException.h
-include/${MOZILLA}/dom/nsIDOMXPathExpression.h
-include/${MOZILLA}/dom/nsIDOMXPathNSResolver.h
-include/${MOZILLA}/dom/nsIDOMXPathNamespace.h
-include/${MOZILLA}/dom/nsIDOMXPathResult.h
-include/${MOZILLA}/dom/nsIDOMXULButtonElement.h
-include/${MOZILLA}/dom/nsIDOMXULCheckboxElement.h
-include/${MOZILLA}/dom/nsIDOMXULCommandDispatcher.h
-include/${MOZILLA}/dom/nsIDOMXULCommandEvent.h
-include/${MOZILLA}/dom/nsIDOMXULControlElement.h
-include/${MOZILLA}/dom/nsIDOMXULDescriptionElement.h
-include/${MOZILLA}/dom/nsIDOMXULDocument.h
-include/${MOZILLA}/dom/nsIDOMXULElement.h
-include/${MOZILLA}/dom/nsIDOMXULImageElement.h
-include/${MOZILLA}/dom/nsIDOMXULLabelElement.h
-include/${MOZILLA}/dom/nsIDOMXULLabeledControlEl.h
-include/${MOZILLA}/dom/nsIDOMXULListener.h
-include/${MOZILLA}/dom/nsIDOMXULMenuListElement.h
-include/${MOZILLA}/dom/nsIDOMXULMultSelectCntrlEl.h
-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
-include/${MOZILLA}/dom/nsIJSNativeInitializer.h
-include/${MOZILLA}/dom/nsIScriptContext.h
-include/${MOZILLA}/dom/nsIScriptContextOwner.h
-include/${MOZILLA}/dom/nsIScriptExternalNameSet.h
-include/${MOZILLA}/dom/nsIScriptGlobalObject.h
-include/${MOZILLA}/dom/nsIScriptGlobalObjectOwner.h
-include/${MOZILLA}/dom/nsIScriptNameSpaceManager.h
-include/${MOZILLA}/dom/nsIScriptObjectOwner.h
-include/${MOZILLA}/dom/nsIScriptObjectPrincipal.h
-include/${MOZILLA}/dom/nsISidebar.h
-include/${MOZILLA}/dom/nsIWebContentHandlerRegistrar.h
-include/${MOZILLA}/dom/nsPIDOMStorage.h
-include/${MOZILLA}/dom/nsPIDOMWindow.h
-include/${MOZILLA}/dom/nsPIWindowRoot.h
-include/${MOZILLA}/downloads/nsIDownloadManager.h
-include/${MOZILLA}/downloads/nsIDownloadProgressListener.h
-include/${MOZILLA}/downloads/nsIXPInstallManagerUI.h
-include/${MOZILLA}/editor/nsEditorCID.h
-include/${MOZILLA}/editor/nsICiter.h
-include/${MOZILLA}/editor/nsIContentFilter.h
-include/${MOZILLA}/editor/nsIDocumentStateListener.h
-include/${MOZILLA}/editor/nsIEditActionListener.h
-include/${MOZILLA}/editor/nsIEditor.h
-include/${MOZILLA}/editor/nsIEditorIMESupport.h
-include/${MOZILLA}/editor/nsIEditorLogging.h
-include/${MOZILLA}/editor/nsIEditorMailSupport.h
-include/${MOZILLA}/editor/nsIEditorObserver.h
-include/${MOZILLA}/editor/nsIEditorSpellCheck.h
-include/${MOZILLA}/editor/nsIEditorStyleSheets.h
-include/${MOZILLA}/editor/nsIHTMLAbsPosEditor.h
-include/${MOZILLA}/editor/nsIHTMLEditor.h
-include/${MOZILLA}/editor/nsIHTMLInlineTableEditor.h
-include/${MOZILLA}/editor/nsIHTMLObjectResizeListener.h
-include/${MOZILLA}/editor/nsIHTMLObjectResizer.h
-include/${MOZILLA}/editor/nsIPlaintextEditor.h
-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}/embed_base/nsIWindowProvider.h
-include/${MOZILLA}/embedcomponents/nsIAppStartupNotifier.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}/feeds/nsIFeed.h
-include/${MOZILLA}/feeds/nsIFeedContainer.h
-include/${MOZILLA}/feeds/nsIFeedElementBase.h
-include/${MOZILLA}/feeds/nsIFeedEntry.h
-include/${MOZILLA}/feeds/nsIFeedGenerator.h
-include/${MOZILLA}/feeds/nsIFeedListener.h
-include/${MOZILLA}/feeds/nsIFeedPerson.h
-include/${MOZILLA}/feeds/nsIFeedProcessor.h
-include/${MOZILLA}/feeds/nsIFeedResult.h
-include/${MOZILLA}/feeds/nsIFeedTextConstruct.h
-include/${MOZILLA}/feeds/nsIScriptableUnescapeHTML.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/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/nsIDrawingSurface.h
-include/${MOZILLA}/gfx/nsIFontEnumerator.h
-include/${MOZILLA}/gfx/nsIFontList.h
-include/${MOZILLA}/gfx/nsIFontMetrics.h
-include/${MOZILLA}/gfx/nsIImage.h
-include/${MOZILLA}/gfx/nsIPrintOptions.h
-include/${MOZILLA}/gfx/nsIPrintSession.h
-include/${MOZILLA}/gfx/nsIPrintSettings.h
-include/${MOZILLA}/gfx/nsIPrintSettingsService.h
-include/${MOZILLA}/gfx/nsIRegion.h
-include/${MOZILLA}/gfx/nsIRenderingContext.h
-include/${MOZILLA}/gfx/nsIScreen.h
-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
-include/${MOZILLA}/gfx/nsRegion.h
-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}/history/nsIBrowserHistory.h
-include/${MOZILLA}/htmlparser/nsHTMLTagList.h
-include/${MOZILLA}/htmlparser/nsHTMLTags.h
-include/${MOZILLA}/htmlparser/nsHTMLTokens.h
-include/${MOZILLA}/htmlparser/nsIContentSink.h
-include/${MOZILLA}/htmlparser/nsIDTD.h
-include/${MOZILLA}/htmlparser/nsIElementObserver.h
-include/${MOZILLA}/htmlparser/nsIExpatSink.h
-include/${MOZILLA}/htmlparser/nsIExtendedExpatSink.h
-include/${MOZILLA}/htmlparser/nsIFragmentContentSink.h
-include/${MOZILLA}/htmlparser/nsIHTMLContentSink.h
-include/${MOZILLA}/htmlparser/nsIParser.h
-include/${MOZILLA}/htmlparser/nsIParserFilter.h
-include/${MOZILLA}/htmlparser/nsIParserNode.h
-include/${MOZILLA}/htmlparser/nsIParserService.h
-include/${MOZILLA}/htmlparser/nsITokenizer.h
-include/${MOZILLA}/htmlparser/nsParserCIID.h
-include/${MOZILLA}/htmlparser/nsParserDataListener.h
-include/${MOZILLA}/htmlparser/nsScannerString.h
-include/${MOZILLA}/htmlparser/nsToken.h
-include/${MOZILLA}/imglib2/ImageErrors.h
-include/${MOZILLA}/imglib2/ImageLogging.h
-include/${MOZILLA}/imglib2/imgICache.h
-include/${MOZILLA}/imglib2/imgIContainer.h
-include/${MOZILLA}/imglib2/imgIContainerObserver.h
-include/${MOZILLA}/imglib2/imgIDecoder.h
-include/${MOZILLA}/imglib2/imgIDecoderObserver.h
-include/${MOZILLA}/imglib2/imgIEncoder.h
-include/${MOZILLA}/imglib2/imgILoad.h
-include/${MOZILLA}/imglib2/imgILoader.h
-include/${MOZILLA}/imglib2/imgIRequest.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMail.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMailImport.h
-include/${MOZILLA}/impComm4xMail/nsComm4xMailStringBundle.h
-include/${MOZILLA}/impComm4xMail/nsComm4xProfile.h
-include/${MOZILLA}/impComm4xMail/nsIComm4xProfile.h
-include/${MOZILLA}/impText/nsTextImport.h
-include/${MOZILLA}/impText/nsTextStringBundle.h
-include/${MOZILLA}/import/ImportOutFile.h
-include/${MOZILLA}/import/nsIImportABDescriptor.h
-include/${MOZILLA}/import/nsIImportAddressBooks.h
-include/${MOZILLA}/import/nsIImportFieldMap.h
-include/${MOZILLA}/import/nsIImportGeneric.h
-include/${MOZILLA}/import/nsIImportMail.h
-include/${MOZILLA}/import/nsIImportMailboxDescriptor.h
-include/${MOZILLA}/import/nsIImportMimeEncode.h
-include/${MOZILLA}/import/nsIImportModule.h
-include/${MOZILLA}/import/nsIImportService.h
-include/${MOZILLA}/import/nsIImportSettings.h
-include/${MOZILLA}/import/nsImportEncodeScan.h
-include/${MOZILLA}/import/nsImportMimeEncode.h
-include/${MOZILLA}/import/nsImportScanFile.h
-include/${MOZILLA}/import/nsImportService.h
-include/${MOZILLA}/import/nsImportStringBundle.h
-include/${MOZILLA}/import/nsImportTranslator.h
-include/${MOZILLA}/inspector/inICSSValueSearch.h
-include/${MOZILLA}/inspector/inIDOMUtils.h
-include/${MOZILLA}/inspector/inIDOMView.h
-include/${MOZILLA}/inspector/inIDeepTreeWalker.h
-include/${MOZILLA}/inspector/inIFileSearch.h
-include/${MOZILLA}/inspector/inIFlasher.h
-include/${MOZILLA}/inspector/inISearchObserver.h
-include/${MOZILLA}/inspector/inISearchProcess.h
-include/${MOZILLA}/intl/nsIStringBundle.h
-include/${MOZILLA}/intl/nsIStringBundleOverride.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
-include/${MOZILLA}/jar/zipstub.h
-include/${MOZILLA}/java/bool.h
-include/${MOZILLA}/java/interpreter.h
-include/${MOZILLA}/java/javaString.h
-include/${MOZILLA}/java/javaThreads.h
-include/${MOZILLA}/java/java_lang_String.h
-include/${MOZILLA}/java/jdk_java_lang_String.h
-include/${MOZILLA}/java/jmc.h
-include/${MOZILLA}/java/jni.h
-include/${MOZILLA}/java/jni_md.h
-include/${MOZILLA}/java/jri.h
-include/${MOZILLA}/java/jri_md.h
-include/${MOZILLA}/java/jriext.h
-include/${MOZILLA}/java/jritypes.h
-include/${MOZILLA}/java/nspr_md.h
-include/${MOZILLA}/java/oobj.h
-include/${MOZILLA}/java/sysmacros_md.h
-include/${MOZILLA}/java/tree.h
-include/${MOZILLA}/java/typedefs.h
-include/${MOZILLA}/java/typedefs_md.h
-include/${MOZILLA}/java/zip.h
-include/${MOZILLA}/js/fdlibm.h
-include/${MOZILLA}/js/js.msg
-include/${MOZILLA}/js/jsapi.h
-include/${MOZILLA}/js/jsarena.h
-include/${MOZILLA}/js/jsarray.h
-include/${MOZILLA}/js/jsatom.h
-include/${MOZILLA}/js/jsautocfg.h
-include/${MOZILLA}/js/jsautokw.h
-include/${MOZILLA}/js/jsbit.h
-include/${MOZILLA}/js/jsbool.h
-include/${MOZILLA}/js/jsclist.h
-include/${MOZILLA}/js/jscntxt.h
-include/${MOZILLA}/js/jscompat.h
-include/${MOZILLA}/js/jsconfig.h
-include/${MOZILLA}/js/jsdate.h
-include/${MOZILLA}/js/jsdbgapi.h
-include/${MOZILLA}/js/jsdhash.h
-include/${MOZILLA}/js/jsemit.h
-include/${MOZILLA}/js/jsfun.h
-include/${MOZILLA}/js/jsgc.h
-include/${MOZILLA}/js/jshash.h
-include/${MOZILLA}/js/jsinterp.h
-include/${MOZILLA}/js/jsiter.h
-include/${MOZILLA}/js/jslock.h
-include/${MOZILLA}/js/jslong.h
-include/${MOZILLA}/js/jsmath.h
-include/${MOZILLA}/js/jsnum.h
-include/${MOZILLA}/js/jsobj.h
-include/${MOZILLA}/js/jsopcode.h
-include/${MOZILLA}/js/jsopcode.tbl
-include/${MOZILLA}/js/jsosdep.h
-include/${MOZILLA}/js/jsotypes.h
-include/${MOZILLA}/js/jsparse.h
-include/${MOZILLA}/js/jsprf.h
-include/${MOZILLA}/js/jsproto.tbl
-include/${MOZILLA}/js/jsprvtd.h
-include/${MOZILLA}/js/jspubtd.h
-include/${MOZILLA}/js/jsregexp.h
-include/${MOZILLA}/js/jsscan.h
-include/${MOZILLA}/js/jsscope.h
-include/${MOZILLA}/js/jsscript.h
-include/${MOZILLA}/js/jsstddef.h
-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/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
-include/${MOZILLA}/layout/nsGridLayout2.h
-include/${MOZILLA}/layout/nsGridRow.h
-include/${MOZILLA}/layout/nsGridRowGroupLayout.h
-include/${MOZILLA}/layout/nsGridRowLayout.h
-include/${MOZILLA}/layout/nsGridRowLeafFrame.h
-include/${MOZILLA}/layout/nsGridRowLeafLayout.h
-include/${MOZILLA}/layout/nsHTMLParts.h
-include/${MOZILLA}/layout/nsHTMLReflowMetrics.h
-include/${MOZILLA}/layout/nsHTMLReflowState.h
-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/nsIFormControlFrame.h
-include/${MOZILLA}/layout/nsIFrame.h
-include/${MOZILLA}/layout/nsIFrameDebug.h
-include/${MOZILLA}/layout/nsIFrameFrame.h
-include/${MOZILLA}/layout/nsIFrameSelection.h
-include/${MOZILLA}/layout/nsIFrameTraversal.h
-include/${MOZILLA}/layout/nsIFrameUtil.h
-include/${MOZILLA}/layout/nsIGridPart.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
-include/${MOZILLA}/layout/nsIListBoxObject.h
-include/${MOZILLA}/layout/nsIListControlFrame.h
-include/${MOZILLA}/layout/nsIMenuBoxObject.h
-include/${MOZILLA}/layout/nsIMenuFrame.h
-include/${MOZILLA}/layout/nsIMenuParent.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/nsIPresShell.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/nsIScrollBoxObject.h
-include/${MOZILLA}/layout/nsIScrollableFrame.h
-include/${MOZILLA}/layout/nsIScrollableViewProvider.h
-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/nsLayoutStatics.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/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/nsTreeColFrame.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}/locale/nsCollation.h
-include/${MOZILLA}/locale/nsCollationCID.h
-include/${MOZILLA}/locale/nsDateTimeFormatCID.h
-include/${MOZILLA}/locale/nsICollation.h
-include/${MOZILLA}/locale/nsIDateTimeFormat.h
-include/${MOZILLA}/locale/nsIFontPackageHandler.h
-include/${MOZILLA}/locale/nsIFontPackageProxy.h
-include/${MOZILLA}/locale/nsIFontPackageService.h
-include/${MOZILLA}/locale/nsILanguageAtomService.h
-include/${MOZILLA}/locale/nsILocale.h
-include/${MOZILLA}/locale/nsILocaleService.h
-include/${MOZILLA}/locale/nsIMacLocale.h
-include/${MOZILLA}/locale/nsIOS2Locale.h
-include/${MOZILLA}/locale/nsIPosixLocale.h
-include/${MOZILLA}/locale/nsIScriptableDateFormat.h
-include/${MOZILLA}/locale/nsIWin32Locale.h
-include/${MOZILLA}/locale/nsLocaleCID.h
-include/${MOZILLA}/lwbrk/nsIBinarySearchIterator.h
-include/${MOZILLA}/lwbrk/nsIBreakState.h
-include/${MOZILLA}/lwbrk/nsILineBreaker.h
-include/${MOZILLA}/lwbrk/nsILineBreakerFactory.h
-include/${MOZILLA}/lwbrk/nsILinearIterator.h
-include/${MOZILLA}/lwbrk/nsISemanticUnitScanner.h
-include/${MOZILLA}/lwbrk/nsIWordBreaker.h
-include/${MOZILLA}/lwbrk/nsIWordBreakerFactory.h
-include/${MOZILLA}/lwbrk/nsLWBrkCIID.h
-include/${MOZILLA}/mailnews/MailNewsTypes.h
-include/${MOZILLA}/mailnews/MailNewsTypes2.h
-include/${MOZILLA}/mailprofilemigration/nsIMailProfileMigrator.h
-include/${MOZILLA}/mailprofilemigration/nsMailMigrationCID.h
-include/${MOZILLA}/mailview/nsIMsgMailView.h
-include/${MOZILLA}/mailview/nsIMsgMailViewList.h
-include/${MOZILLA}/mailview/nsMsgMailViewList.h
-include/${MOZILLA}/mailview/nsMsgMailViewsCID.h
-include/${MOZILLA}/mime/comi18n.h
-include/${MOZILLA}/mime/mimecont.h
-include/${MOZILLA}/mime/mimecth.h
-include/${MOZILLA}/mime/mimehdrs.h
-include/${MOZILLA}/mime/mimei.h
-include/${MOZILLA}/mime/mimeleaf.h
-include/${MOZILLA}/mime/mimemsig.h
-include/${MOZILLA}/mime/mimemult.h
-include/${MOZILLA}/mime/mimeobj.h
-include/${MOZILLA}/mime/mimepbuf.h
-include/${MOZILLA}/mime/mimetext.h
-include/${MOZILLA}/mime/modlmime.h
-include/${MOZILLA}/mime/modmimee.h
-include/${MOZILLA}/mime/nsIMimeContentTypeHandler.h
-include/${MOZILLA}/mime/nsIMimeConverter.h
-include/${MOZILLA}/mime/nsIMimeEmitter.h
-include/${MOZILLA}/mime/nsIMimeHeaders.h
-include/${MOZILLA}/mime/nsIMimeMiscStatus.h
-include/${MOZILLA}/mime/nsIMimeObjectClassAccess.h
-include/${MOZILLA}/mime/nsIMimeStreamConverter.h
-include/${MOZILLA}/mime/nsIMsgHeaderParser.h
-include/${MOZILLA}/mime/nsISimpleMimeConverter.h
-include/${MOZILLA}/mime/nsMailHeaders.h
-include/${MOZILLA}/mime/nsMimeContentTypeHandler.h
-include/${MOZILLA}/mime/nsMimeConverter.h
-include/${MOZILLA}/mime/nsMimeHeaders.h
-include/${MOZILLA}/mime/nsMimeObjectClassAccess.h
-include/${MOZILLA}/mime/nsMimeStringResources.h
-include/${MOZILLA}/mime/nsMsgHeaderParser.h
-include/${MOZILLA}/mime/nsMsgMimeCID.h
-include/${MOZILLA}/mime/nsStreamConverter.h
-include/${MOZILLA}/mimeemitter/nsEmitterUtils.h
-include/${MOZILLA}/mimeemitter/nsMimeBaseEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeEmitterCID.h
-include/${MOZILLA}/mimeemitter/nsMimeHtmlEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimePlainEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeRawEmitter.h
-include/${MOZILLA}/mimeemitter/nsMimeRebuffer.h
-include/${MOZILLA}/mimeemitter/nsMimeXmlEmitter.h
-include/${MOZILLA}/mimetype/nsIMIMEHeaderParam.h
-include/${MOZILLA}/mimetype/nsIMIMEInfo.h
-include/${MOZILLA}/mimetype/nsIMIMEService.h
-include/${MOZILLA}/mimetype/nsMimeTypes.h
-include/${MOZILLA}/mork/mdb.h
-include/${MOZILLA}/mork/nsIMdbFactoryFactory.h
-include/${MOZILLA}/mork/nsMorkCID.h
-include/${MOZILLA}/mozgnome/nsIGConfService.h
-include/${MOZILLA}/mozgnome/nsIGnomeVFSService.h
-include/${MOZILLA}/mozilla-config.h
-include/${MOZILLA}/mozldap/nsILDAPBERElement.h
-include/${MOZILLA}/mozldap/nsILDAPBERValue.h
-include/${MOZILLA}/mozldap/nsILDAPConnection.h
-include/${MOZILLA}/mozldap/nsILDAPControl.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}/msgbase/msgCore.h
-include/${MOZILLA}/msgbase/nsCopyMessageStreamListener.h
-include/${MOZILLA}/msgbase/nsICopyMessageListener.h
-include/${MOZILLA}/msgbase/nsICopyMsgStreamListener.h
-include/${MOZILLA}/msgbase/nsIFolderListener.h
-include/${MOZILLA}/msgbase/nsIIncomingServerListener.h
-include/${MOZILLA}/msgbase/nsIMapiRegistry.h
-include/${MOZILLA}/msgbase/nsIMessenger.h
-include/${MOZILLA}/msgbase/nsIMessengerMigrator.h
-include/${MOZILLA}/msgbase/nsIMessengerOSIntegration.h
-include/${MOZILLA}/msgbase/nsIMessengerWindowService.h
-include/${MOZILLA}/msgbase/nsIMsgAccount.h
-include/${MOZILLA}/msgbase/nsIMsgAccountManager.h
-include/${MOZILLA}/msgbase/nsIMsgBiffManager.h
-include/${MOZILLA}/msgbase/nsIMsgCopyService.h
-include/${MOZILLA}/msgbase/nsIMsgCopyServiceListener.h
-include/${MOZILLA}/msgbase/nsIMsgCustomColumnHandler.h
-include/${MOZILLA}/msgbase/nsIMsgDBView.h
-include/${MOZILLA}/msgbase/nsIMsgFilter.h
-include/${MOZILLA}/msgbase/nsIMsgFilterHitNotify.h
-include/${MOZILLA}/msgbase/nsIMsgFilterList.h
-include/${MOZILLA}/msgbase/nsIMsgFilterPlugin.h
-include/${MOZILLA}/msgbase/nsIMsgFilterService.h
-include/${MOZILLA}/msgbase/nsIMsgFolder.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCache.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCacheElement.h
-include/${MOZILLA}/msgbase/nsIMsgFolderCompactor.h
-include/${MOZILLA}/msgbase/nsIMsgFolderListener.h
-include/${MOZILLA}/msgbase/nsIMsgFolderNotificationService.h
-include/${MOZILLA}/msgbase/nsIMsgGroupRecord.h
-include/${MOZILLA}/msgbase/nsIMsgHdr.h
-include/${MOZILLA}/msgbase/nsIMsgHost.h
-include/${MOZILLA}/msgbase/nsIMsgIdentity.h
-include/${MOZILLA}/msgbase/nsIMsgIncomingServer.h
-include/${MOZILLA}/msgbase/nsIMsgMailNewsUrl.h
-include/${MOZILLA}/msgbase/nsIMsgMailSession.h
-include/${MOZILLA}/msgbase/nsIMsgMdnGenerator.h
-include/${MOZILLA}/msgbase/nsIMsgMessageService.h
-include/${MOZILLA}/msgbase/nsIMsgOfflineManager.h
-include/${MOZILLA}/msgbase/nsIMsgPrintEngine.h
-include/${MOZILLA}/msgbase/nsIMsgProgress.h
-include/${MOZILLA}/msgbase/nsIMsgProtocolInfo.h
-include/${MOZILLA}/msgbase/nsIMsgPurgeService.h
-include/${MOZILLA}/msgbase/nsIMsgRDFDataSource.h
-include/${MOZILLA}/msgbase/nsIMsgSearchAdapter.h
-include/${MOZILLA}/msgbase/nsIMsgSearchNotify.h
-include/${MOZILLA}/msgbase/nsIMsgSearchScopeTerm.h
-include/${MOZILLA}/msgbase/nsIMsgSearchSession.h
-include/${MOZILLA}/msgbase/nsIMsgSearchTerm.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValidityManager.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValidityTable.h
-include/${MOZILLA}/msgbase/nsIMsgSearchValue.h
-include/${MOZILLA}/msgbase/nsIMsgSignature.h
-include/${MOZILLA}/msgbase/nsIMsgStatusFeedback.h
-include/${MOZILLA}/msgbase/nsIMsgStringService.h
-include/${MOZILLA}/msgbase/nsIMsgTagService.h
-include/${MOZILLA}/msgbase/nsIMsgThread.h
-include/${MOZILLA}/msgbase/nsIMsgWindow.h
-include/${MOZILLA}/msgbase/nsISpamSettings.h
-include/${MOZILLA}/msgbase/nsIStatusBarBiffManager.h
-include/${MOZILLA}/msgbase/nsISubscribableServer.h
-include/${MOZILLA}/msgbase/nsIUrlListener.h
-include/${MOZILLA}/msgbase/nsIUrlListenerManager.h
-include/${MOZILLA}/msgbase/nsMailDirServiceDefs.h
-include/${MOZILLA}/msgbase/nsMessenger.h
-include/${MOZILLA}/msgbase/nsMessengerBootstrap.h
-include/${MOZILLA}/msgbase/nsMessengerContentHandler.h
-include/${MOZILLA}/msgbase/nsMessengerMigrator.h
-include/${MOZILLA}/msgbase/nsMsgAccount.h
-include/${MOZILLA}/msgbase/nsMsgAccountManager.h
-include/${MOZILLA}/msgbase/nsMsgAccountManagerDS.h
-include/${MOZILLA}/msgbase/nsMsgBaseCID.h
-include/${MOZILLA}/msgbase/nsMsgBiffManager.h
-include/${MOZILLA}/msgbase/nsMsgBodyHandler.h
-include/${MOZILLA}/msgbase/nsMsgContentPolicy.h
-include/${MOZILLA}/msgbase/nsMsgCopyService.h
-include/${MOZILLA}/msgbase/nsMsgFilterCore.h
-include/${MOZILLA}/msgbase/nsMsgFilterDataSource.h
-include/${MOZILLA}/msgbase/nsMsgFilterDelegateFactory.h
-include/${MOZILLA}/msgbase/nsMsgFilterService.h
-include/${MOZILLA}/msgbase/nsMsgFolderCache.h
-include/${MOZILLA}/msgbase/nsMsgFolderDataSource.h
-include/${MOZILLA}/msgbase/nsMsgFolderFlags.h
-include/${MOZILLA}/msgbase/nsMsgHeaderMasks.h
-include/${MOZILLA}/msgbase/nsMsgLocalFolderHdrs.h
-include/${MOZILLA}/msgbase/nsMsgMailSession.h
-include/${MOZILLA}/msgbase/nsMsgMessageFlags.h
-include/${MOZILLA}/msgbase/nsMsgPrintEngine.h
-include/${MOZILLA}/msgbase/nsMsgProgress.h
-include/${MOZILLA}/msgbase/nsMsgPurgeService.h
-include/${MOZILLA}/msgbase/nsMsgRDFDataSource.h
-include/${MOZILLA}/msgbase/nsMsgRDFUtils.h
-include/${MOZILLA}/msgbase/nsMsgResultElement.h
-include/${MOZILLA}/msgbase/nsMsgSearchAdapter.h
-include/${MOZILLA}/msgbase/nsMsgSearchArray.h
-include/${MOZILLA}/msgbase/nsMsgSearchBoolExpression.h
-include/${MOZILLA}/msgbase/nsMsgSearchCore.h
-include/${MOZILLA}/msgbase/nsMsgSearchScopeTerm.h
-include/${MOZILLA}/msgbase/nsMsgSearchSession.h
-include/${MOZILLA}/msgbase/nsMsgSearchTerm.h
-include/${MOZILLA}/msgbase/nsMsgServiceProvider.h
-include/${MOZILLA}/msgbase/nsMsgStatusFeedback.h
-include/${MOZILLA}/msgbase/nsMsgWindow.h
-include/${MOZILLA}/msgbase/nsStatusBarBiffManager.h
-include/${MOZILLA}/msgbase/nsSubscribableServer.h
-include/${MOZILLA}/msgbase/nsSubscribeDataSource.h
-include/${MOZILLA}/msgbase/nsUrlListenerManager.h
-include/${MOZILLA}/msgbaseutil/nsAdapterEnumerator.h
-include/${MOZILLA}/msgbaseutil/nsImapMoveCoalescer.h
-include/${MOZILLA}/msgbaseutil/nsLocalFolderSummarySpec.h
-include/${MOZILLA}/msgbaseutil/nsMsgDBFolder.h
-include/${MOZILLA}/msgbaseutil/nsMsgGroupRecord.h
-include/${MOZILLA}/msgbaseutil/nsMsgI18N.h
-include/${MOZILLA}/msgbaseutil/nsMsgIdentity.h
-include/${MOZILLA}/msgbaseutil/nsMsgIncomingServer.h
-include/${MOZILLA}/msgbaseutil/nsMsgKeyArray.h
-include/${MOZILLA}/msgbaseutil/nsMsgKeySet.h
-include/${MOZILLA}/msgbaseutil/nsMsgLineBuffer.h
-include/${MOZILLA}/msgbaseutil/nsMsgMailNewsUrl.h
-include/${MOZILLA}/msgbaseutil/nsMsgProtocol.h
-include/${MOZILLA}/msgbaseutil/nsMsgTxn.h
-include/${MOZILLA}/msgbaseutil/nsMsgUtils.h
-include/${MOZILLA}/msgbaseutil/nsNewsSummarySpec.h
-include/${MOZILLA}/msgbaseutil/nsUInt32Array.h
-include/${MOZILLA}/msgbaseutil/nsUint8Array.h
-include/${MOZILLA}/msgcompose/nsIMsgAttachment.h
-include/${MOZILLA}/msgcompose/nsIMsgCompFields.h
-include/${MOZILLA}/msgcompose/nsIMsgCompUtils.h
-include/${MOZILLA}/msgcompose/nsIMsgCompose.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeParams.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeProgressParams.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeSecure.h
-include/${MOZILLA}/msgcompose/nsIMsgComposeService.h
-include/${MOZILLA}/msgcompose/nsIMsgQuote.h
-include/${MOZILLA}/msgcompose/nsIMsgQuotingOutputStreamListener.h
-include/${MOZILLA}/msgcompose/nsIMsgRecipientArray.h
-include/${MOZILLA}/msgcompose/nsIMsgSend.h
-include/${MOZILLA}/msgcompose/nsIMsgSendLater.h
-include/${MOZILLA}/msgcompose/nsIMsgSendLaterListener.h
-include/${MOZILLA}/msgcompose/nsIMsgSendListener.h
-include/${MOZILLA}/msgcompose/nsIMsgSendReport.h
-include/${MOZILLA}/msgcompose/nsISmtpServer.h
-include/${MOZILLA}/msgcompose/nsISmtpService.h
-include/${MOZILLA}/msgcompose/nsISmtpUrl.h
-include/${MOZILLA}/msgcompose/nsIURLFetcher.h
-include/${MOZILLA}/msgcompose/nsMsgAttachment.h
-include/${MOZILLA}/msgcompose/nsMsgAttachmentHandler.h
-include/${MOZILLA}/msgcompose/nsMsgCompCID.h
-include/${MOZILLA}/msgcompose/nsMsgCompFields.h
-include/${MOZILLA}/msgcompose/nsMsgCompUtils.h
-include/${MOZILLA}/msgcompose/nsMsgCompose.h
-include/${MOZILLA}/msgcompose/nsMsgComposeContentHandler.h
-include/${MOZILLA}/msgcompose/nsMsgComposeParams.h
-include/${MOZILLA}/msgcompose/nsMsgComposeProgressParams.h
-include/${MOZILLA}/msgcompose/nsMsgComposeService.h
-include/${MOZILLA}/msgcompose/nsMsgComposeStringBundle.h
-include/${MOZILLA}/msgcompose/nsMsgCopy.h
-include/${MOZILLA}/msgcompose/nsMsgDeliveryListener.h
-include/${MOZILLA}/msgcompose/nsMsgEncoders.h
-include/${MOZILLA}/msgcompose/nsMsgPrompts.h
-include/${MOZILLA}/msgcompose/nsMsgQuote.h
-include/${MOZILLA}/msgcompose/nsMsgRecipientArray.h
-include/${MOZILLA}/msgcompose/nsMsgSend.h
-include/${MOZILLA}/msgcompose/nsMsgSendLater.h
-include/${MOZILLA}/msgcompose/nsMsgSendReport.h
-include/${MOZILLA}/msgcompose/nsMsgSimulateError.h
-include/${MOZILLA}/msgcompose/nsSmtpDataSource.h
-include/${MOZILLA}/msgcompose/nsSmtpDelegateFactory.h
-include/${MOZILLA}/msgcompose/nsSmtpProtocol.h
-include/${MOZILLA}/msgcompose/nsSmtpServer.h
-include/${MOZILLA}/msgcompose/nsSmtpService.h
-include/${MOZILLA}/msgcompose/nsSmtpUrl.h
-include/${MOZILLA}/msgcompose/nsURLFetcher.h
-include/${MOZILLA}/msgdb/nsDBFolderInfo.h
-include/${MOZILLA}/msgdb/nsIDBChangeAnnouncer.h
-include/${MOZILLA}/msgdb/nsIDBChangeListener.h
-include/${MOZILLA}/msgdb/nsIDBFolderInfo.h
-include/${MOZILLA}/msgdb/nsIMsgDatabase.h
-include/${MOZILLA}/msgdb/nsIMsgOfflineImapOperation.h
-include/${MOZILLA}/msgdb/nsINewsDatabase.h
-include/${MOZILLA}/msgdb/nsImapMailDatabase.h
-include/${MOZILLA}/msgdb/nsMailDatabase.h
-include/${MOZILLA}/msgdb/nsMsgDBCID.h
-include/${MOZILLA}/msgdb/nsMsgDatabase.h
-include/${MOZILLA}/msgdb/nsMsgHdr.h
-include/${MOZILLA}/msgdb/nsMsgThread.h
-include/${MOZILLA}/msgdb/nsNewsDatabase.h
-include/${MOZILLA}/msgimap/nsIIMAPHostSessionList.h
-include/${MOZILLA}/msgimap/nsIImapExtensionSink.h
-include/${MOZILLA}/msgimap/nsIImapFlagAndUidState.h
-include/${MOZILLA}/msgimap/nsIImapHeaderXferInfo.h
-include/${MOZILLA}/msgimap/nsIImapIncomingServer.h
-include/${MOZILLA}/msgimap/nsIImapMailFolderSink.h
-include/${MOZILLA}/msgimap/nsIImapMessageSink.h
-include/${MOZILLA}/msgimap/nsIImapMiscellaneousSink.h
-include/${MOZILLA}/msgimap/nsIImapMockChannel.h
-include/${MOZILLA}/msgimap/nsIImapProtocol.h
-include/${MOZILLA}/msgimap/nsIImapServerSink.h
-include/${MOZILLA}/msgimap/nsIImapService.h
-include/${MOZILLA}/msgimap/nsIImapUrl.h
-include/${MOZILLA}/msgimap/nsIMAPBodyShell.h
-include/${MOZILLA}/msgimap/nsIMAPGenericParser.h
-include/${MOZILLA}/msgimap/nsIMAPHostSessionList.h
-include/${MOZILLA}/msgimap/nsIMAPNamespace.h
-include/${MOZILLA}/msgimap/nsIMailboxSpec.h
-include/${MOZILLA}/msgimap/nsIMsgImapMailFolder.h
-include/${MOZILLA}/msgimap/nsIMsgLogonRedirector.h
-include/${MOZILLA}/msgimap/nsImapCore.h
-include/${MOZILLA}/msgimap/nsImapFlagAndUidState.h
-include/${MOZILLA}/msgimap/nsImapIncomingServer.h
-include/${MOZILLA}/msgimap/nsImapMailFolder.h
-include/${MOZILLA}/msgimap/nsImapProtocol.h
-include/${MOZILLA}/msgimap/nsImapProxyEvent.h
-include/${MOZILLA}/msgimap/nsImapSearchResults.h
-include/${MOZILLA}/msgimap/nsImapServerResponseParser.h
-include/${MOZILLA}/msgimap/nsImapService.h
-include/${MOZILLA}/msgimap/nsImapUrl.h
-include/${MOZILLA}/msgimap/nsImapUtils.h
-include/${MOZILLA}/msgimap/nsMsgImapCID.h
-include/${MOZILLA}/msglocal/nsILocalMailIncomingServer.h
-include/${MOZILLA}/msglocal/nsIMailboxService.h
-include/${MOZILLA}/msglocal/nsIMailboxUrl.h
-include/${MOZILLA}/msglocal/nsIMovemailIncomingServer.h
-include/${MOZILLA}/msglocal/nsIMovemailService.h
-include/${MOZILLA}/msglocal/nsIMsgLocalMailFolder.h
-include/${MOZILLA}/msglocal/nsIMsgParseMailMsgState.h
-include/${MOZILLA}/msglocal/nsINewsBlogFeedDownloader.h
-include/${MOZILLA}/msglocal/nsINoIncomingServer.h
-include/${MOZILLA}/msglocal/nsINoneService.h
-include/${MOZILLA}/msglocal/nsIPop3IncomingServer.h
-include/${MOZILLA}/msglocal/nsIPop3Protocol.h
-include/${MOZILLA}/msglocal/nsIPop3Service.h
-include/${MOZILLA}/msglocal/nsIPop3Sink.h
-include/${MOZILLA}/msglocal/nsIPop3URL.h
-include/${MOZILLA}/msglocal/nsIRssIncomingServer.h
-include/${MOZILLA}/msglocal/nsIRssService.h
-include/${MOZILLA}/msglocal/nsLocalMailFolder.h
-include/${MOZILLA}/msglocal/nsLocalStringBundle.h
-include/${MOZILLA}/msglocal/nsMailboxProtocol.h
-include/${MOZILLA}/msglocal/nsMailboxService.h
-include/${MOZILLA}/msglocal/nsMailboxUrl.h
-include/${MOZILLA}/msglocal/nsMovemailIncomingServer.h
-include/${MOZILLA}/msglocal/nsMovemailService.h
-include/${MOZILLA}/msglocal/nsMsgLocalCID.h
-include/${MOZILLA}/msglocal/nsNoIncomingServer.h
-include/${MOZILLA}/msglocal/nsNoneService.h
-include/${MOZILLA}/msglocal/nsParseMailbox.h
-include/${MOZILLA}/msglocal/nsPop3IncomingServer.h
-include/${MOZILLA}/msglocal/nsPop3Protocol.h
-include/${MOZILLA}/msglocal/nsPop3Service.h
-include/${MOZILLA}/msglocal/nsPop3Sink.h
-include/${MOZILLA}/msglocal/nsPop3URL.h
-include/${MOZILLA}/msglocal/nsRssIncomingServer.h
-include/${MOZILLA}/msglocal/nsRssService.h
-include/${MOZILLA}/msgmdn/nsMsgMdnCID.h
-include/${MOZILLA}/msgmdn/nsMsgMdnGenerator.h
-include/${MOZILLA}/msgnews/nntpCore.h
-include/${MOZILLA}/msgnews/nsIMsgNewsFolder.h
-include/${MOZILLA}/msgnews/nsIMsgOfflineNewsState.h
-include/${MOZILLA}/msgnews/nsINNTPArticleList.h
-include/${MOZILLA}/msgnews/nsINNTPNewsgroupList.h
-include/${MOZILLA}/msgnews/nsINNTPNewsgroupPost.h
-include/${MOZILLA}/msgnews/nsINNTPProtocol.h
-include/${MOZILLA}/msgnews/nsINewsDownloadDialogArgs.h
-include/${MOZILLA}/msgnews/nsINntpIncomingServer.h
-include/${MOZILLA}/msgnews/nsINntpService.h
-include/${MOZILLA}/msgnews/nsINntpUrl.h
-include/${MOZILLA}/msgnews/nsMsgNewsCID.h
-include/${MOZILLA}/msgnews/nsNNTPArticleList.h
-include/${MOZILLA}/msgnews/nsNNTPNewsgroupList.h
-include/${MOZILLA}/msgnews/nsNNTPNewsgroupPost.h
-include/${MOZILLA}/msgnews/nsNNTPProtocol.h
-include/${MOZILLA}/msgnews/nsNewsDownloadDialogArgs.h
-include/${MOZILLA}/msgnews/nsNewsFolder.h
-include/${MOZILLA}/msgnews/nsNewsUtils.h
-include/${MOZILLA}/msgnews/nsNntpIncomingServer.h
-include/${MOZILLA}/msgnews/nsNntpService.h
-include/${MOZILLA}/msgnews/nsNntpUrl.h
-include/${MOZILLA}/msgsmime/nsEncryptedSMIMEURIsService.h
-include/${MOZILLA}/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
-include/${MOZILLA}/msgsmime/nsIMsgSMIMECompFields.h
-include/${MOZILLA}/msgsmime/nsIMsgSMIMEHeaderSink.h
-include/${MOZILLA}/msgsmime/nsISMimeJSHelper.h
-include/${MOZILLA}/msgsmime/nsMsgComposeSecure.h
-include/${MOZILLA}/msgsmime/nsMsgSMIMECID.h
-include/${MOZILLA}/msgsmime/nsSMimeJSHelper.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
-include/${MOZILLA}/necko/nsIAuthPrompt.h
-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
-include/${MOZILLA}/necko/nsICookieConsent.h
-include/${MOZILLA}/necko/nsICookieManager.h
-include/${MOZILLA}/necko/nsICookieManager2.h
-include/${MOZILLA}/necko/nsICookiePermission.h
-include/${MOZILLA}/necko/nsICookieService.h
-include/${MOZILLA}/necko/nsICryptoFIPSInfo.h
-include/${MOZILLA}/necko/nsIDNSListener.h
-include/${MOZILLA}/necko/nsIDNSRecord.h
-include/${MOZILLA}/necko/nsIDNSService.h
-include/${MOZILLA}/necko/nsIDataChannel.h
-include/${MOZILLA}/necko/nsIDirIndex.h
-include/${MOZILLA}/necko/nsIDirIndexListener.h
-include/${MOZILLA}/necko/nsIDownloader.h
-include/${MOZILLA}/necko/nsIEncodedChannel.h
-include/${MOZILLA}/necko/nsIExternalProtocolHandler.h
-include/${MOZILLA}/necko/nsIFTPChannel.h
-include/${MOZILLA}/necko/nsIFileChannel.h
-include/${MOZILLA}/necko/nsIFileProtocolHandler.h
-include/${MOZILLA}/necko/nsIFileStreams.h
-include/${MOZILLA}/necko/nsIFileURL.h
-include/${MOZILLA}/necko/nsIHttpActivityObserver.h
-include/${MOZILLA}/necko/nsIHttpAuthManager.h
-include/${MOZILLA}/necko/nsIHttpAuthenticator.h
-include/${MOZILLA}/necko/nsIHttpChannel.h
-include/${MOZILLA}/necko/nsIHttpChannelInternal.h
-include/${MOZILLA}/necko/nsIHttpEventSink.h
-include/${MOZILLA}/necko/nsIHttpHeaderVisitor.h
-include/${MOZILLA}/necko/nsIHttpProtocolHandler.h
-include/${MOZILLA}/necko/nsIIDNService.h
-include/${MOZILLA}/necko/nsIIOService.h
-include/${MOZILLA}/necko/nsIIOService2.h
-include/${MOZILLA}/necko/nsIIncrementalDownload.h
-include/${MOZILLA}/necko/nsIInputStreamChannel.h
-include/${MOZILLA}/necko/nsIInputStreamPump.h
-include/${MOZILLA}/necko/nsILoadGroup.h
-include/${MOZILLA}/necko/nsIMIMEInputStream.h
-include/${MOZILLA}/necko/nsIMultiPartChannel.h
-include/${MOZILLA}/necko/nsINetUtil.h
-include/${MOZILLA}/necko/nsINetworkLinkService.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/nsIProxyAutoConfig.h
-include/${MOZILLA}/necko/nsIProxyInfo.h
-include/${MOZILLA}/necko/nsIRequest.h
-include/${MOZILLA}/necko/nsIRequestObserver.h
-include/${MOZILLA}/necko/nsIRequestObserverProxy.h
-include/${MOZILLA}/necko/nsIResProtocolHandler.h
-include/${MOZILLA}/necko/nsIResumableChannel.h
-include/${MOZILLA}/necko/nsISOCKSSocketInfo.h
-include/${MOZILLA}/necko/nsISSLSocketControl.h
-include/${MOZILLA}/necko/nsISafeOutputStream.h
-include/${MOZILLA}/necko/nsISecretDecoderRing.h
-include/${MOZILLA}/necko/nsISecureBrowserUI.h
-include/${MOZILLA}/necko/nsISecurityEventSink.h
-include/${MOZILLA}/necko/nsIServerSocket.h
-include/${MOZILLA}/necko/nsISimpleStreamListener.h
-include/${MOZILLA}/necko/nsISocketProvider.h
-include/${MOZILLA}/necko/nsISocketProviderService.h
-include/${MOZILLA}/necko/nsISocketTransport.h
-include/${MOZILLA}/necko/nsISocketTransportService.h
-include/${MOZILLA}/necko/nsIStandardURL.h
-include/${MOZILLA}/necko/nsIStreamConverter.h
-include/${MOZILLA}/necko/nsIStreamConverterService.h
-include/${MOZILLA}/necko/nsIStreamListener.h
-include/${MOZILLA}/necko/nsIStreamListenerProxy.h
-include/${MOZILLA}/necko/nsIStreamListenerTee.h
-include/${MOZILLA}/necko/nsIStreamLoader.h
-include/${MOZILLA}/necko/nsIStreamTransportService.h
-include/${MOZILLA}/necko/nsISyncStreamListener.h
-include/${MOZILLA}/necko/nsITXTToHTMLConv.h
-include/${MOZILLA}/necko/nsITransport.h
-include/${MOZILLA}/necko/nsITransportSecurityInfo.h
-include/${MOZILLA}/necko/nsIURI.h
-include/${MOZILLA}/necko/nsIURIChecker.h
-include/${MOZILLA}/necko/nsIURL.h
-include/${MOZILLA}/necko/nsIURLParser.h
-include/${MOZILLA}/necko/nsIUnicharStreamListener.h
-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}/necko2/nsIViewSourceChannel.h
-include/${MOZILLA}/nkcache/nsCacheService.h
-include/${MOZILLA}/nkcache/nsICache.h
-include/${MOZILLA}/nkcache/nsICacheEntryDescriptor.h
-include/${MOZILLA}/nkcache/nsICacheListener.h
-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/_aix32.cfg
-include/${MOZILLA}/nspr/md/_aix64.cfg
-include/${MOZILLA}/nspr/md/_beos.cfg
-include/${MOZILLA}/nspr/md/_bsdi.cfg
-include/${MOZILLA}/nspr/md/_darwin.cfg
-include/${MOZILLA}/nspr/md/_dgux.cfg
-include/${MOZILLA}/nspr/md/_freebsd.cfg
-include/${MOZILLA}/nspr/md/_hpux32.cfg
-include/${MOZILLA}/nspr/md/_hpux64.cfg
-include/${MOZILLA}/nspr/md/_irix32.cfg
-include/${MOZILLA}/nspr/md/_irix64.cfg
-include/${MOZILLA}/nspr/md/_linux.cfg
-include/${MOZILLA}/nspr/md/_ncr.cfg
-include/${MOZILLA}/nspr/md/_nec.cfg
-include/${MOZILLA}/nspr/md/_netbsd.cfg
-include/${MOZILLA}/nspr/md/_nextstep.cfg
-include/${MOZILLA}/nspr/md/_nto.cfg
-include/${MOZILLA}/nspr/md/_openbsd.cfg
-include/${MOZILLA}/nspr/md/_openvms.cfg
-include/${MOZILLA}/nspr/md/_os2.cfg
-include/${MOZILLA}/nspr/md/_osf1.cfg
-include/${MOZILLA}/nspr/md/_qnx.cfg
-include/${MOZILLA}/nspr/md/_reliantunix.cfg
-include/${MOZILLA}/nspr/md/_riscos.cfg
-include/${MOZILLA}/nspr/md/_scoos.cfg
-include/${MOZILLA}/nspr/md/_solaris.cfg
-include/${MOZILLA}/nspr/md/_sony.cfg
-include/${MOZILLA}/nspr/md/_sunos4.cfg
-include/${MOZILLA}/nspr/md/_unixware.cfg
-include/${MOZILLA}/nspr/md/_unixware7.cfg
-include/${MOZILLA}/nspr/md/_win16.cfg
-include/${MOZILLA}/nspr/md/_win95.cfg
-include/${MOZILLA}/nspr/md/_winnt.cfg
-include/${MOZILLA}/nspr/nspr.h
-include/${MOZILLA}/nspr/obsolete/pralarm.h
-include/${MOZILLA}/nspr/obsolete/probslet.h
-include/${MOZILLA}/nspr/obsolete/protypes.h
-include/${MOZILLA}/nspr/obsolete/prsem.h
-include/${MOZILLA}/nspr/plarena.h
-include/${MOZILLA}/nspr/plarenas.h
-include/${MOZILLA}/nspr/plbase64.h
-include/${MOZILLA}/nspr/plerror.h
-include/${MOZILLA}/nspr/plgetopt.h
-include/${MOZILLA}/nspr/plhash.h
-include/${MOZILLA}/nspr/plresolv.h
-include/${MOZILLA}/nspr/plstr.h
-include/${MOZILLA}/nspr/pratom.h
-include/${MOZILLA}/nspr/prbit.h
-include/${MOZILLA}/nspr/prclist.h
-include/${MOZILLA}/nspr/prcmon.h
-include/${MOZILLA}/nspr/prcountr.h
-include/${MOZILLA}/nspr/prcpucfg.h
-include/${MOZILLA}/nspr/prcvar.h
-include/${MOZILLA}/nspr/prdtoa.h
-include/${MOZILLA}/nspr/prenv.h
-include/${MOZILLA}/nspr/prerr.h
-include/${MOZILLA}/nspr/prerror.h
-include/${MOZILLA}/nspr/prinet.h
-include/${MOZILLA}/nspr/prinit.h
-include/${MOZILLA}/nspr/prinrval.h
-include/${MOZILLA}/nspr/prio.h
-include/${MOZILLA}/nspr/pripcsem.h
-include/${MOZILLA}/nspr/private/pprio.h
-include/${MOZILLA}/nspr/private/pprthred.h
-include/${MOZILLA}/nspr/private/prpriv.h
-include/${MOZILLA}/nspr/prlink.h
-include/${MOZILLA}/nspr/prlock.h
-include/${MOZILLA}/nspr/prlog.h
-include/${MOZILLA}/nspr/prlong.h
-include/${MOZILLA}/nspr/prmem.h
-include/${MOZILLA}/nspr/prmon.h
-include/${MOZILLA}/nspr/prmwait.h
-include/${MOZILLA}/nspr/prnetdb.h
-include/${MOZILLA}/nspr/prolock.h
-include/${MOZILLA}/nspr/prpdce.h
-include/${MOZILLA}/nspr/prprf.h
-include/${MOZILLA}/nspr/prproces.h
-include/${MOZILLA}/nspr/prrng.h
-include/${MOZILLA}/nspr/prrwlock.h
-include/${MOZILLA}/nspr/prshm.h
-include/${MOZILLA}/nspr/prshma.h
-include/${MOZILLA}/nspr/prsystem.h
-include/${MOZILLA}/nspr/prthread.h
-include/${MOZILLA}/nspr/prtime.h
-include/${MOZILLA}/nspr/prtpool.h
-include/${MOZILLA}/nspr/prtrace.h
-include/${MOZILLA}/nspr/prtypes.h
-include/${MOZILLA}/nspr/prvrsion.h
-include/${MOZILLA}/nspr/prwin16.h
-include/${MOZILLA}/pipboot/nsIBufEntropyCollector.h
-include/${MOZILLA}/pipboot/nsISSLStatusProvider.h
-include/${MOZILLA}/pipboot/nsISecurityWarningDialogs.h
-include/${MOZILLA}/pipnss/nsIASN1Object.h
-include/${MOZILLA}/pipnss/nsIASN1PrintableItem.h
-include/${MOZILLA}/pipnss/nsIASN1Sequence.h
-include/${MOZILLA}/pipnss/nsIBadCertListener.h
-include/${MOZILLA}/pipnss/nsICMSDecoder.h
-include/${MOZILLA}/pipnss/nsICMSEncoder.h
-include/${MOZILLA}/pipnss/nsICMSMessage.h
-include/${MOZILLA}/pipnss/nsICMSMessage2.h
-include/${MOZILLA}/pipnss/nsICMSMessageErrors.h
-include/${MOZILLA}/pipnss/nsICMSSecureMessage.h
-include/${MOZILLA}/pipnss/nsICRLInfo.h
-include/${MOZILLA}/pipnss/nsICRLManager.h
-include/${MOZILLA}/pipnss/nsICertPickDialogs.h
-include/${MOZILLA}/pipnss/nsICertSelect.h
-include/${MOZILLA}/pipnss/nsICertTree.h
-include/${MOZILLA}/pipnss/nsICertificateDialogs.h
-include/${MOZILLA}/pipnss/nsICipherInfo.h
-include/${MOZILLA}/pipnss/nsIClientAuthDialogs.h
-include/${MOZILLA}/pipnss/nsIDOMCryptoDialogs.h
-include/${MOZILLA}/pipnss/nsIFormSigningDialog.h
-include/${MOZILLA}/pipnss/nsIGenKeypairInfoDlg.h
-include/${MOZILLA}/pipnss/nsIKeyModule.h
-include/${MOZILLA}/pipnss/nsIKeygenThread.h
-include/${MOZILLA}/pipnss/nsINSSCertCache.h
-include/${MOZILLA}/pipnss/nsIOCSPResponder.h
-include/${MOZILLA}/pipnss/nsIPK11Token.h
-include/${MOZILLA}/pipnss/nsIPK11TokenDB.h
-include/${MOZILLA}/pipnss/nsIPKCS11Module.h
-include/${MOZILLA}/pipnss/nsIPKCS11ModuleDB.h
-include/${MOZILLA}/pipnss/nsIPKCS11Slot.h
-include/${MOZILLA}/pipnss/nsISMimeCert.h
-include/${MOZILLA}/pipnss/nsISSLStatus.h
-include/${MOZILLA}/pipnss/nsIStreamCipher.h
-include/${MOZILLA}/pipnss/nsITokenDialogs.h
-include/${MOZILLA}/pipnss/nsITokenPasswordDialogs.h
-include/${MOZILLA}/pipnss/nsIUserCertPicker.h
-include/${MOZILLA}/pipnss/nsIX509Cert.h
-include/${MOZILLA}/pipnss/nsIX509Cert18Branch.h
-include/${MOZILLA}/pipnss/nsIX509Cert3.h
-include/${MOZILLA}/pipnss/nsIX509CertDB.h
-include/${MOZILLA}/pipnss/nsIX509CertDB2.h
-include/${MOZILLA}/pipnss/nsIX509CertValidity.h
-include/${MOZILLA}/pippki/nsIASN1Tree.h
-include/${MOZILLA}/pippki/nsIPKIParamBlock.h
-include/${MOZILLA}/plugin/npapi.h
-include/${MOZILLA}/plugin/npruntime.h
-include/${MOZILLA}/plugin/nptypes.h
-include/${MOZILLA}/plugin/npupp.h
-include/${MOZILLA}/plugin/nsDefaultPlugin.h
-include/${MOZILLA}/plugin/nsIClassicPluginFactory.h
-include/${MOZILLA}/plugin/nsICookieStorage.h
-include/${MOZILLA}/plugin/nsIEventHandler.h
-include/${MOZILLA}/plugin/nsIFileUtilities.h
-include/${MOZILLA}/plugin/nsIHTTPHeaderListener.h
-include/${MOZILLA}/plugin/nsIJRILiveConnectPIPeer.h
-include/${MOZILLA}/plugin/nsIJRILiveConnectPlugin.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
-include/${MOZILLA}/plugin/nsIPluginManager.h
-include/${MOZILLA}/plugin/nsIPluginManager2.h
-include/${MOZILLA}/plugin/nsIPluginStreamInfo.h
-include/${MOZILLA}/plugin/nsIPluginStreamListener.h
-include/${MOZILLA}/plugin/nsIPluginTagInfo.h
-include/${MOZILLA}/plugin/nsIPluginTagInfo2.h
-include/${MOZILLA}/plugin/nsIScriptablePlugin.h
-include/${MOZILLA}/plugin/nsIWindowlessPlugInstPeer.h
-include/${MOZILLA}/plugin/nsPIPluginHost.h
-include/${MOZILLA}/plugin/nsPIPluginInstancePeer.h
-include/${MOZILLA}/plugin/nsPluginError.h
-include/${MOZILLA}/plugin/nsPluginLogging.h
-include/${MOZILLA}/plugin/nsPluginNativeWindow.h
-include/${MOZILLA}/plugin/nsPluginsCID.h
-include/${MOZILLA}/plugin/nsplugin.h
-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
-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}/progressDlg/nsIProgressDialog.h
-include/${MOZILLA}/rdf/nsILocalStore.h
-include/${MOZILLA}/rdf/nsIRDFCompositeDataSource.h
-include/${MOZILLA}/rdf/nsIRDFContainer.h
-include/${MOZILLA}/rdf/nsIRDFContainerUtils.h
-include/${MOZILLA}/rdf/nsIRDFContentSink.h
-include/${MOZILLA}/rdf/nsIRDFDataSource.h
-include/${MOZILLA}/rdf/nsIRDFDelegateFactory.h
-include/${MOZILLA}/rdf/nsIRDFFileSystem.h
-include/${MOZILLA}/rdf/nsIRDFInMemoryDataSource.h
-include/${MOZILLA}/rdf/nsIRDFInferDataSource.h
-include/${MOZILLA}/rdf/nsIRDFLiteral.h
-include/${MOZILLA}/rdf/nsIRDFNode.h
-include/${MOZILLA}/rdf/nsIRDFObserver.h
-include/${MOZILLA}/rdf/nsIRDFPropagatableDataSource.h
-include/${MOZILLA}/rdf/nsIRDFPurgeableDataSource.h
-include/${MOZILLA}/rdf/nsIRDFRemoteDataSource.h
-include/${MOZILLA}/rdf/nsIRDFResource.h
-include/${MOZILLA}/rdf/nsIRDFService.h
-include/${MOZILLA}/rdf/nsIRDFXMLParser.h
-include/${MOZILLA}/rdf/nsIRDFXMLSerializer.h
-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}/shellservice/nsIShellService.h
-include/${MOZILLA}/shistory/nsIHistoryEntry.h
-include/${MOZILLA}/shistory/nsISHContainer.h
-include/${MOZILLA}/shistory/nsISHEntry.h
-include/${MOZILLA}/shistory/nsISHTransaction.h
-include/${MOZILLA}/shistory/nsISHistory.h
-include/${MOZILLA}/shistory/nsISHistoryInternal.h
-include/${MOZILLA}/shistory/nsISHistoryListener.h
-include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
-include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
-include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
-include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
-include/${MOZILLA}/sqlite3/sqlite3.h
-include/${MOZILLA}/sqlite3/sqlite3file.h
-include/${MOZILLA}/storage/mozIStorageConnection.h
-include/${MOZILLA}/storage/mozIStorageDataSet.h
-include/${MOZILLA}/storage/mozIStorageFunction.h
-include/${MOZILLA}/storage/mozIStorageService.h
-include/${MOZILLA}/storage/mozIStorageStatement.h
-include/${MOZILLA}/storage/mozIStorageStatementWrapper.h
-include/${MOZILLA}/storage/mozIStorageValueArray.h
-include/${MOZILLA}/storage/mozStorageCID.h
-include/${MOZILLA}/storage/mozStorageHelper.h
-include/${MOZILLA}/string/nsAString.h
-include/${MOZILLA}/string/nsAlgorithm.h
-include/${MOZILLA}/string/nsCharTraits.h
-include/${MOZILLA}/string/nsDependentString.h
-include/${MOZILLA}/string/nsDependentSubstring.h
-include/${MOZILLA}/string/nsEmbedString.h
-include/${MOZILLA}/string/nsLiteralString.h
-include/${MOZILLA}/string/nsObsoleteAString.h
-include/${MOZILLA}/string/nsPrintfCString.h
-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
-include/${MOZILLA}/string/nsSubstringTuple.h
-include/${MOZILLA}/string/nsTAString.h
-include/${MOZILLA}/string/nsTDependentString.h
-include/${MOZILLA}/string/nsTDependentSubstring.h
-include/${MOZILLA}/string/nsTObsoleteAString.h
-include/${MOZILLA}/string/nsTPromiseFlatString.h
-include/${MOZILLA}/string/nsTString.h
-include/${MOZILLA}/string/nsTSubstring.h
-include/${MOZILLA}/string/nsTSubstringTuple.h
-include/${MOZILLA}/string/nsUTF8Utils.h
-include/${MOZILLA}/string/nsXPIDLString.h
-include/${MOZILLA}/string/string-template-def-char.h
-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/nsICommandLineValidator.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
-include/${MOZILLA}/txtsvc/nsITextServicesFilter.h
-include/${MOZILLA}/txtsvc/nsTextServicesCID.h
-include/${MOZILLA}/uconv/nsEncoderDecoderUtils.h
-include/${MOZILLA}/uconv/nsICharRepresentable.h
-include/${MOZILLA}/uconv/nsICharsetAlias.h
-include/${MOZILLA}/uconv/nsICharsetConverterManager.h
-include/${MOZILLA}/uconv/nsICurrentCharsetListener.h
-include/${MOZILLA}/uconv/nsIMappingCache.h
-include/${MOZILLA}/uconv/nsIPlatformCharset.h
-include/${MOZILLA}/uconv/nsIScriptableUConv.h
-include/${MOZILLA}/uconv/nsITextToSubURI.h
-include/${MOZILLA}/uconv/nsIUTF8ConverterService.h
-include/${MOZILLA}/uconv/nsIUnicodeDecodeHelper.h
-include/${MOZILLA}/uconv/nsIUnicodeDecoder.h
-include/${MOZILLA}/uconv/nsIUnicodeEncodeHelper.h
-include/${MOZILLA}/uconv/nsIUnicodeEncoder.h
-include/${MOZILLA}/uconv/nsUConvCID.h
-include/${MOZILLA}/uconv/uconvutil.h
-include/${MOZILLA}/ucvcn/nsUCvCnCID.h
-include/${MOZILLA}/ucvibm/nsUCvIBMCID.h
-include/${MOZILLA}/ucvja/nsUCVJA2CID.h
-include/${MOZILLA}/ucvja/nsUCVJACID.h
-include/${MOZILLA}/ucvko/nsUCvKOCID.h
-include/${MOZILLA}/ucvlatin/nsUCvLatinCID.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
-include/${MOZILLA}/unicharutil/nsIEntityConverter.h
-include/${MOZILLA}/unicharutil/nsIOrderIdFormater.h
-include/${MOZILLA}/unicharutil/nsISaveAsCharset.h
-include/${MOZILLA}/unicharutil/nsITextTransform.h
-include/${MOZILLA}/unicharutil/nsIUGenDetailCategory.h
-include/${MOZILLA}/unicharutil/nsIUnicodeNormalizer.h
-include/${MOZILLA}/unicharutil/nsUnicharUtilCIID.h
-include/${MOZILLA}/unicharutil/nsUnicharUtils.h
-include/${MOZILLA}/update/nsIUpdateService.h
-include/${MOZILLA}/uriloader/nsCURILoader.h
-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}/url-classifier/nsIUrlClassifierDBService.h
-include/${MOZILLA}/url-classifier/nsIUrlClassifierStreamUpdater.h
-include/${MOZILLA}/url-classifier/nsIUrlClassifierTable.h
-include/${MOZILLA}/url-classifier/nsIUrlClassifierUtils.h
-include/${MOZILLA}/url-classifier/nsIUrlListManager.h
-include/${MOZILLA}/urlformatter/nsIURLFormatter.h
-include/${MOZILLA}/util/nsTimer.h
-include/${MOZILLA}/util/stopwatch.h
-include/${MOZILLA}/view/nsICompositeListener.h
-include/${MOZILLA}/view/nsIScrollPositionListener.h
-include/${MOZILLA}/view/nsIScrollableView.h
-include/${MOZILLA}/view/nsIView.h
-include/${MOZILLA}/view/nsIViewManager.h
-include/${MOZILLA}/view/nsIViewObserver.h
-include/${MOZILLA}/view/nsViewsCID.h
-include/${MOZILLA}/wallet/nsCPassword.h
-include/${MOZILLA}/wallet/nsIPassword.h
-include/${MOZILLA}/wallet/nsIWalletService.h
-include/${MOZILLA}/walletviewers/nsISignonViewer.h
-include/${MOZILLA}/walletviewers/nsIWalletEditor.h
-include/${MOZILLA}/walletviewers/nsIWalletPreview.h
-include/${MOZILLA}/webbrowserpersist/nsCWebBrowserPersist.h
-include/${MOZILLA}/webbrowserpersist/nsIWebBrowserPersist.h
-include/${MOZILLA}/webbrwsr/nsCTooltipTextProvider.h
-include/${MOZILLA}/webbrwsr/nsCWebBrowser.h
-include/${MOZILLA}/webbrwsr/nsICommandHandler.h
-include/${MOZILLA}/webbrwsr/nsIContextMenuListener.h
-include/${MOZILLA}/webbrwsr/nsIContextMenuListener2.h
-include/${MOZILLA}/webbrwsr/nsIEmbeddingSiteWindow.h
-include/${MOZILLA}/webbrwsr/nsIEmbeddingSiteWindow2.h
-include/${MOZILLA}/webbrwsr/nsIPrintingPrompt.h
-include/${MOZILLA}/webbrwsr/nsIPrintingPromptService.h
-include/${MOZILLA}/webbrwsr/nsITooltipListener.h
-include/${MOZILLA}/webbrwsr/nsITooltipTextProvider.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowser.h
-include/${MOZILLA}/webbrwsr/nsIWebBrowserChrome.h
-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/nsIDocumentLoaderFactory.h
-include/${MOZILLA}/webshell/nsILinkHandler.h
-include/${MOZILLA}/webshell/nsIRefreshURI.h
-include/${MOZILLA}/webshell/nsIWebShellServices.h
-include/${MOZILLA}/websrvcs/nsIGenericInterfaceInfoSet.h
-include/${MOZILLA}/websrvcs/nsIInterfaceInfoToIDL.h
-include/${MOZILLA}/websrvcs/nsISOAPAttachments.h
-include/${MOZILLA}/websrvcs/nsISOAPBlock.h
-include/${MOZILLA}/websrvcs/nsISOAPCall.h
-include/${MOZILLA}/websrvcs/nsISOAPCallCompletion.h
-include/${MOZILLA}/websrvcs/nsISOAPDecoder.h
-include/${MOZILLA}/websrvcs/nsISOAPEncoder.h
-include/${MOZILLA}/websrvcs/nsISOAPEncoding.h
-include/${MOZILLA}/websrvcs/nsISOAPFault.h
-include/${MOZILLA}/websrvcs/nsISOAPHeaderBlock.h
-include/${MOZILLA}/websrvcs/nsISOAPMessage.h
-include/${MOZILLA}/websrvcs/nsISOAPParameter.h
-include/${MOZILLA}/websrvcs/nsISOAPPropertyBagMutator.h
-include/${MOZILLA}/websrvcs/nsISOAPResponse.h
-include/${MOZILLA}/websrvcs/nsISOAPResponseListener.h
-include/${MOZILLA}/websrvcs/nsISOAPService.h
-include/${MOZILLA}/websrvcs/nsISOAPServiceRegistry.h
-include/${MOZILLA}/websrvcs/nsISOAPTransport.h
-include/${MOZILLA}/websrvcs/nsISOAPTransportListener.h
-include/${MOZILLA}/websrvcs/nsISchema.h
-include/${MOZILLA}/websrvcs/nsISchemaLoader.h
-include/${MOZILLA}/websrvcs/nsIScriptableInterfaceInfo.h
-include/${MOZILLA}/websrvcs/nsIWSDL.h
-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
-include/${MOZILLA}/widget/nsEvent.h
-include/${MOZILLA}/widget/nsGUIEvent.h
-include/${MOZILLA}/widget/nsIAppShell.h
-include/${MOZILLA}/widget/nsIBaseWindow.h
-include/${MOZILLA}/widget/nsIBidiKeyboard.h
-include/${MOZILLA}/widget/nsIButton.h
-include/${MOZILLA}/widget/nsICheckButton.h
-include/${MOZILLA}/widget/nsIClipboard.h
-include/${MOZILLA}/widget/nsIClipboardDragDropHookList.h
-include/${MOZILLA}/widget/nsIClipboardDragDropHooks.h
-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
-include/${MOZILLA}/widget/nsIDragSessionXlib.h
-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
-include/${MOZILLA}/widget/nsIMenu.h
-include/${MOZILLA}/widget/nsIMenuBar.h
-include/${MOZILLA}/widget/nsIMenuItem.h
-include/${MOZILLA}/widget/nsIMenuListener.h
-include/${MOZILLA}/widget/nsIMenuRollup.h
-include/${MOZILLA}/widget/nsIMouseListener.h
-include/${MOZILLA}/widget/nsINativeKeyBindings.h
-include/${MOZILLA}/widget/nsINativeScrollbar.h
-include/${MOZILLA}/widget/nsIPluginWidget.h
-include/${MOZILLA}/widget/nsIRollupListener.h
-include/${MOZILLA}/widget/nsISound.h
-include/${MOZILLA}/widget/nsITextWidget.h
-include/${MOZILLA}/widget/nsIToolkit.h
-include/${MOZILLA}/widget/nsITransferable.h
-include/${MOZILLA}/widget/nsIWidget.h
-include/${MOZILLA}/widget/nsStringUtil.h
-include/${MOZILLA}/widget/nsWidgetSupport.h
-include/${MOZILLA}/widget/nsWidgetsCID.h
-include/${MOZILLA}/widget/widgetCore.h
-include/${MOZILLA}/windowwatcher/nsIAuthPromptWrapper.h
-include/${MOZILLA}/windowwatcher/nsIDialogParamBlock.h
-include/${MOZILLA}/windowwatcher/nsINonBlockingAlertService.h
-include/${MOZILLA}/windowwatcher/nsIPromptService.h
-include/${MOZILLA}/windowwatcher/nsIWindowWatcher.h
-include/${MOZILLA}/windowwatcher/nsPIPromptService.h
-include/${MOZILLA}/windowwatcher/nsPIWindowWatcher.h
-include/${MOZILLA}/xml/nsISAXAttributes.h
-include/${MOZILLA}/xml/nsISAXContentHandler.h
-include/${MOZILLA}/xml/nsISAXDTDHandler.h
-include/${MOZILLA}/xml/nsISAXErrorHandler.h
-include/${MOZILLA}/xml/nsISAXLexicalHandler.h
-include/${MOZILLA}/xml/nsISAXLocator.h
-include/${MOZILLA}/xml/nsISAXMutableAttributes.h
-include/${MOZILLA}/xml/nsISAXXMLFilter.h
-include/${MOZILLA}/xml/nsISAXXMLReader.h
-include/${MOZILLA}/xml/nsSAXAttributes.h
-include/${MOZILLA}/xml/nsSAXLocator.h
-include/${MOZILLA}/xml/nsSAXXMLReader.h
-include/${MOZILLA}/xpcom/nsAgg.h
-include/${MOZILLA}/xpcom/nsAppDirectoryServiceDefs.h
-include/${MOZILLA}/xpcom/nsArray.h
-include/${MOZILLA}/xpcom/nsArrayEnumerator.h
-include/${MOZILLA}/xpcom/nsAtomService.h
-include/${MOZILLA}/xpcom/nsAutoBuffer.h
-include/${MOZILLA}/xpcom/nsAutoLock.h
-include/${MOZILLA}/xpcom/nsAutoPtr.h
-include/${MOZILLA}/xpcom/nsBaseHashtable.h
-include/${MOZILLA}/xpcom/nsCOMArray.h
-include/${MOZILLA}/xpcom/nsCOMPtr.h
-include/${MOZILLA}/xpcom/nsCRT.h
-include/${MOZILLA}/xpcom/nsCategoryCache.h
-include/${MOZILLA}/xpcom/nsCategoryManagerUtils.h
-include/${MOZILLA}/xpcom/nsCheapSets.h
-include/${MOZILLA}/xpcom/nsClassHashtable.h
-include/${MOZILLA}/xpcom/nsCom.h
-include/${MOZILLA}/xpcom/nsComponentManagerUtils.h
-include/${MOZILLA}/xpcom/nsCppSharedAllocator.h
-include/${MOZILLA}/xpcom/nsDataHashtable.h
-include/${MOZILLA}/xpcom/nsDebug.h
-include/${MOZILLA}/xpcom/nsDebugImpl.h
-include/${MOZILLA}/xpcom/nsDeque.h
-include/${MOZILLA}/xpcom/nsDirectoryService.h
-include/${MOZILLA}/xpcom/nsDirectoryServiceDefs.h
-include/${MOZILLA}/xpcom/nsDirectoryServiceUtils.h
-include/${MOZILLA}/xpcom/nsDoubleHashtable.h
-include/${MOZILLA}/xpcom/nsEnumeratorUtils.h
-include/${MOZILLA}/xpcom/nsError.h
-include/${MOZILLA}/xpcom/nsEscape.h
-include/${MOZILLA}/xpcom/nsEventQueueUtils.h
-include/${MOZILLA}/xpcom/nsFastLoadPtr.h
-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
-include/${MOZILLA}/xpcom/nsIArray.h
-include/${MOZILLA}/xpcom/nsIAsyncInputStream.h
-include/${MOZILLA}/xpcom/nsIAsyncOutputStream.h
-include/${MOZILLA}/xpcom/nsIAtom.h
-include/${MOZILLA}/xpcom/nsIAtomService.h
-include/${MOZILLA}/xpcom/nsIBinaryInputStream.h
-include/${MOZILLA}/xpcom/nsIBinaryOutputStream.h
-include/${MOZILLA}/xpcom/nsIByteArrayInputStream.h
-include/${MOZILLA}/xpcom/nsIByteBuffer.h
-include/${MOZILLA}/xpcom/nsICategoryManager.h
-include/${MOZILLA}/xpcom/nsIClassInfo.h
-include/${MOZILLA}/xpcom/nsICollection.h
-include/${MOZILLA}/xpcom/nsIComponentLoader.h
-include/${MOZILLA}/xpcom/nsIComponentLoaderManager.h
-include/${MOZILLA}/xpcom/nsIComponentManager.h
-include/${MOZILLA}/xpcom/nsIComponentManagerObsolete.h
-include/${MOZILLA}/xpcom/nsIComponentRegistrar.h
-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
-include/${MOZILLA}/xpcom/nsIErrorService.h
-include/${MOZILLA}/xpcom/nsIEventQueue.h
-include/${MOZILLA}/xpcom/nsIEventQueueListener.h
-include/${MOZILLA}/xpcom/nsIEventQueueService.h
-include/${MOZILLA}/xpcom/nsIEventTarget.h
-include/${MOZILLA}/xpcom/nsIException.h
-include/${MOZILLA}/xpcom/nsIExceptionService.h
-include/${MOZILLA}/xpcom/nsIFactory.h
-include/${MOZILLA}/xpcom/nsIFastLoadFileControl.h
-include/${MOZILLA}/xpcom/nsIFastLoadService.h
-include/${MOZILLA}/xpcom/nsIFile.h
-include/${MOZILLA}/xpcom/nsIGenericFactory.h
-include/${MOZILLA}/xpcom/nsIID.h
-include/${MOZILLA}/xpcom/nsIInputStream.h
-include/${MOZILLA}/xpcom/nsIInputStreamTee.h
-include/${MOZILLA}/xpcom/nsIInterfaceInfo.h
-include/${MOZILLA}/xpcom/nsIInterfaceInfoManager.h
-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/nsINIParser.h
-include/${MOZILLA}/xpcom/nsIObjectInputStream.h
-include/${MOZILLA}/xpcom/nsIObjectOutputStream.h
-include/${MOZILLA}/xpcom/nsIObserver.h
-include/${MOZILLA}/xpcom/nsIObserverService.h
-include/${MOZILLA}/xpcom/nsIOutputStream.h
-include/${MOZILLA}/xpcom/nsIPersistentProperties2.h
-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
-include/${MOZILLA}/xpcom/nsIRunnable.h
-include/${MOZILLA}/xpcom/nsIScriptableInputStream.h
-include/${MOZILLA}/xpcom/nsISeekableStream.h
-include/${MOZILLA}/xpcom/nsISerializable.h
-include/${MOZILLA}/xpcom/nsIServiceManager.h
-include/${MOZILLA}/xpcom/nsIServiceManagerObsolete.h
-include/${MOZILLA}/xpcom/nsISimpleEnumerator.h
-include/${MOZILLA}/xpcom/nsIStorageStream.h
-include/${MOZILLA}/xpcom/nsIStreamBufferAccess.h
-include/${MOZILLA}/xpcom/nsIStringEnumerator.h
-include/${MOZILLA}/xpcom/nsIStringStream.h
-include/${MOZILLA}/xpcom/nsISupports.h
-include/${MOZILLA}/xpcom/nsISupportsArray.h
-include/${MOZILLA}/xpcom/nsISupportsBase.h
-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
-include/${MOZILLA}/xpcom/nsITimer.h
-include/${MOZILLA}/xpcom/nsITimerInternal.h
-include/${MOZILLA}/xpcom/nsITimerManager.h
-include/${MOZILLA}/xpcom/nsITraceRefcnt.h
-include/${MOZILLA}/xpcom/nsIUUIDGenerator.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
-include/${MOZILLA}/xpcom/nsObserverService.h
-include/${MOZILLA}/xpcom/nsObsoleteModuleLoading.h
-include/${MOZILLA}/xpcom/nsProcess.h
-include/${MOZILLA}/xpcom/nsProxiedService.h
-include/${MOZILLA}/xpcom/nsProxyEvent.h
-include/${MOZILLA}/xpcom/nsProxyRelease.h
-include/${MOZILLA}/xpcom/nsQuickSort.h
-include/${MOZILLA}/xpcom/nsRecyclingAllocator.h
-include/${MOZILLA}/xpcom/nsRefPtrHashtable.h
-include/${MOZILLA}/xpcom/nsScriptableInputStream.h
-include/${MOZILLA}/xpcom/nsServiceManagerUtils.h
-include/${MOZILLA}/xpcom/nsStaticAtom.h
-include/${MOZILLA}/xpcom/nsStaticNameTable.h
-include/${MOZILLA}/xpcom/nsStorageStream.h
-include/${MOZILLA}/xpcom/nsStreamUtils.h
-include/${MOZILLA}/xpcom/nsStringEnumerator.h
-include/${MOZILLA}/xpcom/nsStringIO.h
-include/${MOZILLA}/xpcom/nsStringStream.h
-include/${MOZILLA}/xpcom/nsSupportsArray.h
-include/${MOZILLA}/xpcom/nsSupportsPrimitives.h
-include/${MOZILLA}/xpcom/nsTArray.h
-include/${MOZILLA}/xpcom/nsTHashtable.h
-include/${MOZILLA}/xpcom/nsTextFormatter.h
-include/${MOZILLA}/xpcom/nsTime.h
-include/${MOZILLA}/xpcom/nsTraceRefcnt.h
-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
-include/${MOZILLA}/xpcom/nsXPCOM.h
-include/${MOZILLA}/xpcom/nsXPCOMCID.h
-include/${MOZILLA}/xpcom/nsXPCOMGlue.h
-include/${MOZILLA}/xpcom/nscore.h
-include/${MOZILLA}/xpcom/nsrootidl.h
-include/${MOZILLA}/xpcom/pldhash.h
-include/${MOZILLA}/xpcom/plevent.h
-include/${MOZILLA}/xpcom/xcDll.h
-include/${MOZILLA}/xpcom/xpcom-config.h
-include/${MOZILLA}/xpcom/xpt_arena.h
-include/${MOZILLA}/xpcom/xpt_struct.h
-include/${MOZILLA}/xpcom/xpt_xdr.h
-include/${MOZILLA}/xpcom/xptcall.h
-include/${MOZILLA}/xpcom/xptcstubsdecl.inc
-include/${MOZILLA}/xpcom/xptcstubsdef.inc
-include/${MOZILLA}/xpcom/xptinfo.h
-include/${MOZILLA}/xpcom_obsolete/nsFileSpec.h
-include/${MOZILLA}/xpcom_obsolete/nsFileStream.h
-include/${MOZILLA}/xpcom_obsolete/nsIFileSpec.h
-include/${MOZILLA}/xpcom_obsolete/nsIFileStream.h
-include/${MOZILLA}/xpcom_obsolete/nsIRegistry.h
-include/${MOZILLA}/xpcom_obsolete/nsIRegistryUtils.h
-include/${MOZILLA}/xpcom_obsolete/nsSpecialSystemDirectory.h
-include/${MOZILLA}/xpcom_obsolete/xpcomobsolete.h
-include/${MOZILLA}/xpconnect/XPCIDispatch.h
-include/${MOZILLA}/xpconnect/mozIJSSubScriptLoader.h
-include/${MOZILLA}/xpconnect/nsIJSContextStack.h
-include/${MOZILLA}/xpconnect/nsIJSRuntimeService.h
-include/${MOZILLA}/xpconnect/nsIScriptError.h
-include/${MOZILLA}/xpconnect/nsIScriptableInterfaces.h
-include/${MOZILLA}/xpconnect/nsIXPCScriptNotify.h
-include/${MOZILLA}/xpconnect/nsIXPCScriptable.h
-include/${MOZILLA}/xpconnect/nsIXPCSecurityManager.h
-include/${MOZILLA}/xpconnect/nsIXPConnect.h
-include/${MOZILLA}/xpconnect/xpc_map_end.h
-include/${MOZILLA}/xpconnect/xpccomponents.h
-include/${MOZILLA}/xpconnect/xpcexception.h
-include/${MOZILLA}/xpconnect/xpcjsid.h
-include/${MOZILLA}/xpinstall/InstallCleanupDefines.h
-include/${MOZILLA}/xpinstall/nsIDOMInstallTriggerGlobal.h
-include/${MOZILLA}/xpinstall/nsIDOMInstallVersion.h
-include/${MOZILLA}/xpinstall/nsISoftwareUpdate.h
-include/${MOZILLA}/xpinstall/nsIXPIDialogService.h
-include/${MOZILLA}/xpinstall/nsIXPINotifier.h
-include/${MOZILLA}/xpinstall/nsIXPIProgressDialog.h
-include/${MOZILLA}/xpinstall/nsIXPInstallManager.h
-include/${MOZILLA}/xpinstall/nsPICertNotification.h
-include/${MOZILLA}/xpinstall/nsPIXPIProxy.h
-include/${MOZILLA}/xpinstall/nsPIXPIStubHook.h
-include/${MOZILLA}/xpinstall/nsSoftwareUpdateIIDs.h
-include/${MOZILLA}/xpinstall/nsXPITriggerInfo.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
-include/${MOZILLA}/xuldoc/nsIXULContentSink.h
-include/${MOZILLA}/xuldoc/nsIXULDocument.h
-include/${MOZILLA}/xuldoc/nsIXULOverlayProvider.h
-include/${MOZILLA}/xuldoc/nsIXULPrototypeCache.h
-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
-@comment begin INCLUDE-PUBLIC
-include/${MOZILLA}/ldap-private/lber-int.h
-include/${MOZILLA}/ldap-private/ldap-int.h
-include/${MOZILLA}/ldap-private/ldaplog.h
-include/${MOZILLA}/ldap-private/ldaprot.h
-include/${MOZILLA}/ldap-private/portable.h
-include/${MOZILLA}/ldap/disptmpl.h
-include/${MOZILLA}/ldap/iutil.h
-include/${MOZILLA}/ldap/lber.h
-include/${MOZILLA}/ldap/ldap-deprecated.h
-include/${MOZILLA}/ldap/ldap-extension.h
-include/${MOZILLA}/ldap/ldap-platform.h
-include/${MOZILLA}/ldap/ldap-standard.h
-include/${MOZILLA}/ldap/ldap-to-be-deprecated.h
-include/${MOZILLA}/ldap/ldap.h
-include/${MOZILLA}/ldap/ldap_ssl.h
-include/${MOZILLA}/ldap/ldappr.h
-include/${MOZILLA}/ldap/srchpref.h
-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/nssutil.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/utilrename.h
-@comment end INCLUDE-PUBLIC
-share/applications/${MOZILLA}.desktop
-share/pixmaps/${MOZILLA}.xpm
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@unexec ${RM} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
-@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
-@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
+@comment $NetBSD: PLIST,v 1.30 2009/11/29 03:06:42 tnn Exp $
+bin/thunderbird
+lib/thunderbird/README.txt
+lib/thunderbird/application.ini
+lib/thunderbird/chrome/classic.jar
+lib/thunderbird/chrome/classic.manifest
+lib/thunderbird/chrome/comm.jar
+lib/thunderbird/chrome/comm.manifest
+lib/thunderbird/chrome/en-US.jar
+lib/thunderbird/chrome/en-US.manifest
+lib/thunderbird/chrome/gloda.jar
+lib/thunderbird/chrome/gloda.manifest
+lib/thunderbird/chrome/icons/default/default16.png
+lib/thunderbird/chrome/icons/default/default22.png
+lib/thunderbird/chrome/icons/default/default24.png
+lib/thunderbird/chrome/icons/default/default256.png
+lib/thunderbird/chrome/icons/default/default32.png
+lib/thunderbird/chrome/icons/default/default48.png
+lib/thunderbird/chrome/messenger.jar
+lib/thunderbird/chrome/messenger.manifest
+lib/thunderbird/chrome/newsblog.jar
+lib/thunderbird/chrome/newsblog.manifest
+lib/thunderbird/chrome/pippki.jar
+lib/thunderbird/chrome/pippki.manifest
+lib/thunderbird/chrome/toolkit.jar
+lib/thunderbird/chrome/toolkit.manifest
+lib/thunderbird/components/FeedProcessor.js
+lib/thunderbird/components/NetworkGeolocationProvider.js
+lib/thunderbird/components/aboutRights.js
+lib/thunderbird/components/accessibility.xpt
+lib/thunderbird/components/activity.xpt
+lib/thunderbird/components/addrbook.xpt
+lib/thunderbird/components/alerts.xpt
+lib/thunderbird/components/appshell.xpt
+lib/thunderbird/components/appstartup.xpt
+lib/thunderbird/components/autocomplete.xpt
+lib/thunderbird/components/autoconfig.xpt
+lib/thunderbird/components/caps.xpt
+lib/thunderbird/components/chardet.xpt
+lib/thunderbird/components/chrome.xpt
+lib/thunderbird/components/commandhandler.xpt
+lib/thunderbird/components/commandlines.xpt
+lib/thunderbird/components/composer.xpt
+lib/thunderbird/components/content_base.xpt
+lib/thunderbird/components/content_html.xpt
+lib/thunderbird/components/content_htmldoc.xpt
+lib/thunderbird/components/content_xmldoc.xpt
+lib/thunderbird/components/content_xslt.xpt
+lib/thunderbird/components/content_xtf.xpt
+lib/thunderbird/components/contentprefs.xpt
+lib/thunderbird/components/cookie.xpt
+lib/thunderbird/components/docshell.xpt
+lib/thunderbird/components/dom.xpt
+lib/thunderbird/components/dom_base.xpt
+lib/thunderbird/components/dom_canvas.xpt
+lib/thunderbird/components/dom_core.xpt
+lib/thunderbird/components/dom_css.xpt
+lib/thunderbird/components/dom_events.xpt
+lib/thunderbird/components/dom_geolocation.xpt
+lib/thunderbird/components/dom_html.xpt
+lib/thunderbird/components/dom_json.xpt
+lib/thunderbird/components/dom_loadsave.xpt
+lib/thunderbird/components/dom_offline.xpt
+lib/thunderbird/components/dom_range.xpt
+lib/thunderbird/components/dom_sidebar.xpt
+lib/thunderbird/components/dom_storage.xpt
+lib/thunderbird/components/dom_stylesheets.xpt
+lib/thunderbird/components/dom_svg.xpt
+lib/thunderbird/components/dom_threads.xpt
+lib/thunderbird/components/dom_traversal.xpt
+lib/thunderbird/components/dom_views.xpt
+lib/thunderbird/components/dom_xbl.xpt
+lib/thunderbird/components/dom_xpath.xpt
+lib/thunderbird/components/dom_xul.xpt
+lib/thunderbird/components/downloads.xpt
+lib/thunderbird/components/editor.xpt
+lib/thunderbird/components/embed_base.xpt
+lib/thunderbird/components/extensions.xpt
+lib/thunderbird/components/exthandler.xpt
+lib/thunderbird/components/exthelper.xpt
+lib/thunderbird/components/fastfind.xpt
+lib/thunderbird/components/feeds.xpt
+lib/thunderbird/components/filepicker.xpt
+lib/thunderbird/components/find.xpt
+lib/thunderbird/components/fts3tok.xpt
+lib/thunderbird/components/gfx.xpt
+lib/thunderbird/components/glautocomp.js
+lib/thunderbird/components/htmlparser.xpt
+lib/thunderbird/components/imgicon.xpt
+lib/thunderbird/components/imglib2.xpt
+lib/thunderbird/components/impComm4xMail.xpt
+lib/thunderbird/components/import.xpt
+lib/thunderbird/components/inspector.xpt
+lib/thunderbird/components/intl.xpt
+lib/thunderbird/components/jar.xpt
+lib/thunderbird/components/jsconsole-clhandler.js
+lib/thunderbird/components/jsdservice.xpt
+lib/thunderbird/components/jsmimeemitter.js
+lib/thunderbird/components/layout_base.xpt
+lib/thunderbird/components/layout_printing.xpt
+lib/thunderbird/components/layout_xul.xpt
+lib/thunderbird/components/layout_xul_tree.xpt
+${PLIST.gnome}lib/thunderbird/components/libdbusservice.so
+lib/thunderbird/components/libimgicon.so
+lib/thunderbird/components/libjsd.so
+${PLIST.gnome}lib/thunderbird/components/libmozgnome.so
+lib/thunderbird/components/libxpinstall.so
+lib/thunderbird/components/locale.xpt
+lib/thunderbird/components/loginmgr.xpt
+lib/thunderbird/components/lwbrk.xpt
+lib/thunderbird/components/mailContentHandler.js
+lib/thunderbird/components/mailprofilemigration.xpt
+lib/thunderbird/components/mailview.xpt
+lib/thunderbird/components/mdn-service.js
+lib/thunderbird/components/mime.xpt
+lib/thunderbird/components/mimetype.xpt
+lib/thunderbird/components/mozbrwsr.xpt
+lib/thunderbird/components/mozfind.xpt
+lib/thunderbird/components/mozldap.xpt
+lib/thunderbird/components/msgAsyncPrompter.js
+lib/thunderbird/components/msgbase.xpt
+lib/thunderbird/components/msgcompose.xpt
+lib/thunderbird/components/msgdb.xpt
+lib/thunderbird/components/msgimap.xpt
+lib/thunderbird/components/msglocal.xpt
+lib/thunderbird/components/msgnews.xpt
+lib/thunderbird/components/msgsearch.xpt
+lib/thunderbird/components/msgsmime.xpt
+lib/thunderbird/components/necko.xpt
+lib/thunderbird/components/necko_about.xpt
+lib/thunderbird/components/necko_cache.xpt
+lib/thunderbird/components/necko_cookie.xpt
+lib/thunderbird/components/necko_dns.xpt
+lib/thunderbird/components/necko_file.xpt
+lib/thunderbird/components/necko_ftp.xpt
+lib/thunderbird/components/necko_http.xpt
+lib/thunderbird/components/necko_res.xpt
+lib/thunderbird/components/necko_socket.xpt
+lib/thunderbird/components/necko_strconv.xpt
+lib/thunderbird/components/necko_viewsource.xpt
+lib/thunderbird/components/newsblog.js
+lib/thunderbird/components/nsAbAutoCompleteMyDomain.js
+lib/thunderbird/components/nsAbAutoCompleteSearch.js
+lib/thunderbird/components/nsAbLDAPAttributeMap.js
+lib/thunderbird/components/nsActivity.js
+lib/thunderbird/components/nsActivityManager.js
+lib/thunderbird/components/nsActivityManagerUI.js
+lib/thunderbird/components/nsAddonRepository.js
+lib/thunderbird/components/nsBadCertHandler.js
+lib/thunderbird/components/nsBlocklistService.js
+lib/thunderbird/components/nsContentDispatchChooser.js
+lib/thunderbird/components/nsContentPrefService.js
+lib/thunderbird/components/nsDefaultCLH.js
+lib/thunderbird/components/nsDownloadManagerUI.js
+lib/thunderbird/components/nsExtensionManager.js
+lib/thunderbird/components/nsFilePicker.js
+lib/thunderbird/components/nsHandlerService.js
+lib/thunderbird/components/nsHelperAppDlg.js
+lib/thunderbird/components/nsLDAPProtocolHandler.js
+lib/thunderbird/components/nsLoginInfo.js
+lib/thunderbird/components/nsLoginManager.js
+lib/thunderbird/components/nsLoginManagerPrompter.js
+lib/thunderbird/components/nsMailDefaultHandler.js
+lib/thunderbird/components/nsMailNewsCommandLineHandler.js
+lib/thunderbird/components/nsMsgTraitService.js
+lib/thunderbird/components/nsPhishingProtectionApplication.js
+lib/thunderbird/components/nsProgressDialog.js
+lib/thunderbird/components/nsProxyAutoConfig.js
+lib/thunderbird/components/nsSMTPProtocolHandler.js
+lib/thunderbird/components/nsSetDefaultMail.js
+lib/thunderbird/components/nsTryToClose.js
+lib/thunderbird/components/nsURLFormatter.js
+lib/thunderbird/components/nsUpdateService.js
+lib/thunderbird/components/nsUrlClassifierLib.js
+lib/thunderbird/components/nsUrlClassifierListManager.js
+lib/thunderbird/components/nsWebHandlerApp.js
+lib/thunderbird/components/offlineStartup.js
+lib/thunderbird/components/parentalcontrols.xpt
+lib/thunderbird/components/pipboot.xpt
+lib/thunderbird/components/pipnss.xpt
+lib/thunderbird/components/pippki.xpt
+lib/thunderbird/components/places.xpt
+lib/thunderbird/components/plugin.xpt
+lib/thunderbird/components/pluginGlue.js
+lib/thunderbird/components/pref.xpt
+lib/thunderbird/components/prefetch.xpt
+lib/thunderbird/components/profile.xpt
+lib/thunderbird/components/proxyObjInst.xpt
+lib/thunderbird/components/rdf.xpt
+lib/thunderbird/components/satchel.xpt
+lib/thunderbird/components/saxparser.xpt
+lib/thunderbird/components/shellservice.xpt
+lib/thunderbird/components/shistory.xpt
+lib/thunderbird/components/smime-service.js
+lib/thunderbird/components/spellchecker.xpt
+lib/thunderbird/components/steel.xpt
+lib/thunderbird/components/steelApplication.js
+lib/thunderbird/components/storage-Legacy.js
+lib/thunderbird/components/storage-mozStorage.js
+lib/thunderbird/components/storage.xpt
+lib/thunderbird/components/toolkitprofile.xpt
+lib/thunderbird/components/toolkitremote.xpt
+lib/thunderbird/components/txEXSLTRegExFunctions.js
+lib/thunderbird/components/txmgr.xpt
+lib/thunderbird/components/txtsvc.xpt
+lib/thunderbird/components/uconv.xpt
+lib/thunderbird/components/unicharutil.xpt
+lib/thunderbird/components/update.xpt
+lib/thunderbird/components/uriloader.xpt
+lib/thunderbird/components/url-classifier.xpt
+lib/thunderbird/components/urlformatter.xpt
+lib/thunderbird/components/webBrowser_core.xpt
+lib/thunderbird/components/webbrowserpersist.xpt
+lib/thunderbird/components/webshell_idls.xpt
+lib/thunderbird/components/widget.xpt
+lib/thunderbird/components/windowds.xpt
+lib/thunderbird/components/windowwatcher.xpt
+lib/thunderbird/components/xpautocomplete.xpt
+lib/thunderbird/components/xpcom_base.xpt
+lib/thunderbird/components/xpcom_components.xpt
+lib/thunderbird/components/xpcom_ds.xpt
+lib/thunderbird/components/xpcom_io.xpt
+lib/thunderbird/components/xpcom_system.xpt
+lib/thunderbird/components/xpcom_threads.xpt
+lib/thunderbird/components/xpcom_xpti.xpt
+lib/thunderbird/components/xpconnect.xpt
+lib/thunderbird/components/xpinstall.xpt
+lib/thunderbird/components/xulapp.xpt
+lib/thunderbird/components/xuldoc.xpt
+lib/thunderbird/components/xultmpl.xpt
+lib/thunderbird/components/zipwriter.xpt
+lib/thunderbird/defaults/autoconfig/platform.js
+lib/thunderbird/defaults/autoconfig/prefcalls.js
+lib/thunderbird/defaults/messenger/mailViews.dat
+lib/thunderbird/defaults/pref/all-l10n.js
+lib/thunderbird/defaults/pref/all-thunderbird.js
+lib/thunderbird/defaults/pref/channel-prefs.js
+lib/thunderbird/defaults/pref/composer.js
+lib/thunderbird/defaults/pref/mailnews.js
+lib/thunderbird/defaults/pref/mdn.js
+lib/thunderbird/defaults/pref/smime.js
+lib/thunderbird/defaults/pref/thunderbird-branding.js
+lib/thunderbird/defaults/profile/localstore.rdf
+lib/thunderbird/defaults/profile/mimeTypes.rdf
+lib/thunderbird/defaults/profile/prefs.js
+lib/thunderbird/dependentlibs.list
+lib/thunderbird/dictionaries/en-US.aff
+lib/thunderbird/dictionaries/en-US.dic
+lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+lib/thunderbird/greprefs/all.js
+lib/thunderbird/greprefs/security-prefs.js
+lib/thunderbird/greprefs/xpinstall.js
+lib/thunderbird/icons/updater.png
+lib/thunderbird/isp/SpamAssassin.sfd
+lib/thunderbird/isp/SpamPal.sfd
+lib/thunderbird/isp/movemail.rdf
+lib/thunderbird/isp/rss.rdf
+lib/thunderbird/libfreebl3.chk
+lib/thunderbird/libfreebl3.so
+lib/thunderbird/libldap60.so
+lib/thunderbird/libldif60.so
+lib/thunderbird/libmozjs.so
+lib/thunderbird/libnspr4.so
+lib/thunderbird/libnss3.so
+lib/thunderbird/libnssckbi.so
+lib/thunderbird/libnssdbm3.chk
+lib/thunderbird/libnssdbm3.so
+lib/thunderbird/libnssutil3.so
+lib/thunderbird/libplc4.so
+lib/thunderbird/libplds4.so
+lib/thunderbird/libprldap60.so
+lib/thunderbird/libsmime3.so
+lib/thunderbird/libsoftokn3.chk
+lib/thunderbird/libsoftokn3.so
+lib/thunderbird/libssl3.so
+lib/thunderbird/libxpcom.so
+lib/thunderbird/libxpcom_core.so
+lib/thunderbird/modules/DownloadLastDir.jsm
+lib/thunderbird/modules/DownloadUtils.jsm
+lib/thunderbird/modules/ISO8601DateUtils.jsm
+lib/thunderbird/modules/MailConsts.js
+lib/thunderbird/modules/MailUtils.js
+lib/thunderbird/modules/Microformats.js
+lib/thunderbird/modules/MsgHdrSyntheticView.js
+lib/thunderbird/modules/PluralForm.jsm
+lib/thunderbird/modules/SearchIntegration.js
+lib/thunderbird/modules/SpatialNavigation.js
+lib/thunderbird/modules/StringBundle.js
+lib/thunderbird/modules/WindowDraggingUtils.jsm
+lib/thunderbird/modules/XPCOMUtils.jsm
+lib/thunderbird/modules/activity/activityModules.js
+lib/thunderbird/modules/activity/alertHook.js
+lib/thunderbird/modules/activity/autosync.js
+lib/thunderbird/modules/activity/glodaIndexer.js
+lib/thunderbird/modules/activity/moveCopy.js
+lib/thunderbird/modules/activity/sendLater.js
+lib/thunderbird/modules/appIdleManager.js
+lib/thunderbird/modules/attachmentChecker.js
+lib/thunderbird/modules/autoconfigUtils.jsm
+lib/thunderbird/modules/dbViewWrapper.js
+lib/thunderbird/modules/debug.js
+lib/thunderbird/modules/errUtils.js
+lib/thunderbird/modules/folderUtils.jsm
+lib/thunderbird/modules/gloda/collection.js
+lib/thunderbird/modules/gloda/connotent.js
+lib/thunderbird/modules/gloda/databind.js
+lib/thunderbird/modules/gloda/datamodel.js
+lib/thunderbird/modules/gloda/datastore.js
+lib/thunderbird/modules/gloda/dbview.js
+lib/thunderbird/modules/gloda/everybody.js
+lib/thunderbird/modules/gloda/explattr.js
+lib/thunderbird/modules/gloda/facet.js
+lib/thunderbird/modules/gloda/fundattr.js
+lib/thunderbird/modules/gloda/gloda.js
+lib/thunderbird/modules/gloda/index_ab.js
+lib/thunderbird/modules/gloda/index_msg.js
+lib/thunderbird/modules/gloda/indexer.js
+lib/thunderbird/modules/gloda/log4moz.js
+lib/thunderbird/modules/gloda/mimeTypeCategories.js
+lib/thunderbird/modules/gloda/mimemsg.js
+lib/thunderbird/modules/gloda/msg_search.js
+lib/thunderbird/modules/gloda/noun_freetag.js
+lib/thunderbird/modules/gloda/noun_mimetype.js
+lib/thunderbird/modules/gloda/noun_tag.js
+lib/thunderbird/modules/gloda/public.js
+lib/thunderbird/modules/gloda/query.js
+lib/thunderbird/modules/gloda/suffixtree.js
+lib/thunderbird/modules/gloda/utils.js
+lib/thunderbird/modules/iteratorUtils.jsm
+lib/thunderbird/modules/jsTreeSelection.js
+lib/thunderbird/modules/mailViewManager.js
+lib/thunderbird/modules/quickSearchManager.js
+lib/thunderbird/modules/searchSpec.js
+lib/thunderbird/modules/templateUtils.js
+lib/thunderbird/modules/traceHelper.js
+lib/thunderbird/modules/virtualFolderWrapper.js
+lib/thunderbird/mozilla-xremote-client
+lib/thunderbird/platform.ini
+lib/thunderbird/removed-files
+lib/thunderbird/res/EditorOverride.css
+lib/thunderbird/res/arrow.gif
+lib/thunderbird/res/arrowd.gif
+lib/thunderbird/res/broken-image.gif
+lib/thunderbird/res/charsetData.properties
+lib/thunderbird/res/charsetalias.properties
+lib/thunderbird/res/contenteditable.css
+lib/thunderbird/res/designmode.css
+lib/thunderbird/res/dtd/mathml.dtd
+lib/thunderbird/res/dtd/xhtml11.dtd
+lib/thunderbird/res/entityTables/html40Latin1.properties
+lib/thunderbird/res/entityTables/html40Special.properties
+lib/thunderbird/res/entityTables/html40Symbols.properties
+lib/thunderbird/res/entityTables/htmlEntityVersions.properties
+lib/thunderbird/res/entityTables/mathml20.properties
+lib/thunderbird/res/entityTables/transliterate.properties
+lib/thunderbird/res/fonts/mathfont.properties
+lib/thunderbird/res/fonts/mathfontSTIXNonUnicode.properties
+lib/thunderbird/res/fonts/mathfontSTIXSize1.properties
+lib/thunderbird/res/fonts/mathfontStandardSymbolsL.properties
+lib/thunderbird/res/fonts/mathfontUnicode.properties
+lib/thunderbird/res/forms.css
+lib/thunderbird/res/grabber.gif
+lib/thunderbird/res/hiddenWindow.html
+lib/thunderbird/res/html.css
+lib/thunderbird/res/html/folder.png
+lib/thunderbird/res/langGroups.properties
+lib/thunderbird/res/language.properties
+lib/thunderbird/res/loading-image.gif
+lib/thunderbird/res/mathml.css
+lib/thunderbird/res/quirk.css
+lib/thunderbird/res/svg.css
+lib/thunderbird/res/table-add-column-after-active.gif
+lib/thunderbird/res/table-add-column-after-hover.gif
+lib/thunderbird/res/table-add-column-after.gif
+lib/thunderbird/res/table-add-column-before-active.gif
+lib/thunderbird/res/table-add-column-before-hover.gif
+lib/thunderbird/res/table-add-column-before.gif
+lib/thunderbird/res/table-add-row-after-active.gif
+lib/thunderbird/res/table-add-row-after-hover.gif
+lib/thunderbird/res/table-add-row-after.gif
+lib/thunderbird/res/table-add-row-before-active.gif
+lib/thunderbird/res/table-add-row-before-hover.gif
+lib/thunderbird/res/table-add-row-before.gif
+lib/thunderbird/res/table-remove-column-active.gif
+lib/thunderbird/res/table-remove-column-hover.gif
+lib/thunderbird/res/table-remove-column.gif
+lib/thunderbird/res/table-remove-row-active.gif
+lib/thunderbird/res/table-remove-row-hover.gif
+lib/thunderbird/res/table-remove-row.gif
+lib/thunderbird/res/ua.css
+lib/thunderbird/res/unixcharset.properties
+lib/thunderbird/res/viewsource.css
+lib/thunderbird/run-mozilla.sh
+lib/thunderbird/thunderbird
+lib/thunderbird/thunderbird-bin
+lib/thunderbird/update.locale
+lib/thunderbird/updater
+lib/thunderbird/updater.ini
+share/applications/thunderbird.desktop
+share/pixmaps/thunderbird.png
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 9f0c6e5bfd8..1d34ef9aaa9 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,56 +1,8 @@
-$NetBSD: distinfo,v 1.57 2009/10/03 13:18:23 ghen Exp $
+$NetBSD: distinfo,v 1.58 2009/11/29 03:06:42 tnn Exp $
 
-SHA1 (thunderbird-2.0.0.23-source.tar.bz2) = a237bfb92ec9c4b2bed7ea744e95d01ec43e07f1
-RMD160 (thunderbird-2.0.0.23-source.tar.bz2) = a1ef4af80121cdd8000c796e0c5fb575bea30348
-Size (thunderbird-2.0.0.23-source.tar.bz2) = 38860245 bytes
-SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
-SHA1 (patch-ab) = de3452875e0fd0dc207c9f5e4bdffab72a43155e
-SHA1 (patch-ac) = 24da4ecce48d22a3752276cae132845b4b474c2a
-SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
-SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
-SHA1 (patch-af) = 2500e35f74eab9ec16df7303fe8d1c2bff0a655b
-SHA1 (patch-ag) = bc08dcb0f7acc4eace112c28241a31b0b6a492e3
-SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916
-SHA1 (patch-ai) = 189aa46f116e424c23368e1c7fbc6c56dd389954
-SHA1 (patch-aj) = 36e80c573457bb38f0bd0cb87d9aa7aed4506a0b
-SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a
-SHA1 (patch-al) = 46e7986f0c803701ce9eec38620cf22a2a96ba86
-SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641
-SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d
-SHA1 (patch-ap) = 9ca3715eaef7d86933621665f81cc19a79059ed0
-SHA1 (patch-aq) = e8389d53e0d490b3cc1078f646749abfe54225ff
-SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81
-SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1
-SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7
-SHA1 (patch-ax) = 320b29cb9b6addc21c82480c400746deed8522cb
-SHA1 (patch-ba) = 72b65dc1ecbff188d010e25cf304f9b623f45f26
-SHA1 (patch-bb) = 3f53a7358e881528cf8bec6933af7cbfcffb08ed
-SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
-SHA1 (patch-bo) = 7ed3756e2eb4ff9967d126452506429c2346ae84
-SHA1 (patch-bq) = 8818e9cbcc2c0a48c1488a5b8e92dd1350e76bb1
-SHA1 (patch-br) = 8ed1b865b0133acb6070ff0b65a6082873126c52
-SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
-SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
-SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
-SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85
-SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
-SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711
-SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
-SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
-SHA1 (patch-da) = 936f8617f9423dbc90dd556956111caf70f28986
-SHA1 (patch-db) = 9e63cc592429682cf3d23ed255e287cca0073822
-SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
-SHA1 (patch-de) = 24f030cdf22c1ace2fbc68cdb04c2d5ebfa96620
-SHA1 (patch-df) = f639028cc604ea13c0a230d0fbedfa26dfc9e9f3
-SHA1 (patch-dg) = 17912d183f754ab6661d2be8092e6a07d142632b
-SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
-SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
-SHA1 (patch-dk) = a1f5c2ef52c7066302acc110d87a6d57b02092d2
-SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab
-SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
-SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
-SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
-SHA1 (patch-dw) = 6ef560d688b3b67450b9582c95d9239ab4749f61
-SHA1 (patch-dx) = ab7606171564b6879effc3b37d9eadc6565cb74b
-SHA1 (patch-ea) = eaa1cb5d2d87aa6f6fbe9aeb4b3b557f183cbc0a
-SHA1 (patch-eb) = d489079ae84fe336498bc1d9cf11edc71b38a9a4
+SHA1 (thunderbird-3.0rc1.source.tar.bz2) = 5fe37576ece321fc546713330ae83db61f41195b
+RMD160 (thunderbird-3.0rc1.source.tar.bz2) = 3c5b5a59d59540be9a23192b0d9cd2bc646d9d7d
+Size (thunderbird-3.0rc1.source.tar.bz2) = 60017712 bytes
+SHA1 (patch-aa-toplevel) = 458051a1b3318b49124192c6e97cb9ed0d92dead
+SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31
+SHA1 (patch-zc) = 0b06b5c77ea4eb4a6b845eaeb4ec82a96d5cc4c3
diff --git a/mail/thunderbird/files/thunderbird.desktop.in b/mail/thunderbird/files/desktop.in
index 4b327acadac..4b327acadac 100644
--- a/mail/thunderbird/files/thunderbird.desktop.in
+++ b/mail/thunderbird/files/desktop.in
diff --git a/mail/thunderbird/options.mk b/mail/thunderbird/options.mk
new file mode 100644
index 00000000000..393fbb0ad14
--- /dev/null
+++ b/mail/thunderbird/options.mk
@@ -0,0 +1,55 @@
+# $NetBSD: options.mk,v 1.1 2009/11/29 03:06:42 tnn Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
+PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome official-mozilla-branding
+
+PLIST_VARS+=		branding debug gnome
+
+.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+PKG_SUGGESTED_OPTIONS+=	mozilla-jemalloc
+.endif
+
+.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
+	!empty(MACHINE_ARCH:Marm)
+PKG_SUPPORTED_OPTIONS+=	mozilla-jit
+PKG_SUGGESTED_OPTIONS+=	mozilla-jit
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gnomevfs --enable-dbus --enable-gnomeui
+PLIST.gnome=		yes
+.else
+CONFIGURE_ARGS+=	--disable-gnomevfs --disable-dbus --disable-gnomeui
+.endif
+
+.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
+CONFIGURE_ARGS+=	--enable-jemalloc
+.else
+CONFIGURE_ARGS+=	--disable-jemalloc
+.endif
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+PLIST.debug=		yes
+.else
+CONFIGURE_ARGS+=	--disable-debug
+.endif
+
+.if !empty(PKG_OPTIONS:Mmozilla-jit)
+CONFIGURE_ARGS+=	--enable-jit
+.else
+CONFIGURE_ARGS+=	--disable-jit
+.endif
+
+.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
+CONFIGURE_ARGS+=	--enable-official-branding
+PLIST.branding=		yes
+LICENSE=		mozilla-trademark-license
+RESTRICTED=		Trademark holder prohibits distribution of modified versions.
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+.endif
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
deleted file mode 100644
index 8231ec23486..00000000000
--- a/mail/thunderbird/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- config/autoconf.mk.in.orig	2006-02-02 13:20:06.000000000 +0100
-+++ config/autoconf.mk.in
-@@ -54,13 +54,13 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZILLA_PKG_NAME)
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= @datadir@/idl/$(MOZILLA_PKG_NAME)
- 
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/$(MOZILLA_PKG_NAME)
- mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
- mrelibdir	= $(mredir)/lib
- 
diff --git a/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel
new file mode 100644
index 00000000000..d6557c3777b
--- /dev/null
+++ b/mail/thunderbird/patches/patch-aa-toplevel
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 03:06:43 tnn Exp $
+
+--- configure.in.orig	2009-10-25 15:29:01.000000000 +0100
++++ configure.in
+@@ -1963,7 +1963,7 @@ case "$target" in
+     fi
+     ;;
+ 
+-*-freebsd*)
++*-freebsd* | *-dragonfly*)
+     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
+ 	DLL_SUFFIX=".so.1.0"
+ 	DSO_LDOPTS="-shared"
+@@ -1977,6 +1977,9 @@ case "$target" in
+ #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
+ #	MKSHLIB_UNFORCE_ALL=''
+ #    fi
++    if test "$LIBRUNPATH"; then
++       DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
++    fi
+     ;; 
+ 
+ *-hpux*)
+@@ -3173,6 +3176,9 @@ dnl ====================================
+ case $target in
+ *-hpux11.*)
+ 	;;
++*-dragonfly*)
++	AC_CHECK_LIB(c, gethostbyname_r)
++	;;
+ *)
+ 	AC_CHECK_LIB(c_r, gethostbyname_r)
+ 	;;
+@@ -4233,6 +4239,14 @@ else
+    fi
+ fi
+ 
++if test -n "${LIBXUL_SDK_DIR}"; then
++    AC_MSG_WARN([pkgsrc: LIBXUL_SDK_DIR is set; assuming we want nss and nspr from xulrunner.])
++    NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`"
++    NSPR_LIBS="`pkg-config --libs mozilla-nspr`"
++    NSS_CFLAGS="`pkg-config --cflags mozilla-nss`"
++    NSS_LIBS="`pkg-config --libs mozilla-nss`"
++fi
++
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
+ dnl system JPEG support
+ dnl ========================================================
+@@ -7513,7 +7527,8 @@ rm -f confdefs.h.save
+ mv confdefs.h confdefs.h.save
+ egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
+ AC_OUTPUT_MAKE_DEFS()
+-MOZ_DEFINES=$DEFS
++# nbsed broken. PR bin/42261
++MOZ_DEFINES="$DEFS`awk 'BEGIN {while(x<1000){printf " ";x++}}'`"
+ AC_SUBST(MOZ_DEFINES)
+ rm -f confdefs.h
+ mv confdefs.h.save confdefs.h
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
deleted file mode 100644
index 202807196d8..00000000000
--- a/mail/thunderbird/patches/patch-ab
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2009/05/02 07:51:03 hasso Exp $
-
---- configure.in.orig	2008-10-19 19:14:06 +0300
-+++ configure.in	2009-05-02 09:52:59 +0300
-@@ -1532,7 +1532,6 @@ case "$target" in
-     DSO_LDOPTS=''
-     STRIP="$STRIP -x -S"
-     _PLATFORM_DEFAULT_TOOLKIT='mac'
--    MOZ_ENABLE_POSTSCRIPT=
-     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
-     # set MACOSX to generate lib/mac/MoreFiles/Makefile
-     MACOSX=1
-@@ -1551,7 +1550,7 @@ case "$target" in
-     LDFLAGS=$_SAVE_LDFLAGS
-     ;;
- 
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
- 	DLL_SUFFIX=".so.1.0"
- 	DSO_LDOPTS="-shared"
-@@ -1565,6 +1564,9 @@ case "$target" in
- #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
- #	MKSHLIB_UNFORCE_ALL=''
- #    fi
-+    if test "$LIBRUNPATH"; then
-+	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
-+    fi
-     ;; 
- 
- *-hpux*)
-@@ -2235,7 +2237,7 @@ dnl the qsort routine under solaris is f
-        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -h $@ -o $@'
-        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-        MKSHLIB_UNFORCE_ALL=''
--       DSO_LDOPTS='-G -Qoption ld -z,muldefs'
-+       DSO_LDOPTS='-G -z,muldefs'
-        AR_LIST="$AR t"
-        AR_EXTRACT="$AR x"
-        AR_DELETE="$AR d"
-@@ -2749,6 +2751,9 @@ dnl ====================================
- case $target in
- *-hpux11.*)
- 	;;
-+*-dragonfly*)
-+	AC_CHECK_LIB(c, gethostbyname_r)
-+	;;
- *)
- 	AC_CHECK_LIB(c_r, gethostbyname_r)
- 	;;
-@@ -2946,7 +2951,7 @@ then
-     fi
- 
- 	case "$target" in
--	    *-*-freebsd*)
-+	    *-*-freebsd* | *-*-dragonfly*)
- 			AC_DEFINE(_REENTRANT)
- 			AC_DEFINE(_THREAD_SAFE)
- 			dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -5714,7 +5719,7 @@ dnl ====================================
- dnl = Enable code optimization. ON by default.
- dnl ========================================================
- if test -z "$MOZ_OPTIMIZE_FLAGS"; then
--	MOZ_OPTIMIZE_FLAGS="-O"
-+	MOZ_OPTIMIZE_FLAGS=""
- fi
- 
- MOZ_ARG_ENABLE_STRING(optimize,
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
deleted file mode 100644
index fbf449ea0d6..00000000000
--- a/mail/thunderbird/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2007/11/15 15:05:23 tron Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2007-10-03 13:54:53.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2007-11-15 12:59:59.000000000 +0000
-@@ -62,10 +62,13 @@
- #
- # Lots of Unixish x86 flavors
- #
--ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
-+ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin DragonFly,$(OS_ARCH)))
- ifeq (86,$(findstring 86,$(OS_TEST)))
- CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
- endif
-+ifeq (amd64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- #
- # OpenBSD/amd64
-@@ -170,7 +173,7 @@
- # NetBSD/ARM
- #
- ifeq ($(OS_ARCH),NetBSD)
--ifneq (,$(filter arm% sa110,$(OS_TEST)))
-+ifneq (,$(filter arm%,$(TARGET_CPU)))
- CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
- endif
- endif
-@@ -214,7 +217,7 @@
- # NetBSD/m68k
- #
- ifeq ($(OS_ARCH),NetBSD)
--ifneq (,$(filter amiga atari hp300 mac68k mvme68k next68k sun3 sun3x x68k,$(OS_TEST)))
-+ifneq (,$(filter m68k,$(TARGET_CPU)))
- CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
- endif
- endif
-@@ -297,6 +300,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
-+AS		:= $(CC) -c -x assembler-with-cpp
- endif
- 
- #
-@@ -353,6 +357,13 @@
- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
- ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
- endif
-+#   
-+# NetBSD/SPARC64
-+#   
-+ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc64)
-+CPPSRCS                := xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
-+ASFILES                := xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
-+endif
- #
- # Solaris/SPARC
- #
diff --git a/mail/thunderbird/patches/patch-ad b/mail/thunderbird/patches/patch-ad
deleted file mode 100644
index 93be816469f..00000000000
--- a/mail/thunderbird/patches/patch-ad
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../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	2001-09-29 05:12:51.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp	2004-06-15 23:55:46.000000000 +0900
-@@ -132,6 +132,15 @@
-     }
- }
- 
-+/*
-+ * SYMBOL PREFIX must be "_" for aout symbols and "" for ELF
-+ */
-+#ifndef __ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
-+
- XPTC_PUBLIC_API(nsresult)
- XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-                    PRUint32 paramCount, nsXPTCVariant* params)
-@@ -139,30 +148,30 @@
-     PRUint32 result;
- 
-  __asm__ __volatile__(
--    "movl  %4, sp@-\n\t"
--    "movl  %3, sp@-\n\t"
--    "jbsr  _invoke_count_words\n\t"     /* count words */
--    "addql #8, sp\n\t"
--    "lsll  #2, d0\n\t"      /* *= 4 */
--    "movl  sp, a2\n\t"	    /* save original sp */
--    "subl  d0, sp\n\t"      /* make room for params */
--    "movl  sp, a0\n\t"
--    "movl  %4, sp@-\n\t"
--    "movl  %3, sp@-\n\t"
--    "movl  a0, sp@-\n\t"
--    "jbsr  _invoke_copy_to_stack\n\t"   /* copy params */
--    "addl  #12, sp\n\t"
--    "movl  %1, a0\n\t"
--    "movl  a0@, a1\n\t"
--    "movl  %2, d0\n\t"      /* function index */
--    "movl  a0, d1\n\t"
--    "movw  a1@(8,d0:l:8), a0\n\t"
--    "addl  a0, d1\n\t"
--    "movl  a1@(12,d0:l:8), a1\n\t"
--    "movl  d1, sp@-\n\t"
--    "jbsr  a1@\n\t"
--    "movl  a2, sp\n\t"	    /* restore original sp */
--    "movl  d0, %0\n\t"
-+    "movl  %4, %%sp@-\n\t"
-+    "movl  %3, %%sp@-\n\t"
-+    "jbsr  "SYMBOLPREFIX"invoke_count_words\n\t"     /* count words */
-+    "addql #8, %%sp\n\t"
-+    "lsll  #2, %%d0\n\t"      /* *= 4 */
-+    "movl  %%sp, %%a2\n\t"         /* save original sp */
-+    "subl  %%d0, %%sp\n\t"      /* make room for params */
-+    "movl  %%sp, %%a0\n\t"
-+    "movl  %4, %%sp@-\n\t"
-+    "movl  %3, %%sp@-\n\t"
-+    "movl  %%a0, %%sp@-\n\t"
-+    "jbsr  "SYMBOLPREFIX"invoke_copy_to_stack\n\t"   /* copy params */
-+    "addl  #12, %%sp\n\t"
-+    "movl  %1, %%a0\n\t"
-+    "movl  %%a0@, %%a1\n\t"
-+    "movl  %2, %%d0\n\t"      /* function index */
-+    "movl  %%a0, %%d1\n\t"
-+    "movw  %%a1@(8,%%d0:l:8), %%a0\n\t"
-+    "addl  %%a0, %%d1\n\t"
-+    "movl  %%a1@(12,%%d0:l:8), %%a1\n\t"
-+    "movl  %%d1, %%sp@-\n\t"
-+    "jbsr  %%a1@\n\t"
-+    "movl  %%a2, %%sp\n\t"         /* restore original sp */
-+    "movl  %%d0, %0\n\t"
-     : "=g" (result)         /* %0 */
-     : "g" (that),           /* %1 */
-       "g" (methodIndex),    /* %2 */
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
deleted file mode 100644
index 8757c8a1100..00000000000
--- a/mail/thunderbird/patches/patch-ae
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../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	2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp	2004-06-15 23:55:47.000000000 +0900
-@@ -123,17 +123,27 @@
-     }
- }
- 
-+/*
-+ * Beware: use % instead of %% for register identifiers in a preprocessor macro
-+ * SYMBOL PREFIX must be "_" for aout and "" for ELF 
-+ */
-+#ifndef	__ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
-+
- #define STUB_ENTRY(n)							\
- __asm__(								\
--    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
--"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
--    "link  a6,#0			\n\t"				\
--    "lea   a6@(12), a0			\n\t"	/* pointer to args */	\
--    "movl  a0, sp@-			\n\t"				\
--    "movl  #"#n", sp@-			\n\t"	/* method index */	\
--    "movl  a6@(8), sp@-			\n\t"	/* this */		\
--    "jbsr  _PrepareAndDispatch		\n\t"				\
--    "unlk  a6				\n\t"				\
-+    ".global   "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"           \
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"                          \
-+    "link  %a6,#0                      \n\t"                           \
-+    "lea   %a6@(12), %a0               \n\t"   /* pointer to args */   \
-+    "movl  %a0, %sp@-                  \n\t"                           \
-+    "movl  #"#n", %sp@-                        \n\t"   /* method index */      \
-+    "movl  %a6@(8), %sp@-              \n\t"   /* this */              \
-+    "jbsr  "SYMBOLPREFIX"PrepareAndDispatch\n\t"                       \
-+    "unlk  %a6                         \n\t"                           \
-     "rts				\n\t"				\
- );
- 
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
deleted file mode 100644
index d1d35a2604d..00000000000
--- a/mail/thunderbird/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.5 2008/08/22 09:42:15 ghen Exp $
-
---- security/nss/lib/freebl/unix_rand.c.orig	2007-07-26 01:18:55.000000000 +0200
-+++ security/nss/lib/freebl/unix_rand.c
-@@ -35,6 +35,7 @@
-  * ***** END LICENSE BLOCK ***** */
- 
- #include <stdio.h>
-+#include <fcntl.h>
- #include <string.h>
- #include <signal.h>
- #include <unistd.h>
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
deleted file mode 100644
index 7d5a80e5467..00000000000
--- a/mail/thunderbird/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- extensions/transformiix/source/base/ErrorObserver.h.orig	2006-02-02 13:20:05.000000000 +0100
-+++ extensions/transformiix/source/base/ErrorObserver.h
-@@ -41,7 +41,8 @@
- 
- #include "txCore.h"
- #ifdef TX_EXE
--#include <iostream.h>
-+#include <iostream>
-+using namespace std;
- #endif
- 
- /**
diff --git a/mail/thunderbird/patches/patch-ah b/mail/thunderbird/patches/patch-ah
deleted file mode 100644
index 5f63d954921..00000000000
--- a/mail/thunderbird/patches/patch-ah
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 10:09:33.000000000 +0900
-+++ ./gfx/idl/nsIFreeType2.idl	2004-06-15 23:55:52.000000000 +0900
-@@ -76,10 +76,11 @@
- native FT_Sfnt_Tag(FT_Sfnt_Tag);
- native FT_Size(FT_Size);
- 
--[ptr] native FTC_Image_Desc_p(FTC_Image_Desc);
-+[ptr] native FTC_ImageType_p(FTC_ImageType);
- native FTC_Face_Requester(FTC_Face_Requester);
- native FTC_Font(FTC_Font);
--native FTC_Image_Cache(FTC_Image_Cache);
-+native FTC_FaceID(FTC_FaceID);
-+native FTC_ImageCache(FTC_ImageCache);
- native FTC_Manager(FTC_Manager);
- 
- // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@
- 
-     readonly attribute FT_Library library;
-     readonly attribute FTC_Manager FTCacheManager;
--    readonly attribute FTC_Image_Cache ImageCache;
-+    readonly attribute FTC_ImageCache ImageCache;
- 
-     void    doneFace(in FT_Face face);
-     void    doneFreeType(in FT_Library lib);
-@@ -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);
--    void    imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc,
-+    void    imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc,
-                              in FT_UInt gindex, out FT_Glyph glyph);
--    void    managerLookupSize(in FTC_Manager manager, in FTC_Font font,
--                              out FT_Face face, out FT_Size size);
-+    void    managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id,
-+                              out FT_Face face);
-     void    managerDone(in FTC_Manager manager);
-     void    managerNew(in FT_Library lib, in FT_UInt max_faces,
-                        in FT_UInt max_sizes, in FT_ULong max_bytes,
-                        in FTC_Face_Requester requester, in FT_Pointer req_data,
-                        out FTC_Manager manager);
--    void    imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache);
-+    void    imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache);
- /* #ifdef MOZ_SVG */
-     void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
-                         in FT_Vector_p delta);
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
deleted file mode 100644
index bd97e8a5567..00000000000
--- a/mail/thunderbird/patches/patch-ai
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2006/10/19 10:26:14 markd Exp $
-
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	2006-05-07 14:01:25.000000000 +1200
-+++ gfx/src/ps/nsFontMetricsPS.cpp
-@@ -993,7 +993,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
- 
-         fontps *fps = new fontps;
-         fps->entry = xftEntry;
--        fps->charset = fc_charset;
-+        fps->charset = FcCharSetCopy (fc_charset);
-         fps->fontps = nsnull;
-         fpi.fontps->AppendElement(fps);
-     }
-@@ -1868,10 +1868,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
-   
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
- 
--  mImageDesc.font.face_id    = (void*)mEntry;
--  mImageDesc.font.pix_width  = mPixelSize;
--  mImageDesc.font.pix_height = mPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-+  mImageDesc->width  = mPixelSize;
-+  mImageDesc->height = mPixelSize;
-+  mImageDesc->flags = 0;
- 
-   nsresult rv;
-   mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1905,7 +1905,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache iCache;
-+  FTC_ImageCache iCache;
-   nsresult rv = mFt2->GetImageCache(&iCache);
-   if (NS_FAILED(rv)) {
-     NS_ERROR("Failed to get Image Cache");
-@@ -1943,8 +1943,8 @@ nsFontPSFreeType::getFTFace()
-   
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   NS_ASSERTION(rv==0, "failed to get face/size");
-   if (rv)
-     return nsnull;
-@@ -2388,16 +2388,16 @@ void nsFT2Type1Generator::GeneratePSFont
-   mEntry->GetFamilyName(fontName);
-   mEntry->GetStyleName(styleName);
-   
--  mImageDesc.font.face_id    = (void*)mEntry;
-+  mImageDesc->face_id = (FTC_FaceID)&mEntry;
-   // TT glyph has no relation to size
--  mImageDesc.font.pix_width  = 16;
--  mImageDesc.font.pix_height = 16;
--  mImageDesc.image_type = 0;
-+  mImageDesc->width  = 16;
-+  mImageDesc->height = 16;
-+  mImageDesc->flags = 0;
-   FT_Face face = nsnull;
-   FTC_Manager cManager;
-   mFt2->GetFTCacheManager(&cManager);
--  nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font,
--                                        &face, nsnull);
-+  nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id,
-+                                        &face);
-   if (NS_FAILED(rv))
-     return;
-  
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
deleted file mode 100644
index 01d4b13b76b..00000000000
--- a/mail/thunderbird/patches/patch-aj
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2006/02/05 14:49:05 ghen Exp $
-
---- gfx/src/freetype/nsFreeType.h.orig	2006-02-02 13:20:15.000000000 +0100
-+++ gfx/src/freetype/nsFreeType.h
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
- 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)
--                      (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*);
--typedef FT_Error (*FTC_Manager_Lookup_Size_t)
--                      (FTC_Manager, FTC_Font, FT_Face*, FT_Size*);
-+                      (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*);
-+typedef FT_Error (*FTC_Manager_LookupFace_t)
-+                      (FTC_Manager, FTC_FaceID, FT_Face*);
- typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager);
- typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong,
-                        FTC_Face_Requester, FT_Pointer, FTC_Manager*);
--typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*);
-+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*);
- // #ifdef MOZ_SVG
- typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
- typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
-   FT_Outline_Decompose_t    nsFT_Outline_Decompose;
-   FT_Set_Charmap_t          nsFT_Set_Charmap;
-   FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
--  FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size;
-+  FTC_Manager_LookupFace_t  nsFTC_Manager_LookupFace;
-   FTC_Manager_Done_t        nsFTC_Manager_Done;
-   FTC_Manager_New_t         nsFTC_Manager_New;
-   FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
-   PRLibrary      *mSharedLib;
-   FT_Library      mFreeTypeLibrary;
-   FTC_Manager     mFTCacheManager;
--  FTC_Image_Cache mImageCache;
-+  FTC_ImageCache  mImageCache;
- 
-   static nsHashtable   *sFontFamilies;
-   static nsHashtable   *sRange1CharSetNames;
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
deleted file mode 100644
index 31deac54564..00000000000
--- a/mail/thunderbird/patches/patch-ak
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp
---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp	2004-02-08 00:22:30.000000000 +0900
-+++ ./gfx/src/freetype/nsFreeType.cpp	2004-06-15 23:56:01.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},
--  {"FTC_Image_Cache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),  PR_TRUE},
--  {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE},
-+  {"FTC_ImageCache_Lookup",  NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup),   PR_TRUE},
-+  {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace),   PR_TRUE},
-   {"FTC_Manager_Done",        NS_FT2_OFFSET(nsFTC_Manager_Done),        PR_TRUE},
-   {"FTC_Manager_New",         NS_FT2_OFFSET(nsFTC_Manager_New),         PR_TRUE},
--  {"FTC_Image_Cache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),     PR_TRUE},
-+  {"FTC_ImageCache_New",     NS_FT2_OFFSET(nsFTC_Image_Cache_New),      PR_TRUE},
- // #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 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc,
-+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc,
-                               FT_UInt glyphID, FT_Glyph *glyph)
- { 
-   // call the FreeType2 function via the function pointer
-@@ -291,11 +291,11 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font,
--                               FT_Face *face, FT_Size *size)
-+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id,
-+                               FT_Face *face)
- { 
-   // call the FreeType2 function via the function pointer
--  FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size);
-+  FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face);
-   return error ? NS_ERROR_FAILURE : NS_OK;
- } 
-  
-@@ -320,7 +320,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache)
-+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache)
- { 
-   // call the FreeType2 function via the function pointer
-   FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -389,7 +389,7 @@
- } 
-  
- NS_IMETHODIMP
--nsFreeType2::GetImageCache(FTC_Image_Cache *aCache)
-+nsFreeType2::GetImageCache(FTC_ImageCache *aCache)
- {
-   *aCache = mImageCache;
-   return NS_OK;
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
deleted file mode 100644
index 68d4529d6bb..00000000000
--- a/mail/thunderbird/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/02/05 14:49:05 ghen Exp $
-
---- gfx/src/ps/nsFontMetricsPS.h.orig	2006-02-02 13:20:15.000000000 +0100
-+++ gfx/src/ps/nsFontMetricsPS.h
-@@ -424,7 +424,7 @@ protected:
-   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; 
- 
-@@ -493,7 +493,7 @@ public:
- protected:
-   nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry;
-   nsCOMPtr<nsIFreeType2> mFt2;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
- };
- #endif   // MOZ_ENABLE_FREETYPE2
- #endif   // MOZ_ENABLE_XFT
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
deleted file mode 100644
index bc60ea7d557..00000000000
--- a/mail/thunderbird/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.2 2004/06/24 23:09:55 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h	2003-04-23 01:25:13.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.h	2004-06-15 23:56:10.000000000 +0900
-@@ -110,7 +110,7 @@
-   XImage *GetXImage(PRUint32 width, PRUint32 height);
-   nsITrueTypeFontCatalogEntry *mFaceID;
-   PRUint16        mPixelSize;
--  FTC_Image_Desc  mImageDesc;
-+  FTC_ImageType   mImageDesc;
-   nsCOMPtr<nsIFreeType2> mFt2;
- };
- 
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
deleted file mode 100644
index 6506fa3d1e1..00000000000
--- a/mail/thunderbird/patches/patch-ao
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2004/06/24 23:09:56 taya Exp $
-
-diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2003-12-25 17:24:52.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp	2004-06-15 23:56:14.000000000 +0900
-@@ -177,7 +177,7 @@
-   FTC_Manager mgr;
-   nsresult rv;
-   mFt2->GetFTCacheManager(&mgr);
--  rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull);
-+  rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face);
-   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
-   if (NS_FAILED(rv))
-     return nsnull;
-@@ -191,22 +191,15 @@
-   PRBool embedded_bimap = PR_FALSE;
-   mFaceID = aFaceID;
-   mPixelSize = aPixelSize;
--  mImageDesc.font.face_id    = (void*)mFaceID;
--  mImageDesc.font.pix_width  = aPixelSize;
--  mImageDesc.font.pix_height = aPixelSize;
--  mImageDesc.image_type = 0;
-+  mImageDesc->face_id = (FTC_FaceID)&mFaceID;
-+  mImageDesc->width  = aPixelSize;
-+  mImageDesc->height = aPixelSize;
-+  mImageDesc->flags = 0;
- 
-   if (aPixelSize < nsFreeType2::gAntiAliasMinimum) {
--    mImageDesc.image_type |= ftc_image_mono;
-     anti_alias = PR_FALSE;
-   }
- 
--  if (nsFreeType2::gFreeType2Autohinted)
--    mImageDesc.image_type |= ftc_image_flag_autohinted;
--
--  if (nsFreeType2::gFreeType2Unhinted)
--    mImageDesc.image_type |= ftc_image_flag_unhinted;
--
-   PRUint32  num_embedded_bitmaps, i;
-   PRInt32*  embedded_bitmapheights;
-   mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@
-         if (embedded_bitmapheights[i] == aPixelSize) {
-           embedded_bimap = PR_TRUE;
-           // unhinted must be set for embedded bitmaps to be used
--          mImageDesc.image_type |= ftc_image_flag_unhinted;
-           break;
-         }
-       }
-@@ -312,7 +304,7 @@
-   if (!face)
-     return NS_ERROR_FAILURE;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@
-   if (!face)
-     return 0;
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
-@@ -723,7 +715,7 @@
-     if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
- #endif
- 
--  FTC_Image_Cache icache;
-+  FTC_ImageCache icache;
-   mFt2->GetImageCache(&icache);
-   if (!icache)
-     return 0;
diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap
deleted file mode 100644
index 89779f99bd2..00000000000
--- a/mail/thunderbird/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.5 2008/08/22 09:42:15 ghen Exp $
-
---- security/coreconf/command.mk.orig	2007-05-09 03:38:16.000000000 +0200
-+++ security/coreconf/command.mk
-@@ -45,7 +45,7 @@ ASFLAGS      += $(CFLAGS)
- CCF           = $(CC) $(CFLAGS)
- LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS        = $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- PERL          = perl
- RANLIB        = echo
diff --git a/mail/thunderbird/patches/patch-aq b/mail/thunderbird/patches/patch-aq
deleted file mode 100644
index 313277101f3..00000000000
--- a/mail/thunderbird/patches/patch-aq
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2006/02/05 14:49:05 ghen Exp $
-
---- directory/c-sdk/configure.in.orig	2006-02-02 13:29:07.000000000 +0100
-+++ directory/c-sdk/configure.in
-@@ -54,7 +54,7 @@ USE_64=
- USE_CPLUS=
- USE_IPV6=
- USE_MDUPDATE=
--_OPTIMIZE_FLAGS=-O
-+_OPTIMIZE_FLAGS=
- _DEBUG_FLAGS=-g
- MOZ_DEBUG=1
- MOZ_OPTIMIZE=
-@@ -907,7 +907,7 @@ case "$target" in
-     PR_MD_CSRCS=dgux.c
-     ;;
- 
--*-freebsd*)
-+*-freebsd*|*-dragonfly*)
-     if test -z "$USE_NSPR_THREADS"; then
-         USE_PTHREADS=1
-     fi
-@@ -2061,7 +2061,7 @@ if test -n "$USE_PTHREADS"; then
-             _PTHREAD_LDFLAGS=
-         fi
- 	    ;;
--    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*)
-+    *-freebsd*|*-openbsd*|*-bsdi*|*-netbsd*|*-dragonfly*)
- 	    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
-@@ -2114,7 +2114,7 @@ case "$target" in
-         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
-     fi
-     ;;
--*-freebsd*)
-+*-freebsd*|*-dragonfly*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
diff --git a/mail/thunderbird/patches/patch-ar b/mail/thunderbird/patches/patch-ar
deleted file mode 100644
index 26f29ddc330..00000000000
--- a/mail/thunderbird/patches/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
---- mailnews/movemail/src/movemail.c.orig	2005-12-29 17:00:05.000000000 +0000
-+++ mailnews/movemail/src/movemail.c
-@@ -51,8 +51,8 @@ typedef int XP_Bool;
- 
- #define LINUX_GLIBC_2
- 
--#include <sys/errno.h>
--#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2)
-+#include <errno.h>
-+#if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) && !defined(__DragonFly__)
- extern char *sys_errlist[];
- extern int sys_nerr;
- #endif
diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-as
deleted file mode 100644
index 992a23f2a5f..00000000000
--- a/mail/thunderbird/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.3 2006/10/20 12:45:13 tron Exp $
-
---- build/autoconf/mozconfig2configure.orig	2006-02-22 16:41:28.000000000 +0000
-+++ build/autoconf/mozconfig2configure	2006-10-20 12:26:11.000000000 +0100
-@@ -79,7 +79,7 @@
- ac_add_app_options() {
-   APP=$1
-   shift;
--  if [ "$APP" == "$MOZ_BUILD_APP" ]; then
-+  if [ "$APP" = "$MOZ_BUILD_APP" ]; then
-       ac_add_options "$*";
-   fi
- }
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
deleted file mode 100644
index 18c172c7eaa..00000000000
--- a/mail/thunderbird/patches/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aw,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- widget/src/gtksuperwin/Makefile.in.orig	2006-02-02 13:31:00.000000000 +0100
-+++ widget/src/gtksuperwin/Makefile.in
-@@ -46,6 +46,7 @@ MODULE		= widget
- LIBRARY_NAME	= gtksuperwin
- EXPORT_LIBRARY = 1
- LIBXUL_LIBRARY = 1
-+MKSHLIB		= $(MKCSHLIB)
- 
- PACKAGE_FILE = gtksuperwin.pkg
- 
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
deleted file mode 100644
index 4cac14e05ea..00000000000
--- a/mail/thunderbird/patches/patch-ax
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ax,v 1.4 2007/03/02 14:12:25 ghen Exp $
-
---- security/coreconf/SunOS5.mk.orig	2006-04-25 03:32:16.000000000 +0200
-+++ security/coreconf/SunOS5.mk
-@@ -176,6 +176,10 @@ endif
- endif
- DSO_LDOPTS += -z combreloc -z defs -z ignore
- 
-+ifdef LIBRUNPATH
-+DSO_LDOPTS += -R$(LIBRUNPATH)
-+endif
-+
- # -KPIC generates position independent code for use in shared libraries.
- # (Similarly for -fPIC in case of gcc.)
- ifdef NS_USE_GCC
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
deleted file mode 100644
index e90ef6f3b59..00000000000
--- a/mail/thunderbird/patches/patch-ba
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-ba,v 1.6 2009/10/03 13:18:23 ghen Exp $
-
---- nsprpub/pr/include/md/_netbsd.cfg.orig	2007-11-26 19:17:17.000000000 +0100
-+++ nsprpub/pr/include/md/_netbsd.cfg
-@@ -52,7 +52,8 @@
- #define HAVE_LONG_LONG
- #endif
- 
--#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
-+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
-+	defined(__MIPSEL__)
- 
- #define IS_LITTLE_ENDIAN 1
- #undef  IS_BIG_ENDIAN
-@@ -97,7 +98,53 @@
- #define PR_ALIGN_OF_DOUBLE  4
- #define PR_ALIGN_OF_POINTER 4
- 
--#elif defined(__sparc__) || defined(__MIPSEB__)
-+#elif defined(__sparcv9)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define  IS_BIG_ENDIAN 1
-+#define HAVE_LONG_LONG
-+#define  HAVE_ALIGNED_DOUBLES
-+#define  HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+#define PR_BYTES_PER_WORD_LOG2   3
-+#define PR_BYTES_PER_DWORD_LOG2  3
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8 
-+#define PR_ALIGN_OF_FLOAT   4 
-+#define PR_ALIGN_OF_DOUBLE  8 
-+#define PR_ALIGN_OF_POINTER 8 
-+
-+#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__)
- 
- #undef IS_LITTLE_ENDIAN
- #define  IS_BIG_ENDIAN 1
-@@ -188,6 +235,55 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT    4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE    8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT     32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG    64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD    64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG2    5
-+#define PR_BITS_PER_INT64_LOG2  6
-+#define PR_BITS_PER_LONG_LOG2   6
-+#define PR_BITS_PER_FLOAT_LOG2  5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2   6
-+
-+#define PR_ALIGN_OF_SHORT   2
-+#define PR_ALIGN_OF_INT     4
-+#define PR_ALIGN_OF_LONG    8
-+#define PR_ALIGN_OF_INT64   8
-+#define PR_ALIGN_OF_FLOAT   4
-+#define PR_ALIGN_OF_DOUBLE  8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD    8
-+
-+#define PR_BYTES_PER_WORD_LOG2  3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define HAVE_LONG_LONG
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
- #elif defined(__powerpc__) || defined(__m68k__)
- 
- #undef  IS_LITTLE_ENDIAN
diff --git a/mail/thunderbird/patches/patch-bb b/mail/thunderbird/patches/patch-bb
deleted file mode 100644
index 901616b49ee..00000000000
--- a/mail/thunderbird/patches/patch-bb
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2006/02/05 14:49:05 ghen Exp $
-
---- nsprpub/pr/include/md/_netbsd.h.orig	2006-02-02 13:52:50.000000000 +0100
-+++ nsprpub/pr/include/md/_netbsd.h
-@@ -44,6 +44,8 @@
- #define _PR_SI_ARCHITECTURE "x86"
- #elif defined(__alpha__)
- #define _PR_SI_ARCHITECTURE "alpha"
-+#elif defined(__amd64__)
-+#define _PR_SI_ARCHITECTURE "amd64"
- #elif defined(__m68k__)
- #define _PR_SI_ARCHITECTURE "m68k"
- #elif defined(__powerpc__)
-@@ -95,6 +97,12 @@
- #define _PR_HAVE_GETPROTO_R_INT
- #endif
- 
-+#if __NetBSD_Version__ >= 106370000
-+/* NetBSD 1.6ZK */
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_GETPROTO_R_INT
-+#endif
-+
- #define USE_SETJMP
- 
- #ifndef _PR_PTHREADS
diff --git a/mail/thunderbird/patches/patch-bm b/mail/thunderbird/patches/patch-bm
deleted file mode 100644
index a83c43f5b9b..00000000000
--- a/mail/thunderbird/patches/patch-bm
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-bm,v 1.3 2004/06/24 23:09:56 taya Exp $
-
-diff -ru ../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	2001-09-29 05:12:52.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp	2004-06-15 23:56:36.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.
-  */
-+#ifndef	__ELF__
-+#define	SYMBOLPREFIX	"_"
-+#else
-+#define	SYMBOLPREFIX
-+#endif
- 
- #define STUB_ENTRY(n)							\
- __asm__(								\
--    ".global	_Stub"#n"__14nsXPTCStubBase\n\t"			\
--"_Stub"#n"__14nsXPTCStubBase:\n\t"					\
-+    ".global	"SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"		\
-+SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"				\
-     "stmfd	sp!, {r1, r2, r3}	\n\t"				\
-     "mov	ip, sp			\n\t"				\
-     "stmfd	sp!, {fp, ip, lr, pc}	\n\t"				\
-     "sub	fp, ip, #4		\n\t"				\
-     "mov	r1, #"#n"		\n\t"    /* = methodIndex 	*/ \
-     "add	r2, sp, #16		\n\t"				\
--    "bl		_PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
-+    "bl		"SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"	\
-     "ldmea	fp, {fp, sp, lr}	\n\t"				\
-     "add	sp, sp, #12		\n\t"				\
-     "mov	pc, lr			\n\t"				\
diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo
deleted file mode 100644
index 5cd7aa5f4c2..00000000000
--- a/mail/thunderbird/patches/patch-bo
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-bo,v 1.6 2006/02/05 14:49:05 ghen Exp $
-
---- nsprpub/configure.in.orig	2006-02-02 13:38:48.000000000 +0100
-+++ nsprpub/configure.in
-@@ -1045,6 +1045,34 @@ case "$target" in
-     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-     MDCPUCFG_H=_freebsd.cfg
-     PR_MD_CSRCS=freebsd.c
-+    if test "$LIBRUNPATH"; then
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+    fi
-+    ;;
-+
-+*-dragonfly*)
-+    if test -z "$USE_NSPR_THREADS"; then
-+        USE_PTHREADS=1
-+    fi
-+    AC_DEFINE(XP_UNIX)
-+    AC_DEFINE(FREEBSD)
-+    AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-+    CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+    MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+    if test "$MOZ_OBJFORMAT" = "elf"; then
-+        DLL_SUFFIX=so
-+    else
-+        DLL_SUFFIX=so.1.0
-+    fi
-+    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-+    DSO_CFLAGS=-fPIC
-+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
-+    MDCPUCFG_H=_freebsd.cfg
-+    PR_MD_CSRCS=freebsd.c
-+    if test "$LIBRUNPATH"; then
-+        DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
-+    fi
-     ;;
- 
- *-hpux*)
-@@ -1544,6 +1572,7 @@ mips-nec-sysv*)
-     AC_DEFINE(XP_UNIX)
-     AC_DEFINE(NETBSD)
-     AC_DEFINE(HAVE_BSD_FLOCK)
-+    AC_DEFINE(HAVE_SOCKLEN_T)
-     USE_NSPR_THREADS=1
-     MDCPUCFG_H=_netbsd.cfg
-     PR_MD_CSRCS=netbsd.c
-@@ -2307,7 +2336,7 @@ if test -n "$USE_PTHREADS"; then
- 	if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
- 	    ac_cv_have_dash_pthread=yes
- 		case "$target_os" in
--	    freebsd*)
-+	    freebsd* | dragonfly*)
- # Freebsd doesn't use -pthread for compiles, it uses them for linking
-             ;;
- 	    *)
-@@ -2345,7 +2374,7 @@ if test -n "$USE_PTHREADS"; then
-             _PTHREAD_LDFLAGS=
-         fi
- 	    ;;
--    *-freebsd*)
-+    *-freebsd* | *-dragonfly*)
- 	    AC_DEFINE(_REENTRANT)
- 	    AC_DEFINE(_THREAD_SAFE)
- 	    dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -2426,7 +2455,7 @@ case "$target" in
-         AC_DEFINE(_PR_NEED_PTHREAD_INIT)
-     fi
-     ;;
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test -n "$USE_NSPR_THREADS"; then
-         AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-     fi
diff --git a/mail/thunderbird/patches/patch-bq b/mail/thunderbird/patches/patch-bq
deleted file mode 100644
index 1a855738d18..00000000000
--- a/mail/thunderbird/patches/patch-bq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bq,v 1.5 2006/02/05 14:49:05 ghen Exp $
-
---- xpcom/io/nsLocalFileUnix.h.orig	2006-02-02 13:20:12.000000000 +0100
-+++ xpcom/io/nsLocalFileUnix.h
-@@ -73,7 +73,7 @@
- #endif
- 
- // so we can statfs on freebsd
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || (defined(__NetBSD__) && !defined(HAVE_STATVFS))
-     #define HAVE_SYS_STATFS_H
-     #define STATFS statfs
-     #include <sys/param.h>
diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br
deleted file mode 100644
index 53c19de492d..00000000000
--- a/mail/thunderbird/patches/patch-br
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-br,v 1.8 2009/10/03 13:18:23 ghen Exp $
-
---- nsprpub/pr/src/misc/prnetdb.c.orig	2008-01-13 02:27:15.000000000 +0100
-+++ nsprpub/pr/src/misc/prnetdb.c
-@@ -93,6 +93,11 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_GETPROTO_R_POINTER
- #endif
- 
-+#if __DragonFly_version >= 200202
-+#define _PR_HAVE_GETPROTO_R
-+#define _PR_HAVE_5_ARG_GETPROTO_R
-+#endif
-+
- #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
- 	|| (defined(LINUX) && defined(_REENTRANT) \
-         && !(defined(__GLIBC__) && __GLIBC__ >= 2))
-@@ -331,7 +336,7 @@ _pr_QueryNetIfs(void)
- }
- 
- #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
--    || defined(NETBSD) || defined(OPENBSD)
-+    || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
- 
- /*
-  * Use the BSD getifaddrs function.
-@@ -2039,7 +2044,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
-          */
-         hints.ai_socktype = SOCK_STREAM;
- 
-+/* NetBSD >= 2.99.9 has a thread-safe resolver */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+	LOCK_DNS();
-+#endif
-+
-         rv = GETADDRINFO(hostname, NULL, &hints, &res);
-+
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 299000900
-+	UNLOCK_DNS();
-+#endif
-+
-         if (rv == 0)
-             return (PRAddrInfo *) res;
- 
diff --git a/mail/thunderbird/patches/patch-bs b/mail/thunderbird/patches/patch-bs
deleted file mode 100644
index 793120f8f09..00000000000
--- a/mail/thunderbird/patches/patch-bs
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-bs,v 1.4 2005/12/30 21:35:58 joerg Exp $
-
-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"
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define DEFAULT_CPP "/usr/libexec/cpp"
- #endif
- #ifdef	MACH
-@@ -273,7 +273,7 @@
- #ifdef unix
- 	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
- #endif
--#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH)
-+#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) || defined(__DragonFly__)
- # ifdef __i386__
- 	"-D__i386__",
- # endif
-@@ -713,6 +713,9 @@
- #ifdef __sgi
- 	{"__sgi", "1"},
- #endif
-+#ifdef __DragonFly__
-+	{"__DragonFly__", "1"},
-+#endif
- #ifdef __FreeBSD__
- 	{"__FreeBSD__", "1"},
- #endif
diff --git a/mail/thunderbird/patches/patch-bu b/mail/thunderbird/patches/patch-bu
deleted file mode 100644
index af417dfe118..00000000000
--- a/mail/thunderbird/patches/patch-bu
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-bu,v 1.1 2004/06/24 23:09:56 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig	2004-05-30 21:38:13.000000000 +0900
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp	2004-05-30 21:37:22.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
-+
-+#include "xptcprivate.h"
-+
-+// 6 integral parameters are passed in registers
-+const PRUint32 GPR_COUNT = 6;
-+
-+// 8 floating point parameters are passed in SSE registers
-+const PRUint32 FPR_COUNT = 8;
-+
-+// Remember that these 'words' are 64-bit long
-+static inline void
-+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s,
-+                   PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack)
-+{
-+    nr_gpr = 1; // skip one GP register for 'that'
-+    nr_fpr = 0;
-+    nr_stack = 0;
-+
-+    /* Compute number of eightbytes of class MEMORY.  */
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (!s->IsPtrData()
-+            && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) {
-+            if (nr_fpr < FPR_COUNT)
-+                nr_fpr++;
-+            else
-+                nr_stack++;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                nr_gpr++;
-+            else
-+                nr_stack++;
-+        }
-+    }
-+}
-+
-+static void
-+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s,
-+                     PRUint64 * gpregs, double * fpregs)
-+{
-+    PRUint32 nr_gpr = 1; // skip one GP register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for (uint32 i = 0; i < paramCount; i++, s++) {
-+        if (s->IsPtrData())
-+            value = (PRUint64) s->ptr;
-+        else {
-+            switch (s->type) {
-+            case nsXPTType::T_FLOAT:                                break;
-+            case nsXPTType::T_DOUBLE:                               break;
-+            case nsXPTType::T_I8:     value = s->val.i8;            break;
-+            case nsXPTType::T_I16:    value = s->val.i16;           break;
-+            case nsXPTType::T_I32:    value = s->val.i32;           break;
-+            case nsXPTType::T_I64:    value = s->val.i64;           break;
-+            case nsXPTType::T_U8:     value = s->val.u8;            break;
-+            case nsXPTType::T_U16:    value = s->val.u16;           break;
-+            case nsXPTType::T_U32:    value = s->val.u32;           break;
-+            case nsXPTType::T_U64:    value = s->val.u64;           break;
-+            case nsXPTType::T_BOOL:   value = s->val.b;             break;
-+            case nsXPTType::T_CHAR:   value = s->val.c;             break;
-+            case nsXPTType::T_WCHAR:  value = s->val.wc;            break;
-+            default:                  value = (PRUint64) s->val.p;  break;
-+            }
-+        }
-+
-+        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((double *)d) = s->val.d;
-+                d++;
-+            }
-+        }
-+        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                fpregs[nr_fpr++] = s->val.d;
-+            else {
-+                *((float *)d) = s->val.f;
-+                d++;
-+            }
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                gpregs[nr_gpr++] = value;
-+            else
-+                *d++ = value;
-+        }
-+    }
-+}
-+
-+extern "C"
-+XPTC_PUBLIC_API(nsresult)
-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
-+                   PRUint32 paramCount, nsXPTCVariant * params)
-+{
-+    PRUint32 nr_gpr, nr_fpr, nr_stack;
-+    invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack);
-+    
-+    // Stack, if used, must be 16-bytes aligned
-+    if (nr_stack)
-+        nr_stack = (nr_stack + 1) & ~1;
-+
-+    // Load parameters to stack, if necessary
-+    PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
-+    PRUint64 gpregs[GPR_COUNT];
-+    double fpregs[FPR_COUNT];
-+    invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
-+
-+    // Load FPR registers from fpregs[]
-+    register double d0 asm("xmm0");
-+    register double d1 asm("xmm1");
-+    register double d2 asm("xmm2");
-+    register double d3 asm("xmm3");
-+    register double d4 asm("xmm4");
-+    register double d5 asm("xmm5");
-+    register double d6 asm("xmm6");
-+    register double d7 asm("xmm7");
-+
-+    switch (nr_fpr) {
-+#define ARG_FPR(N) \
-+    case N+1: d##N = fpregs[N];
-+        ARG_FPR(7);
-+        ARG_FPR(6);
-+        ARG_FPR(5);
-+        ARG_FPR(4);
-+        ARG_FPR(3);
-+        ARG_FPR(2);
-+        ARG_FPR(1);
-+        ARG_FPR(0);
-+    case 0:;
-+#undef ARG_FPR
-+    }
-+    
-+    // Load GPR registers from gpregs[]
-+    register PRUint64 a0 asm("rdi");
-+    register PRUint64 a1 asm("rsi");
-+    register PRUint64 a2 asm("rdx");
-+    register PRUint64 a3 asm("rcx");
-+    register PRUint64 a4 asm("r8");
-+    register PRUint64 a5 asm("r9");
-+    
-+    switch (nr_gpr) {
-+#define ARG_GPR(N) \
-+    case N+1: a##N = gpregs[N];
-+        ARG_GPR(5);
-+        ARG_GPR(4);
-+        ARG_GPR(3);
-+        ARG_GPR(2);
-+        ARG_GPR(1);
-+    case 1: a0 = (PRUint64) that;
-+    case 0:;
-+#undef ARG_GPR
-+    }
-+
-+    // Ensure that assignments to SSE registers won't be optimized away
-+    asm("" ::
-+        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
-+        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
-+    
-+    // Get pointer to method
-+    PRUint64 methodAddress = *((PRUint64 *)that);
-+    methodAddress += 8 * methodIndex;
-+    methodAddress = *((PRUint64 *)methodAddress);
-+    
-+    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
-+    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
-+    return result;
-+}
diff --git a/mail/thunderbird/patches/patch-bv b/mail/thunderbird/patches/patch-bv
deleted file mode 100644
index de1dd0dcf20..00000000000
--- a/mail/thunderbird/patches/patch-bv
+++ /dev/null
@@ -1,211 +0,0 @@
-$NetBSD: patch-bv,v 1.1 2004/06/24 23:09:56 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig	2004-05-30 21:38:22.000000000 +0900
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp	2004-05-30 21:37:22.000000000 +0900
-@@ -0,0 +1,206 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+
-+// Implement shared vtbl methods.
-+
-+#include "xptcprivate.h"
-+
-+// The Linux/x86-64 ABI passes the first 6 integral parameters and the
-+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
-+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the
-+// caller.  The rest of the parameters are passed in the callers stack
-+// area.
-+
-+const PRUint32 PARAM_BUFFER_COUNT   = 16;
-+const PRUint32 GPR_COUNT            = 6;
-+const PRUint32 FPR_COUNT            = 8;
-+
-+// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
-+//
-+// - 'args[]' contains the arguments passed on stack
-+// - 'gpregs[]' contains the arguments passed in integer registers
-+// - 'fpregs[]' contains the arguments passed in floating point registers
-+// 
-+// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
-+// and then the method gets called.
-+
-+extern "C" nsresult
-+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
-+                   PRUint64 * args, PRUint64 * gpregs, double *fpregs)
-+{
-+    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
-+    nsXPTCMiniVariant* dispatchParams = NULL;
-+    nsIInterfaceInfo* iface_info = NULL;
-+    const nsXPTMethodInfo* info;
-+    PRUint32 paramCount;
-+    PRUint32 i;
-+    nsresult result = NS_ERROR_FAILURE;
-+
-+    NS_ASSERTION(self,"no self");
-+
-+    self->GetInterfaceInfo(&iface_info);
-+    NS_ASSERTION(iface_info,"no interface info");
-+    if (! iface_info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-+    NS_ASSERTION(info,"no method info");
-+    if (! info)
-+        return NS_ERROR_UNEXPECTED;
-+
-+    paramCount = info->GetParamCount();
-+
-+    // setup variant array pointer
-+    if(paramCount > PARAM_BUFFER_COUNT)
-+        dispatchParams = new nsXPTCMiniVariant[paramCount];
-+    else
-+        dispatchParams = paramBuffer;
-+
-+    NS_ASSERTION(dispatchParams,"no place for params");
-+    if (! dispatchParams)
-+        return NS_ERROR_OUT_OF_MEMORY;
-+
-+    PRUint64* ap = args;
-+    PRUint32 nr_gpr = 1;    // skip one GPR register for 'that'
-+    PRUint32 nr_fpr = 0;
-+    PRUint64 value;
-+
-+    for(i = 0; i < paramCount; i++) {
-+        const nsXPTParamInfo& param = info->GetParam(i);
-+        const nsXPTType& type = param.GetType();
-+        nsXPTCMiniVariant* dp = &dispatchParams[i];
-+	
-+        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
-+            if (nr_fpr < FPR_COUNT)
-+                dp->val.d = fpregs[nr_fpr++];
-+            else
-+                dp->val.d = *(double*) ap++;
-+            continue;
-+        }
-+        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-+            if (nr_fpr < FPR_COUNT)
-+                // The value in %xmm register is already prepared to
-+                // be retrieved as a float. Therefore, we pass the
-+                // value verbatim, as a double without conversion.
-+                dp->val.d = *(double*) ap++;
-+            else
-+                dp->val.f = *(float*) ap++;
-+            continue;
-+        }
-+        else {
-+            if (nr_gpr < GPR_COUNT)
-+                value = gpregs[nr_gpr++];
-+            else
-+                value = *ap++;
-+        }
-+
-+        if (param.IsOut() || !type.IsArithmetic()) {
-+            dp->val.p = (void*) value;
-+            continue;
-+        }
-+
-+        switch (type) {
-+        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   value; break;
-+        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  value; break;
-+        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  value; break;
-+        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  value; break;
-+        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  value; break;
-+        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) value; break;
-+        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) value; break;
-+        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) value; break;
-+        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   value; break;
-+        case nsXPTType::T_CHAR:    dp->val.c   = (char)     value; break;
-+        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  value; break;
-+
-+        default:
-+            NS_ASSERTION(0, "bad type");
-+            break;
-+        }
-+    }
-+
-+    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
-+
-+    NS_RELEASE(iface_info);
-+
-+    if (dispatchParams != paramBuffer)
-+        delete [] dispatchParams;
-+
-+    return result;
-+}
-+
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-+// Linux/x86-64 uses gcc >= 3.1
-+#define STUB_ENTRY(n) \
-+asm(".section	\".text\"\n\t" \
-+    ".align	2\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-+    ".elseif    " #n " < 1000\n\t" \
-+    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-+    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-+    ".else\n\t" \
-+    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
-+    ".endif\n\t" \
-+    "movl	$" #n ", %eax\n\t" \
-+    "jmp	SharedStub\n\t" \
-+    ".if	" #n " < 10\n\t" \
-+    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-+    ".elseif	" #n " < 100\n\t" \
-+    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-+    ".else\n\t" \
-+    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-+    ".endif");
-+
-+// static nsresult SharedStub(PRUint32 methodIndex)
-+asm(".section   \".text\"\n\t"
-+    ".align     2\n\t"
-+    ".type      SharedStub,@function\n\t"
-+    "SharedStub:\n\t"
-+    // make room for gpregs (48), fpregs (64)
-+    "pushq      %rbp\n\t"
-+    "movq       %rsp,%rbp\n\t"
-+    "subq       $112,%rsp\n\t"
-+    // save GP registers
-+    "movq       %rdi,-112(%rbp)\n\t"
-+    "movq       %rsi,-104(%rbp)\n\t"
-+    "movq       %rdx, -96(%rbp)\n\t"
-+    "movq       %rcx, -88(%rbp)\n\t"
-+    "movq       %r8 , -80(%rbp)\n\t"
-+    "movq       %r9 , -72(%rbp)\n\t"
-+    "leaq       -112(%rbp),%rcx\n\t"
-+    // save FP registers
-+    "movsd      %xmm0,-64(%rbp)\n\t"
-+    "movsd      %xmm1,-56(%rbp)\n\t"
-+    "movsd      %xmm2,-48(%rbp)\n\t"
-+    "movsd      %xmm3,-40(%rbp)\n\t"
-+    "movsd      %xmm4,-32(%rbp)\n\t"
-+    "movsd      %xmm5,-24(%rbp)\n\t"
-+    "movsd      %xmm6,-16(%rbp)\n\t"
-+    "movsd      %xmm7, -8(%rbp)\n\t"
-+    "leaq       -64(%rbp),%r8\n\t"
-+    // rdi has the 'self' pointer already
-+    "movl       %eax,%esi\n\t"
-+    "leaq       16(%rbp),%rdx\n\t"
-+    "call       PrepareAndDispatch\n\t"
-+    "leave\n\t"
-+    "ret\n\t"
-+    ".size      SharedStub,.-SharedStub");
-+
-+#define SENTINEL_ENTRY(n) \
-+nsresult nsXPTCStubBase::Sentinel##n() \
-+{ \
-+    NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
-+    return NS_ERROR_NOT_IMPLEMENTED; \
-+}
-+
-+#include "xptcstubsdef.inc"
-+
-+#else
-+#error "can't find a compiler to use"
-+#endif /* __GNUC__ */
diff --git a/mail/thunderbird/patches/patch-bx b/mail/thunderbird/patches/patch-bx
deleted file mode 100644
index 33599cd0713..00000000000
--- a/mail/thunderbird/patches/patch-bx
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-bx,v 1.2 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2001-09-28 22:12:53.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
-@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-                 if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
-                 dp->val.d = *(double*) ap;
-                 ap += 2;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 2;
-+#endif
-             }
-             continue;
-         }
-@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-             else {
-                 dp->val.f = *(float*) ap;
- 		ap += 1;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 1;
-+#endif
-             }
-             continue;
-         }
-@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- // however, it's quick, dirty, and'll break when the ABI changes on
- // us, which is what we want ;-).
- 
--#define STUB_ENTRY(n)                                       \
-+#if __GXX_ABI_VERSION < 100
-+// gcc-2 version
-+# define STUB_ENTRY(n)                                       \
- __asm__ (                                                   \
-         ".section \".text\" \n\t"                           \
-         ".align 2 \n\t"                                     \
-@@ -206,6 +212,46 @@ __asm__ (                               
- 	"li     11,"#n" \n\t"                               \
- 	"b      SharedStub@local \n"                        \
- );
-+#else
-+// gcc-3 version
-+//
-+// As G++3 ABI contains the length of the functionname in the mangled
-+// name, it is difficult to get a generic assembler mechanism like
-+// in the G++ 2.95 case.
-+// Create names would be like:
-+// _ZN14nsXPTCStubBase5Stub1Ev
-+// _ZN14nsXPTCStubBase6Stub12Ev
-+// _ZN14nsXPTCStubBase7Stub123Ev
-+// _ZN14nsXPTCStubBase8Stub1234Ev
-+// etc.
-+// Use assembler directives to get the names right...
-+
-+# define STUB_ENTRY(n)							\
-+__asm__ (								\
-+	".align	2 \n\t"							\
-+	".if	"#n" < 10 \n\t"						\
-+	".globl	_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 100 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
-+									\
-+	".elseif "#n" < 1000 \n\t"					\
-+	".globl	_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"			\
-+	".type	_ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"		\
-+"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
-+									\
-+	".else \n\t"							\
-+	".err	\"stub number "#n" >= 1000 not yet supported\"\n"	\
-+	".endif \n\t"							\
-+									\
-+	"li	11,"#n" \n\t"						\
-+	"b	SharedStub@local \n"					\
-+);
-+#endif
- 
- #define SENTINEL_ENTRY(n)                            \
- nsresult nsXPTCStubBase::Sentinel##n()               \
diff --git a/mail/thunderbird/patches/patch-by b/mail/thunderbird/patches/patch-by
deleted file mode 100644
index 65e7d988bcb..00000000000
--- a/mail/thunderbird/patches/patch-by
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-by,v 1.2 2004/07/06 13:40:57 taya Exp $
-
-diff -ru ../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-03-19 10:36:16.000000000 +0900
-+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-07-04 22:59:19.000000000 +0900
-@@ -155,15 +155,15 @@
- 
-   static NS_NAMED_LITERAL_STRING(arial, "arial");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
--                                              &arial);
-+                                              (nsDependentString *)&arial);
- 
-   static NS_NAMED_LITERAL_STRING(courier, "courier new");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
--                                              &courier);
-+                                              (nsDependentString *)&courier);
- 
-   static NS_NAMED_LITERAL_STRING(times, "times new roman");
-   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
--                                              &times);
-+                                              (nsDependentString *)&times);
- }
- 
- void NS_FreeSVGLibartGlyphMetricsFTGlobals()
-@@ -440,19 +440,19 @@
-     return;
-   }
- 
--  FTC_Image_Desc imageDesc;
--  imageDesc.font.face_id=(void*)font_data.font_entry.get(); // XXX do we need to addref?
-+  FTC_ImageType imageDesc;
-+  imageDesc->face_id = (FTC_FaceID)font_data.font_entry.get(); // XXX do we need to addref?
-   float twipstopixel = GetTwipsToPixels();
-   float scale = GetPixelScale();
--  imageDesc.font.pix_width = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.font.pix_height = (int)((float)(font_data.font.size)*twipstopixel/scale);
--  imageDesc.image_type |= ftc_image_grays;
-+  imageDesc->width = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+  imageDesc->height = (int)((float)(font_data.font.size)*twipstopixel/scale);
-+  imageDesc->flags = 0;
- 
-   // get the face
-   nsresult rv;
-   FTC_Manager mgr;
-   nsSVGLibartFreetype::ft2->GetFTCacheManager(&mgr);
--  rv = nsSVGLibartFreetype::ft2->ManagerLookupSize(mgr, &imageDesc.font, &mFace, nsnull);
-+  rv = nsSVGLibartFreetype::ft2->ManagerLookupFace(mgr, imageDesc->face_id, &mFace);
-   NS_ASSERTION(mFace, "failed to get face/size");
- }
- 
diff --git a/mail/thunderbird/patches/patch-bz b/mail/thunderbird/patches/patch-bz
deleted file mode 100644
index 40091b2f76e..00000000000
--- a/mail/thunderbird/patches/patch-bz
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-bz,v 1.1 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig	2001-03-11 18:22:22.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
-@@ -1,27 +1,27 @@
--# -*- Mode: Asm -*-
--#
--# The contents of this file are subject to the Netscape Public
--# License Version 1.1 (the "License"); you may not use this file
--# except in compliance with the License. You may obtain a copy of
--# the License at http://www.mozilla.org/NPL/
--#
--# Software distributed under the License is distributed on an "AS
--# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
--# implied. See the License for the specific language governing
--# rights and limitations under the License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is Netscape
--# Communications Corporation.  Portions created by Netscape are
--# Copyright (C) 1999 Netscape Communications Corporation. All
--# Rights Reserved.
--#
--# Contributor(s): 
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
-+// -*- Mode: Asm -*-
-+//
-+// The contents of this file are subject to the Netscape Public
-+// License Version 1.1 (the "License"); you may not use this file
-+// except in compliance with the License. You may obtain a copy of
-+// the License at http://www.mozilla.org/NPL/
-+//
-+// Software distributed under the License is distributed on an "AS
-+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+// implied. See the License for the specific language governing
-+// rights and limitations under the License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is Netscape
-+// Communications Corporation.  Portions created by Netscape are
-+// Copyright (C) 1999 Netscape Communications Corporation. All
-+// Rights Reserved.
-+//
-+// Contributor(s): 
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
- 
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-@@ -44,23 +44,23 @@
- 	.type  SharedStub,@function
- 
- SharedStub:
--        stwu	sp,-112(sp)			# room for 
--						# linkage (8),
--						# gprData (32),
--						# fprData (64), 
--						# stack alignment(8)
-+        stwu	sp,-112(sp)			// room for 
-+						// linkage (8),
-+						// gprData (32),
-+						// fprData (64), 
-+						// stack alignment(8)
-         mflr	r0
--	stw	r0,116(sp)			# save LR backchain
-+	stw	r0,116(sp)			// save LR backchain
- 
--	stw	r4,12(sp)			# save GP registers
--	stw	r5,16(sp)			# (n.b. that we don't save r3
--	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
-+	stw	r4,12(sp)			// save GP registers
-+	stw	r5,16(sp)			// (n.b. that we don't save r3
-+	stw	r6,20(sp)			// because PrepareAndDispatch() is savvy)
- 	stw	r7,24(sp)
- 	stw	r8,28(sp)
- 	stw	r9,32(sp)
- 	stw	r10,36(sp)
- 
--	stfd	f1,40(sp)			# save FP registers
-+	stfd	f1,40(sp)			// save FP registers
- 	stfd	f2,48(sp)
- 	stfd	f3,56(sp)
- 	stfd	f4,64(sp)
-@@ -69,21 +69,20 @@ SharedStub:
- 	stfd	f7,88(sp)
- 	stfd	f8,96(sp)
- 
--						# r3 has the 'self' pointer already
-+						// r3 has the 'self' pointer already
- 	
--	mr      r4,r11				# r4 <= methodIndex selector, passed
--						# via r11 in the nsXPTCStubBase::StubXX() call
-+	mr      r4,r11				// r4 <= methodIndex selector, passed
-+						// via r11 in the nsXPTCStubBase::StubXX() call
- 	
--	addi	r5,sp,120			# r5 <= pointer to callers args area,
--						# beyond r3-r10/f1-f8 mapped range
-+	addi	r5,sp,120			// r5 <= pointer to callers args area,
-+						// beyond r3-r10/f1-f8 mapped range
- 	
--	addi	r6,sp,8				# r6 <= gprData
--	addi	r7,sp,40			# r7 <= fprData
-+	addi	r6,sp,8				// r6 <= gprData
-+	addi	r7,sp,40			// r7 <= fprData
-       
--	bl	PrepareAndDispatch@local	# Go!
-+	bl	PrepareAndDispatch@local	// Go!
-     
--	lwz	r0,116(sp)			# restore LR
-+	lwz	r0,116(sp)			// restore LR
- 	mtlr	r0
--	la	sp,112(sp)			# clean up the stack
-+	la	sp,112(sp)			// clean up the stack
- 	blr
--
diff --git a/mail/thunderbird/patches/patch-ca b/mail/thunderbird/patches/patch-ca
deleted file mode 100644
index 89e433dc1b8..00000000000
--- a/mail/thunderbird/patches/patch-ca
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2001-03-11 18:22:17.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -1,27 +1,28 @@
--# -*- Mode: Asm -*-
--#
--# The contents of this file are subject to the Netscape Public
--# License Version 1.1 (the "License"); you may not use this file
--# except in compliance with the License. You may obtain a copy of
--# the License at http://www.mozilla.org/NPL/
--#
--# Software distributed under the License is distributed on an "AS
--# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
--# implied. See the License for the specific language governing
--# rights and limitations under the License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is Netscape
--# Communications Corporation.  Portions created by Netscape are
--# Copyright (C) 1999 Netscape Communications Corporation. All
--# Rights Reserved.
--#
--# Contributor(s):
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
-+// -*- Mode: Asm -*-
-+//
-+// The contents of this file are subject to the Netscape Public
-+// License Version 1.1 (the "License"); you may not use this file
-+// except in compliance with the License. You may obtain a copy of
-+// the License at http://www.mozilla.org/NPL/
-+//
-+// Software distributed under the License is distributed on an "AS
-+// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+// implied. See the License for the specific language governing
-+// rights and limitations under the License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is Netscape
-+// Communications Corporation.  Portions created by Netscape are
-+// Copyright (C) 1999 Netscape Communications Corporation. All
-+// Rights Reserved.
-+//
-+// Contributor(s):
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
-+
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
- .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-@@ -42,38 +43,38 @@
- 	.globl XPTC_InvokeByIndex
- 	.type  XPTC_InvokeByIndex,@function
- 
--#
--# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
--#                    PRUint32 paramCount, nsXPTCVariant* params)
--#
-+//
-+// XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+//                    PRUint32 paramCount, nsXPTCVariant* params)
-+//
- 
- XPTC_InvokeByIndex:
--	stwu    sp,-32(sp)			# setup standard stack frame
--	mflr    r0				# save LR
--	stw     r3,8(sp)			# r3 <= that
--	stw     r4,12(sp)			# r4 <= methodIndex
-+	stwu    sp,-32(sp)			// setup standard stack frame
-+	mflr    r0				// save LR
-+	stw     r3,8(sp)			// r3 <= that
-+	stw     r4,12(sp)			// r4 <= methodIndex
- 	stw     r30,16(sp)
- 	stw     r31,20(sp)
- 
--	stw     r0,36(sp)			# store LR backchain
-+	stw     r0,36(sp)			// store LR backchain
- 	mr      r31,sp
- 
--	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
--	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
--	lwz     r9,0(sp)			# r9 = backchain
-+	rlwinm  r10,r5,3,0,27			// r10 = (ParamCount * 2 * 4) & ~0x0f
-+	addi    r0,r10,96			// reserve stack for GPR and FPR register save area r0 = r10 + 96
-+	lwz     r9,0(sp)			// r9 = backchain
- 	neg     r0,r0
--	stwux   r9,sp,r0			# reserve stack sapce and save SP backchain
--	
--	addi    r3,sp,8				# r3 <= args
--	mr      r4,r5				# r4 <= paramCount
--	mr      r5,r6				# r5 <= params
--	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
--	mr      r30,r6				# store in r30 for use later...
--	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
-+	stwux   r9,sp,r0			// reserve stack space and save SP backchain
-+
-+	addi    r3,sp,8				// r3 <= args
-+	mr      r4,r5				// r4 <= paramCount
-+	mr      r5,r6				// r5 <= params
-+	add     r6,r3,r10			// r6 <= gpregs ( == args + r10 )
-+	mr      r30,r6				// store in r30 for use later...
-+	addi    r7,r6,32			// r7 <= fpregs ( == gpregs + 32 )
- 
--	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
-+	bl      invoke_copy_to_stack@local	// (args, paramCount, params, gpregs, fpregs)
- 
--	lfd     f1,32(r30)			# load FP registers with method parameters
-+	lfd     f1,32(r30)			// load FP registers with method parameters
- 	lfd     f2,40(r30)   
- 	lfd     f3,48(r30)  
- 	lfd     f4,56(r30)  
-@@ -82,18 +83,18 @@ XPTC_InvokeByIndex:
- 	lfd     f7,80(r30)  
- 	lfd     f8,88(r30)
- 
--	lwz     r3,8(r31)			# r3 <= that
--	lwz     r4,12(r31)			# r4 <= methodIndex
--	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
--	slwi    r4,r4,3				# convert to offset ( *= 8 )
--	addi	r4,r4,8				# skip first two vtable entries
--	add	r4,r4,r5
--	lhz	r0,0(r4)			# virtual base offset
--	extsh	r0,r0
--	add	r3,r3,r0
--	lwz     r0,4(r4)			# r0 <= methodpointer ( == vtable + offset )
-+	lwz     r3,8(r31)			// r3 <= that
-+	lwz     r4,12(r31)			// r4 <= methodIndex
-+	lwz     r5,0(r3)			// r5 <= vtable ( == *that )
-+#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION  >= 100) // G++ pre-V3 ABI is like that of AIX under NetBSD
-+	slwi    r4,r4,3				// convert to offset ( *= 8 )
-+	addi	r4,r4,8				// skip garbage before vtable
-+#else
-+	slwi    r4,r4,2				// convert to offset ( *= 4 )
-+#endif
-+	lwzx    r0,r5,r4			// r0 <= methodpointer ( == vtable + offset )
- 
--        lwz     r4,4(r30)			# load GP regs with method parameters
-+        lwz     r4,4(r30)			// load GP regs with method parameters
- 	lwz     r5,8(r30)   
- 	lwz     r6,12(r30)  
- 	lwz     r7,16(r30)  
-@@ -101,13 +102,13 @@ XPTC_InvokeByIndex:
- 	lwz     r9,24(r30)  
- 	lwz     r10,28(r30)
- 
--	mtlr    r0				# copy methodpointer to LR    
--	blrl					# call method
-+	mtlr    r0				// copy methodpointer to LR    
-+	blrl					// call method
- 	
--	lwz     r30,16(r31)			# restore r30 & r31
-+	lwz     r30,16(r31)			// restore r30 & r31
- 	lwz     r31,20(r31)
- 	
--	lwz     r11,0(sp)			# clean up the stack
-+	lwz     r11,0(sp)			// clean up the stack
- 	lwz     r0,4(r11)
- 	mtlr    r0
- 	mr      sp,r11
diff --git a/mail/thunderbird/patches/patch-cb b/mail/thunderbird/patches/patch-cb
deleted file mode 100644
index 78e1f5f9b57..00000000000
--- a/mail/thunderbird/patches/patch-cb
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2004/12/04 02:16:03 taya Exp $
-
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2001-09-28 22:12:52.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
-@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d,
-                 if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
-                 *((double*) d) = s->val.d;
-                 d += 2;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 2;
-+#endif
-             }
-         }
-         else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d,
-             else {
-                 *((float*) d) = s->val.f;
- 		d += 1;
-+#if __GXX_ABI_VERSION < 100
- 		if (gpr < GPR_COUNT)
- 		    gpr += 1;
-+#endif
- 	    }
-         }
-         else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
diff --git a/mail/thunderbird/patches/patch-da b/mail/thunderbird/patches/patch-da
deleted file mode 100644
index cbb854f8809..00000000000
--- a/mail/thunderbird/patches/patch-da
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-da,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
---- xpcom/build/malloc.c.orig	2005-12-29 17:03:39.000000000 +0000
-+++ xpcom/build/malloc.c
-@@ -918,7 +918,7 @@ struct mallinfo {
- 
- 
- #ifdef LACKS_UNISTD_H
--#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- #if __STD_C
- extern Void_t*     sbrk(ptrdiff_t);
- #else
diff --git a/mail/thunderbird/patches/patch-db b/mail/thunderbird/patches/patch-db
deleted file mode 100644
index 83147bdd954..00000000000
--- a/mail/thunderbird/patches/patch-db
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-db,v 1.2 2006/02/05 14:49:05 ghen Exp $
-
---- js/src/Makefile.in.orig	2006-02-02 13:20:09.000000000 +0100
-+++ js/src/Makefile.in
-@@ -256,6 +256,9 @@ endif # WINNT
- ifeq ($(OS_ARCH),FreeBSD)
- LDFLAGS		+= -pthread
- endif
-+ifeq ($(OS_ARCH),DragonFly)
-+LDFLAGS		+= -pthread
-+endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
- DASH_R		+= -n32
diff --git a/mail/thunderbird/patches/patch-dc b/mail/thunderbird/patches/patch-dc
deleted file mode 100644
index a4e363ac4af..00000000000
--- a/mail/thunderbird/patches/patch-dc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-dc,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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__)) \
- 	&& !(defined(__FreeBSD__) && defined(__ELF__)) \
--	&& !defined(DOS4GW)
-+	&& !defined(DOS4GW) && !(defined(__DragonFly__) && defined(__ELF__))
- 	/* I386 code, generic code does not appear to work */
- 	/* It does appear to work under OS2, and asms dont */
- 	/* This is used for some 38g UNIX variants and for CYGWIN32 */
-@@ -220,7 +220,7 @@
- #       endif
- 
- #	if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \
--	|| ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) )
-+	|| ( defined(I386) && (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(__ELF__) )
- 
- 	/* This is modified for Linux with ELF (Note: _ELF_ only) */
- 	/* This section handles FreeBSD with ELF. */
diff --git a/mail/thunderbird/patches/patch-de b/mail/thunderbird/patches/patch-de
deleted file mode 100644
index eea2a7cb226..00000000000
--- a/mail/thunderbird/patches/patch-de
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-de,v 1.2 2006/02/05 14:49:05 ghen Exp $
-
---- config/rules.mk.orig	2006-02-02 13:20:06.000000000 +0100
-+++ config/rules.mk
-@@ -447,6 +447,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
- endif
- 
-+ifeq ($(OS_ARCH),DragonFly)
-+ifdef IS_COMPONENT
-+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
-+endif
-+
- ifeq ($(OS_ARCH),NetBSD)
- ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
- ifeq ($(MODULE),layout)
diff --git a/mail/thunderbird/patches/patch-df b/mail/thunderbird/patches/patch-df
deleted file mode 100644
index 02deebbd9d6..00000000000
--- a/mail/thunderbird/patches/patch-df
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-df,v 1.2 2006/02/05 14:49:05 ghen Exp $
-
---- config/config.mk.orig	2006-02-02 13:20:06.000000000 +0100
-+++ config/config.mk
-@@ -121,7 +121,7 @@ endif
- # but save the version to allow multiple versions of the same base
- # platform to be built in the same tree.
- #
--ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
- OS_RELEASE	:= $(basename $(OS_RELEASE))
- 
- # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
diff --git a/mail/thunderbird/patches/patch-dg b/mail/thunderbird/patches/patch-dg
deleted file mode 100644
index dbeb21542c9..00000000000
--- a/mail/thunderbird/patches/patch-dg
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-dg,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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)
--#if __FreeBSD_version >= 400008
-+#if defined(__DragonFly__) || __FreeBSD_version >= 400008
- /*
-  * libc_r before this version of FreeBSD doesn't have poll().
-  * Although libc has poll(), it is not thread-safe so we can't
-@@ -88,7 +88,7 @@
- #define _PR_POLL_AVAILABLE
- #endif
- #else
--#if __FreeBSD_version >= 300000
-+#if defined(__DragonFly__) || __FreeBSD_version >= 300000
- #define _PR_POLL_AVAILABLE
- #define _PR_USE_POLL
- #endif
-@@ -97,7 +97,7 @@
- #define _PR_HAVE_SYSV_SEMAPHORES
- #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
- 
--#if __FreeBSD_version >= 400014
-+#if defined(__DragonFly__) || __FreeBSD_version >= 400014
- #define _PR_INET6
- #define _PR_HAVE_INET_NTOP
- #define _PR_HAVE_GETHOSTBYNAME2
diff --git a/mail/thunderbird/patches/patch-dh b/mail/thunderbird/patches/patch-dh
deleted file mode 100644
index 2b48aec5cd2..00000000000
--- a/mail/thunderbird/patches/patch-dh
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-dh,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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
- 
-+#elif defined(__DragonFly__)
-+#  if defined(__FreeBSD_cc_version)
-+#    define CFRONT_STYLE_THIS_ADJUST
-+#  else
-+#    define THUNK_BASED_THIS_ADJUST
-+#  endif
-+
- #elif defined(__FreeBSD__) 
- /* System versions of gcc on FreeBSD don't use thunks.  On 3.x, the system
-  * compiler is gcc 2.7.2.3, which doesn't use thunks by default.  On 4.x and
diff --git a/mail/thunderbird/patches/patch-dj b/mail/thunderbird/patches/patch-dj
deleted file mode 100644
index af9a8a8a2ad..00000000000
--- a/mail/thunderbird/patches/patch-dj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dj,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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)
- {    
--#if !defined(_WINDOWS) || defined(_WIN32)
-+#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno)
- 	extern int errno;                    
- #endif
- 	register char *start, *trv;
diff --git a/mail/thunderbird/patches/patch-dk b/mail/thunderbird/patches/patch-dk
deleted file mode 100644
index 5b2dcf172f7..00000000000
--- a/mail/thunderbird/patches/patch-dk
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dk,v 1.2 2009/10/03 13:18:23 ghen Exp $
-
---- security/coreconf/config.mk.orig	2009-02-13 18:14:05.000000000 +0100
-+++ security/coreconf/config.mk
-@@ -63,7 +63,7 @@ endif
- #######################################################################
- 
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              OpenVMS AIX RISCOS WINNT WIN95 WINCE
-+              OpenVMS AIX RISCOS WINNT WIN95 WINCE DragonFly
- 
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/mail/thunderbird/patches/patch-dl b/mail/thunderbird/patches/patch-dl
deleted file mode 100644
index 38f85082cf7..00000000000
--- a/mail/thunderbird/patches/patch-dl
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-dl,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
-+# 
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+# 
-+# The Original Code is the Netscape security libraries.
-+# 
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are 
-+# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
-+# Rights Reserved.
-+# 
-+# Contributor(s):
-+# 
-+# Alternatively, the contents of this file may be used under the
-+# terms of the GNU General Public License Version 2 or later (the
-+# "GPL"), in which case the provisions of the GPL are applicable 
-+# instead of those above.  If you wish to allow use of your 
-+# version of this file only under the terms of the GPL and not to
-+# allow others to use your version of this file under the MPL,
-+# indicate your decision by deleting the provisions above and
-+# replace them with the notice and other provisions required by
-+# the GPL.  If you do not delete the provisions above, a recipient
-+# may use your version of this file under either the MPL or the
-+# GPL.
-+#
-+# Config stuff for DragonFly
-+#
-+
-+include $(CORE_DEPTH)/coreconf/UNIX.mk
-+
-+DEFAULT_COMPILER	= gcc
-+CC			= gcc
-+CCC			= g++
-+RANLIB			= ranlib
-+
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH		= alpha
-+else
-+CPU_ARCH		= x86
-+endif
-+
-+OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDOPTS		= -shared -Wl,-soname -Wl,$(notdir $@)
-+
-+#
-+# The default implementation strategy for FreeBSD is pthreads.
-+#
-+ifndef CLASSIC_NSPR
-+USE_PTHREADS		= 1
-+DEFINES			+= -D_THREAD_SAFE -D_REENTRANT
-+OS_LIBS			+= -pthread
-+DSO_LDOPTS		+= -pthread
-+endif
-+
-+ARCH			= freebsd
-+
-+MOZ_OBJFORMAT		:= $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+
-+DLL_SUFFIX		= so
-+
-+ifdef LIBRUNPATH
-+DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
-+endif
-+
-+MKSHLIB			= $(CC) $(DSO_LDOPTS)
-+ifdef MAPFILE
-+# Add LD options to restrict exported symbols to those in the map file
-+endif
-+# Change PROCESS to put the mapfile in the correct format for this platform
-+PROCESS_MAP_FILE = cp $(LIBRARY_NAME).def $@
-+
-+G++INCLUDES		= -I/usr/include/g++
-+
-+INCLUDES		+= -I/usr/X11R6/include
diff --git a/mail/thunderbird/patches/patch-do b/mail/thunderbird/patches/patch-do
deleted file mode 100644
index 7f65bf3ba70..00000000000
--- a/mail/thunderbird/patches/patch-do
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-do,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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
-+# License Version 1.1 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
-+# 
-+# Software distributed under the License is distributed on an "AS
-+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+# implied. See the License for the specific language governing
-+# rights and limitations under the License.
-+# 
-+# The Original Code is the Netscape Portable Runtime (NSPR).
-+# 
-+# The Initial Developer of the Original Code is Netscape
-+# Communications Corporation.  Portions created by Netscape are 
-+# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-+# Rights Reserved.
-+# 
-+# Contributor(s):
-+# 
-+# Alternatively, the contents of this file may be used under the
-+# terms of the GNU General Public License Version 2 or later (the
-+# "GPL"), in which case the provisions of the GPL are applicable 
-+# instead of those above.  If you wish to allow use of your 
-+# version of this file only under the terms of the GPL and not to
-+# allow others to use your version of this file under the MPL,
-+# indicate your decision by deleting the provisions above and
-+# replace them with the notice and other provisions required by
-+# the GPL.  If you do not delete the provisions above, a recipient
-+# may use your version of this file under either the MPL or the
-+# GPL.
-+# 
-+
-+#
-+# Config stuff for DragonFly
-+#
-+
-+include $(MOD_DEPTH)/config/UNIX.mk
-+
-+CC			= gcc
-+CCC			= g++
-+RANLIB			= ranlib
-+
-+OS_REL_CFLAGS		= -Di386
-+CPU_ARCH		= x86
-+CPU_ARCH_TAG		= _$(CPU_ARCH)
-+
-+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-+
-+#
-+# The default implementation strategy for FreeBSD is pthreads.
-+#
-+ifeq ($(CLASSIC_NSPR),1)
-+IMPL_STRATEGY		= _EMU
-+DEFINES			+= -D_PR_LOCAL_THREADS_ONLY
-+else
-+USE_PTHREADS		= 1
-+IMPL_STRATEGY		= _PTH
-+DEFINES			+= -D_THREAD_SAFE
-+THREAD_FLAG		+= -pthread
-+endif
-+
-+ARCH			= freebsd
-+
-+MOZ_OBJFORMAT          := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+
-+ifeq ($(MOZ_OBJFORMAT),elf)
-+DLL_SUFFIX		= so
-+else
-+DLL_SUFFIX		= so.1.0
-+endif
-+
-+DSO_CFLAGS		= -fPIC
-+DSO_LDOPTS		= -Bshareable
-+
-+ifdef LIBRUNPATH
-+DSO_LDOPTS		+= -Wl,-R$(LIBRUNPATH)
-+endif
-+
-+MKSHLIB			= $(LD) $(DSO_LDOPTS)
-+
-+G++INCLUDES		= -I/usr/include/g++
diff --git a/mail/thunderbird/patches/patch-ds b/mail/thunderbird/patches/patch-ds
deleted file mode 100644
index 2aeae0ac402..00000000000
--- a/mail/thunderbird/patches/patch-ds
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ds,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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.
- #
- 
--ifeq (,$(filter-out Linux FreeBSD IRIX,$(OS_ARCH)))
-+ifeq (,$(filter-out Linux DragonFly FreeBSD IRIX,$(OS_ARCH)))
-     OS_RELEASE := $(shell echo $(OS_RELEASE) | sed 's/-.*//')
- endif
- 
diff --git a/mail/thunderbird/patches/patch-dt b/mail/thunderbird/patches/patch-dt
deleted file mode 100644
index 53d9a24a1c8..00000000000
--- a/mail/thunderbird/patches/patch-dt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-dt,v 1.1 2005/12/30 21:35:58 joerg Exp $
-
-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
- #
- 
--ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH)))
-+ifeq (,$(filter-out Linux DragonFly FreeBSD,$(OS_ARCH)))
- OS_RELEASE	:= $(shell echo "$(OS_RELEASE)" | sed 's/-.*//')
- endif
- 
diff --git a/mail/thunderbird/patches/patch-dw b/mail/thunderbird/patches/patch-dw
deleted file mode 100644
index 0fd26c73f56..00000000000
--- a/mail/thunderbird/patches/patch-dw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dw,v 1.2 2008/08/22 09:42:15 ghen Exp $
-
---- security/nss/lib/freebl/Makefile.orig	2007-11-14 23:47:33.000000000 +0100
-+++ security/nss/lib/freebl/Makefile
-@@ -194,7 +194,7 @@ endif
- # to bind the blapi function references in FREEBLVector vector
- # (ldvector.c) to the blapi functions defined in the freebl
- # shared libraries.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
-+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
-     MKSHLIB += -Wl,-Bsymbolic
- endif
- 
diff --git a/mail/thunderbird/patches/patch-dx b/mail/thunderbird/patches/patch-dx
deleted file mode 100644
index 80005facff0..00000000000
--- a/mail/thunderbird/patches/patch-dx
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-dx,v 1.1 2007/06/15 16:11:42 joerg Exp $
-
---- db/sqlite3/src/os_unix.c.orig	2006-05-22 19:12:32.000000000 +0000
-+++ db/sqlite3/src/os_unix.c
-@@ -443,6 +443,7 @@ static int lockTrace(int fd, int op, str
- #define fcntl lockTrace
- #endif /* SQLITE_LOCK_TRACE */
- 
-+#if SQLITE_THREAD_OVERRIDE_LOCK == -1
- /*
- ** The testThreadLockingBehavior() routine launches two separate
- ** threads on this routine.  This routine attempts to lock a file
-@@ -483,6 +484,7 @@ static void testThreadLockingBehavior(in
-   close(fd);
-   threadsOverrideEachOthersLocks =  d[0].result==0 && d[1].result==0;
- }
-+#endif
- #endif /* SQLITE_UNIX_THREADS */
- 
- /*
-@@ -536,9 +538,11 @@ static int findLockInfo(
-   key1.dev = statbuf.st_dev;
-   key1.ino = statbuf.st_ino;
- #ifdef SQLITE_UNIX_THREADS
-+#if SQLITE_THREAD_OVERRIDE_LOCK == -1
-   if( threadsOverrideEachOthersLocks<0 ){
-     testThreadLockingBehavior(fd);
-   }
-+#endif
-   key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
- #endif
-   memset(&key2, 0, sizeof(key2));
diff --git a/mail/thunderbird/patches/patch-ea b/mail/thunderbird/patches/patch-ea
deleted file mode 100644
index 324d02261a5..00000000000
--- a/mail/thunderbird/patches/patch-ea
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ea,v 1.1 2009/06/19 11:34:31 he Exp $
-
-For the benefit of 64-bit strict alignment archs using gcc, such
-as NetBSD/sparc64, ensure that the specially crafted double values
-are properly aligned.
-
---- extensions/transformiix/source/base/Double.cpp.orig	2006-06-22 21:13:00.000000000 +0200
-+++ extensions/transformiix/source/base/Double.cpp
-@@ -95,8 +95,12 @@ typedef union txdpun {
- #define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
- #define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
- 
-+#define __d_align	__attribute__ ((aligned (__alignof__(double))))
-+
- #else // __GNUC__
- 
-+#define __d_align	/* Empty */
-+
- /* We don't know of any non-gcc compilers that perform alias optimization,
-  * so this code should work.
-  */
-@@ -117,17 +121,19 @@ typedef union txdpun {
- 
- //-- Initialize Double related constants
- #ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-+const PRUint32 nanMask[2] __d_align =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
-                                 0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
-+const PRUint32 infMask[2] __d_align =    {TX_DOUBLE_HI32_EXPMASK, 0};
-+const PRUint32 negInfMask[2] __d_align = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
- #else
--const PRUint32 nanMask[2] =    {0xffffffff,
-+const PRUint32 nanMask[2] __d_align =    {0xffffffff,
-                                 TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
-+const PRUint32 infMask[2] __d_align =    {0, TX_DOUBLE_HI32_EXPMASK};
-+const PRUint32 negInfMask[2] __d_align = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
- #endif
- 
-+#undef __d_align
-+
- const double Double::NaN = *((double*)nanMask);
- const double Double::POSITIVE_INFINITY = *((double*)infMask);
- const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
diff --git a/mail/thunderbird/patches/patch-eb b/mail/thunderbird/patches/patch-eb
deleted file mode 100644
index bbb270c20d7..00000000000
--- a/mail/thunderbird/patches/patch-eb
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-eb,v 1.1 2009/10/03 13:18:23 ghen Exp $
-
---- security/nss/tests/libpkix/libpkix.sh.orig	2008-11-11 10:06:52.000000000 +0100
-+++ security/nss/tests/libpkix/libpkix.sh
-@@ -85,12 +85,12 @@ libpkix_cleanup()
- ParseArgs ()
- {
-     while [ $# -gt 0 ]; do
--        if [ $1 == "-checkmem" ]; then
-+        if [ $1 = "-checkmem" ]; then
-             checkMemArg=$1
-             memText="   (Memory Checking Enabled)"
--        elif [ $1 == "-quiet" ]; then
-+        elif [ $1 = "-quiet" ]; then
-             quietArg=$1
--        elif [ $1 == "-arenas" ]; then
-+        elif [ $1 = "-arenas" ]; then
-             arenasArg=$1
-         fi
-         shift
diff --git a/mail/thunderbird/patches/patch-ma-toplevel b/mail/thunderbird/patches/patch-ma-toplevel
new file mode 100644
index 00000000000..739dffdab06
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ma-toplevel
@@ -0,0 +1,23 @@
+$NetBSD: patch-ma-toplevel,v 1.1 2009/11/29 03:06:44 tnn Exp $
+
+--- config/autoconf.mk.in.orig	2009-10-25 15:29:01.000000000 +0100
++++ config/autoconf.mk.in
+@@ -62,14 +62,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/$(MOZILLA_PKG_NAME)
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir		= @datadir@/idl/$(MOZILLA_PKG_NAME)
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZILLA_PKG_NAME)
++sdkdir		= $(libdir)/$(MOZILLA_PKG_NAME)-sdk
+ 
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
diff --git a/mail/thunderbird/patches/patch-zc b/mail/thunderbird/patches/patch-zc
new file mode 100644
index 00000000000..e9b48f5cd0d
--- /dev/null
+++ b/mail/thunderbird/patches/patch-zc
@@ -0,0 +1,40 @@
+$NetBSD: patch-zc,v 1.1 2009/11/29 03:06:44 tnn Exp $
+
+--- mail/app/nsMailApp.cpp.orig	2009-11-22 03:44:31.000000000 +0100
++++ mail/app/nsMailApp.cpp
+@@ -44,6 +44,27 @@
+ 
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <sys/resource.h>
++/*
++ * On netbsd-4, ulimit -n is 64 by default; too few for us.
++ */
++static void netbsd_fixrlimit(void) {
++	struct rlimit rlp;
++	if (getrlimit(RLIMIT_NOFILE, &rlp) == -1) {
++		fprintf(stderr, "warning: getrlimit failed\n");
++		return;
++	}
++	if (rlp.rlim_cur >= 512)
++		return;
++	if (rlp.rlim_max < 512) {
++		fprintf(stderr, "warning: hard limit of 'ulimit -n' too low\n");
++		rlp.rlim_cur = rlp.rlim_max;
++	}
++	else
++		rlp.rlim_cur = 512;
++	if (setrlimit(RLIMIT_NOFILE, &rlp) == -1)
++		fprintf(stderr, "warning: setrlimit failed\n");
++}
+ 
+ #include "nsCOMPtr.h"
+ #include "nsILocalFile.h"
+@@ -83,6 +104,7 @@ public:
+ 
+ int main(int argc, char* argv[])
+ {
++  netbsd_fixrlimit();
+   ScopedLogging log;
+ 
+   nsCOMPtr<nsILocalFile> appini;