- Update to thunderbird-3.1

- Update bundled enigmail to 1.1.2
- Update mozilla branch patches to 1.9.2 (from devel/xulrunner)
- While here fix PR pkg/43598 PLIST problem w/ enigmail

---8<---
Thunderbird 3.1 is based on the Gecko 1.9.2 platform to provide improved
performance, stability, web compatibility, and code simplification and
sustainability.

New features include:
Faster Search Results and Quick Filter Toolbar
 * Faster Search Results
 * Quick Filter Toolbar
User Experience Improvements
 * New Migration Assistant
 * Saved Files Manager
 * Mail Account Setup Wizard
Performance Improvements
  * Improvements to Stability, Memory, and Password Handling

85 files changed, 666 insertions, 933 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index ad81275dbca..d65ab4f1745 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2010/06/24 18:01:38 tnn Exp $
+# $NetBSD: Makefile,v 1.56 2010/07/12 16:49:21 tnn Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}.source
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		3.0.5
+TB_VER=		3.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,7 +12,8 @@ MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://www.mozillamessaging.com/en-US/thunderbird/
 COMMENT=	Organize, secure and customize your mail
 
-WRKSRC=		${WRKDIR}/comm-1.9.1
+USE_TOOLS+=	unzip pax
+WRKSRC=		${WRKDIR}/comm-1.9.2
 MOZILLA_DIR=	mozilla/
 PLIST_SRC+=	PLIST
 
@@ -51,6 +52,18 @@ post-install:
 	  ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
 	${INSTALL_DATA} ${WRKSRC}/mail/branding/nightly/mailicon48.png	\
 	  ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
+	@${STEP_MSG} "Installing bundled thunderbird extensions."
+	rm -rf ${WRKDIR}/extensions
+	${MKDIR} ${WRKDIR}/extensions
+	${RUN} for e in ${XPI_FILES}; do				\
+	  subdir="`${UNZIP_CMD} -c "$$e" install.rdf | awk '/^    <em:id>/ {sub(".*<em:id>","");sub("</em:id>.*","");print;exit;}'`" &&	\
+	  ${MKDIR} "${WRKDIR}/extensions/$$subdir" &&			\
+	  cd "${WRKDIR}/extensions/$$subdir" &&				\
+	  ${UNZIP_CMD} -aqo $$e;					\
+	done
+	cd ${WRKDIR}/extensions && pax -rw .				\
+	   ${DESTDIR}${PREFIX}/lib/${MOZILLA}/extensions/.
+	rm -rf ${WRKDIR}/extensions
 
 .include "../../devel/xulrunner/mozilla-common.mk"
 .include "options.mk"
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index ded674316cd..5d2f566709c 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2009/11/29 03:06:42 tnn Exp $
+@comment $NetBSD: PLIST,v 1.31 2010/07/12 16:49:21 tnn Exp $
 bin/thunderbird
 lib/thunderbird/README.txt
 lib/thunderbird/application.ini
@@ -25,119 +25,22 @@ lib/thunderbird/chrome/pippki.manifest
 lib/thunderbird/chrome/toolkit.jar
 lib/thunderbird/chrome/toolkit.manifest
 lib/thunderbird/components/FeedProcessor.js
+lib/thunderbird/components/GPSDGeolocationProvider.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/components.list
 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/mail.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
@@ -154,8 +57,10 @@ lib/thunderbird/components/nsDefaultCLH.js
 lib/thunderbird/components/nsDownloadManagerUI.js
 lib/thunderbird/components/nsExtensionManager.js
 lib/thunderbird/components/nsFilePicker.js
+lib/thunderbird/components/nsFormAutoComplete.js
 lib/thunderbird/components/nsHandlerService.js
 lib/thunderbird/components/nsHelperAppDlg.js
+lib/thunderbird/components/nsINIProcessor.js
 lib/thunderbird/components/nsLDAPProtocolHandler.js
 lib/thunderbird/components/nsLoginInfo.js
 lib/thunderbird/components/nsLoginManager.js
@@ -164,71 +69,24 @@ 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/nsUpdateServiceStub.js
+lib/thunderbird/components/nsUpdateTimerManager.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
@@ -243,7 +101,6 @@ 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
@@ -277,13 +134,19 @@ lib/thunderbird/libsoftokn3.so
 lib/thunderbird/libssl3.so
 lib/thunderbird/libxpcom.so
 lib/thunderbird/libxpcom_core.so
+lib/thunderbird/modules/CertUtils.jsm
 lib/thunderbird/modules/DownloadLastDir.jsm
 lib/thunderbird/modules/DownloadUtils.jsm
+lib/thunderbird/modules/FileUtils.jsm
+lib/thunderbird/modules/IOUtils.js
 lib/thunderbird/modules/ISO8601DateUtils.jsm
+lib/thunderbird/modules/LightweightThemeConsumer.jsm
+lib/thunderbird/modules/LightweightThemeManager.jsm
 lib/thunderbird/modules/MailConsts.js
 lib/thunderbird/modules/MailUtils.js
 lib/thunderbird/modules/Microformats.js
 lib/thunderbird/modules/MsgHdrSyntheticView.js
+lib/thunderbird/modules/NetUtil.jsm
 lib/thunderbird/modules/PluralForm.jsm
 lib/thunderbird/modules/SearchIntegration.js
 lib/thunderbird/modules/SpatialNavigation.js
@@ -295,10 +158,11 @@ 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/pop3Download.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/ctypes.jsm
 lib/thunderbird/modules/dbViewWrapper.js
 lib/thunderbird/modules/debug.js
 lib/thunderbird/modules/errUtils.js
@@ -330,9 +194,12 @@ 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/mailMigrator.js
 lib/thunderbird/modules/mailViewManager.js
-lib/thunderbird/modules/quickSearchManager.js
+lib/thunderbird/modules/mailnewsMigrator.js
+lib/thunderbird/modules/quickFilterManager.js
 lib/thunderbird/modules/searchSpec.js
+lib/thunderbird/modules/sessionStoreManager.js
 lib/thunderbird/modules/templateUtils.js
 lib/thunderbird/modules/traceHelper.js
 lib/thunderbird/modules/virtualFolderWrapper.js
@@ -342,7 +209,7 @@ 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/broken-image.png
 lib/thunderbird/res/charsetData.properties
 lib/thunderbird/res/charsetalias.properties
 lib/thunderbird/res/contenteditable.css
@@ -367,7 +234,7 @@ 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/loading-image.png
 lib/thunderbird/res/mathml.css
 lib/thunderbird/res/quirk.css
 lib/thunderbird/res/svg.css
diff --git a/mail/thunderbird/PLIST.enigmail b/mail/thunderbird/PLIST.enigmail
index 1fc7fb3682f..610e72705fb 100644
--- a/mail/thunderbird/PLIST.enigmail
+++ b/mail/thunderbird/PLIST.enigmail
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.enigmail,v 1.1 2010/06/02 15:39:26 tnn Exp $
+@comment $NetBSD: PLIST.enigmail,v 1.2 2010/07/12 16:49:21 tnn Exp $
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/enigmail.jar
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigMsgCompFields.js
@@ -10,6 +10,7 @@ lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/ipc
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/pref/enigmail.js
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/enigmail.js
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${MACHINE_ARCH}-gcc3/components/libenigmime-${MACHINE_ARCH}-gcc3.so
+lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${TARGET_XPCOM_ABI}/components/libenigmime-${TARGET_XPCOM_ABI}.so
+lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${TARGET_XPCOM_ABI}/components/libipc-${TARGET_XPCOM_ABI}.so
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
 lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-wrapper.sh
diff --git a/mail/thunderbird/PLIST.lightning b/mail/thunderbird/PLIST.lightning
index 29f0f803012..a88f1d8cd29 100644
--- a/mail/thunderbird/PLIST.lightning
+++ b/mail/thunderbird/PLIST.lightning
@@ -1,21 +1,10 @@
-@comment $NetBSD: PLIST.lightning,v 1.2 2010/05/19 09:21:43 tnn Exp $
+@comment $NetBSD: PLIST.lightning,v 1.3 2010/07/12 16:49:21 tnn Exp $
 lib/thunderbird/extensions/calendar-timezones@mozilla.org/chrome.manifest
 lib/thunderbird/extensions/calendar-timezones@mozilla.org/chrome/calendar-timezones-en-US.jar
 lib/thunderbird/extensions/calendar-timezones@mozilla.org/chrome/calendar-timezones.jar
 lib/thunderbird/extensions/calendar-timezones@mozilla.org/defaults/preferences/preferences.js
 lib/thunderbird/extensions/calendar-timezones@mozilla.org/install.rdf
 lib/thunderbird/extensions/calendar-timezones@mozilla.org/timezones.sqlite
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome.manifest
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider-en-US.jar
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider.jar
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/calGoogleCalendarModule.js
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/gdata.xpt
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/defaults/preferences/preferences.js
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/install.rdf
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleCalendar.js
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleRequest.js
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleSession.js
-lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleUtils.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarm.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmMonitor.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmService.js
@@ -60,11 +49,11 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/ca
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US.jar
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar.jar
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-alarm-dialog.xpm
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-dialog.xpm
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-summary-dialog.xpm
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-dialog.xpm
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-summary-dialog.xpm
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-alarm-dialog.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-dialog.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-event-summary-dialog.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-dialog.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/icons/default/calendar-task-summary-dialog.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning-en-US.jar
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning.jar
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calCompositeCalendar.js
@@ -80,6 +69,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/cal
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calbase.xpt
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calbaseinternal.xpt
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/caldav.xpt
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/components.list
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/libcalbasecomps.so
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/lightningTextCalendarConverter.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/wcap.xpt
@@ -87,10 +77,27 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/prefe
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calProviderUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageHelpers.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageUpgrade.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite
+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/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome.manifest
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider-en-US.jar
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider.jar
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/calGoogleCalendarModule.js
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/components.list
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/components/gdata.xpt
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/defaults/preferences/preferences.js
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/install.rdf
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleCalendar.js
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleRequest.js
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleSession.js
+lib/thunderbird/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/js/calGoogleUtils.js
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index c927881270f..507b2f30504 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.69 2010/06/24 18:01:38 tnn Exp $
+$NetBSD: distinfo,v 1.70 2010/07/12 16:49:21 tnn Exp $
 
-SHA1 (enigmail-1.0.1.tar.gz) = 334e70723fffc0631dadb6fd4449afffdeafc3f2
-RMD160 (enigmail-1.0.1.tar.gz) = 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666
-Size (enigmail-1.0.1.tar.gz) = 1201945 bytes
-SHA1 (thunderbird-3.0.5.source.tar.bz2) = c51b6c6a9357578beb7440e4d3cf4594a61fd6a7
-RMD160 (thunderbird-3.0.5.source.tar.bz2) = a5ebfbf5444fe694cbd9bc7a7131460e404c5d40
-Size (thunderbird-3.0.5.source.tar.bz2) = 60574905 bytes
+SHA1 (enigmail-1.1.2.tar.gz) = d29fce2b20a36d210b12c28fcbbee965007c95aa
+RMD160 (enigmail-1.1.2.tar.gz) = 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7
+Size (enigmail-1.1.2.tar.gz) = 1280923 bytes
+SHA1 (thunderbird-3.1.source.tar.bz2) = 89e9d8099a5437ce401577fc4d526eb0dd9e51da
+RMD160 (thunderbird-3.1.source.tar.bz2) = bc55cf89dfe1f2c946fff8f5ec21b0377229afe7
+Size (thunderbird-3.1.source.tar.bz2) = 65633518 bytes
 SHA1 (patch-aa) = 0d46562e73fce3fc1bf590ac93a28b2202a8e214
-SHA1 (patch-aa-toplevel) = 458051a1b3318b49124192c6e97cb9ed0d92dead
-SHA1 (patch-ab) = c7a6961362b131f0a39f65355562b115fae3be85
+SHA1 (patch-aa-toplevel) = 0a872c898af5846a3493dadc2253ba3c72fa3094
+SHA1 (patch-ab) = abf862976c04594dc4f99d34a2b58725efafd5fd
 SHA1 (patch-ac) = e181323e153ee061b7f3644b599294a4c4a3e3e8
 SHA1 (patch-ad) = f49147e2fa28400986b659ec50918e3835db0105
 SHA1 (patch-ae) = cf4cb737fc29ef7ac6ffe1b3bc504743441e4828
@@ -16,12 +16,12 @@ SHA1 (patch-af) = 16cae98e043dedeb6331212fd15ce914196fe8c7
 SHA1 (patch-ag) = 7f8c3ac1bec475dd2b6fd6e10e5304ab9c112a67
 SHA1 (patch-ah) = 10c80ec60801295b037b4a45fbad8937922da235
 SHA1 (patch-ai) = 4d701ece9a2aaa0b640c189745fa7e731617fb7c
-SHA1 (patch-aj) = 89d390f7eeeb52256265955610b3cad4b62c5aa7
-SHA1 (patch-ak) = dca377e3cb733a48c3aa071a74bba8d2535ee161
+SHA1 (patch-aj) = ff95a4c7ff92d15b40489240286dfff371b226e0
+SHA1 (patch-ak) = af8ee30ac512bfa99e53e64b08d475d10d4d2447
 SHA1 (patch-al) = 893eb0c096f61b52a6299eff1e5ab520014fbda4
 SHA1 (patch-am) = 81bcda476a7b54050ed1ae87bd47cf9de8f19919
 SHA1 (patch-an) = e30362e1a07c6c8e96dc81d134517685c3f19ca9
-SHA1 (patch-ao) = 6307d82a2eb65131908b0d4d05da7433b6cf38d1
+SHA1 (patch-ao) = 42c268711a8bb24c3bde3c5bf74bb5a9f73ff21a
 SHA1 (patch-ap) = 78d9944ba37b3d90d0ab9e91fc831949e54ef2ad
 SHA1 (patch-aq) = ac5cd0e83f0c166fae6b033ad960d7820bb7add6
 SHA1 (patch-ar) = dab688f86340bccb80db5531f4e36cb8f50254e4
@@ -34,33 +34,39 @@ SHA1 (patch-ax) = 1dbdcd2e9a791a686fd42452ccf486d14cdf2a57
 SHA1 (patch-ay) = 5aaeb992cab024fb2b6035ddee239a8534b23aee
 SHA1 (patch-az) = 0e04c1c740ad3f1462a6cda4a3832378acefb600
 SHA1 (patch-ba) = fd28f3b24848e7221078ef692eef7ccae8625987
-SHA1 (patch-bb) = 70d1d1fed2f611fa0185ca5736dae26c8cbc2f12
+SHA1 (patch-bb) = 7cb648a5f20b3b61a24494e502bd49b535bb8055
+SHA1 (patch-bc) = ca4122954a38770449372bd67da5b64190d97d16
+SHA1 (patch-be) = 654ca74f4ec23bfef147c6f0f852ae6de046bc9e
+SHA1 (patch-bf) = 63d4ba67d29ab64ba97fe6f148a52760e940a8b3
+SHA1 (patch-bg) = 5e44de4d5904dc962c40d146d212ad084011c79c
+SHA1 (patch-directory_c-sdk_configure.in) = 4d8d8c1425ca26036d8f5179f954dbea2203de36
+SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 2727868e9fd905badb5b2f6195903ba214ce8138
+SHA1 (patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in) = 6e9788e5e9575fc0813f5f0e178cc2f5659ea781
 SHA1 (patch-ma) = 9b9bc5e5ced5831aa14e1549ed2ddf0b9c2ce986
 SHA1 (patch-ma-toplevel) = 460326a0551fecd13ca188cff907c89cce359c31
-SHA1 (patch-mb) = 8bdd47c4e57ae63c971766286ce8626d3341c92e
+SHA1 (patch-mb) = c27a2a8891bd5215fef9b920baa87499424d278f
+SHA1 (patch-mc) = 3050ce0f99c6a1cbb45dfa3a2b110ced8fb1edab
 SHA1 (patch-md) = 932c2b0237c9690da06533f0abfeabddf32d8f3e
-SHA1 (patch-me) = 60b8d372fc706bfa9e39b75ef99c201d213abfe6
-SHA1 (patch-mf) = bc693a247f306f414f54bf515eeb8f36841a46b8
+SHA1 (patch-me) = 775262c00ac16ea78a11ede5678e3d08f97c9640
+SHA1 (patch-mf) = 9aa245b2704df3b2009a8dee0e8217cbd20df9d0
 SHA1 (patch-mg) = f33a92539ebe171b7bbbd83a54ad9ac2fdca249a
+SHA1 (patch-mh) = 9f1b447ef0236ac10b88c8d6f6d62cde4acb4331
 SHA1 (patch-mi) = c49e917409c0542e69f57fe5571a16b6c2e4aa9a
 SHA1 (patch-mj) = 9b28802eb665a7a77e879ec44e9da52e2e79ec8b
 SHA1 (patch-mk) = 3c25934e0c7b9277d96a5635b961e1fb6682ab7b
 SHA1 (patch-ml) = ef7d87fff48f298f4c1ed037439eaf8c7c574f68
 SHA1 (patch-mm) = 04d9105ab0fb520690b58230e90bf6217b439df7
 SHA1 (patch-mn) = beb92ccc59f909f0d4f5f5bb62ad834b55fc94ce
-SHA1 (patch-mo) = 93590d077e305a369ce9548165e0f1d8edf040b2
 SHA1 (patch-mp) = 3da5e645d4e0c704ad8147c33f66bb13ec7c1bc6
-SHA1 (patch-na) = b7c0feed9546ca1168c696bf7ea6bbc8ea4564c4
 SHA1 (patch-nd) = 007b8d1310990253e86dab579397b02ced42cb71
-SHA1 (patch-pa) = ee713ec24b453aaf3f1964e8100b26ecae3bf6a4
-SHA1 (patch-pb) = fede79d8fec147b4f79edbdf571474365a6dba25
-SHA1 (patch-pc) = 5a74b0476c0be0bf4e0c22fbe78b6dbe63beae08
-SHA1 (patch-pd) = b2e18e7b09123576d07ae052b2f2599217d6f3ce
-SHA1 (patch-pe) = 218275a25df933ed548395f4338a5cb2f045d4a6
-SHA1 (patch-pf) = 88c39f735087fa285f3f75bfdaa6dc571da67eb9
-SHA1 (patch-pg) = 5268f7e7b22f89f55db44537c32bf5ac73630168
-SHA1 (patch-ra) = 70d5130250a4ac6825112e64006b233f4b802e9c
-SHA1 (patch-rc) = 7e6a38bd3eabe500bcf3c47be7f4bd5768f24c39
+SHA1 (patch-pa) = 6201d005501d1912bbac16c2856dc8d22b50f017
+SHA1 (patch-pb) = 8f38b72fc44a6fcf5b211592f8265dee0cb6303a
+SHA1 (patch-pc) = 154972a9a44a80380829a3dc3ecfdd2e1238d406
+SHA1 (patch-pd) = 1f12080244c75f42e4edbe623a15fd2ac6abd6d4
+SHA1 (patch-pe) = d9a5f9730e2498597449d47da134202fd6b91150
+SHA1 (patch-pg) = e022af26945893d2a61ec4ca3a414ccb6150a235
+SHA1 (patch-ra) = 4b26efb538e7c9f6fea0799cf31daaf3c69c2080
+SHA1 (patch-rc) = 959d6046a97a6ba9061da4019edc7b1a34b47cf6
 SHA1 (patch-xa) = 0acaf27d8687c7cb5a46fc3773097a3dea4c75d9
 SHA1 (patch-xb) = 07a90e393dbb38a98e8d9954387757d21d3e65cf
 SHA1 (patch-xc) = 98c8b4193dde73f28747c8ac870071f1debbe9f0
@@ -68,11 +74,11 @@ SHA1 (patch-xd) = 927a73f9ba1f516a10e83dbe5f00744acc6a88df
 SHA1 (patch-xe) = 945bce0dc7347392b992b9698597d8584557d51e
 SHA1 (patch-xf) = 34d671d4e615a694e3add3303eaae5e23c7df3ac
 SHA1 (patch-xg) = 4fdf27307cfb3bf3cb33440da75704b149fc2aaa
-SHA1 (patch-xh) = a5a2923069d5819e979a445d0ea35cde74699bd7
-SHA1 (patch-xi) = db8359452da08413ac6672010f2f05766571464c
 SHA1 (patch-xj) = 452d87313b29510fb02e804545c17193e2c822bf
 SHA1 (patch-xk) = b50b34041b75b1590f021592b1e26893ae458a01
 SHA1 (patch-xl) = 1425f9e5fd0dc49f3204730d1d88b9600d6475e4
 SHA1 (patch-xm) = 270e762936fe686cc55b820d52e15421b27c7c2c
+SHA1 (patch-xn) = edd741e4e71ecb44fc58750727aac473ff2e628e
+SHA1 (patch-xo) = 02c913b01bba8afd70ea28c0dd752ebf4b696e0c
 SHA1 (patch-zb) = a8f2ad6cc50302537d8fc5fe7d543da2b808cd28
 SHA1 (patch-zc) = 0b06b5c77ea4eb4a6b845eaeb4ec82a96d5cc4c3
diff --git a/mail/thunderbird/enigmail.mk b/mail/thunderbird/enigmail.mk
index 88efe0c9037..a5b38ddacf9 100644
--- a/mail/thunderbird/enigmail.mk
+++ b/mail/thunderbird/enigmail.mk
@@ -1,10 +1,10 @@
-# $NetBSD: enigmail.mk,v 1.1 2010/06/02 15:39:26 tnn Exp $
+# $NetBSD: enigmail.mk,v 1.2 2010/07/12 16:49:21 tnn Exp $
 #
 # This Makefile fragment hooks the Enigmail OpenPGP extension
 # (see http://www.mozilla-enigmail.org/ ) into the build.
 
-ENIGMAIL_DIST=		enigmail-1.0.1.tar.gz
-ENIGMAIL_UUID=		847b3a00-7ab1-11d4-8f02-006008948af5
+ENIGMAIL_DIST=		enigmail-1.1.2.tar.gz
+XPI_FILES+=		${WRKDIR}/enigmail.xpi
 .if !defined(DISTFILES)
 DISTFILES=		${DEFAULT_DISTFILES}
 .endif
@@ -13,7 +13,9 @@ SITES.${ENIGMAIL_DIST}=	http://www.mozilla-enigmail.org/download/source/
 
 DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
 PLIST_SRC+=		PLIST.enigmail
-USE_TOOLS+=		unzip pax
+
+TARGET_XPCOM_ABI=	${MACHINE_ARCH:S/i386/x86/}-gcc3
+PLIST_SUBST+=		TARGET_XPCOM_ABI=${TARGET_XPCOM_ABI}
 
 post-extract: enigmail-post-extract
 .PHONY: enigmail-post-extract
@@ -35,14 +37,7 @@ enigmail-post-build:
 	${RUN} cd ${WRKSRC}/mailnews/extensions/enigmail &&		\
 	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} &&			\
 	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
-	${RUN} ${MKDIR} "${WRKDIR}/{${ENIGMAIL_UUID}}"
-	${RUN} cd "${WRKDIR}/{${ENIGMAIL_UUID}}" &&			\
-	  ${UNZIP_CMD} -aqo ${WRKSRC}/mozilla/dist/bin/enigmail*.xpi
+	${CP} ${WRKSRC}/mozilla/dist/bin/enigmail*.xpi			\
+	  ${WRKDIR}/enigmail.xpi
 	${RUN} rm -rf ${WRKSRC}/mozilla/dist
 	${RUN} cd ${WRKSRC}/mozilla/dist.save && pax -rwpe . ../dist
-
-post-install: enigmail-post-install
-.PHONY: enigmail-post-install
-enigmail-post-install:
-	${RUN} cd ${WRKDIR} && pax -rw "{${ENIGMAIL_UUID}}"		\
-	  ${DESTDIR}${PREFIX}/lib/${MOZILLA}/extensions/.
diff --git a/mail/thunderbird/options.mk b/mail/thunderbird/options.mk
index f81a0d66ca7..943a89d20a2 100644
--- a/mail/thunderbird/options.mk
+++ b/mail/thunderbird/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/06/02 15:39:26 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2010/07/12 16:49:21 tnn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
 PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail
@@ -49,6 +49,9 @@ CONFIGURE_ARGS+=	--disable-jit
 .if !empty(PKG_OPTIONS:Mmozilla-lightning)
 CONFIGURE_ARGS+=	--enable-calendar
 PLIST_SRC+=		PLIST.lightning
+XPI_FILES+=		${WRKSRC}/mozilla/dist/xpi-stage/calendar-timezones.xpi
+XPI_FILES+=		${WRKSRC}/mozilla/dist/xpi-stage/gdata-provider.xpi
+XPI_FILES+=		${WRKSRC}/mozilla/dist/xpi-stage/lightning.xpi
 .else
 CONFIGURE_ARGS+=	--disable-calendar
 .endif
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index e3504e04dc8..c75513d0da3 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-aa,v 1.7 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/configure.in.orig	2009-10-16 17:13:35.000000000 +0200
 +++ mozilla/configure.in
diff --git a/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel
index d6557c3777b..6c1528675d0 100644
--- a/mail/thunderbird/patches/patch-aa-toplevel
+++ b/mail/thunderbird/patches/patch-aa-toplevel
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 03:06:43 tnn Exp $
+$NetBSD: patch-aa-toplevel,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- configure.in.orig	2009-10-25 15:29:01.000000000 +0100
+--- configure.in.orig	2010-06-23 17:43:07.000000000 +0000
 +++ configure.in
-@@ -1963,7 +1963,7 @@ case "$target" in
-     fi
+@@ -1938,7 +1938,7 @@ case "$target" in
+     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
 -*-freebsd*)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 03:06:43 tnn Exp $
      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
+@@ -1952,6 +1952,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 03:06:43 tnn Exp $
      ;; 
  
  *-hpux*)
-@@ -3173,6 +3176,9 @@ dnl ====================================
+@@ -3200,6 +3203,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 03:06:43 tnn Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4233,6 +4239,14 @@ else
+@@ -4350,6 +4356,14 @@ fi
     fi
  fi
  
@@ -46,7 +46,7 @@ $NetBSD: patch-aa-toplevel,v 1.1 2009/11/29 03:06:43 tnn Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -7513,7 +7527,8 @@ rm -f confdefs.h.save
+@@ -7526,7 +7540,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()
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index bdacd7bc415..16443f11efb 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.13 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ab,v 1.14 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2009-06-29 18:15:06.000000000 +0200
+--- mozilla/nsprpub/pr/include/md/_netbsd.h.orig	2010-03-15 14:56:04.000000000 +0000
 +++ mozilla/nsprpub/pr/include/md/_netbsd.h
+@@ -79,7 +79,7 @@
+ #define HAVE_DLL
+ #define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN
+-#define _PR_NO_LARGE_FILES
++#define _PR_HAVE_LARGE_OFF_T
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_POLL_AVAILABLE
+ #define _PR_USE_POLL
 @@ -94,6 +94,12 @@
  #define _PR_INET6_PROBE
  #endif
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index 7ca6c21c6e1..ec0dd9040e4 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.10 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ac,v 1.11 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/nsprpub/configure.in.orig	2009-06-29 18:15:05.000000000 +0200
 +++ mozilla/nsprpub/configure.in
diff --git a/mail/thunderbird/patches/patch-ad b/mail/thunderbird/patches/patch-ad
index d70dd958502..f073da7719c 100644
--- a/mail/thunderbird/patches/patch-ad
+++ b/mail/thunderbird/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ad,v 1.6 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/xpcom/io/nsLocalFileUnix.h.orig	2009-06-29 18:15:32.000000000 +0200
 +++ mozilla/xpcom/io/nsLocalFileUnix.h
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
index 64f69b82d76..fd5492035b3 100644
--- a/mail/thunderbird/patches/patch-ae
+++ b/mail/thunderbird/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.5 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ae,v 1.6 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig	2009-06-29 18:15:07.000000000 +0200
 +++ mozilla/nsprpub/pr/src/misc/prnetdb.c
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
index 498248b890a..253f2ac20aa 100644
--- a/mail/thunderbird/patches/patch-af
+++ b/mail/thunderbird/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-af,v 1.8 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/config/mkdepend/imakemdep.h.orig	2009-06-29 18:14:41.000000000 +0200
 +++ mozilla/config/mkdepend/imakemdep.h
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
index 329b05efbb2..ebf812798b7 100644
--- a/mail/thunderbird/patches/patch-ag
+++ b/mail/thunderbird/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.6 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ag,v 1.7 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2009-06-29 18:15:06.000000000 +0200
 +++ mozilla/nsprpub/pr/include/md/_freebsd.h
diff --git a/mail/thunderbird/patches/patch-ah b/mail/thunderbird/patches/patch-ah
index 71acbfe611c..a9831df56c2 100644
--- a/mail/thunderbird/patches/patch-ah
+++ b/mail/thunderbird/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ah,v 1.5 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	2009-06-29 18:15:33.000000000 +0200
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
index 927b2e2e1c5..a04e15959c8 100644
--- a/mail/thunderbird/patches/patch-ai
+++ b/mail/thunderbird/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.6 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ai,v 1.7 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/dbm/src/mktemp.c.orig	2009-06-29 18:14:43.000000000 +0200
 +++ mozilla/dbm/src/mktemp.c
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
index 54d39bf792c..85f6fb58a35 100644
--- a/mail/thunderbird/patches/patch-aj
+++ b/mail/thunderbird/patches/patch-aj
@@ -1,16 +1,16 @@
-$NetBSD: patch-aj,v 1.5 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-aj,v 1.6 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2009-06-29 18:15:11.000000000 +0200
+--- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2010-04-13 22:22:54.000000000 +0000
 +++ mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
-@@ -391,6 +391,7 @@ nsresult nsProfileLock::LockWithSymlink(
-                     act.sa_flags = 0;
+@@ -396,6 +396,7 @@ nsresult nsProfileLock::LockWithSymlink(
+                     act.sa_flags = SA_SIGINFO;
                      sigfillset(&act.sa_mask);
  
 +#ifndef DEBUG
  #define CATCH_SIGNAL(signame)                                           \
  PR_BEGIN_MACRO                                                          \
    if (sigaction(signame, NULL, &oldact) == 0 &&                         \
-@@ -409,6 +410,7 @@ PR_BEGIN_MACRO                          
+@@ -414,6 +415,7 @@ PR_BEGIN_MACRO                          
                      CATCH_SIGNAL(SIGTERM);
  
  #undef CATCH_SIGNAL
diff --git a/mail/thunderbird/patches/patch-ak b/mail/thunderbird/patches/patch-ak
index 11657ca57a1..a03595771d4 100644
--- a/mail/thunderbird/patches/patch-ak
+++ b/mail/thunderbird/patches/patch-ak
@@ -1,19 +1,23 @@
-$NetBSD: patch-ak,v 1.4 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ak,v 1.5 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp.orig	2009-06-29 18:15:22.000000000 +0200
-+++ mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp
-@@ -148,9 +148,12 @@ AddToHistoryCB(const nsCSubstring &aRowI
-     }
+--- mozilla/js/ctypes/libffi/configure.orig	2010-03-16 05:55:17.000000000 -0400
++++ mozilla/js/ctypes/libffi/configure	2010-03-31 04:08:48.000000000 -0400
+@@ -21020,6 +21020,9 @@ case "$host" in
+   mips*-*-linux*)
+ 	TARGET=MIPS; TARGETDIR=mips
+ 	;;
++  mips*-*-netbsd*)
++	TARGET=MIPS; TARGETDIR=mips
++	;;
  
-     PRTime date;
--    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &date) != 1) {
-+    long long ld;
-+    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &ld) != 1) {
-       date = -1;
--    }
-+    } else {
-+      date = ld;
-+   }
- 
-     PRBool isTyped = values[kTypedColumn].EqualsLiteral("1");
-     PRInt32 transition = isTyped ?
+   powerpc*-*-linux* | powerpc-*-sysv*)
+ 	TARGET=POWERPC; TARGETDIR=powerpc
+@@ -21033,7 +21036,7 @@ case "$host" in
+   powerpc-*-aix* | rs6000-*-aix*)
+ 	TARGET=POWERPC_AIX; TARGETDIR=powerpc
+ 	;;
+-  powerpc-*-freebsd*)
++  powerpc-*-freebsd* | powerpc-*-netbsd*)
+ 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+ 	;;
+   powerpc*-*-rtems*)
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
index 789e386bcd6..bf0143e23e5 100644
--- a/mail/thunderbird/patches/patch-al
+++ b/mail/thunderbird/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.5 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-al,v 1.6 2010/07/12 16:49:22 tnn Exp $
 
 # Reported upstream as https://bugzilla.mozilla.org/show_bug.cgi?id=471179
 
diff --git a/mail/thunderbird/patches/patch-am b/mail/thunderbird/patches/patch-am
index 217cda21905..ba9c79e9cb2 100644
--- a/mail/thunderbird/patches/patch-am
+++ b/mail/thunderbird/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-am,v 1.4 2010/07/12 16:49:22 tnn Exp $
 
 SHA1_Update conflicts with openssl which may be dynamically loaded
 at runtime via libcups or libgssapi so causing a crash due to using
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
index 7489b4b6c98..d31903fff62 100644
--- a/mail/thunderbird/patches/patch-an
+++ b/mail/thunderbird/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.4 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-an,v 1.5 2010/07/12 16:49:22 tnn Exp $
 
 SHA1_Update conflicts with openssl which may be dynamically loaded
 at runtime via libcups or libgssapi so causing a crash due to using
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
index d942824fa9d..7960e4d4ce8 100644
--- a/mail/thunderbird/patches/patch-ao
+++ b/mail/thunderbird/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.4 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ao,v 1.5 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2009-06-29 18:15:27.000000000 +0200
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig	2009-10-29 23:11:21.000000000 +0100
 +++ mozilla/toolkit/mozapps/installer/packager.mk
-@@ -449,8 +449,8 @@ endif
+@@ -441,8 +441,8 @@ endif
  	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
  	  (cd $(DESTDIR)$(installdir) && tar -xf -)
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
@@ -11,14 +11,5 @@ $NetBSD: patch-ao,v 1.4 2010/03/16 10:59:09 tnn Exp $
 +	$(RM) -f $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME)
 +	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME)
  ifdef INSTALL_SDK # Here comes the hard part
- # include directory is stable (dist/sdk/include) and unstable (dist/include)
- 	$(NSINSTALL) -D $(DESTDIR)$(includedir)/stable
-@@ -458,7 +458,7 @@ ifdef INSTALL_SDK # Here comes the hard 
- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+	find $(DIST)/include -type f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
+ 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap
index cddeea77fa8..e65df785b61 100644
--- a/mail/thunderbird/patches/patch-ap
+++ b/mail/thunderbird/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.7 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ap,v 1.8 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-08-24 17:52:50.000000000 +0200
 +++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h
diff --git a/mail/thunderbird/patches/patch-aq b/mail/thunderbird/patches/patch-aq
index 974310ae543..cfe951c0550 100644
--- a/mail/thunderbird/patches/patch-aq
+++ b/mail/thunderbird/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.5 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-aq,v 1.6 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/media/liboggplay/src/liboggplay/std_semaphore.h.orig	2009-10-16 17:14:09.000000000 +0200
 +++ mozilla/media/liboggplay/src/liboggplay/std_semaphore.h
diff --git a/mail/thunderbird/patches/patch-ar b/mail/thunderbird/patches/patch-ar
index 2867b87e903..c2365ad1a51 100644
--- a/mail/thunderbird/patches/patch-ar
+++ b/mail/thunderbird/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.3 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ar,v 1.4 2010/07/12 16:49:22 tnn Exp $
 
 Enable the sunaudio module to build on NetBSD.
 
diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-as
index ac3a6e8af8e..6498b0f8bc4 100644
--- a/mail/thunderbird/patches/patch-as
+++ b/mail/thunderbird/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.5 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-as,v 1.6 2010/07/12 16:49:22 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 
diff --git a/mail/thunderbird/patches/patch-at b/mail/thunderbird/patches/patch-at
index e0b2738bd2d..45c5f9778f4 100644
--- a/mail/thunderbird/patches/patch-at
+++ b/mail/thunderbird/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.3 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-at,v 1.4 2010/07/12 16:49:22 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 Avoid silly redefinitions of standard types on NetBSD.
diff --git a/mail/thunderbird/patches/patch-au b/mail/thunderbird/patches/patch-au
index 27ccf5372fc..25fbe8e3e74 100644
--- a/mail/thunderbird/patches/patch-au
+++ b/mail/thunderbird/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-au,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 SOUND_VERSION just isn't a reliable way to detect features supported by
 particular OSS implementation.
diff --git a/mail/thunderbird/patches/patch-av b/mail/thunderbird/patches/patch-av
index 4223a5f3ce3..23aa00b9daf 100644
--- a/mail/thunderbird/patches/patch-av
+++ b/mail/thunderbird/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-av,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2008-03-22 05:25:35.000000000 +0100
 +++ mozilla/xulrunner/app/nsXULRunnerApp.cpp
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
index 1303a783e02..13219d28804 100644
--- a/mail/thunderbird/patches/patch-aw
+++ b/mail/thunderbird/patches/patch-aw
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.6 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-aw,v 1.7 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/xulrunner/stub/nsXULStub.cpp.orig	2009-08-24 17:53:30.000000000 +0200
 +++ mozilla/xulrunner/stub/nsXULStub.cpp
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
index 4598eb8277e..ae448dcdf2a 100644
--- a/mail/thunderbird/patches/patch-ax
+++ b/mail/thunderbird/patches/patch-ax
@@ -1,4 +1,4 @@
-$NetBSD: patch-ax,v 1.6 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ax,v 1.7 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/xpcom/base/nsStackWalk.cpp.orig	2009-08-24 17:53:27.000000000 +0200
 +++ mozilla/xpcom/base/nsStackWalk.cpp
diff --git a/mail/thunderbird/patches/patch-ay b/mail/thunderbird/patches/patch-ay
index e2cd21d7763..cb583aa8f5d 100644
--- a/mail/thunderbird/patches/patch-ay
+++ b/mail/thunderbird/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ay,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/browser/app/nsBrowserApp.cpp.orig	2009-06-29 18:14:40.000000000 +0200
 +++ mozilla/browser/app/nsBrowserApp.cpp
diff --git a/mail/thunderbird/patches/patch-az b/mail/thunderbird/patches/patch-az
index ab8d7eda2dc..f2ba81f787a 100644
--- a/mail/thunderbird/patches/patch-az
+++ b/mail/thunderbird/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-az,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig	2009-11-02 22:43:08.000000000 +0100
 +++ mozilla/nsprpub/pr/src/pthreads/ptthread.c
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index 64d103f1401..7063ab727e1 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.8 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ba,v 1.9 2010/07/12 16:49:22 tnn Exp $
 
 pthread_t may be 64-bit, avoid casting it.
 
diff --git a/mail/thunderbird/patches/patch-bb b/mail/thunderbird/patches/patch-bb
index df6a24b5cc5..c9e715ad465 100644
--- a/mail/thunderbird/patches/patch-bb
+++ b/mail/thunderbird/patches/patch-bb
@@ -1,19 +1,35 @@
-$NetBSD: patch-bb,v 1.6 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-bb,v 1.7 2010/07/12 16:49:22 tnn Exp $
 
-Fix build using Sun Studio C++.
+# make sure the inline assembler code works on the same word size as
+# the C/C++ code on sparc64 when compiling for 64bit
+# https://bugzilla.mozilla.org/show_bug.cgi?id=550271
 
---- mozilla/memory/jemalloc/jemalloc.h.orig	2009-12-02 04:29:06.000000000 +0000
-+++ mozilla/memory/jemalloc/jemalloc.h	2010-01-09 23:24:34.000000000 +0000
-@@ -1,3 +1,4 @@
-+#ifndef  __cplusplus
- #ifndef MOZ_MEMORY_WINDOWS
- #  include <stdbool.h>
- #else
-@@ -6,6 +7,7 @@
- #    define bool BOOL
- #  endif
- #endif
-+#endif
+--- mozilla/js/src/jslock.cpp.orig	2010-02-27 02:32:31.000000000 +0000
++++ mozilla/js/src/jslock.cpp
+@@ -159,6 +159,7 @@ NativeCompareAndSwap(jsword *w, jsword o
+ {
+     unsigned int res;
  
- extern const char	*_malloc_options;
++#if JS_BITS_PER_WORD == 32
+     __asm__ __volatile__ (
+                   "stbar\n"
+                   "cas [%1],%2,%3\n"
+@@ -169,6 +170,18 @@ NativeCompareAndSwap(jsword *w, jsword o
+                   "1:"
+                   : "=r" (res)
+                   : "r" (w), "r" (ov), "r" (nv));
++#else
++    __asm__ __volatile__ (
++                  "stbar\n"
++                  "casx [%1],%2,%3\n"
++                  "cmp %2,%3\n"
++                  "be,a 1f\n"
++                  "mov 1,%0\n"
++                  "mov 0,%0\n"
++                  "1:"
++                  : "=r" (res)
++                  : "r" (w), "r" (ov), "r" (nv));
++#endif
+     return (int)res;
+ }
  
diff --git a/mail/thunderbird/patches/patch-bc b/mail/thunderbird/patches/patch-bc
new file mode 100644
index 00000000000..51fb373c8c3
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bc
@@ -0,0 +1,20 @@
+$NetBSD: patch-bc,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+# ensure at least pointer compatible alignement of memory arena for
+# RuleProcessorData::operator new
+# Reported upstream as https://bugzilla.mozilla.org/show_bug.cgi?id=550842
+
+--- mozilla/content/base/src/nsGenericElement.cpp.orig	2010-02-27 02:32:31.000000000 +0000
++++ mozilla/content/base/src/nsGenericElement.cpp
+@@ -5132,9 +5132,9 @@ TryMatchingElementsInSubtree(nsINode* aR
+    * cheaper than heap-allocating all the datas and keeping track of them all,
+    * and helps a good bit in the common cases.  We also keep track of the whole
+    * parent data chain, since we have those Around anyway */
+-  char databuf[2 * sizeof(RuleProcessorData)];
++  union { char c[2 * sizeof(RuleProcessorData)]; void *p; } databuf;
+   RuleProcessorData* prevSibling = nsnull;
+-  RuleProcessorData* data = reinterpret_cast<RuleProcessorData*>(databuf);
++  RuleProcessorData* data = reinterpret_cast<RuleProcessorData*>(&databuf);
+ 
+   PRBool continueIteration = PR_TRUE;
+   for (nsINode::ChildIterator iter(aRoot); !iter.IsDone(); iter.Next()) {
diff --git a/mail/thunderbird/patches/patch-be b/mail/thunderbird/patches/patch-be
new file mode 100644
index 00000000000..2a066e56557
--- /dev/null
+++ b/mail/thunderbird/patches/patch-be
@@ -0,0 +1,16 @@
+$NetBSD: patch-be,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+Disable all sound support for now since it causes
+crashes and doesn't work correctly anyway ...
+
+--- mozilla/widget/src/gtk2/nsSound.cpp.orig	2010-03-15 14:56:04.000000000 +0000
++++ mozilla/widget/src/gtk2/nsSound.cpp
+@@ -149,6 +149,8 @@ nsSound::Init()
+ 
+     mInited = PR_TRUE;
+ 
++    return NS_OK;
++
+     if (!elib) {
+         elib = PR_LoadLibrary("libesd.so.0");
+         if (elib) {
diff --git a/mail/thunderbird/patches/patch-bf b/mail/thunderbird/patches/patch-bf
new file mode 100644
index 00000000000..faeef997073
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bf
@@ -0,0 +1,42 @@
+$NetBSD: patch-bf,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+--- mozilla/js/ctypes/libffi/src/mips/ffitarget.h.orig	2010-03-31 04:09:31.000000000 -0400
++++ mozilla/js/ctypes/libffi/src/mips/ffitarget.h	2010-03-31 04:12:52.000000000 -0400
+@@ -29,15 +29,28 @@
+ 
+ #ifdef linux
+ #include <asm/sgidefs.h>
+-#  ifndef _ABIN32
+-#    define _ABIN32 _MIPS_SIM_NABI32
+-#  endif
+-#  ifndef _ABI64
+-#    define _ABI64 _MIPS_SIM_ABI64
+-#  endif
+-#  ifndef _ABIO32
+-#    define _ABIO32 _MIPS_SIM_ABI32
+-#  endif
++#elif defined(irix)
++#include <sgidefs.h>
++#else
++#include <sys/cdefs.h>
++#endif
++
++#ifndef _ABIN32
++# define _ABIN32 _MIPS_SIM_NABI32
++#endif
++#ifndef _ABI64
++# define _ABI64 _MIPS_SIM_ABI64
++#endif
++#ifndef _ABIO32
++# define _ABIO32 _MIPS_SIM_ABI32
++#endif
++
++#ifndef _MIPS_SIM
++# ifdef _MIPS_BSD_API
++#  define _MIPS_SIM _MIPS_BSD_API
++# else
++#  define _MIPS_SIM _ABIO32
++# endif
+ #endif
+ 
+ #if !defined(_MIPS_SIM)
diff --git a/mail/thunderbird/patches/patch-bg b/mail/thunderbird/patches/patch-bg
new file mode 100644
index 00000000000..dc872bbb1cc
--- /dev/null
+++ b/mail/thunderbird/patches/patch-bg
@@ -0,0 +1,58 @@
+$NetBSD: patch-bg,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+--- mozilla/js/ctypes/libffi/src/mips/ffi.c.orig	2010-03-31 08:23:20.000000000 -0400
++++ mozilla/js/ctypes/libffi/src/mips/ffi.c	2010-03-31 08:25:28.000000000 -0400
+@@ -32,12 +32,19 @@
+ 
+ #ifdef __GNUC__
+ #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
+-#    define USE__BUILTIN___CLEAR_CACHE 1
++#    if !defined(__NetBSD__)
++#      define USE__BUILTIN___CLEAR_CACHE 1
++#    endif
+ #  endif
+ #endif
+ 
+ #ifndef USE__BUILTIN___CLEAR_CACHE
+-#include <sys/cachectl.h>
++#  if !defined(__NetBSD__)
++#    include <sys/cachectl.h>
++#  else
++#    include <mips/cachectl.h>
++#    define cacheflush _cacheflush
++#  endif
+ #endif
+ 
+ #ifdef FFI_DEBUG
+@@ -419,6 +426,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif 
+               ((cif->arg_types)[index]->type << (arg_reg * FFI_FLAG_BITS));
+ 	    arg_reg++;
+ 	    break;
++#ifdef __mips64
+           case FFI_TYPE_LONGDOUBLE:
+             /* Align it.  */
+             arg_reg = ALIGN(arg_reg, 2);
+@@ -430,6 +438,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif 
+               (FFI_TYPE_DOUBLE << (arg_reg * FFI_FLAG_BITS));
+             arg_reg++;
+             break;
++#endif
+ 
+ 	  case FFI_TYPE_STRUCT:
+             loc = arg_reg * FFI_SIZEOF_ARG;
+@@ -474,6 +483,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif 
+       case FFI_TYPE_DOUBLE:
+ 	cif->flags += cif->rtype->type << (FFI_FLAG_BITS * 8);
+ 	break;
++#ifdef __mips64
+       case FFI_TYPE_LONGDOUBLE:
+ 	/* Long double is returned as if it were a struct containing
+ 	   two doubles.  */
+@@ -481,6 +491,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif 
+ 	cif->flags += (FFI_TYPE_DOUBLE + (FFI_TYPE_DOUBLE << FFI_FLAG_BITS))
+ 		      << (4 + (FFI_FLAG_BITS * 8));
+ 	break;
++#endif
+       default:
+ 	cif->flags += FFI_TYPE_INT << (FFI_FLAG_BITS * 8);
+ 	break;
diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_configure.in b/mail/thunderbird/patches/patch-directory_c-sdk_configure.in
new file mode 100644
index 00000000000..8e7645c3f5d
--- /dev/null
+++ b/mail/thunderbird/patches/patch-directory_c-sdk_configure.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-directory_c-sdk_configure.in,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+Add DragonFly support.
+https://bugzilla.mozilla.org/show_bug.cgi?id=577298
+
+--- directory/c-sdk/configure.in.orig	2009-10-06 21:43:08.000000000 +0000
++++ directory/c-sdk/configure.in
+@@ -1233,6 +1233,16 @@ tools are selected during the Xcode/Deve
+     _DEBUG_FLAGS=
+     ;;
+ 
++*-dragonfly*)
++    if test -z "$USE_NSPR_THREADS"; then
++        USE_PTHREADS=1
++    fi
++    AC_DEFINE(XP_UNIX)
++    AC_DEFINE(DRAGONFLY)
++    DSO_CFLAGS=-fPIC
++    DSO_LDOPTS='-shared'
++	;;
++
+ *-freebsd*)
+     if test -z "$USE_NSPR_THREADS"; then
+         USE_PTHREADS=1
diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
new file mode 100644
index 00000000000..69c1ac7515d
--- /dev/null
+++ b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+Add DragonFly support.
+https://bugzilla.mozilla.org/show_bug.cgi?id=577298
+
+--- directory/c-sdk/ldap/include/portable.h.orig	2006-10-03 20:43:40.000000000 +0000
++++ directory/c-sdk/ldap/include/portable.h
+@@ -295,7 +295,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
+ #elif defined(HPUX10)
+ #define GETHOSTBYNAME_BUF_T struct hostent_data
+ #define GETHOSTBYNAME( n, r, b, l, e )	nsldapi_compat_gethostbyname_r( n, r, (char *)&b, l, e )
+-#elif defined(LINUX)
++#elif defined(LINUX) || defined(DRAGONFLY)
+ typedef char GETHOSTBYNAME_buf_t [NSLDAPI_NETDB_BUF_SIZE];
+ #define GETHOSTBYNAME_BUF_T GETHOSTBYNAME_buf_t
+ #define GETHOSTBYNAME( n, r, b, l, rp, e )  gethostbyname_r( n, r, b, l, rp, e )
+@@ -317,7 +317,7 @@ typedef char GETHOSTBYNAME_buf_t [NSLDAP
+ 	|| defined(OSF1V4) || defined(AIX) || defined(UnixWare) \
+         || defined(hpux) || defined(HPUX11) || defined(NETBSD) \
+         || defined(IRIX6) || defined(FREEBSD) || defined(VMS) \
+-        || defined(NTO) || defined(OPENBSD)
++        || defined(NTO) || defined(OPENBSD) || defined(DRAGONFLY)
+ #define NSLDAPI_CTIME( c, b, l )        ctime_r( c, b )
+ #elif defined( OSF1V3 )
+ #define NSLDAPI_CTIME( c, b, l )	(ctime_r( c, b, l ) ? NULL : b)
diff --git a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in
new file mode 100644
index 00000000000..a8291cbad1b
--- /dev/null
+++ b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-directory_c-sdk_ldap_libraries_libldap_Makefile.in,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+Add DragonFly support.
+https://bugzilla.mozilla.org/show_bug.cgi?id=577298
+
+--- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2008-12-24 09:39:55.000000000 +0000
++++ directory/c-sdk/ldap/libraries/libldap/Makefile.in
+@@ -262,6 +262,10 @@ ifeq ($(OS_ARCH), OpenBSD)
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
+ endif
+ 
++ifeq ($(OS_ARCH), DragonFly)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
++endif
++
+ ifeq ($(HAVE_SASL), 1)
+ EXTRA_LIBS += $(SASL_LINK)
+ endif
diff --git a/mail/thunderbird/patches/patch-ma b/mail/thunderbird/patches/patch-ma
index 2cf19d24d49..69847e131b3 100644
--- a/mail/thunderbird/patches/patch-ma
+++ b/mail/thunderbird/patches/patch-ma
@@ -1,4 +1,4 @@
-$NetBSD: patch-ma,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ma,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/config/autoconf.mk.in.orig	2009-06-29 18:14:41.000000000 +0200
 +++ mozilla/config/autoconf.mk.in
diff --git a/mail/thunderbird/patches/patch-mb b/mail/thunderbird/patches/patch-mb
index f10d2d5888f..38fb6256386 100644
--- a/mail/thunderbird/patches/patch-mb
+++ b/mail/thunderbird/patches/patch-mb
@@ -1,32 +1,45 @@
-$NetBSD: patch-mb,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mb,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-06-29 18:15:32.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -64,14 +64,21 @@ include $(topsrcdir)/config/config.mk
- #
- # Lots of Unixish x86 flavors
- #
--ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD NetBSD OpenBSD BSD_OS Darwin,$(OS_ARCH)))
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+else
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2010-03-16 05:57:24.000000000 -0400
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2010-03-31 05:09:52.000000000 -0400
+@@ -76,7 +76,7 @@ endif
+ endif
+ endif
+ 
+-ifneq (,$(filter FreeBSD NetBSD OpenBSD BSD_OS,$(OS_ARCH)))
++ifneq (,$(filter BSD_OS,$(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
- ifeq (Darwin,$(OS_ARCH))
- DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
  endif
+@@ -85,7 +85,7 @@ endif
+ # New code for Linux, et. al., with gcc
+ # Migrate other platforms here after testing
+ #
+-ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
++ifneq (,$(filter Linux NetBSD DragonFly FreeBSD OpenBSD GNU_%,$(OS_ARCH)))
+ # Linux/x86-64
+ ifeq (x86_64,$(OS_TEST))
+ CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
+@@ -103,18 +103,6 @@ ASFILES		:= xptcstubs_asm_ipf64.s xptcin
  endif
+ endif
+ #
+-# OpenBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64)
+-CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+-endif
+-#
+-# FreeBSD/amd64
+-#
+-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
+-CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
 -endif
+-#
+ # BeOS/Intel (uses the same unixish_x86 code)
  #
- # New code for Linux, et. al., with gcc
- # Migrate other platforms here after testing
-@@ -185,7 +192,7 @@ endif
+ ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
+@@ -200,7 +188,7 @@ endif
  # NetBSD/ARM
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -35,7 +48,7 @@ $NetBSD: patch-mb,v 1.1 2010/03/16 10:59:09 tnn Exp $
  CPPSRCS		:= xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
  endif
  endif
-@@ -240,7 +247,7 @@ endif
+@@ -255,7 +243,7 @@ endif
  # NetBSD/m68k
  #
  ifeq ($(OS_ARCH),NetBSD)
@@ -44,7 +57,22 @@ $NetBSD: patch-mb,v 1.1 2010/03/16 10:59:09 tnn Exp $
  CPPSRCS		:= xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
  endif
  endif
-@@ -325,9 +332,10 @@ endif
+@@ -295,6 +283,14 @@ ASFLAGS		+= -I$(DIST)/include -x assembl
+ endif
+ endif
+ 
++ifeq ($(OS_ARCH),NetBSD)
++ifneq (,$(findstring mips, $(OS_TEST)))
++CPPSRCS		:= xptcinvoke_mips.cpp xptcstubs_mips.cpp
++ASFILES		:= xptcinvoke_asm_mips.s xptcstubs_asm_mips.s
++ASFLAGS		+= -I$(DIST)/include -x assembler-with-cpp
++endif
++endif
++
+ ######################################################################
+ # PowerPC
+ ######################################################################
+@@ -340,9 +336,10 @@ endif
  #
  # NetBSD/PPC
  #
@@ -56,7 +84,7 @@ $NetBSD: patch-mb,v 1.1 2010/03/16 10:59:09 tnn Exp $
  endif
  
  #
-@@ -399,6 +407,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
+@@ -414,6 +411,13 @@ CPPSRCS		:= xptcinvoke_sparc64_openbsd.c
  ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
  endif
  #
diff --git a/mail/thunderbird/patches/patch-mc b/mail/thunderbird/patches/patch-mc
new file mode 100644
index 00000000000..f614f37ce51
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mc
@@ -0,0 +1,15 @@
+$NetBSD: patch-mc,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+Avoid extra file appearing in PLIST on Linux.
+
+--- mozilla/security/nss/lib/freebl/manifest.mn.orig	2010-04-13 22:22:54.000000000 +0000
++++ mozilla/security/nss/lib/freebl/manifest.mn
+@@ -72,7 +72,7 @@ endif
+ 
+ ifdef FREEBL_NO_DEPEND
+ LOWHASH_SRCS = stubs.c nsslowhash.c
+-LOWHASH_EXPORTS = nsslowhash.h
++#LOWHASH_EXPORTS = nsslowhash.h
+ MAPFILE_SOURCE = freebl_hash.def
+ else
+ MAPFILE_SOURCE = freebl.def
diff --git a/mail/thunderbird/patches/patch-md b/mail/thunderbird/patches/patch-md
index e1b38917294..b421b62a350 100644
--- a/mail/thunderbird/patches/patch-md
+++ b/mail/thunderbird/patches/patch-md
@@ -1,4 +1,4 @@
-$NetBSD: patch-md,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-md,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 ???. from www/firefox/patch-ax.
 
diff --git a/mail/thunderbird/patches/patch-me b/mail/thunderbird/patches/patch-me
index 3b51a2de6e3..15b4833e10f 100644
--- a/mail/thunderbird/patches/patch-me
+++ b/mail/thunderbird/patches/patch-me
@@ -1,9 +1,9 @@
-$NetBSD: patch-me,v 1.2 2010/04/26 12:38:00 tnn Exp $
+$NetBSD: patch-me,v 1.3 2010/07/12 16:49:22 tnn Exp $
 
 Add DragonFly support.
 Disable assembly routines in freebl on Linux (PR pkg/43146)
 
---- mozilla/security/nss/lib/freebl/Makefile.orig	2010-03-17 17:06:12.000000000 +0000
+--- mozilla/security/nss/lib/freebl/Makefile.orig	2010-04-13 22:22:54.000000000 +0000
 +++ mozilla/security/nss/lib/freebl/Makefile
 @@ -154,7 +154,9 @@ ifeq ($(USE_N32),1)
  endif
diff --git a/mail/thunderbird/patches/patch-mf b/mail/thunderbird/patches/patch-mf
index bcd234439df..1d15a807343 100644
--- a/mail/thunderbird/patches/patch-mf
+++ b/mail/thunderbird/patches/patch-mf
@@ -1,9 +1,9 @@
-$NetBSD: patch-mf,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mf,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Add DragonFly support.
 Make sure nss libraries have a run path defined.
 
---- mozilla/security/coreconf/config.mk.orig	2009-10-16 17:14:17.000000000 +0200
+--- mozilla/security/coreconf/config.mk.orig	2010-03-15 14:56:04.000000000 +0000
 +++ mozilla/security/coreconf/config.mk
 @@ -63,7 +63,7 @@ endif
  #######################################################################
@@ -14,7 +14,7 @@ Make sure nss libraries have a run path defined.
  
  ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-@@ -212,3 +212,4 @@ endif
+@@ -207,3 +207,4 @@ endif
  DEFINES += -DUSE_UTIL_DIRECTLY
  USE_UTIL_DIRECTLY = 1
  
diff --git a/mail/thunderbird/patches/patch-mg b/mail/thunderbird/patches/patch-mg
index 172ceb8cd73..a45dc1d4d66 100644
--- a/mail/thunderbird/patches/patch-mg
+++ b/mail/thunderbird/patches/patch-mg
@@ -1,4 +1,4 @@
-$NetBSD: patch-mg,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mg,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Add DragonFly support.
 
diff --git a/mail/thunderbird/patches/patch-mh b/mail/thunderbird/patches/patch-mh
new file mode 100644
index 00000000000..40a371b7fbb
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mh
@@ -0,0 +1,13 @@
+$NetBSD: patch-mh,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+--- mozilla/security/nss/lib/Makefile.orig	2010-04-13 22:22:54.000000000 +0000
++++ mozilla/security/nss/lib/Makefile
+@@ -70,7 +70,7 @@ endif
+ 
+ ifndef MOZILLA_CLIENT
+ ifeq ($(OS_ARCH),Linux)
+-SYSINIT_SRCDIR = sysinit  # Add the sysinit directory to DIRS.
++#SYSINIT_SRCDIR = sysinit  # Add the sysinit directory to DIRS.
+ endif
+ endif
+ 
diff --git a/mail/thunderbird/patches/patch-mi b/mail/thunderbird/patches/patch-mi
index e556827414e..794e6c384f8 100644
--- a/mail/thunderbird/patches/patch-mi
+++ b/mail/thunderbird/patches/patch-mi
@@ -1,4 +1,4 @@
-$NetBSD: patch-mi,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mi,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Add DragonFly support.
 
diff --git a/mail/thunderbird/patches/patch-mj b/mail/thunderbird/patches/patch-mj
index ba574e4f000..ea86c0506d4 100644
--- a/mail/thunderbird/patches/patch-mj
+++ b/mail/thunderbird/patches/patch-mj
@@ -1,4 +1,4 @@
-$NetBSD: patch-mj,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mj,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Add DragonFly support.
 
diff --git a/mail/thunderbird/patches/patch-mk b/mail/thunderbird/patches/patch-mk
index fc098b68025..333cc5296b9 100644
--- a/mail/thunderbird/patches/patch-mk
+++ b/mail/thunderbird/patches/patch-mk
@@ -1,4 +1,4 @@
-$NetBSD: patch-mk,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mk,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 
diff --git a/mail/thunderbird/patches/patch-ml b/mail/thunderbird/patches/patch-ml
index e5278830f35..61dfdf66a59 100644
--- a/mail/thunderbird/patches/patch-ml
+++ b/mail/thunderbird/patches/patch-ml
@@ -1,4 +1,4 @@
-$NetBSD: patch-ml,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ml,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Treat DragonFly like FreeBSD.
 
diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm
index fb9fa1becfe..f13254d83d3 100644
--- a/mail/thunderbird/patches/patch-mm
+++ b/mail/thunderbird/patches/patch-mm
@@ -1,4 +1,4 @@
-$NetBSD: patch-mm,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mm,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman.
 part of PR pkg/39085
diff --git a/mail/thunderbird/patches/patch-mn b/mail/thunderbird/patches/patch-mn
index e5036c39ac9..d14b610d4ab 100644
--- a/mail/thunderbird/patches/patch-mn
+++ b/mail/thunderbird/patches/patch-mn
@@ -1,4 +1,4 @@
-$NetBSD: patch-mn,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mn,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 Make sure we link correctly with sqlite3 from pkgsrc.
 
diff --git a/mail/thunderbird/patches/patch-mo b/mail/thunderbird/patches/patch-mo
deleted file mode 100644
index a804a3673f7..00000000000
--- a/mail/thunderbird/patches/patch-mo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-mo,v 1.1 2010/05/19 09:21:43 tnn Exp $
-
---- calendar/providers/gdata/Makefile.in.orig	2010-03-17 17:02:26.000000000 +0000
-+++ calendar/providers/gdata/Makefile.in
-@@ -67,6 +67,11 @@ DEFINES += -DAB_CD=$(AB_CD) \
- PREF_JS_EXPORTS = $(srcdir)/defaults/preferences.js
- DIRS = components locales public
- 
-+ifndef DISABLE_LIGHTNING_INSTALL
-+# install as a global extension in dist/bin/extensions/
-+INSTALL_EXTENSION_ID = {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
-+endif
-+
- libs-%:
- 	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=$(XPI_NAME) USE_EXTENSION_MANIFEST=1
- 
diff --git a/mail/thunderbird/patches/patch-mp b/mail/thunderbird/patches/patch-mp
index 0bc741babfc..78193c22f8f 100644
--- a/mail/thunderbird/patches/patch-mp
+++ b/mail/thunderbird/patches/patch-mp
@@ -1,4 +1,4 @@
-$NetBSD: patch-mp,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-mp,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 --- mozilla/media/libsydneyaudio/src/Makefile.in.orig	2009-12-02 05:28:49.000000000 +0100
 +++ mozilla/media/libsydneyaudio/src/Makefile.in
diff --git a/mail/thunderbird/patches/patch-na b/mail/thunderbird/patches/patch-na
deleted file mode 100644
index 4b24e5e851b..00000000000
--- a/mail/thunderbird/patches/patch-na
+++ /dev/null
@@ -1,122 +0,0 @@
-$NetBSD: patch-na,v 1.1 2010/03/16 10:59:09 tnn Exp $
-
-# reported upstream as:
-#   https://bugzilla.mozilla.org/show_bug.cgi?id=512802
-
---- mozilla/js/src/jsscript.cpp.orig	2009-08-24 01:32:14.000000000 +0200
-+++ mozilla/js/src/jsscript.cpp	2009-08-24 01:36:20.000000000 +0200
-@@ -1370,19 +1370,49 @@ js_NewScript(JSContext *cx, uint32 lengt
-     size_t size, vectorSize;
-     JSScript *script;
-     uint8 *cursor;
-+#ifdef _LP64
-+#define LP64_ALIGN(V)  if ((V) & 7) (V) = (((V)|7) + 1)
-+#define LP64_ALIGNP(P)  if ((uintptr_t)(P) & 7) (P) = (uint8*)(((uintptr_t)(P)|7) + 1)
-+#else
-+#define LP64_ALIGN(V)
-+#define LP64_ALIGNP(V)
-+#endif
- 
--    size = sizeof(JSScript) +
--           sizeof(JSAtom *) * natoms +
--           length * sizeof(jsbytecode) +
--           nsrcnotes * sizeof(jssrcnote);
--    if (nobjects != 0)
--        size += sizeof(JSObjectArray) + nobjects * sizeof(JSObject *);
--    if (nupvars != 0)
--        size += sizeof(JSUpvarArray) + nupvars * sizeof(uint32);
--    if (nregexps != 0)
--        size += sizeof(JSObjectArray) + nregexps * sizeof(JSObject *);
--    if (ntrynotes != 0)
--        size += sizeof(JSTryNoteArray) + ntrynotes * sizeof(JSTryNote);
-+    size = sizeof(JSScript);
-+    if (nobjects != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSObjectArray);
-+    }
-+    if (nupvars != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSUpvarArray);
-+    }
-+    if (nregexps != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSObjectArray);
-+    }
-+    if (ntrynotes != 0) {
-+	LP64_ALIGN(size);
-+        size += sizeof(JSTryNoteArray);
-+    }
-+    if (natoms != 0) {
-+	LP64_ALIGN(size);
-+	size += sizeof(JSAtom *) * natoms;
-+    }
-+    if (nobjects != 0) {
-+	LP64_ALIGN(size);
-+        size += nobjects * sizeof(JSObject *);
-+    }
-+    if (nupvars != 0) {
-+        size += nupvars * sizeof(uint32);
-+    }
-+    if (nregexps != 0) {
-+	LP64_ALIGN(size);
-+        size += nregexps * sizeof(JSObject *);
-+    }
-+    size += length * sizeof(jsbytecode) +
-+	nsrcnotes * sizeof(jssrcnote) +
-+	ntrynotes * sizeof(JSTryNote);
- 
-     script = (JSScript *) JS_malloc(cx, size);
-     if (!script)
-@@ -1393,23 +1423,28 @@ js_NewScript(JSContext *cx, uint32 lengt
- 
-     cursor = (uint8 *)script + sizeof(JSScript);
-     if (nobjects != 0) {
-+	LP64_ALIGNP(cursor);
-         script->objectsOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSObjectArray);
-     }
-     if (nupvars != 0) {
-+	LP64_ALIGNP(cursor);
-         script->upvarsOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSUpvarArray);
-     }
-     if (nregexps != 0) {
-+	LP64_ALIGNP(cursor);
-         script->regexpsOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSObjectArray);
-     }
-     if (ntrynotes != 0) {
-+	LP64_ALIGNP(cursor);
-         script->trynotesOffset = (uint8)(cursor - (uint8 *)script);
-         cursor += sizeof(JSTryNoteArray);
-     }
- 
-     if (natoms != 0) {
-+	LP64_ALIGNP(cursor);
-         script->atomMap.length = natoms;
-         script->atomMap.vector = (JSAtom **)cursor;
-         vectorSize = natoms * sizeof(script->atomMap.vector[0]);
-@@ -1423,6 +1458,7 @@ js_NewScript(JSContext *cx, uint32 lengt
-     }
- 
-     if (nobjects != 0) {
-+	LP64_ALIGNP(cursor);
-         JS_SCRIPT_OBJECTS(script)->length = nobjects;
-         JS_SCRIPT_OBJECTS(script)->vector = (JSObject **)cursor;
-         vectorSize = nobjects * sizeof(JS_SCRIPT_OBJECTS(script)->vector[0]);
-@@ -1431,6 +1467,7 @@ js_NewScript(JSContext *cx, uint32 lengt
-     }
- 
-     if (nupvars != 0) {
-+	LP64_ALIGNP(cursor);
-         JS_SCRIPT_UPVARS(script)->length = nupvars;
-         JS_SCRIPT_UPVARS(script)->vector = (uint32 *)cursor;
-         vectorSize = nupvars * sizeof(JS_SCRIPT_UPVARS(script)->vector[0]);
-@@ -1439,6 +1476,7 @@ js_NewScript(JSContext *cx, uint32 lengt
-     }
- 
-     if (nregexps != 0) {
-+	LP64_ALIGNP(cursor);
-         JS_SCRIPT_REGEXPS(script)->length = nregexps;
-         JS_SCRIPT_REGEXPS(script)->vector = (JSObject **)cursor;
-         vectorSize = nregexps * sizeof(JS_SCRIPT_REGEXPS(script)->vector[0]);
diff --git a/mail/thunderbird/patches/patch-nd b/mail/thunderbird/patches/patch-nd
index 7ef6daffa02..4f3b27faf02 100644
--- a/mail/thunderbird/patches/patch-nd
+++ b/mail/thunderbird/patches/patch-nd
@@ -1,4 +1,4 @@
-$NetBSD: patch-nd,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-nd,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 # reported upstream as
 #   https://bugzilla.mozilla.org/show_bug.cgi?id=514002
diff --git a/mail/thunderbird/patches/patch-pa b/mail/thunderbird/patches/patch-pa
index 0613354275e..f7e88e199e2 100644
--- a/mail/thunderbird/patches/patch-pa
+++ b/mail/thunderbird/patches/patch-pa
@@ -1,12 +1,11 @@
-$NetBSD: patch-pa,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-pa,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/mozilla-js.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ mozilla/xulrunner/installer/mozilla-js.pc.in
 @@ -6,5 +6,5 @@ Name: JavaScript
  Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lmozjs
--Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lmozjs
-+Cflags: -I${includedir}/stable -I${includedir}/unstable -DXP_UNIX -DJS_THREADSAFE
+ Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
diff --git a/mail/thunderbird/patches/patch-pb b/mail/thunderbird/patches/patch-pb
index 2b922902f96..3ec7ac85199 100644
--- a/mail/thunderbird/patches/patch-pb
+++ b/mail/thunderbird/patches/patch-pb
@@ -1,11 +1,11 @@
-$NetBSD: patch-pb,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-pb,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/xulrunner/installer/libxul.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/libxul.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ mozilla/xulrunner/installer/libxul.pc.in
-@@ -12,5 +12,5 @@ Name: libxul
+@@ -7,5 +7,5 @@ Name: libxul
  Description: The Mozilla Runtime and Embedding Engine
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue_s -lxul -lxpcom
- Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
+ Cflags: -I${includedir} %WCHAR_CFLAGS%
diff --git a/mail/thunderbird/patches/patch-pc b/mail/thunderbird/patches/patch-pc
index 2f90a7418d3..1daf0b2a030 100644
--- a/mail/thunderbird/patches/patch-pc
+++ b/mail/thunderbird/patches/patch-pc
@@ -1,11 +1,11 @@
-$NetBSD: patch-pc,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-pc,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ mozilla/xulrunner/installer/libxul-embedding.pc.in
-@@ -11,5 +11,5 @@ includetype=stable
+@@ -6,5 +6,5 @@ idldir=%idldir%
  Name: libxul-embedding
  Description: Static library for version-independent embedding of the Mozilla runtime
  Version: %MOZILLA_VERSION%
 -Libs: -L${sdkdir}/lib -lxpcomglue
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff --git a/mail/thunderbird/patches/patch-pd b/mail/thunderbird/patches/patch-pd
index 8bd0c522940..c3ad12ec2f8 100644
--- a/mail/thunderbird/patches/patch-pd
+++ b/mail/thunderbird/patches/patch-pd
@@ -1,6 +1,6 @@
-$NetBSD: patch-pd,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-pd,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2009-10-16 17:14:30.000000000 +0200
+--- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ mozilla/xulrunner/installer/mozilla-nss.pc.in
 @@ -6,5 +6,5 @@ Name: NSS
  Description: Mozilla Network Security Services
@@ -8,4 +8,4 @@ $NetBSD: patch-pd,v 1.1 2010/03/16 10:59:09 tnn Exp $
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lsmime3 -lssl3 -lnss3 -lnssutil3
- Cflags: -I${includedir}/stable
+ Cflags: -I${includedir}
diff --git a/mail/thunderbird/patches/patch-pe b/mail/thunderbird/patches/patch-pe
index 714e5058b89..8942de81a3a 100644
--- a/mail/thunderbird/patches/patch-pe
+++ b/mail/thunderbird/patches/patch-pe
@@ -1,11 +1,11 @@
-$NetBSD: patch-pe,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-pe,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/xulrunner/installer/libxul-unstable.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in
-@@ -8,5 +8,5 @@ Name: libxul
- Description: The Mozilla Runtime and Embedding Engine (unstable API)
+--- mozilla/xulrunner/installer/mozilla-plugin.pc.in.orig	2009-12-04 21:19:58.000000000 +0000
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in
+@@ -5,5 +5,5 @@ includedir=%includedir%
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue_s -lxul -lxpcom
- Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
+-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
++Cflags: -I${includedir} -DXP_UNIX %ojidef%
+ 
diff --git a/mail/thunderbird/patches/patch-pf b/mail/thunderbird/patches/patch-pf
deleted file mode 100644
index 4aea8a5ad3e..00000000000
--- a/mail/thunderbird/patches/patch-pf
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-pf,v 1.1 2010/03/16 10:59:09 tnn Exp $
-
---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
-@@ -7,5 +7,5 @@ includetype=unstable
- Name: libxul-embedding-unstable
- Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
- Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
diff --git a/mail/thunderbird/patches/patch-pg b/mail/thunderbird/patches/patch-pg
index 947556478a0..7578438b720 100644
--- a/mail/thunderbird/patches/patch-pg
+++ b/mail/thunderbird/patches/patch-pg
@@ -1,6 +1,6 @@
-$NetBSD: patch-pg,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-pg,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2009-06-29 18:15:36.000000000 +0200
+--- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig	2009-10-29 23:11:24.000000000 +0100
 +++ mozilla/xulrunner/installer/mozilla-nspr.pc.in
 @@ -5,7 +5,5 @@ includedir=%includedir%
  Name: NSPR
@@ -11,4 +11,4 @@ $NetBSD: patch-pg,v 1.1 2010/03/16 10:59:09 tnn Exp $
 -
 -
 +Libs: -Wl,-R${prefix}/lib/xulrunner -L${prefix}/lib/xulrunner -lplds4 -lplc4 -lnspr4 -pthread
-+Cflags: -I${includedir}/stable
++Cflags: -I${includedir}
diff --git a/mail/thunderbird/patches/patch-ra b/mail/thunderbird/patches/patch-ra
index a6778015819..aa312f7ca60 100644
--- a/mail/thunderbird/patches/patch-ra
+++ b/mail/thunderbird/patches/patch-ra
@@ -1,9 +1,9 @@
-$NetBSD: patch-ra,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-ra,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/browser/branding/unofficial/locales/browserconfig.properties.orig	2009-08-24 17:52:36.000000000 +0200
+--- mozilla/browser/branding/unofficial/locales/browserconfig.properties.orig	2009-10-29 23:10:36.000000000 +0100
 +++ mozilla/browser/branding/unofficial/locales/browserconfig.properties
 @@ -1,3 +1,3 @@
  # Do NOT localize or otherwise change these values
--browser.startup.homepage=http://www.mozilla.org/projects/shiretoko/
+-browser.startup.homepage=http://www.mozilla.org/projects/namoroka/
 +browser.startup.homepage=http://www.google.com/firefox
  
diff --git a/mail/thunderbird/patches/patch-rc b/mail/thunderbird/patches/patch-rc
index 1b9db76ed92..f451679005c 100644
--- a/mail/thunderbird/patches/patch-rc
+++ b/mail/thunderbird/patches/patch-rc
@@ -1,10 +1,10 @@
-$NetBSD: patch-rc,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-rc,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
---- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2009-08-24 17:52:36.000000000 +0200
+--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig	2009-10-29 23:10:36.000000000 +0100
 +++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
 @@ -1,5 +1,5 @@
--<!ENTITY  brandShortName        "Shiretoko">
--<!ENTITY  brandFullName         "Shiretoko">
+-<!ENTITY  brandShortName        "Namoroka">
+-<!ENTITY  brandFullName         "Namoroka">
 +<!ENTITY  brandShortName        "Browser">
 +<!ENTITY  brandFullName         "Browser">
  <!ENTITY  vendorShortName       "mozilla.org">
diff --git a/mail/thunderbird/patches/patch-xa b/mail/thunderbird/patches/patch-xa
index 32c502eea7e..d4c6b5c5d79 100644
--- a/mail/thunderbird/patches/patch-xa
+++ b/mail/thunderbird/patches/patch-xa
@@ -1,4 +1,4 @@
-$NetBSD: patch-xa,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xa,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
diff --git a/mail/thunderbird/patches/patch-xb b/mail/thunderbird/patches/patch-xb
index 0a626c154d7..0c04d49c1f0 100644
--- a/mail/thunderbird/patches/patch-xb
+++ b/mail/thunderbird/patches/patch-xb
@@ -1,4 +1,4 @@
-$NetBSD: patch-xb,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xb,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
diff --git a/mail/thunderbird/patches/patch-xc b/mail/thunderbird/patches/patch-xc
index 7bccc2bcc56..00d5e376cc5 100644
--- a/mail/thunderbird/patches/patch-xc
+++ b/mail/thunderbird/patches/patch-xc
@@ -1,4 +1,4 @@
-$NetBSD: patch-xc,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xc,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
diff --git a/mail/thunderbird/patches/patch-xd b/mail/thunderbird/patches/patch-xd
index 85e595d3966..5fd63b5a5e9 100644
--- a/mail/thunderbird/patches/patch-xd
+++ b/mail/thunderbird/patches/patch-xd
@@ -1,4 +1,4 @@
-$NetBSD: patch-xd,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xd,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
 
diff --git a/mail/thunderbird/patches/patch-xe b/mail/thunderbird/patches/patch-xe
index 1a17f0f97b7..1d2fa25abaa 100644
--- a/mail/thunderbird/patches/patch-xe
+++ b/mail/thunderbird/patches/patch-xe
@@ -1,4 +1,4 @@
-$NetBSD: patch-xe,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xe,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
 
diff --git a/mail/thunderbird/patches/patch-xf b/mail/thunderbird/patches/patch-xf
index 70e4af1853e..0a9fc9cfde1 100644
--- a/mail/thunderbird/patches/patch-xf
+++ b/mail/thunderbird/patches/patch-xf
@@ -1,4 +1,4 @@
-$NetBSD: patch-xf,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xf,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae.
 
diff --git a/mail/thunderbird/patches/patch-xg b/mail/thunderbird/patches/patch-xg
index 6caa98e2b19..dfcdc31b255 100644
--- a/mail/thunderbird/patches/patch-xg
+++ b/mail/thunderbird/patches/patch-xg
@@ -1,4 +1,4 @@
-$NetBSD: patch-xg,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xg,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm.
 
diff --git a/mail/thunderbird/patches/patch-xh b/mail/thunderbird/patches/patch-xh
deleted file mode 100644
index e6a169cae28..00000000000
--- a/mail/thunderbird/patches/patch-xh
+++ /dev/null
@@ -1,181 +0,0 @@
-$NetBSD: patch-xh,v 1.1 2010/03/16 10:59:09 tnn Exp $
-
-NetBSD/amd64 xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig	2009-06-30 22:20:24.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp
-@@ -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-xi b/mail/thunderbird/patches/patch-xi
deleted file mode 100644
index 0ddb323d72a..00000000000
--- a/mail/thunderbird/patches/patch-xi
+++ /dev/null
@@ -1,213 +0,0 @@
-$NetBSD: patch-xi,v 1.1 2010/03/16 10:59:09 tnn Exp $
-
-NetBSD/amd64 xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig	2009-06-30 22:20:24.000000000 +0200
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp
-@@ -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-xj b/mail/thunderbird/patches/patch-xj
index 2fcfddfae95..2617973adea 100644
--- a/mail/thunderbird/patches/patch-xj
+++ b/mail/thunderbird/patches/patch-xj
@@ -1,4 +1,4 @@
-$NetBSD: patch-xj,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xj,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 
diff --git a/mail/thunderbird/patches/patch-xk b/mail/thunderbird/patches/patch-xk
index 69cddfb0065..0de20ba99b2 100644
--- a/mail/thunderbird/patches/patch-xk
+++ b/mail/thunderbird/patches/patch-xk
@@ -1,4 +1,4 @@
-$NetBSD: patch-xk,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xk,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 
diff --git a/mail/thunderbird/patches/patch-xl b/mail/thunderbird/patches/patch-xl
index 66488e81900..15e213d38d9 100644
--- a/mail/thunderbird/patches/patch-xl
+++ b/mail/thunderbird/patches/patch-xl
@@ -1,4 +1,4 @@
-$NetBSD: patch-xl,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xl,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 
diff --git a/mail/thunderbird/patches/patch-xm b/mail/thunderbird/patches/patch-xm
index 1b08dbcbbb6..221bfd3492f 100644
--- a/mail/thunderbird/patches/patch-xm
+++ b/mail/thunderbird/patches/patch-xm
@@ -1,4 +1,4 @@
-$NetBSD: patch-xm,v 1.1 2010/03/16 10:59:09 tnn Exp $
+$NetBSD: patch-xm,v 1.2 2010/07/12 16:49:22 tnn Exp $
 
 NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 
diff --git a/mail/thunderbird/patches/patch-xn b/mail/thunderbird/patches/patch-xn
new file mode 100644
index 00000000000..b50fbfad6c8
--- /dev/null
+++ b/mail/thunderbird/patches/patch-xn
@@ -0,0 +1,53 @@
+$NetBSD: patch-xn,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig	2010-03-31 05:56:51.000000000 -0400
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s	2010-03-31 06:28:51.000000000 -0400
+@@ -42,8 +42,46 @@
+ 
+ /* This code is for MIPS using the O32 ABI. */
+ 
+-#include <sys/regdef.h>
+-#include <sys/asm.h>
++#ifdef __NetBSD__
++# include <machine/regdef.h>
++# include <machine/asm.h>
++# ifndef fp
++#  define	fp	s8
++# endif
++# ifndef PTRLOG
++#  if SZREG == 4
++#   define	PTRLOG	2
++#  else
++#   define	PTRLOG	3
++#  endif
++# endif
++# ifndef SETUP_GP
++#  if defined(__mips_o32)
++#   define	SETUP_GP	\
++		.set push;	\
++		.set noreorder;	\
++		.cpload t9;	\
++		.set pop
++#   define	SAVE_GP(x)	\
++		.cprestore x
++#  else
++#   define	SETUP_GP
++#   define	SAVE_GP(x)
++#  endif
++# endif
++# ifndef ALSZ
++#  if defined(__mips_n32) || defined(__mips_n64)
++#   define	ALSZ	15
++#   define	ALMASK	~15
++#  else
++#   define	ALSZ	7
++#   define	ALMASK	~7
++#  endif
++# endif
++#else
++# include <sys/regdef.h>
++# include <sys/asm.h>
++#endif
+ 
+ # NARGSAVE is the argument space in the callers frame, including extra
+ # 'shadowed' space for the argument registers. The minimum of 4
diff --git a/mail/thunderbird/patches/patch-xo b/mail/thunderbird/patches/patch-xo
new file mode 100644
index 00000000000..07605e8aa3b
--- /dev/null
+++ b/mail/thunderbird/patches/patch-xo
@@ -0,0 +1,53 @@
+$NetBSD: patch-xo,v 1.1 2010/07/12 16:49:22 tnn Exp $
+
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig	2010-03-31 06:23:31.000000000 -0400
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s	2010-03-31 06:28:23.000000000 -0400
+@@ -26,8 +26,46 @@
+ 
+ /* This code is for MIPS using the O32 ABI. */
+ 
+-#include <sys/regdef.h>
+-#include <sys/asm.h>
++#ifdef __NetBSD__
++# include <machine/regdef.h>
++# include <machine/asm.h>
++# ifndef fp
++#  define	fp	s8
++# endif
++# ifndef PTRLOG
++#  if SZREG == 4
++#   define	PTRLOG	2
++#  else
++#   define	PTRLOG	3
++#  endif
++# endif
++# ifndef SETUP_GP
++#  if defined(__mips_o32)
++#   define	SETUP_GP	\
++		.set push;	\
++		.set noreorder;	\
++		.cpload t9;	\
++		.set pop
++#   define	SAVE_GP(x)	\
++		.cprestore x
++#  else
++#   define	SETUP_GP
++#   define	SAVE_GP(x)
++#  endif
++# endif
++# ifndef ALSZ
++#  if defined(__mips_n32) || defined(__mips_n64)
++#   define	ALSZ	15
++#   define	ALMASK	~15
++#  else
++#   define	ALSZ	7
++#   define	ALMASK	~7
++#  endif
++# endif
++#else
++# include <sys/regdef.h>
++# include <sys/asm.h>
++#endif
+ 
+ # NARGSAVE is the argument space in the callers frame, including extra
+ # 'shadowed' space for the argument registers. The minimum of 4