summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2012-09-02 06:43:39 +0000
committerryoon <ryoon@pkgsrc.org>2012-09-02 06:43:39 +0000
commit307391d6db8e117c06142e08dfb63c6afdd322ae (patch)
treed1010dda1553fea9a11f5d72703cd56cffd2a474 /mail
parente1a9a4b88678e4b682b9a8be57a743410e511c55 (diff)
downloadpkgsrc-307391d6db8e117c06142e08dfb63c6afdd322ae.tar.gz
Update to 15.0
* Update Mozilla Lightning to 1.7 * Update Enigmail to 1.4.4 (functionality is not tested yet; should be updated) * Regen patches Changelog: NEW Multi-Channel Chat: You now can enjoy real time conversation with your contacts, right from your favorite messaging application. NEW Do Not Track: This option has been implemented as an addition to Search the Web. NEW Ubuntu One is now supported in Filelink - the option to upload large attachments to online storage services. NEW New User Interface: Thunderbird is replicating the new look and feel of Mozilla Firefox in an effort to provide a similar user experience across all Mozilla software desktop or mobile and all platforms. FIXED Various fixes and performance improvements FIXED Various security fixes MFSA 2012-72 Web console eval capable of executing chrome-privileged code MFSA 2012-70 Location object security checks bypassed by chrome code MFSA 2012-68 DOMParser loads linked resources in extensions when parsing text/html MFSA 2012-67 Installer will launch incorrect executable following new installation MFSA 2012-65 Out-of-bounds read in format-number in XSLT MFSA 2012-64 Graphite 2 memory corruption MFSA 2012-63 SVG buffer overflow and use-after-free issues MFSA 2012-62 WebGL use-after-free and memory corruption MFSA 2012-61 Memory corruption with bitmap format images with negative height MFSA 2012-59 Location object can be shadowed using Object.defineProperty MFSA 2012-58 Use-after-free issues found using Address Sanitizer MFSA 2012-57 Miscellaneous memory safety hazards (rv:15.0/ rv:10.0.7)
Diffstat (limited to 'mail')
-rw-r--r--mail/thunderbird/Makefile14
-rw-r--r--mail/thunderbird/PLIST212
-rw-r--r--mail/thunderbird/PLIST.enigmail3
-rw-r--r--mail/thunderbird/PLIST.lightning9
-rw-r--r--mail/thunderbird/distinfo244
-rw-r--r--mail/thunderbird/enigmail.mk4
-rw-r--r--mail/thunderbird/patches/patch-aa25
-rw-r--r--mail/thunderbird/patches/patch-aa-toplevel10
-rw-r--r--mail/thunderbird/patches/patch-ab8
-rw-r--r--mail/thunderbird/patches/patch-ac16
-rw-r--r--mail/thunderbird/patches/patch-ad6
-rw-r--r--mail/thunderbird/patches/patch-ae14
-rw-r--r--mail/thunderbird/patches/patch-af4
-rw-r--r--mail/thunderbird/patches/patch-ag10
-rw-r--r--mail/thunderbird/patches/patch-ai4
-rw-r--r--mail/thunderbird/patches/patch-aj8
-rw-r--r--mail/thunderbird/patches/patch-ak4
-rw-r--r--mail/thunderbird/patches/patch-al6
-rw-r--r--mail/thunderbird/patches/patch-am6
-rw-r--r--mail/thunderbird/patches/patch-an4
-rw-r--r--mail/thunderbird/patches/patch-ao6
-rw-r--r--mail/thunderbird/patches/patch-as12
-rw-r--r--mail/thunderbird/patches/patch-at4
-rw-r--r--mail/thunderbird/patches/patch-au8
-rw-r--r--mail/thunderbird/patches/patch-av8
-rw-r--r--mail/thunderbird/patches/patch-aw8
-rw-r--r--mail/thunderbird/patches/patch-ax6
-rw-r--r--mail/thunderbird/patches/patch-ay8
-rw-r--r--mail/thunderbird/patches/patch-az6
-rw-r--r--mail/thunderbird/patches/patch-ba8
-rw-r--r--mail/thunderbird/patches/patch-bd7
-rw-r--r--mail/thunderbird/patches/patch-bf8
-rw-r--r--mail/thunderbird/patches/patch-bg6
-rw-r--r--mail/thunderbird/patches/patch-bi4
-rw-r--r--mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h4
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc26
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h14
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc6
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc12
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc63
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc4
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h6
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h24
-rw-r--r--mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h4
-rw-r--r--mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp12
-rw-r--r--mail/thunderbird/patches/patch-js_src_jscpucfg.h6
-rw-r--r--mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk4
-rw-r--r--mail/thunderbird/patches/patch-ma6
-rw-r--r--mail/thunderbird/patches/patch-ma-toplevel6
-rw-r--r--mail/thunderbird/patches/patch-mb18
-rw-r--r--mail/thunderbird/patches/patch-md4
-rw-r--r--mail/thunderbird/patches/patch-me4
-rw-r--r--mail/thunderbird/patches/patch-mf4
-rw-r--r--mail/thunderbird/patches/patch-mg4
-rw-r--r--mail/thunderbird/patches/patch-mh4
-rw-r--r--mail/thunderbird/patches/patch-mi6
-rw-r--r--mail/thunderbird/patches/patch-mj4
-rw-r--r--mail/thunderbird/patches/patch-mk28
-rw-r--r--mail/thunderbird/patches/patch-ml6
-rw-r--r--mail/thunderbird/patches/patch-mm27
-rw-r--r--mail/thunderbird/patches/patch-mn4
-rw-r--r--mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m44
-rw-r--r--mail/thunderbird/patches/patch-mozilla_config_system-headers12
-rw-r--r--mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp18
-rw-r--r--mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp18
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in8
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk11
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h4
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h117
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h27
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc84
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc4
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h14
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h4
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc58
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc4
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc8
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc12
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h8
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk22
-rw-r--r--mail/thunderbird/patches/patch-mozilla_js_src_config_system-headers12
-rw-r--r--mail/thunderbird/patches/patch-mozilla_js_src_jsgc.cpp17
-rw-r--r--mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h14
-rw-r--r--mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_Makefile.in49
-rw-r--r--mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp14
-rw-r--r--mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg199
-rw-r--r--mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h30
-rw-r--r--mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c23
-rw-r--r--mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c13
-rw-r--r--mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in6
-rw-r--r--mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in8
-rw-r--r--mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in12
-rw-r--r--mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py18
-rw-r--r--mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in6
-rw-r--r--mail/thunderbird/patches/patch-mp6
-rw-r--r--mail/thunderbird/patches/patch-pa4
-rw-r--r--mail/thunderbird/patches/patch-pb4
-rw-r--r--mail/thunderbird/patches/patch-pc4
-rw-r--r--mail/thunderbird/patches/patch-pd4
-rw-r--r--mail/thunderbird/patches/patch-pg4
-rw-r--r--mail/thunderbird/patches/patch-rc9
-rw-r--r--mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh17
-rw-r--r--mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk6
-rw-r--r--mail/thunderbird/patches/patch-xa4
-rw-r--r--mail/thunderbird/patches/patch-xb4
-rw-r--r--mail/thunderbird/patches/patch-xc4
-rw-r--r--mail/thunderbird/patches/patch-xd4
-rw-r--r--mail/thunderbird/patches/patch-xe8
-rw-r--r--mail/thunderbird/patches/patch-xf6
-rw-r--r--mail/thunderbird/patches/patch-xg6
-rw-r--r--mail/thunderbird/patches/patch-xj20
-rw-r--r--mail/thunderbird/patches/patch-xk92
-rw-r--r--mail/thunderbird/patches/patch-xl94
-rw-r--r--mail/thunderbird/patches/patch-xm49
-rw-r--r--mail/thunderbird/patches/patch-xn47
-rw-r--r--mail/thunderbird/patches/patch-xo47
-rw-r--r--mail/thunderbird/patches/patch-zb6
-rw-r--r--mail/thunderbird/patches/patch-zc8
131 files changed, 1049 insertions, 1413 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index b4167b714c4..a15e13b5483 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.95 2012/07/19 17:57:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.96 2012/09/02 06:43:39 ryoon Exp $
#
DISTNAME= # empty
PKGNAME= thunderbird-${TB_VER}
-TB_VER= 14.0
+TB_VER= 15.0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} \
${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}/source/}
DISTFILES= thunderbird-${TB_VER}.source.tar.bz2 \
- lightning-1.6.source.tar.bz2
-SITES.lightning-1.6.source.tar.bz2= ${MASTER_SITE_MOZILLA:=calendar/lightning/releases/1.6/source/}
-EXTRACT_DIR.lightning-1.6.source.tar.bz2= ${WRKSRC}/lightning
+ lightning-1.7.source.tar.bz2
+SITES.lightning-1.7.source.tar.bz2= ${MASTER_SITE_MOZILLA:=calendar/lightning/releases/1.7/source/}
+EXTRACT_DIR.lightning-1.7.source.tar.bz2= ${WRKSRC}/lightning
MAINTAINER= tnn@NetBSD.org
HOMEPAGE= http://www.mozillamessaging.com/en-US/thunderbird/
@@ -42,8 +42,8 @@ ALL_ENV+= MOZILLA_PKG_NAME=thunderbird
post-extract:
cd ${WRKSRC} && ${RM} -r calendar
- ${CP} -r ${EXTRACT_DIR.lightning-1.6.source.tar.bz2}/comm-beta/calendar ${WRKSRC}
- ${RM} -r ${EXTRACT_DIR.lightning-1.6.source.tar.bz2}
+ ${CP} -r ${EXTRACT_DIR.lightning-1.7.source.tar.bz2}/comm-beta/calendar ${WRKSRC}
+ ${RM} -r ${EXTRACT_DIR.lightning-1.7.source.tar.bz2}
pre-configure:
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index bf7f4ff5570..ebb2b199b6e 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.42 2012/07/19 17:57:30 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.43 2012/09/02 06:43:39 ryoon Exp $
bin/thunderbird
-include/thunderbird/ARIAGridAccessibleWrap.h
-include/thunderbird/AtkSocketAccessible.h
+include/thunderbird/AudioSegment.h
include/thunderbird/BasicImplData.h
include/thunderbird/BasicLayers.h
include/thunderbird/BasicTiledThebesLayer.h
-include/thunderbird/CheckedInt.h
include/thunderbird/CustomQS_Canvas.h
include/thunderbird/CustomQS_Canvas2D.h
include/thunderbird/CustomQS_WebGL.h
@@ -31,18 +29,30 @@ include/thunderbird/ImageLayers.h
include/thunderbird/ImageLogging.h
include/thunderbird/LayerManagerOGL.h
include/thunderbird/LayerManagerOGLProgram.h
+include/thunderbird/LayerManagerOGLShaders.h
include/thunderbird/LayerSorter.h
include/thunderbird/Layers.h
include/thunderbird/MailNewsTypes.h
include/thunderbird/MailNewsTypes2.h
+include/thunderbird/MediaEngine.h
+include/thunderbird/MediaEngineDefault.h
include/thunderbird/MediaResource.h
+include/thunderbird/MediaSegment.h
+include/thunderbird/MediaStreamGraph.h
include/thunderbird/PCOMContentPermissionRequestChild.h
include/thunderbird/PPrefTuple.h
include/thunderbird/PrefTuple.h
include/thunderbird/ReadbackLayer.h
include/thunderbird/SVGAttrValueWrapper.h
+include/thunderbird/SharedBuffer.h
+include/thunderbird/SharedTextureImage.h
+include/thunderbird/StackArena.h
+include/thunderbird/StreamBuffer.h
include/thunderbird/TabMessageUtils.h
+include/thunderbird/TexturePoolOGL.h
+include/thunderbird/TimeVarying.h
include/thunderbird/VideoFrameContainer.h
+include/thunderbird/VideoSegment.h
include/thunderbird/VideoUtils.h
include/thunderbird/WebGLContext.h
include/thunderbird/a11yGeneric.h
@@ -65,6 +75,7 @@ include/thunderbird/expat_external.h
include/thunderbird/extIApplication.h
include/thunderbird/ftpCore.h
include/thunderbird/gc/Barrier.h
+include/thunderbird/gc/Heap.h
include/thunderbird/gc/Root.h
include/thunderbird/gc/Statistics.h
include/thunderbird/gfx2DGlue.h
@@ -82,6 +93,7 @@ include/thunderbird/gfxFT2FontBase.h
include/thunderbird/gfxFailure.h
include/thunderbird/gfxFont.h
include/thunderbird/gfxFontConstants.h
+include/thunderbird/gfxFontFeatures.h
include/thunderbird/gfxFontTest.h
include/thunderbird/gfxFontUtils.h
include/thunderbird/gfxGdkNativeRenderer.h
@@ -124,6 +136,7 @@ include/thunderbird/harfbuzz/hb-ot-layout.h
include/thunderbird/harfbuzz/hb-ot-shape.h
include/thunderbird/harfbuzz/hb-ot-tag.h
include/thunderbird/harfbuzz/hb-ot.h
+include/thunderbird/harfbuzz/hb-set.h
include/thunderbird/harfbuzz/hb-shape.h
include/thunderbird/harfbuzz/hb-unicode.h
include/thunderbird/harfbuzz/hb-version.h
@@ -169,7 +182,6 @@ include/thunderbird/jsalloc.h
include/thunderbird/jsapi.h
include/thunderbird/jsatom.h
include/thunderbird/jsatom.tbl
-include/thunderbird/jscell.h
include/thunderbird/jsclass.h
include/thunderbird/jsclist.h
include/thunderbird/jscpucfg.h
@@ -238,7 +250,8 @@ include/thunderbird/mozIStorageService.h
include/thunderbird/mozIStorageServiceQuotaManagement.h
include/thunderbird/mozIStorageStatement.h
include/thunderbird/mozIStorageStatementCallback.h
-include/thunderbird/mozIStorageStatementWrapper.h
+include/thunderbird/mozIStorageStatementParams.h
+include/thunderbird/mozIStorageStatementRow.h
include/thunderbird/mozIStorageVacuumParticipant.h
include/thunderbird/mozIStorageValueArray.h
include/thunderbird/mozITXTToHTMLConv.h
@@ -257,9 +270,11 @@ include/thunderbird/mozilla/BlockingResourceBase.h
include/thunderbird/mozilla/BloomFilter.h
include/thunderbird/mozilla/CORSMode.h
include/thunderbird/mozilla/CharTokenizer.h
+include/thunderbird/mozilla/CheckedInt.h
include/thunderbird/mozilla/ClearOnShutdown.h
include/thunderbird/mozilla/CondVar.h
include/thunderbird/mozilla/DeadlockDetector.h
+include/thunderbird/mozilla/ErrorResult.h
include/thunderbird/mozilla/FileLocation.h
include/thunderbird/mozilla/FileUtils.h
include/thunderbird/mozilla/FloatingPoint.h
@@ -287,6 +302,7 @@ include/thunderbird/mozilla/ModuleLoader.h
include/thunderbird/mozilla/ModuleUtils.h
include/thunderbird/mozilla/Monitor.h
include/thunderbird/mozilla/Mutex.h
+include/thunderbird/mozilla/OSFileConstants.h
include/thunderbird/mozilla/Observer.h
include/thunderbird/mozilla/Omnijar.h
include/thunderbird/mozilla/PaintTracker.h
@@ -306,12 +322,14 @@ include/thunderbird/mozilla/StartupTimeline.h
include/thunderbird/mozilla/StringBuilder.h
include/thunderbird/mozilla/Telemetry.h
include/thunderbird/mozilla/TelemetryHistograms.h
+include/thunderbird/mozilla/ThreadLocal.h
include/thunderbird/mozilla/TimeStamp.h
include/thunderbird/mozilla/Types.h
include/thunderbird/mozilla/Util.h
include/thunderbird/mozilla/WidgetTraceEvent.h
include/thunderbird/mozilla/X11Util.h
include/thunderbird/mozilla/XPCOM.h
+include/thunderbird/mozilla/a11y/Accessible.h
include/thunderbird/mozilla/a11y/FocusManager.h
include/thunderbird/mozilla/a11y/Role.h
include/thunderbird/mozilla/a11y/States.h
@@ -328,19 +346,28 @@ include/thunderbird/mozilla/docshell/OfflineCacheUpdateChild.h
include/thunderbird/mozilla/docshell/OfflineCacheUpdateParent.h
include/thunderbird/mozilla/dom/AudioChild.h
include/thunderbird/mozilla/dom/AudioParent.h
+include/thunderbird/mozilla/dom/BindingUtils.h
include/thunderbird/mozilla/dom/ContentChild.h
include/thunderbird/mozilla/dom/ContentParent.h
include/thunderbird/mozilla/dom/ContentProcess.h
include/thunderbird/mozilla/dom/CrashReporterChild.h
include/thunderbird/mozilla/dom/CrashReporterParent.h
include/thunderbird/mozilla/dom/DOMError.h
+include/thunderbird/mozilla/dom/DOMJSClass.h
include/thunderbird/mozilla/dom/DOMRequest.h
include/thunderbird/mozilla/dom/Element.h
+include/thunderbird/mozilla/dom/EventListenerBinding.h
+include/thunderbird/mozilla/dom/EventTargetBinding.h
include/thunderbird/mozilla/dom/ExternalHelperAppChild.h
include/thunderbird/mozilla/dom/ExternalHelperAppParent.h
include/thunderbird/mozilla/dom/FromParser.h
+include/thunderbird/mozilla/dom/FunctionBinding.h
include/thunderbird/mozilla/dom/ImageData.h
include/thunderbird/mozilla/dom/Link.h
+include/thunderbird/mozilla/dom/Nullable.h
+include/thunderbird/mozilla/dom/PrimitiveConversions.h
+include/thunderbird/mozilla/dom/PrototypeList.h
+include/thunderbird/mozilla/dom/RegisterBindings.h
include/thunderbird/mozilla/dom/ScreenOrientation.h
include/thunderbird/mozilla/dom/StorageChild.h
include/thunderbird/mozilla/dom/StorageParent.h
@@ -348,25 +375,28 @@ include/thunderbird/mozilla/dom/StructuredCloneTags.h
include/thunderbird/mozilla/dom/TabChild.h
include/thunderbird/mozilla/dom/TabMessageUtils.h
include/thunderbird/mozilla/dom/TabParent.h
+include/thunderbird/mozilla/dom/TypedArray.h
+include/thunderbird/mozilla/dom/WebGLRenderingContextBinding.h
+include/thunderbird/mozilla/dom/XMLHttpRequestBinding.h
+include/thunderbird/mozilla/dom/XMLHttpRequestEventTargetBinding.h
+include/thunderbird/mozilla/dom/XMLHttpRequestUploadBinding.h
include/thunderbird/mozilla/dom/battery/Constants.h
include/thunderbird/mozilla/dom/battery/Types.h
-include/thunderbird/mozilla/dom/bindings/Common.h
-include/thunderbird/mozilla/dom/bindings/DOMJSClass.h
-include/thunderbird/mozilla/dom/bindings/EventListenerBinding.h
-include/thunderbird/mozilla/dom/bindings/EventTargetBinding.h
-include/thunderbird/mozilla/dom/bindings/FunctionBinding.h
-include/thunderbird/mozilla/dom/bindings/Nullable.h
-include/thunderbird/mozilla/dom/bindings/PrototypeList.h
-include/thunderbird/mozilla/dom/bindings/Utils.h
-include/thunderbird/mozilla/dom/bindings/XMLHttpRequestBinding.h
-include/thunderbird/mozilla/dom/bindings/XMLHttpRequestEventTargetBinding.h
-include/thunderbird/mozilla/dom/bindings/XMLHttpRequestUploadBinding.h
+include/thunderbird/mozilla/dom/file/DOMFileHandle.h
+include/thunderbird/mozilla/dom/file/File.h
+include/thunderbird/mozilla/dom/file/FileCommon.h
+include/thunderbird/mozilla/dom/file/FileHandle.h
+include/thunderbird/mozilla/dom/file/FileHelper.h
+include/thunderbird/mozilla/dom/file/FileService.h
+include/thunderbird/mozilla/dom/file/LockedFile.h
+include/thunderbird/mozilla/dom/indexedDB/DatabaseInfo.h
include/thunderbird/mozilla/dom/indexedDB/FileInfo.h
include/thunderbird/mozilla/dom/indexedDB/FileManager.h
include/thunderbird/mozilla/dom/indexedDB/IDBCursor.h
include/thunderbird/mozilla/dom/indexedDB/IDBDatabase.h
include/thunderbird/mozilla/dom/indexedDB/IDBEvents.h
include/thunderbird/mozilla/dom/indexedDB/IDBFactory.h
+include/thunderbird/mozilla/dom/indexedDB/IDBFileHandle.h
include/thunderbird/mozilla/dom/indexedDB/IDBIndex.h
include/thunderbird/mozilla/dom/indexedDB/IDBKeyRange.h
include/thunderbird/mozilla/dom/indexedDB/IDBObjectStore.h
@@ -376,6 +406,7 @@ include/thunderbird/mozilla/dom/indexedDB/IDBWrapperCache.h
include/thunderbird/mozilla/dom/indexedDB/IndexedDatabase.h
include/thunderbird/mozilla/dom/indexedDB/IndexedDatabaseManager.h
include/thunderbird/mozilla/dom/indexedDB/Key.h
+include/thunderbird/mozilla/dom/indexedDB/SerializationHelpers.h
include/thunderbird/mozilla/dom/network/Constants.h
include/thunderbird/mozilla/dom/network/Types.h
include/thunderbird/mozilla/dom/network/Utils.h
@@ -397,6 +428,7 @@ include/thunderbird/mozilla/dom/workers/bindings/WorkerFeature.h
include/thunderbird/mozilla/dom/workers/bindings/XMLHttpRequest.h
include/thunderbird/mozilla/dom/workers/bindings/XMLHttpRequestEventTarget.h
include/thunderbird/mozilla/dom/workers/bindings/XMLHttpRequestUpload.h
+include/thunderbird/mozilla/fallible.h
include/thunderbird/mozilla/gfx/2D.h
include/thunderbird/mozilla/gfx/BaseMargin.h
include/thunderbird/mozilla/gfx/BasePoint.h
@@ -538,8 +570,6 @@ include/thunderbird/nsAccDocManager.h
include/thunderbird/nsAccessNode.h
include/thunderbird/nsAccessNodeWrap.h
include/thunderbird/nsAccessibilityService.h
-include/thunderbird/nsAccessible.h
-include/thunderbird/nsAccessibleWrap.h
include/thunderbird/nsAgg.h
include/thunderbird/nsAlgorithm.h
include/thunderbird/nsAppDirectoryServiceDefs.h
@@ -619,7 +649,6 @@ include/thunderbird/nsCom.h
include/thunderbird/nsCompatibility.h
include/thunderbird/nsComponentManagerUtils.h
include/thunderbird/nsComposeStrings.h
-include/thunderbird/nsCompressedCharMap.h
include/thunderbird/nsContentCID.h
include/thunderbird/nsContentCreatorFunctions.h
include/thunderbird/nsContentDLF.h
@@ -647,6 +676,7 @@ include/thunderbird/nsDOMEventTargetHelper.h
include/thunderbird/nsDOMFile.h
include/thunderbird/nsDOMJSUtils.h
include/thunderbird/nsDOMMediaQueryList.h
+include/thunderbird/nsDOMMediaStream.h
include/thunderbird/nsDOMScriptObjectHolder.h
include/thunderbird/nsDOMString.h
include/thunderbird/nsDataHashtable.h
@@ -660,13 +690,13 @@ include/thunderbird/nsDeque.h
include/thunderbird/nsDetectionConfident.h
include/thunderbird/nsDeviceContext.h
include/thunderbird/nsDeviceSensors.h
+include/thunderbird/nsDeviceStorage.h
include/thunderbird/nsDirectoryService.h
include/thunderbird/nsDirectoryServiceAtomList.h
include/thunderbird/nsDirectoryServiceDefs.h
include/thunderbird/nsDirectoryServiceUtils.h
include/thunderbird/nsDisplayItemTypes.h
include/thunderbird/nsDisplayList.h
-include/thunderbird/nsDocAccessibleWrap.h
include/thunderbird/nsDocLoader.h
include/thunderbird/nsDocShellCID.h
include/thunderbird/nsDocShellLoadTypes.h
@@ -717,12 +747,10 @@ include/thunderbird/nsGridRowLeafLayout.h
include/thunderbird/nsHTMLAudioElement.h
include/thunderbird/nsHTMLCanvasElement.h
include/thunderbird/nsHTMLDNSPrefetch.h
-include/thunderbird/nsHTMLImageAccessibleWrap.h
include/thunderbird/nsHTMLMediaElement.h
include/thunderbird/nsHTMLParts.h
include/thunderbird/nsHTMLReflowMetrics.h
include/thunderbird/nsHTMLReflowState.h
-include/thunderbird/nsHTMLTableAccessibleWrap.h
include/thunderbird/nsHTMLTagList.h
include/thunderbird/nsHTMLTags.h
include/thunderbird/nsHTMLTokens.h
@@ -762,8 +790,6 @@ include/thunderbird/nsHttp.h
include/thunderbird/nsHttpAtomList.h
include/thunderbird/nsHttpHeaderArray.h
include/thunderbird/nsHttpResponseHead.h
-include/thunderbird/nsHyperTextAccessible.h
-include/thunderbird/nsHyperTextAccessibleWrap.h
include/thunderbird/nsHyphenationManager.h
include/thunderbird/nsHyphenator.h
include/thunderbird/nsIASN1Object.h
@@ -836,6 +862,7 @@ include/thunderbird/nsIApplicationCache.h
include/thunderbird/nsIApplicationCacheChannel.h
include/thunderbird/nsIApplicationCacheContainer.h
include/thunderbird/nsIApplicationCacheService.h
+include/thunderbird/nsIAppsService.h
include/thunderbird/nsIArray.h
include/thunderbird/nsIAssociatedContentSecurity.h
include/thunderbird/nsIAsyncInputStream.h
@@ -1051,8 +1078,12 @@ include/thunderbird/nsIDOMDOMTokenList.h
include/thunderbird/nsIDOMDataContainerEvent.h
include/thunderbird/nsIDOMDataTransfer.h
include/thunderbird/nsIDOMDesktopNotification.h
+include/thunderbird/nsIDOMDeviceLightEvent.h
include/thunderbird/nsIDOMDeviceMotionEvent.h
include/thunderbird/nsIDOMDeviceOrientationEvent.h
+include/thunderbird/nsIDOMDeviceProximityEvent.h
+include/thunderbird/nsIDOMDeviceStorage.h
+include/thunderbird/nsIDOMDeviceStorageCursor.h
include/thunderbird/nsIDOMDocument.h
include/thunderbird/nsIDOMDocumentFragment.h
include/thunderbird/nsIDOMDocumentType.h
@@ -1065,8 +1096,10 @@ include/thunderbird/nsIDOMEvent.h
include/thunderbird/nsIDOMEventListener.h
include/thunderbird/nsIDOMEventTarget.h
include/thunderbird/nsIDOMFile.h
+include/thunderbird/nsIDOMFileHandle.h
include/thunderbird/nsIDOMFileList.h
include/thunderbird/nsIDOMFileReader.h
+include/thunderbird/nsIDOMFileRequest.h
include/thunderbird/nsIDOMFontFace.h
include/thunderbird/nsIDOMFontFaceList.h
include/thunderbird/nsIDOMFormData.h
@@ -1077,6 +1110,7 @@ include/thunderbird/nsIDOMGeoPositionCoords.h
include/thunderbird/nsIDOMGeoPositionError.h
include/thunderbird/nsIDOMGeoPositionErrorCallback.h
include/thunderbird/nsIDOMGetSVGDocument.h
+include/thunderbird/nsIDOMGlobalObjectConstructor.h
include/thunderbird/nsIDOMGlobalPropertyInitializer.h
include/thunderbird/nsIDOMHTMLAnchorElement.h
include/thunderbird/nsIDOMHTMLAppletElement.h
@@ -1153,9 +1187,11 @@ include/thunderbird/nsIDOMLSProgressEvent.h
include/thunderbird/nsIDOMLinkStyle.h
include/thunderbird/nsIDOMLoadStatus.h
include/thunderbird/nsIDOMLocation.h
+include/thunderbird/nsIDOMLockedFile.h
include/thunderbird/nsIDOMMediaError.h
include/thunderbird/nsIDOMMediaList.h
include/thunderbird/nsIDOMMediaQueryList.h
+include/thunderbird/nsIDOMMediaStream.h
include/thunderbird/nsIDOMMessageEvent.h
include/thunderbird/nsIDOMMimeType.h
include/thunderbird/nsIDOMMimeTypeArray.h
@@ -1177,9 +1213,11 @@ include/thunderbird/nsIDOMNamedNodeMap.h
include/thunderbird/nsIDOMNavigator.h
include/thunderbird/nsIDOMNavigatorBattery.h
include/thunderbird/nsIDOMNavigatorDesktopNotification.h
+include/thunderbird/nsIDOMNavigatorDeviceStorage.h
include/thunderbird/nsIDOMNavigatorGeolocation.h
include/thunderbird/nsIDOMNavigatorNetwork.h
include/thunderbird/nsIDOMNavigatorSms.h
+include/thunderbird/nsIDOMNavigatorUserMedia.h
include/thunderbird/nsIDOMNode.h
include/thunderbird/nsIDOMNodeFilter.h
include/thunderbird/nsIDOMNodeIterator.h
@@ -1287,6 +1325,7 @@ include/thunderbird/nsIDOMSVGTransformable.h
include/thunderbird/nsIDOMSVGURIReference.h
include/thunderbird/nsIDOMSVGUnitTypes.h
include/thunderbird/nsIDOMSVGUseElement.h
+include/thunderbird/nsIDOMSVGViewElement.h
include/thunderbird/nsIDOMSVGViewSpec.h
include/thunderbird/nsIDOMSVGZoomAndPan.h
include/thunderbird/nsIDOMSVGZoomEvent.h
@@ -1305,7 +1344,6 @@ include/thunderbird/nsIDOMSmsMessage.h
include/thunderbird/nsIDOMSmsRequest.h
include/thunderbird/nsIDOMStorage.h
include/thunderbird/nsIDOMStorageEvent.h
-include/thunderbird/nsIDOMStorageEventObsolete.h
include/thunderbird/nsIDOMStorageIndexedDB.h
include/thunderbird/nsIDOMStorageItem.h
include/thunderbird/nsIDOMStorageManager.h
@@ -1321,6 +1359,7 @@ include/thunderbird/nsIDOMTransitionEvent.h
include/thunderbird/nsIDOMTreeWalker.h
include/thunderbird/nsIDOMUIEvent.h
include/thunderbird/nsIDOMUserDataHandler.h
+include/thunderbird/nsIDOMUserProximityEvent.h
include/thunderbird/nsIDOMValidityState.h
include/thunderbird/nsIDOMWakeLock.h
include/thunderbird/nsIDOMWakeLockListener.h
@@ -1391,7 +1430,6 @@ include/thunderbird/nsIDownloadProgressListener.h
include/thunderbird/nsIDownloader.h
include/thunderbird/nsIDragService.h
include/thunderbird/nsIDragSession.h
-include/thunderbird/nsIDragSessionGTK.h
include/thunderbird/nsIDroppedLinkHandler.h
include/thunderbird/nsIEditActionListener.h
include/thunderbird/nsIEditingSession.h
@@ -1444,6 +1482,7 @@ include/thunderbird/nsIFile.h
include/thunderbird/nsIFileChannel.h
include/thunderbird/nsIFilePicker.h
include/thunderbird/nsIFileProtocolHandler.h
+include/thunderbird/nsIFileStorage.h
include/thunderbird/nsIFileStreams.h
include/thunderbird/nsIFileURL.h
include/thunderbird/nsIFileView.h
@@ -1478,7 +1517,6 @@ include/thunderbird/nsIGenKeypairInfoDlg.h
include/thunderbird/nsIGeolocationProvider.h
include/thunderbird/nsIGfxInfo.h
include/thunderbird/nsIGfxInfoDebug.h
-include/thunderbird/nsIGlobalHistory.h
include/thunderbird/nsIGlobalHistory2.h
include/thunderbird/nsIGnomeVFSService.h
include/thunderbird/nsIGridPart.h
@@ -1514,6 +1552,7 @@ include/thunderbird/nsIIDBCursor.h
include/thunderbird/nsIIDBCursorWithValue.h
include/thunderbird/nsIIDBDatabase.h
include/thunderbird/nsIIDBFactory.h
+include/thunderbird/nsIIDBFileHandle.h
include/thunderbird/nsIIDBIndex.h
include/thunderbird/nsIIDBKeyRange.h
include/thunderbird/nsIIDBObjectStore.h
@@ -1651,6 +1690,7 @@ include/thunderbird/nsIMimeHeaders.h
include/thunderbird/nsIMimeMiscStatus.h
include/thunderbird/nsIMimeObjectClassAccess.h
include/thunderbird/nsIMimeStreamConverter.h
+include/thunderbird/nsIMmsService.h
include/thunderbird/nsIMobileConnectionProvider.h
include/thunderbird/nsIModule.h
include/thunderbird/nsIMovemailIncomingServer.h
@@ -1809,7 +1849,6 @@ include/thunderbird/nsIPluginHost.h
include/thunderbird/nsIPluginInputStream.h
include/thunderbird/nsIPluginInstanceOwner.h
include/thunderbird/nsIPluginStreamInfo.h
-include/thunderbird/nsIPluginStreamListener.h
include/thunderbird/nsIPluginTag.h
include/thunderbird/nsIPluginTagInfo.h
include/thunderbird/nsIPluginWidget.h
@@ -1839,6 +1878,8 @@ include/thunderbird/nsIPrintSettingsService.h
include/thunderbird/nsIPrintStatusFeedback.h
include/thunderbird/nsIPrintingPrompt.h
include/thunderbird/nsIPrintingPromptService.h
+include/thunderbird/nsIPrivacyTransitionObserver.h
+include/thunderbird/nsIPrivateBrowsingConsumer.h
include/thunderbird/nsIPrivateBrowsingService.h
include/thunderbird/nsIPrivateDOMEvent.h
include/thunderbird/nsIPrivateTextEvent.h
@@ -1982,6 +2023,7 @@ include/thunderbird/nsISerializable.h
include/thunderbird/nsISerializationHelper.h
include/thunderbird/nsIServerSocket.h
include/thunderbird/nsIServiceManager.h
+include/thunderbird/nsISettingsService.h
include/thunderbird/nsIShellService.h
include/thunderbird/nsISidebar.h
include/thunderbird/nsISignatureVerifier.h
@@ -2003,7 +2045,9 @@ include/thunderbird/nsISocketTransport.h
include/thunderbird/nsISocketTransportService.h
include/thunderbird/nsISound.h
include/thunderbird/nsISpamSettings.h
+include/thunderbird/nsISpeculativeConnect.h
include/thunderbird/nsISpellChecker.h
+include/thunderbird/nsIStandardFileStream.h
include/thunderbird/nsIStandardURL.h
include/thunderbird/nsIStartupCache.h
include/thunderbird/nsIStatefulFrame.h
@@ -2130,6 +2174,7 @@ include/thunderbird/nsIVersionComparator.h
include/thunderbird/nsIView.h
include/thunderbird/nsIViewManager.h
include/thunderbird/nsIViewSourceChannel.h
+include/thunderbird/nsIWapPushApplication.h
include/thunderbird/nsIWeakReference.h
include/thunderbird/nsIWeakReferenceUtils.h
include/thunderbird/nsIWebBrowser.h
@@ -2175,7 +2220,6 @@ include/thunderbird/nsIX509CertDB2.h
include/thunderbird/nsIX509CertList.h
include/thunderbird/nsIX509CertValidity.h
include/thunderbird/nsIXBLAccessible.h
-include/thunderbird/nsIXBLService.h
include/thunderbird/nsIXFormsUtilityService.h
include/thunderbird/nsIXMLContentBuilder.h
include/thunderbird/nsIXMLContentSink.h
@@ -2297,6 +2341,7 @@ include/thunderbird/nsNodeUtils.h
include/thunderbird/nsOSHelperAppService.h
include/thunderbird/nsObjCExceptions.h
include/thunderbird/nsObjectFrame.h
+include/thunderbird/nsObserverList.h
include/thunderbird/nsObserverService.h
include/thunderbird/nsOggCodecState.h
include/thunderbird/nsOggDecoder.h
@@ -2328,6 +2373,7 @@ include/thunderbird/nsPluginsCID.h
include/thunderbird/nsPluginsDir.h
include/thunderbird/nsPoint.h
include/thunderbird/nsPosixLocale.h
+include/thunderbird/nsPresArena.h
include/thunderbird/nsPresContext.h
include/thunderbird/nsPresState.h
include/thunderbird/nsPrintfCString.h
@@ -2350,7 +2396,6 @@ include/thunderbird/nsReferencedElement.h
include/thunderbird/nsRefreshDriver.h
include/thunderbird/nsRegion.h
include/thunderbird/nsRenderingContext.h
-include/thunderbird/nsRootAccessibleWrap.h
include/thunderbird/nsRuleData.h
include/thunderbird/nsRuleNode.h
include/thunderbird/nsRuleProcessorData.h
@@ -2379,12 +2424,14 @@ include/thunderbird/nsScriptLoader.h
include/thunderbird/nsScriptableInputStream.h
include/thunderbird/nsServiceManagerUtils.h
include/thunderbird/nsSize.h
+include/thunderbird/nsSpecialCasingData.h
include/thunderbird/nsStackWalk.h
include/thunderbird/nsStaticAtom.h
include/thunderbird/nsStaticComponents.h
include/thunderbird/nsStaticNameTable.h
include/thunderbird/nsStorageStream.h
include/thunderbird/nsStreamConverter.h
+include/thunderbird/nsStreamListenerWrapper.h
include/thunderbird/nsStreamUtils.h
include/thunderbird/nsString.h
include/thunderbird/nsStringAPI.h
@@ -2414,6 +2461,7 @@ include/thunderbird/nsSubstring.h
include/thunderbird/nsSubstringTuple.h
include/thunderbird/nsSupportsArray.h
include/thunderbird/nsSupportsPrimitives.h
+include/thunderbird/nsSurfaceTexture.h
include/thunderbird/nsTArray-inl.h
include/thunderbird/nsTArray.h
include/thunderbird/nsTArrayHelpers.h
@@ -2427,7 +2475,6 @@ include/thunderbird/nsTString.h
include/thunderbird/nsTSubstring.h
include/thunderbird/nsTSubstringTuple.h
include/thunderbird/nsTWeakRef.h
-include/thunderbird/nsTextAccessibleWrap.h
include/thunderbird/nsTextFormatter.h
include/thunderbird/nsTextFragment.h
include/thunderbird/nsTextServicesCID.h
@@ -2443,6 +2490,7 @@ include/thunderbird/nsTransform2D.h
include/thunderbird/nsTreeColFrame.h
include/thunderbird/nsTreeSanitizer.h
include/thunderbird/nsTreeUtils.h
+include/thunderbird/nsTypedSelection.h
include/thunderbird/nsUCVJA2CID.h
include/thunderbird/nsUCVJACID.h
include/thunderbird/nsUConvCID.h
@@ -2462,6 +2510,7 @@ include/thunderbird/nsUnicodeNormalizer.h
include/thunderbird/nsUnicodeProperties.h
include/thunderbird/nsUnicodeScriptCodes.h
include/thunderbird/nsVCardObj.h
+include/thunderbird/nsVKList.h
include/thunderbird/nsVariant.h
include/thunderbird/nsVersionComparator.h
include/thunderbird/nsViewsCID.h
@@ -2488,10 +2537,7 @@ include/thunderbird/nsXPIDLString.h
include/thunderbird/nsXPTCUtils.h
include/thunderbird/nsXREAppData.h
include/thunderbird/nsXULAppAPI.h
-include/thunderbird/nsXULListboxAccessibleWrap.h
-include/thunderbird/nsXULMenuAccessibleWrap.h
include/thunderbird/nsXULPopupManager.h
-include/thunderbird/nsXULTreeGridAccessibleWrap.h
include/thunderbird/nsZipArchive.h
include/thunderbird/nscore.h
include/thunderbird/nspluginroot.h
@@ -2500,6 +2546,10 @@ include/thunderbird/ogg/config_types.h
include/thunderbird/ogg/ogg.h
include/thunderbird/ogg/os_types.h
include/thunderbird/opentype-sanitiser.h
+include/thunderbird/opus/opus.h
+include/thunderbird/opus/opus_defines.h
+include/thunderbird/opus/opus_multistream.h
+include/thunderbird/opus/opus_types.h
include/thunderbird/ots-memory-stream.h
include/thunderbird/pldhash.h
include/thunderbird/png.h
@@ -2512,6 +2562,7 @@ include/thunderbird/prplIRequest.h
include/thunderbird/prplITooltipInfo.h
include/thunderbird/qcms.h
include/thunderbird/qcmstypes.h
+include/thunderbird/qsObjectHelper.h
include/thunderbird/rdf.h
include/thunderbird/rdfIDataSource.h
include/thunderbird/rdfISerializer.h
@@ -2530,7 +2581,6 @@ include/thunderbird/skia/SkBounder.h
include/thunderbird/skia/SkBuffer.h
include/thunderbird/skia/SkCanvas.h
include/thunderbird/skia/SkChunkAlloc.h
-include/thunderbird/skia/SkClampRange.h
include/thunderbird/skia/SkClipStack.h
include/thunderbird/skia/SkColor.h
include/thunderbird/skia/SkColorFilter.h
@@ -2539,9 +2589,11 @@ include/thunderbird/skia/SkColorShader.h
include/thunderbird/skia/SkComposeShader.h
include/thunderbird/skia/SkDashPathEffect.h
include/thunderbird/skia/SkData.h
+include/thunderbird/skia/SkDeferredCanvas.h
include/thunderbird/skia/SkDeque.h
include/thunderbird/skia/SkDescriptor.h
include/thunderbird/skia/SkDevice.h
+include/thunderbird/skia/SkDeviceProfile.h
include/thunderbird/skia/SkDither.h
include/thunderbird/skia/SkDraw.h
include/thunderbird/skia/SkDrawFilter.h
@@ -2569,7 +2621,10 @@ include/thunderbird/skia/SkMaskFilter.h
include/thunderbird/skia/SkMath.h
include/thunderbird/skia/SkMatrix.h
include/thunderbird/skia/SkMetaData.h
+include/thunderbird/skia/SkMorphologyImageFilter.h
include/thunderbird/skia/SkOSFile.h
+include/thunderbird/skia/SkOrderedReadBuffer.h
+include/thunderbird/skia/SkOrderedWriteBuffer.h
include/thunderbird/skia/SkPackBits.h
include/thunderbird/skia/SkPaint.h
include/thunderbird/skia/SkPath.h
@@ -2608,6 +2663,7 @@ include/thunderbird/skia/SkTRegistry.h
include/thunderbird/skia/SkTScopedPtr.h
include/thunderbird/skia/SkTSearch.h
include/thunderbird/skia/SkTemplates.h
+include/thunderbird/skia/SkTextBox.h
include/thunderbird/skia/SkThread.h
include/thunderbird/skia/SkThread_platform.h
include/thunderbird/skia/SkTime.h
@@ -2618,11 +2674,13 @@ include/thunderbird/skia/SkUnPreMultiply.h
include/thunderbird/skia/SkUnitMapper.h
include/thunderbird/skia/SkUserConfig.h
include/thunderbird/skia/SkUtils.h
+include/thunderbird/skia/SkWeakRefCnt.h
include/thunderbird/skia/SkWriter32.h
include/thunderbird/skia/SkXfermode.h
include/thunderbird/snappy/snappy-c.h
include/thunderbird/snappy/snappy-stubs-public.h
include/thunderbird/snappy/snappy.h
+include/thunderbird/speex/speex_resampler.h
include/thunderbird/steelIApplication.h
include/thunderbird/string-template-def-char.h
include/thunderbird/string-template-def-unichar.h
@@ -2643,6 +2701,7 @@ include/thunderbird/vorbis/codec.h
include/thunderbird/xpcIJSGetFactory.h
include/thunderbird/xpcIJSModuleLoader.h
include/thunderbird/xpcIJSWeakReference.h
+include/thunderbird/xpcObjectHelper.h
include/thunderbird/xpc_map_end.h
include/thunderbird/xpccomponents.h
include/thunderbird/xpcexception.h
@@ -2677,6 +2736,7 @@ lib/thunderbird-sdk/sdk/bin/xpidllex.py
lib/thunderbird-sdk/sdk/bin/xpidlyacc.py
lib/thunderbird-sdk/sdk/bin/xpt.py
lib/thunderbird-sdk/sdk/lib/libmozalloc.so
+lib/thunderbird-sdk/sdk/lib/libmozglue.a
lib/thunderbird-sdk/sdk/lib/libunicharutil_external_s.a
lib/thunderbird-sdk/sdk/lib/libunicharutil_external_s.a.desc
lib/thunderbird-sdk/sdk/lib/libxpcom.so
@@ -2730,6 +2790,9 @@ lib/thunderbird/chrome/chat/skin/classic/prpl/irc/icon48.png
lib/thunderbird/chrome/chat/skin/classic/prpl/twitter/icon.png
lib/thunderbird/chrome/chat/skin/classic/prpl/twitter/icon32.png
lib/thunderbird/chrome/chat/skin/classic/prpl/twitter/icon48.png
+lib/thunderbird/chrome/chat/skin/classic/prpl/xmpp/icon.png
+lib/thunderbird/chrome/chat/skin/classic/prpl/xmpp/icon32.png
+lib/thunderbird/chrome/chat/skin/classic/prpl/xmpp/icon48.png
lib/thunderbird/chrome/classic/skin/classic/communicator/communicator.css
lib/thunderbird/chrome/classic/skin/classic/communicator/icons/smileys/smiley-cool.png
lib/thunderbird/chrome/classic/skin/classic/communicator/icons/smileys/smiley-cry.png
@@ -2810,12 +2873,6 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/cloudfile/addAccountDialog
lib/thunderbird/chrome/classic/skin/classic/messenger/contactStarred.png
lib/thunderbird/chrome/classic/skin/classic/messenger/dialogs.css
lib/thunderbird/chrome/classic/skin/classic/messenger/editContactOverlay.css
-lib/thunderbird/chrome/classic/skin/classic/messenger/featureConfigurator.css
-lib/thunderbird/chrome/classic/skin/classic/messenger/featureConfigurators/animation.png
-lib/thunderbird/chrome/classic/skin/classic/messenger/featureConfigurators/compact-header.png
-lib/thunderbird/chrome/classic/skin/classic/messenger/featureConfigurators/folder-columns.png
-lib/thunderbird/chrome/classic/skin/classic/messenger/featureConfigurators/subpage.css
-lib/thunderbird/chrome/classic/skin/classic/messenger/featureConfigurators/toolbars.png
lib/thunderbird/chrome/classic/skin/classic/messenger/filterDialog.css
lib/thunderbird/chrome/classic/skin/classic/messenger/folderMenus.css
lib/thunderbird/chrome/classic/skin/classic/messenger/folderPane.css
@@ -2850,6 +2907,8 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/icons/chat-toolbar-small.p
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/chat-toolbar.png
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/check.gif
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/close-button.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/closeTab-active.svg
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/closeTab.svg
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/columnpicker.svg
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/connecting.png
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/dropbox.png
@@ -2889,7 +2948,12 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/icons/secure.png
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/server.png
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/status-small.png
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/status.png
-lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tab.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tabActiveEnd.svg
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tabActiveMiddle.svg
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tabActiveStart.svg
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tabBackgroundEnd.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tabBackgroundMiddle.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tabBackgroundStart.png
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tabDragIndicator.png
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/thread-col.svg
lib/thunderbird/chrome/classic/skin/classic/messenger/icons/thread-ignored.png
@@ -3265,6 +3329,8 @@ lib/thunderbird/chrome/en-US/locale/en-US/messenger/chat.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/chat.properties
lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/Dropbox/management.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/Dropbox/settings.dtd
+lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/UbuntuOne/management.dtd
+lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/UbuntuOne/settings.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/YouSendIt/management.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/YouSendIt/settings.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/addAccountDialog.dtd
@@ -3278,7 +3344,6 @@ lib/thunderbird/chrome/en-US/locale/en-US/messenger/downloadsOverlay.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/editContactOverlay.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/editContactOverlay.properties
lib/thunderbird/chrome/en-US/locale/en-US/messenger/eudoraImportMsgs.properties
-lib/thunderbird/chrome/en-US/locale/en-US/messenger/featureConfigurator.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/fieldMapImport.dtd
lib/thunderbird/chrome/en-US/locale/en-US/messenger/filter.properties
lib/thunderbird/chrome/en-US/locale/en-US/messenger/folderProps.dtd
@@ -3443,7 +3508,6 @@ lib/thunderbird/chrome/messenger/content/branding/about-logo.png
lib/thunderbird/chrome/messenger/content/branding/about-wordmark.png
lib/thunderbird/chrome/messenger/content/branding/about.png
lib/thunderbird/chrome/messenger/content/branding/aboutDialog.css
-lib/thunderbird/chrome/messenger/content/branding/featureConfigurator.jpg
lib/thunderbird/chrome/messenger/content/branding/icon48.png
lib/thunderbird/chrome/messenger/content/branding/icon64.png
lib/thunderbird/chrome/messenger/content/messagebody/addressbook/print.css
@@ -3582,6 +3646,7 @@ lib/thunderbird/chrome/messenger/content/messenger/browserRequest.js
lib/thunderbird/chrome/messenger/content/messenger/browserRequest.xul
lib/thunderbird/chrome/messenger/content/messenger/chat/addbuddy.js
lib/thunderbird/chrome/messenger/content/messenger/chat/addbuddy.xul
+lib/thunderbird/chrome/messenger/content/messenger/chat/badgebutton.xml
lib/thunderbird/chrome/messenger/content/messenger/chat/chat-messenger-overlay.js
lib/thunderbird/chrome/messenger/content/messenger/chat/chat-messenger-overlay.xul
lib/thunderbird/chrome/messenger/content/messenger/chat/chat.css
@@ -3598,7 +3663,6 @@ lib/thunderbird/chrome/messenger/content/messenger/chat/imcontact.xml
lib/thunderbird/chrome/messenger/content/messenger/chat/imconv.xml
lib/thunderbird/chrome/messenger/content/messenger/chat/imconversation.xml
lib/thunderbird/chrome/messenger/content/messenger/chat/imgroup.xml
-lib/thunderbird/chrome/messenger/content/messenger/chat/imsearch.xml
lib/thunderbird/chrome/messenger/content/messenger/chat/joinchat.js
lib/thunderbird/chrome/messenger/content/messenger/chat/joinchat.xul
lib/thunderbird/chrome/messenger/content/messenger/cloudfile/Dropbox/management.js
@@ -3626,20 +3690,6 @@ lib/thunderbird/chrome/messenger/content/messenger/downloadsOverlay.xul
lib/thunderbird/chrome/messenger/content/messenger/editContactOverlay.js
lib/thunderbird/chrome/messenger/content/messenger/editContactOverlay.xul
lib/thunderbird/chrome/messenger/content/messenger/extraCustomizeItems.xul
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurator.css
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurator.js
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurator.xhtml
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/autosync.js
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/autosync.xhtml
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/compactheader.js
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/compactheader.xhtml
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/extensions.js
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/folderpanecolumns.js
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/folderpanecolumns.xhtml
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/introduction.xhtml
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/subpage.css
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/toolbar.js
-lib/thunderbird/chrome/messenger/content/messenger/featureConfigurators/toolbar.xhtml
lib/thunderbird/chrome/messenger/content/messenger/fieldMapImport.js
lib/thunderbird/chrome/messenger/content/messenger/fieldMapImport.xul
lib/thunderbird/chrome/messenger/content/messenger/folderDisplay.js
@@ -3858,11 +3908,9 @@ lib/thunderbird/chrome/newsblog/content/messenger-newsblog/Feed.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/FeedItem.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/am-newsblog.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/am-newsblog.xul
-lib/thunderbird/chrome/newsblog/content/messenger-newsblog/debug-utils.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/feed-parser.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/feed-subscriptions.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/feed-subscriptions.xul
-lib/thunderbird/chrome/newsblog/content/messenger-newsblog/file-utils.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/newsblogOverlay.js
lib/thunderbird/chrome/newsblog/content/messenger-newsblog/utils.js
lib/thunderbird/chrome/nonlocalized.manifest
@@ -3925,6 +3973,7 @@ lib/thunderbird/chrome/pippki/content/pippki/viewCertDetails.js
lib/thunderbird/chrome/pippki/content/pippki/viewCertDetails.xul
lib/thunderbird/chrome/toolkit/content/cookie/cookieAcceptDialog.js
lib/thunderbird/chrome/toolkit/content/cookie/cookieAcceptDialog.xul
+lib/thunderbird/chrome/toolkit/content/global/BrowserElementChild.js
lib/thunderbird/chrome/toolkit/content/global/XPCNativeWrapper.js
lib/thunderbird/chrome/toolkit/content/global/about.xhtml
lib/thunderbird/chrome/toolkit/content/global/aboutAbout.xhtml
@@ -4046,6 +4095,7 @@ lib/thunderbird/chrome/toolkit/content/global/remote-test-ipc.js
lib/thunderbird/chrome/toolkit/content/global/resetProfile.css
lib/thunderbird/chrome/toolkit/content/global/resetProfile.js
lib/thunderbird/chrome/toolkit/content/global/resetProfile.xul
+lib/thunderbird/chrome/toolkit/content/global/resetProfileProgress.xul
lib/thunderbird/chrome/toolkit/content/global/selectDialog.js
lib/thunderbird/chrome/toolkit/content/global/selectDialog.xul
lib/thunderbird/chrome/toolkit/content/global/strres.js
@@ -4321,7 +4371,6 @@ lib/thunderbird/chrome/toolkit/skin/classic/global/tabbox.css
lib/thunderbird/chrome/toolkit/skin/classic/global/tabprompts.css
lib/thunderbird/chrome/toolkit/skin/classic/global/textbox.css
lib/thunderbird/chrome/toolkit/skin/classic/global/toolbar.css
-lib/thunderbird/chrome/toolkit/skin/classic/global/toolbar/Lighten.png
lib/thunderbird/chrome/toolkit/skin/classic/global/toolbar/chevron.gif
lib/thunderbird/chrome/toolkit/skin/classic/global/toolbar/spring.png
lib/thunderbird/chrome/toolkit/skin/classic/global/toolbarbutton.css
@@ -4408,6 +4457,7 @@ lib/thunderbird/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
lib/thunderbird/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
lib/thunderbird/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
lib/thunderbird/components/ConsoleAPI.js
+lib/thunderbird/components/ContactManager.js
lib/thunderbird/components/FeedProcessor.js
lib/thunderbird/components/GPSDGeolocationProvider.js
lib/thunderbird/components/NetworkGeolocationProvider.js
@@ -4595,6 +4645,7 @@ lib/thunderbird/modules/FileUtils.jsm
lib/thunderbird/modules/Geometry.jsm
lib/thunderbird/modules/IOUtils.js
lib/thunderbird/modules/ISO8601DateUtils.jsm
+lib/thunderbird/modules/IndexedDBHelper.jsm
lib/thunderbird/modules/InlineSpellChecker.jsm
lib/thunderbird/modules/LightweightThemeConsumer.jsm
lib/thunderbird/modules/LightweightThemeManager.jsm
@@ -4613,6 +4664,8 @@ lib/thunderbird/modules/PopupNotifications.jsm
lib/thunderbird/modules/PropertyListUtils.jsm
lib/thunderbird/modules/SearchIntegration.js
lib/thunderbird/modules/Services.jsm
+lib/thunderbird/modules/SettingsDB.jsm
+lib/thunderbird/modules/SettingsQueue.jsm
lib/thunderbird/modules/SpellCheckDictionaryBootstrap.js
lib/thunderbird/modules/StringBundle.js
lib/thunderbird/modules/TelemetryStopwatch.jsm
@@ -4635,6 +4688,7 @@ 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/chatHandler.jsm
lib/thunderbird/modules/cloudFileAccounts.js
lib/thunderbird/modules/ctypes.jsm
lib/thunderbird/modules/dbViewWrapper.js
@@ -4687,7 +4741,9 @@ lib/thunderbird/modules/ircCommands.jsm
lib/thunderbird/modules/ircDCC.jsm
lib/thunderbird/modules/ircHandlers.jsm
lib/thunderbird/modules/ircISUPPORT.jsm
+lib/thunderbird/modules/ircServices.jsm
lib/thunderbird/modules/ircUtils.jsm
+lib/thunderbird/modules/ircWatchMonitor.jsm
lib/thunderbird/modules/iteratorUtils.jsm
lib/thunderbird/modules/jsProtoHelper.jsm
lib/thunderbird/modules/jsTreeSelection.js
@@ -4697,6 +4753,7 @@ lib/thunderbird/modules/mailMigrator.js
lib/thunderbird/modules/mailServices.js
lib/thunderbird/modules/mailViewManager.js
lib/thunderbird/modules/mailnewsMigrator.js
+lib/thunderbird/modules/msgDBCacheManager.js
lib/thunderbird/modules/nsFormAutoCompleteResult.jsm
lib/thunderbird/modules/oauth.jsm
lib/thunderbird/modules/quickFilterManager.js
@@ -4769,6 +4826,7 @@ lib/thunderbird/searchplugins/wikipedia.xml
lib/thunderbird/searchplugins/yahoo.xml
lib/thunderbird/thunderbird
lib/thunderbird/thunderbird-bin
+lib/thunderbird/update-settings.ini
lib/thunderbird/update.locale
lib/thunderbird/updater
lib/thunderbird/updater.ini
@@ -4833,7 +4891,8 @@ share/idl/thunderbird/mozIStorageService.idl
share/idl/thunderbird/mozIStorageServiceQuotaManagement.idl
share/idl/thunderbird/mozIStorageStatement.idl
share/idl/thunderbird/mozIStorageStatementCallback.idl
-share/idl/thunderbird/mozIStorageStatementWrapper.idl
+share/idl/thunderbird/mozIStorageStatementParams.idl
+share/idl/thunderbird/mozIStorageStatementRow.idl
share/idl/thunderbird/mozIStorageVacuumParticipant.idl
share/idl/thunderbird/mozIStorageValueArray.idl
share/idl/thunderbird/mozITXTToHTMLConv.idl
@@ -4909,6 +4968,7 @@ share/idl/thunderbird/nsIApplicationCache.idl
share/idl/thunderbird/nsIApplicationCacheChannel.idl
share/idl/thunderbird/nsIApplicationCacheContainer.idl
share/idl/thunderbird/nsIApplicationCacheService.idl
+share/idl/thunderbird/nsIAppsService.idl
share/idl/thunderbird/nsIArray.idl
share/idl/thunderbird/nsIAssociatedContentSecurity.idl
share/idl/thunderbird/nsIAsyncInputStream.idl
@@ -5102,8 +5162,12 @@ share/idl/thunderbird/nsIDOMDOMTokenList.idl
share/idl/thunderbird/nsIDOMDataContainerEvent.idl
share/idl/thunderbird/nsIDOMDataTransfer.idl
share/idl/thunderbird/nsIDOMDesktopNotification.idl
+share/idl/thunderbird/nsIDOMDeviceLightEvent.idl
share/idl/thunderbird/nsIDOMDeviceMotionEvent.idl
share/idl/thunderbird/nsIDOMDeviceOrientationEvent.idl
+share/idl/thunderbird/nsIDOMDeviceProximityEvent.idl
+share/idl/thunderbird/nsIDOMDeviceStorage.idl
+share/idl/thunderbird/nsIDOMDeviceStorageCursor.idl
share/idl/thunderbird/nsIDOMDocument.idl
share/idl/thunderbird/nsIDOMDocumentFragment.idl
share/idl/thunderbird/nsIDOMDocumentType.idl
@@ -5116,8 +5180,10 @@ share/idl/thunderbird/nsIDOMEvent.idl
share/idl/thunderbird/nsIDOMEventListener.idl
share/idl/thunderbird/nsIDOMEventTarget.idl
share/idl/thunderbird/nsIDOMFile.idl
+share/idl/thunderbird/nsIDOMFileHandle.idl
share/idl/thunderbird/nsIDOMFileList.idl
share/idl/thunderbird/nsIDOMFileReader.idl
+share/idl/thunderbird/nsIDOMFileRequest.idl
share/idl/thunderbird/nsIDOMFontFace.idl
share/idl/thunderbird/nsIDOMFontFaceList.idl
share/idl/thunderbird/nsIDOMFormData.idl
@@ -5128,6 +5194,7 @@ share/idl/thunderbird/nsIDOMGeoPositionCoords.idl
share/idl/thunderbird/nsIDOMGeoPositionError.idl
share/idl/thunderbird/nsIDOMGeoPositionErrorCallback.idl
share/idl/thunderbird/nsIDOMGetSVGDocument.idl
+share/idl/thunderbird/nsIDOMGlobalObjectConstructor.idl
share/idl/thunderbird/nsIDOMGlobalPropertyInitializer.idl
share/idl/thunderbird/nsIDOMHTMLAnchorElement.idl
share/idl/thunderbird/nsIDOMHTMLAppletElement.idl
@@ -5204,9 +5271,11 @@ share/idl/thunderbird/nsIDOMLSProgressEvent.idl
share/idl/thunderbird/nsIDOMLinkStyle.idl
share/idl/thunderbird/nsIDOMLoadStatus.idl
share/idl/thunderbird/nsIDOMLocation.idl
+share/idl/thunderbird/nsIDOMLockedFile.idl
share/idl/thunderbird/nsIDOMMediaError.idl
share/idl/thunderbird/nsIDOMMediaList.idl
share/idl/thunderbird/nsIDOMMediaQueryList.idl
+share/idl/thunderbird/nsIDOMMediaStream.idl
share/idl/thunderbird/nsIDOMMessageEvent.idl
share/idl/thunderbird/nsIDOMMimeType.idl
share/idl/thunderbird/nsIDOMMimeTypeArray.idl
@@ -5228,9 +5297,11 @@ share/idl/thunderbird/nsIDOMNamedNodeMap.idl
share/idl/thunderbird/nsIDOMNavigator.idl
share/idl/thunderbird/nsIDOMNavigatorBattery.idl
share/idl/thunderbird/nsIDOMNavigatorDesktopNotification.idl
+share/idl/thunderbird/nsIDOMNavigatorDeviceStorage.idl
share/idl/thunderbird/nsIDOMNavigatorGeolocation.idl
share/idl/thunderbird/nsIDOMNavigatorNetwork.idl
share/idl/thunderbird/nsIDOMNavigatorSms.idl
+share/idl/thunderbird/nsIDOMNavigatorUserMedia.idl
share/idl/thunderbird/nsIDOMNode.idl
share/idl/thunderbird/nsIDOMNodeFilter.idl
share/idl/thunderbird/nsIDOMNodeIterator.idl
@@ -5338,6 +5409,7 @@ share/idl/thunderbird/nsIDOMSVGTransformable.idl
share/idl/thunderbird/nsIDOMSVGURIReference.idl
share/idl/thunderbird/nsIDOMSVGUnitTypes.idl
share/idl/thunderbird/nsIDOMSVGUseElement.idl
+share/idl/thunderbird/nsIDOMSVGViewElement.idl
share/idl/thunderbird/nsIDOMSVGViewSpec.idl
share/idl/thunderbird/nsIDOMSVGZoomAndPan.idl
share/idl/thunderbird/nsIDOMSVGZoomEvent.idl
@@ -5355,7 +5427,6 @@ share/idl/thunderbird/nsIDOMSmsMessage.idl
share/idl/thunderbird/nsIDOMSmsRequest.idl
share/idl/thunderbird/nsIDOMStorage.idl
share/idl/thunderbird/nsIDOMStorageEvent.idl
-share/idl/thunderbird/nsIDOMStorageEventObsolete.idl
share/idl/thunderbird/nsIDOMStorageIndexedDB.idl
share/idl/thunderbird/nsIDOMStorageItem.idl
share/idl/thunderbird/nsIDOMStorageManager.idl
@@ -5371,6 +5442,7 @@ share/idl/thunderbird/nsIDOMTransitionEvent.idl
share/idl/thunderbird/nsIDOMTreeWalker.idl
share/idl/thunderbird/nsIDOMUIEvent.idl
share/idl/thunderbird/nsIDOMUserDataHandler.idl
+share/idl/thunderbird/nsIDOMUserProximityEvent.idl
share/idl/thunderbird/nsIDOMValidityState.idl
share/idl/thunderbird/nsIDOMWakeLock.idl
share/idl/thunderbird/nsIDOMWakeLockListener.idl
@@ -5512,7 +5584,6 @@ share/idl/thunderbird/nsIGenKeypairInfoDlg.idl
share/idl/thunderbird/nsIGeolocationProvider.idl
share/idl/thunderbird/nsIGfxInfo.idl
share/idl/thunderbird/nsIGfxInfoDebug.idl
-share/idl/thunderbird/nsIGlobalHistory.idl
share/idl/thunderbird/nsIGlobalHistory2.idl
share/idl/thunderbird/nsIGnomeVFSService.idl
share/idl/thunderbird/nsIHTMLAbsPosEditor.idl
@@ -5543,6 +5614,7 @@ share/idl/thunderbird/nsIIDBCursor.idl
share/idl/thunderbird/nsIIDBCursorWithValue.idl
share/idl/thunderbird/nsIIDBDatabase.idl
share/idl/thunderbird/nsIIDBFactory.idl
+share/idl/thunderbird/nsIIDBFileHandle.idl
share/idl/thunderbird/nsIIDBIndex.idl
share/idl/thunderbird/nsIIDBKeyRange.idl
share/idl/thunderbird/nsIIDBObjectStore.idl
@@ -5663,6 +5735,7 @@ share/idl/thunderbird/nsIMimeEmitter.idl
share/idl/thunderbird/nsIMimeHeaders.idl
share/idl/thunderbird/nsIMimeMiscStatus.idl
share/idl/thunderbird/nsIMimeStreamConverter.idl
+share/idl/thunderbird/nsIMmsService.idl
share/idl/thunderbird/nsIMobileConnectionProvider.idl
share/idl/thunderbird/nsIModule.idl
share/idl/thunderbird/nsIMovemailIncomingServer.idl
@@ -5805,7 +5878,6 @@ share/idl/thunderbird/nsIPluginHost.idl
share/idl/thunderbird/nsIPluginInputStream.idl
share/idl/thunderbird/nsIPluginInstanceOwner.idl
share/idl/thunderbird/nsIPluginStreamInfo.idl
-share/idl/thunderbird/nsIPluginStreamListener.idl
share/idl/thunderbird/nsIPluginTag.idl
share/idl/thunderbird/nsIPluginTagInfo.idl
share/idl/thunderbird/nsIPop3IncomingServer.idl
@@ -5832,6 +5904,8 @@ share/idl/thunderbird/nsIPrintSettingsService.idl
share/idl/thunderbird/nsIPrintStatusFeedback.idl
share/idl/thunderbird/nsIPrintingPrompt.idl
share/idl/thunderbird/nsIPrintingPromptService.idl
+share/idl/thunderbird/nsIPrivacyTransitionObserver.idl
+share/idl/thunderbird/nsIPrivateBrowsingConsumer.idl
share/idl/thunderbird/nsIPrivateBrowsingService.idl
share/idl/thunderbird/nsIProcess.idl
share/idl/thunderbird/nsIProfile.idl
@@ -5950,6 +6024,7 @@ share/idl/thunderbird/nsISerializable.idl
share/idl/thunderbird/nsISerializationHelper.idl
share/idl/thunderbird/nsIServerSocket.idl
share/idl/thunderbird/nsIServiceManager.idl
+share/idl/thunderbird/nsISettingsService.idl
share/idl/thunderbird/nsIShellService.idl
share/idl/thunderbird/nsISidebar.idl
share/idl/thunderbird/nsISignatureVerifier.idl
@@ -5970,6 +6045,8 @@ share/idl/thunderbird/nsISocketTransport.idl
share/idl/thunderbird/nsISocketTransportService.idl
share/idl/thunderbird/nsISound.idl
share/idl/thunderbird/nsISpamSettings.idl
+share/idl/thunderbird/nsISpeculativeConnect.idl
+share/idl/thunderbird/nsIStandardFileStream.idl
share/idl/thunderbird/nsIStandardURL.idl
share/idl/thunderbird/nsIStartupCache.idl
share/idl/thunderbird/nsIStatusBarBiffManager.idl
@@ -6072,6 +6149,7 @@ share/idl/thunderbird/nsIUserInfo.idl
share/idl/thunderbird/nsIVariant.idl
share/idl/thunderbird/nsIVersionComparator.idl
share/idl/thunderbird/nsIViewSourceChannel.idl
+share/idl/thunderbird/nsIWapPushApplication.idl
share/idl/thunderbird/nsIWeakReference.idl
share/idl/thunderbird/nsIWebBrowser.idl
share/idl/thunderbird/nsIWebBrowserChrome.idl
diff --git a/mail/thunderbird/PLIST.enigmail b/mail/thunderbird/PLIST.enigmail
index 5d670380626..e1ab252db37 100644
--- a/mail/thunderbird/PLIST.enigmail
+++ b/mail/thunderbird/PLIST.enigmail
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.enigmail,v 1.6 2012/06/12 19:37:48 ryoon Exp $
+@comment $NetBSD: PLIST.enigmail,v 1.7 2012/09/02 06:43:39 ryoon 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
@@ -13,6 +13,7 @@ lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
+lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeDecrypt.jsm
lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeTransport.jsm
lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
diff --git a/mail/thunderbird/PLIST.lightning b/mail/thunderbird/PLIST.lightning
index 4dc01aa95d1..8489d07d2f9 100644
--- a/mail/thunderbird/PLIST.lightning
+++ b/mail/thunderbird/PLIST.lightning
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.lightning,v 1.11 2012/07/19 17:57:30 ryoon Exp $
+@comment $NetBSD: PLIST.lightning,v 1.12 2012/09/02 06:43:39 ryoon Exp $
include/thunderbird/calBaseCID.h
include/thunderbird/calIAlarm.h
include/thunderbird/calIAlarmService.h
@@ -208,6 +208,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/alarms.xul
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/categories.js
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/categories.xul
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/editCategory.js
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/editCategory.xul
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/general.js
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/preferences/general.xul
@@ -232,6 +233,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/cal-icon32.png
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-alarm-dialog.css
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-alarms.css
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-attendees.css
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-creation-wizard.css
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-daypicker.css
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-event-dialog-attendees.png
@@ -275,6 +277,9 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grippy-right.png
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/event-grippy-top.png
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/ok-cancel.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/printing/calHtmlExport.html
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/printing/calMonthGridPrinter.html
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/printing/calWeekPrinter.html
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/task-images.png
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/tasks-actions.png
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/timezone_map.png
@@ -301,6 +306,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightni
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-calendar-creation.xul
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-calendar-properties.js
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-calendar-properties.xul
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-invitation.xhtml
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-menus.xul
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-migration.xul
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/lightning/content/lightning/lightning-standalone.xul
@@ -371,6 +377,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPro
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}/modules/calXMLUtils.jsm
lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite
share/idl/thunderbird/calIAlarm.idl
share/idl/thunderbird/calIAlarmService.idl
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index bf8e0a479f1..a93126311b6 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,125 +1,121 @@
-$NetBSD: distinfo,v 1.99 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: distinfo,v 1.100 2012/09/02 06:43:39 ryoon Exp $
-SHA1 (enigmail-1.4.3.tar.gz) = 3b89155bbd4a36b912304481d293d451fa52f66e
-RMD160 (enigmail-1.4.3.tar.gz) = 94ad953a5494ab2ccd135be84acf434128108fb1
-Size (enigmail-1.4.3.tar.gz) = 1337811 bytes
-SHA1 (lightning-1.6.source.tar.bz2) = 1aa9cb31d2400412b3c5ac4f74c1199a2ca88b2e
-RMD160 (lightning-1.6.source.tar.bz2) = f299834459b92cd4dc0e50803ac81e71a3ea3e10
-Size (lightning-1.6.source.tar.bz2) = 105730907 bytes
-SHA1 (thunderbird-14.0.source.tar.bz2) = 834d7aed141792204cbc8057dc80b20dafba9193
-RMD160 (thunderbird-14.0.source.tar.bz2) = da9eeb8c89da0c751d17a681a51698d2c4faefc2
-Size (thunderbird-14.0.source.tar.bz2) = 105235591 bytes
-SHA1 (patch-aa) = ac0b89346aec8ef8ba937ef494395f526f20054d
-SHA1 (patch-aa-toplevel) = 8891fcadbea806950f2248f290ad34e08d8f6ef2
-SHA1 (patch-ab) = 693567e7c029a7ef07c4ccd3680dc987081ead21
-SHA1 (patch-ac) = 4408aab5333558c916ff52891b0adb1c298cf2c7
-SHA1 (patch-ad) = 207402df0576cc96f034f77b12e7a9dbaae82001
-SHA1 (patch-ae) = 6ab15eb03f9df46a620f7d00deff768df4b618f0
-SHA1 (patch-af) = f8c2b4eed0d0d07f5fdbd9c407a31e36fe68c8ed
-SHA1 (patch-ag) = a6f94709e42717a25c652da7bbeb0554b8b94245
-SHA1 (patch-ai) = 552359ee5e3913bd3d0f085a8ae4a641dca384f9
-SHA1 (patch-aj) = 3579332347f4922d715e4e46f13a176413322953
-SHA1 (patch-ak) = 0c04cbc732406c484f950c91bbe53d6f3a01163c
-SHA1 (patch-al) = fa92c822ebca294bf22ec300aaffde25e1ea1608
-SHA1 (patch-am) = 0e3921088000ea7157ae4610447319379ecb99ab
-SHA1 (patch-an) = 09e2a555c65d87252414cc79eb93f9a73e03fe1e
-SHA1 (patch-ao) = 9a17785de51706df413dcc84128d17f7072a07c3
-SHA1 (patch-as) = 033cdd39261910525413250f6b58c25de9fd47f0
-SHA1 (patch-at) = 66547d1cd153e384855426bb95f02dc5308fbd79
-SHA1 (patch-au) = 3fa326682ac9d39f92f5e64dc575932d99d5ac9a
-SHA1 (patch-av) = b13b213dcb119f5695bf0c54216a0a29c4160b6e
-SHA1 (patch-aw) = 7d067f1a86a3f1e7acc7376e15465e6801fb4d60
-SHA1 (patch-ax) = cc50b68037e5b94f4dc5ba2cb48c660f1cc1a914
-SHA1 (patch-ay) = 745c63fe7270b14ab69d3a3d9ac578f8703a08a3
-SHA1 (patch-az) = 7bdac9e086304b84ce97093dfe192a308711cea0
-SHA1 (patch-ba) = b7f3169e96eedbf40a4de3914ce0c6f89a2a179b
-SHA1 (patch-bd) = 5c688930ad900274a5db4a5bafa7e0414a9e5dc5
-SHA1 (patch-bf) = 776b70f53149e9ca719f9f256da9ed90046451f0
-SHA1 (patch-bg) = b3a2f6414c2932ca9931cb1880ee1128c10a35fc
-SHA1 (patch-bi) = b2804f162ec6cca35832d21947b8de68cf9c8a21
-SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = 4c39a3735edab7cf0ae7535e5071df3c9fbff904
-SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 19dd00bc140fe59ed09f52fbc15b354dca653961
-SHA1 (patch-ipc_chromium_src_base_file__util.h) = 8f138ab6b3846e3ab2b2d1589d744453583005a8
-SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = d3bc7acd9a82bfbc5809a38cd274d2b1eb50a744
-SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = c3be705b758b19df54e165aa01a8cbfa8d66ec8a
-SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 4716000ae82d9a4809ecbd1fba9396eb4191db06
-SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 75392dace086dff98fba4b77fd04d66b0f99d63c
-SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 0c5a4881b818bfe5f549deea80b00f8b356eecf0
-SHA1 (patch-ipc_chromium_src_build_build__config.h) = 414597653f24cff360aba887f54d94988f097f76
-SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 36946782d921d6a7585f662bed640d27a558b3fc
-SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = ca152e5afaa036d4f430f85f723ab7e43884704d
-SHA1 (patch-js_src_jscpucfg.h) = 6a4b8a6b63ae9752188efdba04ce386bb1a04961
-SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 83c2c48c6e8d8adba7d08dc58ff5d83b9b792a34
-SHA1 (patch-ma) = bcc65b1436d5d56b3063d8375853b6de1538c7ac
-SHA1 (patch-ma-toplevel) = 53ed7dcb176bf32a9850ac9096b3e79252aa2d50
-SHA1 (patch-mb) = f29954cd7abe2a8ba2ade48c4ca6dd143e2470b3
-SHA1 (patch-md) = 737fec6c7dbc5caa33ded7a77a9cbf38dba96a0d
-SHA1 (patch-me) = 6e3e1cecbade509d8f5961f5a451b231a4466b4b
-SHA1 (patch-mf) = c5f25d575036ddfaef3bbc728fb752acd74d8d4b
-SHA1 (patch-mg) = ae6b0cfa61f7a7dc900a7b9ee0e1249c655b1b05
-SHA1 (patch-mh) = 2f93a6e83397ee660f66e9df6ab589176a5c3377
-SHA1 (patch-mi) = f651f021979e0363de6a1237a6a2185431f4e2e3
-SHA1 (patch-mj) = f8daad020e06010cda91f0459ccd85f26af57bba
-SHA1 (patch-mk) = 40a07f63d9ef5b95db028409663f834137c20ce4
-SHA1 (patch-ml) = dba2b2cf9ce4198d3da7bb426bb38dc3f889612e
-SHA1 (patch-mm) = 4476720ea3cac6317be6f3e5cea44d2df66fc992
-SHA1 (patch-mn) = 8497e12ca0d19766f192b8d27203c59f60b8209b
-SHA1 (patch-mozilla_build_autoconf_nss.m4) = 1cfc292b1af8a81bca1323358676afaf10615364
-SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = bb3f0bbc3cfafcfad9ddd714d82700cb7f7f8268
-SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 2a228feb57917d016cf1da7fb9dbcc85be7b9cbd
-SHA1 (patch-mozilla_gfx_thebes_gfxPlatform.cpp) = 727aad7b6f5287f4647d59f1fbc1bb9bfe2b0871
-SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 892b77e86072eaee6373e77ea95e35197bf2aed8
-SHA1 (patch-mozilla_ipc_chromium_chromium-config.mk) = 637cbf6dc8f433dc345fbc46917a8ccf5f859aa3
-SHA1 (patch-mozilla_ipc_chromium_src_base_base__paths.h) = 366fd558b5dd9787ed124a8f7507fae6a542015d
-SHA1 (patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc) = c26170448054968c423173cf808114be976b8ddf
-SHA1 (patch-mozilla_ipc_chromium_src_base_message__loop.cc) = d8f46c0620fc58e49d5072993b7c932ba50ae170
-SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = 24769573e6c263eaec15747618ffde368abed545
-SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = 14fc7b606ee3a4a7196e0c51247d3c4e2465501f
-SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = 1a22f5da58dfafe1fc249b0d142be43230544750
-SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = ba5533e5571dbdc5d0cc523c5280d97372abd6b3
-SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = c5ba1624ff07794181839f99ec2b376369b2ca54
-SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = 446d6d55189e09dfb8cb59f98d0985f0961390da
-SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = dd3c5469cac9803ee6b14fd8590d807676a8417d
-SHA1 (patch-mozilla_js_src_config_rules.mk) = 867e1fc9a3ec5b7d38e9f7a0be855e96016f265d
-SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = e16054358a082408bbcd4831407cb5658b1f21f9
-SHA1 (patch-mozilla_js_src_yarr_pcre_pcre.h) = e4d1c540d3b6b6ca21cec710d37198441cfd0b50
-SHA1 (patch-mozilla_js_xpconnect_src_Makefile.in) = bac60c2224b5f1c4ddd902d124a13a30d916b884
-SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = 82cf2de23c75abfe914fb6cc56607c2065c3327d
-SHA1 (patch-mozilla_media_libvpx_vpx__config.h) = 388cd6ef14afe35d337cb7f738011f4d84faab2c
-SHA1 (patch-mozilla_media_libvpx_vpx__config__c.c) = 19e00552a957b8495759916edbbd7d58324da951
-SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = bbe6d513984fcb6d72b35d2c7349499531578a24
-SHA1 (patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg) = e7d3a880ec8c96a098cc91c0aad5bfa34078c7da
-SHA1 (patch-mozilla_nsprpub_pr_include_md___pth.h) = c5a5d1946cd159bd2c8cdc45d399408a100fae2d
-SHA1 (patch-mozilla_nsprpub_pr_include_md_prosdep.h) = dacb08cbe415c96c087528daa90262652391d009
-SHA1 (patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c) = b22b25aa3cadba68ae7a388d3ff57cbaaf64390d
-SHA1 (patch-mozilla_nsprpub_pr_src_pthreads_ptio.c) = 8a3ee0b80884a7deb7b075fb812ee98e07ce6358
-SHA1 (patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c) = 4ad5111f774e93d0a993d6f019827d45e3187cdb
-SHA1 (patch-mozilla_storage_src_Makefile.in) = 15b82a6ac6dee39f1e156789279960e72e9e3e24
-SHA1 (patch-mozilla_xpcom_Makefile.in) = 6466f1f44f6a0db7cc86905113a09102556afe0c
-SHA1 (patch-mozilla_xpcom_idl-parser_Makefile.in) = 7248c3179b72dde2183ba53bd39d2cf4325868dd
-SHA1 (patch-mozilla_xpcom_idl-parser_header.py) = fa8b5f0caf0d5485b13b64fb7a043d66bebd0294
-SHA1 (patch-mozilla_xpcom_typelib_xpidl_Makefile.in) = 07dd6ff65fe98e9e507f3735075fd6a3c540ceb5
-SHA1 (patch-mp) = 1f7c2bf940904d0d040e8a6d1aba5f87c7e09b53
-SHA1 (patch-pa) = 18e942ca2b08b31adebc27538d895ec24939fcc9
-SHA1 (patch-pb) = e71c6b2857cac1ab4d7ef95f09afff8d4ba10069
-SHA1 (patch-pc) = a90ec0619c67dc10d351e8350d530cfaa9fc061f
-SHA1 (patch-pd) = c39d08773bbb184cf3d3b9df13cb28fb80a094fc
-SHA1 (patch-pg) = 29d5dc9a7226bac062665bd831bd622b318eae01
-SHA1 (patch-rc) = bd7fe34b75552fbb589a9498ccb7f715b4ec4ce2
-SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = bafb506b06fac6bc3046bde2c7b3f02c240c04d9
-SHA1 (patch-toolkit_toolkit-tiers.mk) = 43b315af990c91820677ac1d6601eb7d294650a6
-SHA1 (patch-xa) = 4e64460066ac5de142d9289e424ea61e5564963b
-SHA1 (patch-xb) = 27d7dc1144041984ff00584532dda48474c8fc9c
-SHA1 (patch-xc) = 6543ed9aafb09abbed8f8d1d2c6af828f8169004
-SHA1 (patch-xd) = b15013320beb874641e2da7e7e125e79fdfa6676
-SHA1 (patch-xe) = e0d58fcd073c9355c78348e02202791bbf8015fb
-SHA1 (patch-xf) = 37dc7f9cb5258187ecd42413a1297fc34305ba88
-SHA1 (patch-xg) = ba8708b74a8fb69285195c0128a370d4f505da1f
-SHA1 (patch-xj) = 57161bbc50d57e552ed1f3265cdda2c7456bdf11
-SHA1 (patch-xk) = e4fdeadf8e0a3a1620d58ed843e22f8d05f0ee8a
-SHA1 (patch-xl) = d614ff5626db7ed239db79852546e2f2bb51c518
-SHA1 (patch-xm) = 7a0047ccfe7f5b4a69cab2ff3f5ddc68d5a47cc3
-SHA1 (patch-xn) = 44cb75f8e4573151b2193cdc567c7faffa6a9209
-SHA1 (patch-xo) = f45af8ecbc68d4b3d2dfcd7015217d78b9584372
-SHA1 (patch-zb) = 7378bc18f544f230683e533094a0724985c3c838
-SHA1 (patch-zc) = c4f5009946c3aa44cdf9d6e60d58884c0510db1d
+SHA1 (enigmail-1.4.4.tar.gz) = a1601191a3a421b2e94e7ff833300da72267d7ac
+RMD160 (enigmail-1.4.4.tar.gz) = f362b2f205ed151c2127db381c393394995ca8aa
+Size (enigmail-1.4.4.tar.gz) = 1269444 bytes
+SHA1 (lightning-1.7.source.tar.bz2) = 217bfec0003b88e741b563b1e160e4f72ae6362d
+RMD160 (lightning-1.7.source.tar.bz2) = 8392026bcac493f095e3d68b37d0e27984859804
+Size (lightning-1.7.source.tar.bz2) = 106226977 bytes
+SHA1 (thunderbird-15.0.source.tar.bz2) = 00733bf56cbecde0677f2f083f8e2ce3c7379d25
+RMD160 (thunderbird-15.0.source.tar.bz2) = 99c57aafd5fc400ec650de7bce810bc81c624743
+Size (thunderbird-15.0.source.tar.bz2) = 105942186 bytes
+SHA1 (patch-aa) = 627e93e5b61a12bc6de3cdf0e596ed9d1618353b
+SHA1 (patch-aa-toplevel) = 3e46b3ef5e15883c882995f4de41704890605d1d
+SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8
+SHA1 (patch-ac) = 3d54eef3657bf39b73e2851a33b8ee1aa9408131
+SHA1 (patch-ad) = 5f225b1db28a7217d9225ffc03fe3a40b453d7f7
+SHA1 (patch-ae) = 23648401a4f5335a370ff60ae1e1fb37a28404e7
+SHA1 (patch-af) = 371779510213ba63eff81f1258d3d8686b78a7e7
+SHA1 (patch-ag) = bf447af7731e1b508df5b03ec0055e463c1c6db9
+SHA1 (patch-ai) = 6a23c06b627e0d5dddefb926ed08f76e1676d959
+SHA1 (patch-aj) = 2b94927755ffebbe54516b5d66d109cc2e54c400
+SHA1 (patch-ak) = b47277baa1137a7610445b7c4dd147b331d5c5e6
+SHA1 (patch-al) = 9970e89e92ff8b120119b560cb661eabd3a387de
+SHA1 (patch-am) = 2d38162da23828ebee56e56a00ea086992d554ce
+SHA1 (patch-an) = 96139c682b84432e4e8a0be98db56abee89daf02
+SHA1 (patch-ao) = dcdffd03001b8b23ded6a6534c03c3eb300ee459
+SHA1 (patch-as) = e408f64f8e729985b189400989fd324470a0883d
+SHA1 (patch-at) = 45a4f236a45d7f094f72d430a8dff7e86f696aed
+SHA1 (patch-au) = b896f1a65791007b881216e78338411b2ffb6280
+SHA1 (patch-av) = ebf5b14f3b1edc16206e8953c7037459184aa5f4
+SHA1 (patch-aw) = 6bda12d60bd114348eb0c5395302c7e2c8ab223a
+SHA1 (patch-ax) = 146b26866312031aa48c5dfe20ce70da4d198e15
+SHA1 (patch-ay) = 679e1c72851fe74132e53a49b250c21b416e7a49
+SHA1 (patch-az) = e937a48ebcb235b36f50ba2fb3a91864107b7fa3
+SHA1 (patch-ba) = 601d4919f36af98cedd2fc66e4c3852c4520e60a
+SHA1 (patch-bd) = 2d81010e39070cd33224619f0e1f8a329da8940a
+SHA1 (patch-bf) = 0d438453a264599041f4afef38d12d0735d8cbd4
+SHA1 (patch-bg) = 2e55ec7ad6d823b518af9bc59c4425f981f8b94d
+SHA1 (patch-bi) = 745faa7e8b01ab7bdbd790e69a4a8109d5291788
+SHA1 (patch-directory_c-sdk_ldap_include_portable.h) = a6d40c6b92aee607fb4f18d5a7c97b3d7833c74a
+SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 94db51e427931edefd3df5b2c476702242a34926
+SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = d5bc36816be5f336b505354d7ecb019630f13f7c
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 60c091a669774ba47abc768a15f00400aca1d7fe
+SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 1207a1e779ea0d48cb41f6a98edbe22f187b309b
+SHA1 (patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h) = 1334da1b32cffbd2e9eef2d37fe917e8805b5bd3
+SHA1 (patch-ipc_chromium_src_build_build__config.h) = 9f38c64f080464c33c94cc6898365cee7aa2fec7
+SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 02e19237e21ce3bd4431c711ab51bda3fbd33cff
+SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 55d5e4812b1e3b003bbbb73ee4fc7582b8a7c22c
+SHA1 (patch-js_src_jscpucfg.h) = 493889df7e21be8a6b5d5b3854b908da70552de8
+SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 171d81697d136abb6e02cb81445cd88fd8580de2
+SHA1 (patch-ma) = 9d66a2e90afa7b5dedc757dfa939bf9615ee7da1
+SHA1 (patch-ma-toplevel) = 00d3464d03e2014dcb1c708ad94ab2bd03c7b2a7
+SHA1 (patch-mb) = 36ddeba4276196109b5a72b77a2143dada92df34
+SHA1 (patch-md) = ccb29b96c105b6c63d3c85967bed56840b974cf4
+SHA1 (patch-me) = 17b108eb9f0ec40ab34aa58f511a5c1ee6a3a127
+SHA1 (patch-mf) = 5c2fb65285d309fdfdcbf7f1872504deefe236a1
+SHA1 (patch-mg) = f660cfddc4fd49301df2bd31949b5845b8e08f46
+SHA1 (patch-mh) = fff2c712e23d9ffc909cf1a5a3303a155b386716
+SHA1 (patch-mi) = 2dfb916de4e24a2e41ed8f597c8609abb8caa29f
+SHA1 (patch-mj) = f0b7ce3767423c17953bfa511f9e80da2f262543
+SHA1 (patch-mk) = 6a835bfbf4995c7499f5c9d6bf266429e327871e
+SHA1 (patch-ml) = 71ea1c4f984b448d380ed94dabce988a74c4853f
+SHA1 (patch-mm) = 9646a964a86ecbea49d8ea308b5f5811aa65040a
+SHA1 (patch-mn) = 1d0293cce00aa5fa8aa6d0c37dade3c251ca7da6
+SHA1 (patch-mozilla_build_autoconf_nss.m4) = 4c726f98a5139eba2b4a4c34288c08092bfb90b3
+SHA1 (patch-mozilla_config_system-headers) = 55fbb269bb1d42cc50a1520a2733f75bce9436b1
+SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 66d5533eedd9221613c711486d38a5f0c65b4a62
+SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = ff7237f365df1d0bd6eaa8992854f29fe1870319
+SHA1 (patch-mozilla_gfx_thebes_gfxPlatform.cpp) = b4107fea2b683cec7be6c6179c4ecfe6b6a901ee
+SHA1 (patch-mozilla_ipc_chromium_Makefile.in) = 5b1cd2c6b9e9c21df504aafe85013445a7e9425e
+SHA1 (patch-mozilla_ipc_chromium_chromium-config.mk) = 3a502f13a41636f2e793f03fb041d267e6dadb71
+SHA1 (patch-mozilla_ipc_chromium_src_base_base__paths.h) = 1550fd2f3961ded7a17e821208d1bfe6f549e6ac
+SHA1 (patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h) = c222c1087b37b0916f13782a37557d14d028eb98
+SHA1 (patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h) = 0c95e25bc77d775c37be342087c5e6591c90de8d
+SHA1 (patch-mozilla_ipc_chromium_src_base_file__util__linux.cc) = 9e0e8d4e8a4254fca93b37f51eb4940c8f82bd5e
+SHA1 (patch-mozilla_ipc_chromium_src_base_message__loop.cc) = c8b5440d8886c97a54a759cad49cb129304a29de
+SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread.h) = b39c8cfa98fcf0c78e63b234c705f6efce9577d8
+SHA1 (patch-mozilla_ipc_chromium_src_base_process__util.h) = f73dd24bcde49fdafe0495589efc81a96ccb3b5f
+SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = 1383847d6a1236e7de51f032dc8141c53212bfb1
+SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = 975f5409bf51654b033b07f3ed31af637c3c3c2e
+SHA1 (patch-mozilla_ipc_chromium_src_base_ref__counted.h) = 78cef1e5f8c1270060a7defdaa4fef8eb482f542
+SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = 6597dbd50643a8455e377961d2caa29a16496d13
+SHA1 (patch-mozilla_ipc_chromium_src_base_time__posix.cc) = 5f08406a92d5bc2f6cbd524fa4ac77dadb7cafdb
+SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h) = 885d4b060c2f8982db99ed3c0cab0ebffd79b1f6
+SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc) = f4a090285e084d4efa42c0280f26fe003eaad706
+SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = eb1e68191669e61fe95f9b93a4a960c8826d5323
+SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = c6ffcca539c25f58778ac9cc9cdee100e458f714
+SHA1 (patch-mozilla_ipc_glue_SharedMemorySysV.h) = 5907b3b2a66f2a1afc4732d758aa958cb74dcbe9
+SHA1 (patch-mozilla_js_src_config_system-headers) = 17933be7c9573010c4866c14501764760a27030d
+SHA1 (patch-mozilla_js_src_jsgc.cpp) = 6d05c98c75c78d0deb86d780a7ee5ac2a0e69bf2
+SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = eaadbba9c425f67bbd0e7688a0df757645129416
+SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = c12f98cd3e8797d4b2626b18d884c09d4e35d679
+SHA1 (patch-mozilla_media_libvpx_vpx__config.h) = e9033a14f51e15654f2e00f8f447c9cc6a6233ff
+SHA1 (patch-mozilla_media_libvpx_vpx__config__c.c) = 52cd60aaaf68b1fb21eda6d052ed09bf02b8ece0
+SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = 4ce50fe017b56f7bb8d07d3d72a117bfea61f003
+SHA1 (patch-mozilla_storage_src_Makefile.in) = 302301fd992a58e472f72ae6dc9a226129354175
+SHA1 (patch-mozilla_xpcom_Makefile.in) = f7d495a53e207b3ca24df3337b3bb5a88ca9b34a
+SHA1 (patch-mozilla_xpcom_idl-parser_Makefile.in) = 282a06fc56e9fe6980560a3f288bc204a6324188
+SHA1 (patch-mozilla_xpcom_typelib_xpidl_Makefile.in) = addbabcf67b58605f6f8e4ccb674af7ab46d9d22
+SHA1 (patch-mp) = 6687d3583947cd3dc62f9005c38916a747326e3a
+SHA1 (patch-pa) = 659ce8e226b0683d667526df076ded8903aeb235
+SHA1 (patch-pb) = 6ffe3119c9968480de8702e35498cf1f3decba4f
+SHA1 (patch-pc) = 2edc09191a28be7368eca2ef05cf3faa3224d493
+SHA1 (patch-pd) = 99c58b5b6d145c5d19724acd04ce88abe61c0f3a
+SHA1 (patch-pg) = 30b00a6a302c431dd2ea36afc7ee87d564dd7159
+SHA1 (patch-rc) = 46175f709b324d6a363378807eb5689aea52f065
+SHA1 (patch-toolkit_toolkit-tiers.mk) = da9e166c6ae48719370ed2fc979edf1eaeb7fdbd
+SHA1 (patch-xa) = ccd6112610256a5f4965db3531d131e1c35b781a
+SHA1 (patch-xb) = c293419875babf8a3cdd4cd6f0bb22037540d2b8
+SHA1 (patch-xc) = 4e7e2d2c6c117b781aaefd271e739e7242f4de19
+SHA1 (patch-xd) = 0a938219f82e86f618f16656347b7302045dfff0
+SHA1 (patch-xe) = 445281f1383cc6e8f02a0f5a4339c16d61b35fe7
+SHA1 (patch-xf) = 4ed26a45e79a927ed65240e390bc5582676f8665
+SHA1 (patch-xg) = e4a68a6b1eb3e3fc37077638cd347b8ee65c05d9
+SHA1 (patch-xj) = 4ab10a536e9ab925c4bd560aa32d6612e6a63778
+SHA1 (patch-xk) = d43cc553d6e6ebe941657be0581049c66f365b71
+SHA1 (patch-xl) = 149cfa84665e7b4c5351db79af5a56adcc21ddde
+SHA1 (patch-xn) = 86fc014136f2f48c277835c10047eaf424ed256e
+SHA1 (patch-xo) = 390ed2a433103c323e8865c37932560bc01fdd1b
+SHA1 (patch-zb) = 9b94504d7b3ff6d06cecb391bdbd6df5423e715a
+SHA1 (patch-zc) = 9deaf5396eb8cfb41c42eb19967f6e0c4971783d
diff --git a/mail/thunderbird/enigmail.mk b/mail/thunderbird/enigmail.mk
index 10adaac3ee7..5cb4db77e33 100644
--- a/mail/thunderbird/enigmail.mk
+++ b/mail/thunderbird/enigmail.mk
@@ -1,9 +1,9 @@
-# $NetBSD: enigmail.mk,v 1.9 2012/07/19 17:57:30 ryoon Exp $
+# $NetBSD: enigmail.mk,v 1.10 2012/09/02 06:43:39 ryoon Exp $
#
# This Makefile fragment hooks the Enigmail OpenPGP extension
# (see http://www.mozilla-enigmail.org/ ) into the build.
-ENIGMAIL_DIST= enigmail-1.4.3.tar.gz
+ENIGMAIL_DIST= enigmail-1.4.4.tar.gz
XPI_FILES+= ${WRKDIR}/enigmail.xpi
.if !defined(DISTFILES)
DISTFILES= ${DEFAULT_DISTFILES}
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 79c6a7174ec..7810bbf3861 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-aa,v 1.12 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/configure.in.orig 2012-04-20 22:39:56.000000000 +0000
+--- mozilla/configure.in.orig 2012-08-25 00:30:59.000000000 +0000
+++ mozilla/configure.in
-@@ -2413,7 +2413,7 @@ case "$target" in
+@@ -2299,7 +2299,7 @@ case "$target" in
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
;;
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.11 2012/04/28 16:56:58 ryoon Exp $
if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
DLL_SUFFIX=".so.1.0"
DSO_LDOPTS="-shared"
-@@ -2421,6 +2421,9 @@ case "$target" in
+@@ -2307,6 +2307,9 @@ case "$target" in
if test ! "$GNU_CC"; then
DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.11 2012/04/28 16:56:58 ryoon Exp $
;;
ia64*-hpux*)
-@@ -3412,6 +3415,9 @@ dnl ====================================
+@@ -3309,6 +3312,9 @@ dnl ====================================
case $target in
*-hpux11.*)
;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.11 2012/04/28 16:56:58 ryoon Exp $
*)
AC_CHECK_LIB(c_r, gethostbyname_r)
;;
-@@ -4358,6 +4364,14 @@ if test -n "$YASM"; then
+@@ -4308,6 +4314,14 @@ if test -n "$YASM"; then
_YASM_BUILD=` echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
fi
@@ -46,7 +46,7 @@ $NetBSD: patch-aa,v 1.11 2012/04/28 16:56:58 ryoon Exp $
if test -z "$SKIP_LIBRARY_CHECKS"; then
dnl system JPEG support
dnl ========================================================
-@@ -5732,11 +5746,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5734,11 +5748,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
dnl See if we have assembly on this platform.
case "$OS_ARCH:$CPU_ARCH" in
@@ -60,7 +60,16 @@ $NetBSD: patch-aa,v 1.11 2012/04/28 16:56:58 ryoon Exp $
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
;;
-@@ -9102,6 +9116,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -6140,7 +6154,7 @@ if test -n "$MOZ_CRASHREPORTER"; then
+ AC_MSG_ERROR([Breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH. Use --disable-crashreporter.])
+ fi
+
+- if test "$OS_ARCH" == "WINNT" -a -z "$HAVE_64BIT_OS"; then
++ if test "$OS_ARCH" = "WINNT" -a -z "$HAVE_64BIT_OS"; then
+ MOZ_CRASHREPORTER_INJECTOR=1
+ AC_DEFINE(MOZ_CRASHREPORTER_INJECTOR)
+ fi
+@@ -9248,6 +9262,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
if test "$OS_ARCH" != "WINNT"; then
NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
diff --git a/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel
index 966ab4ac8b8..804b45d1cfd 100644
--- a/mail/thunderbird/patches/patch-aa-toplevel
+++ b/mail/thunderbird/patches/patch-aa-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa-toplevel,v 1.7 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-aa-toplevel,v 1.8 2012/09/02 06:43:39 ryoon Exp $
---- configure.in.orig 2012-06-01 17:11:49.000000000 +0000
+--- configure.in.orig 2012-08-25 00:24:32.000000000 +0000
+++ configure.in
-@@ -1925,7 +1925,7 @@ ld.])
+@@ -1865,7 +1865,7 @@ ld.])
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
;;
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.7 2012/06/12 19:37:49 ryoon Exp $
if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
DLL_SUFFIX=".so.1.0"
DSO_LDOPTS="-shared"
-@@ -1933,6 +1933,9 @@ ld.])
+@@ -1873,6 +1873,9 @@ ld.])
if test ! "$GNU_CC"; then
DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.7 2012/06/12 19:37:49 ryoon Exp $
;;
ia64*-hpux*)
-@@ -3168,6 +3171,9 @@ dnl ====================================
+@@ -3106,6 +3109,9 @@ dnl ====================================
case $target in
*-hpux11.*)
;;
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index 66702af8e3b..088ab5fc3ea 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ab,v 1.18 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/nsprpub/pr/include/md/_netbsd.h.orig 2012-04-20 22:40:20.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_netbsd.h.orig 2012-08-25 00:31:27.000000000 +0000
+++ mozilla/nsprpub/pr/include/md/_netbsd.h
-@@ -79,7 +79,7 @@
+@@ -47,7 +47,7 @@
#define HAVE_DLL
#define USE_DLFCN
#define _PR_HAVE_SOCKADDR_LEN
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.17 2012/04/28 16:56:58 ryoon Exp $
#define _PR_STAT_HAS_ST_ATIMESPEC
#define _PR_POLL_AVAILABLE
#define _PR_USE_POLL
-@@ -107,6 +107,8 @@
+@@ -75,6 +75,8 @@
#define JB_SP_INDEX 2
#elif defined(__mips__)
#define JB_SP_INDEX 4
diff --git a/mail/thunderbird/patches/patch-ac b/mail/thunderbird/patches/patch-ac
index dba0660bff4..a9a43417378 100644
--- a/mail/thunderbird/patches/patch-ac
+++ b/mail/thunderbird/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.14 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ac,v 1.15 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/nsprpub/configure.in.orig 2012-04-20 22:40:20.000000000 +0000
+--- mozilla/nsprpub/configure.in.orig 2012-08-25 00:31:27.000000000 +0000
+++ mozilla/nsprpub/configure.in
-@@ -71,7 +71,7 @@ OBJDIR_NAME=.
+@@ -36,7 +36,7 @@ OBJDIR_NAME=.
OBJDIR_SUFFIX=OBJ
NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
NOSUCHFILE=/no-such-file
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.14 2012/04/28 16:56:58 ryoon Exp $
LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
CYGWIN_WRAPPER=
MACOS_SDK_DIR=
-@@ -1567,6 +1567,33 @@ tools are selected during the Xcode/Deve
+@@ -1519,6 +1519,33 @@ tools are selected during the Xcode/Deve
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MDCPUCFG_H=_freebsd.cfg
PR_MD_CSRCS=freebsd.c
@@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.14 2012/04/28 16:56:58 ryoon Exp $
;;
*-hpux*)
-@@ -2154,6 +2181,7 @@ mips-nec-sysv*)
+@@ -2110,6 +2137,7 @@ mips-nec-sysv*)
AC_DEFINE(XP_UNIX)
AC_DEFINE(NETBSD)
AC_DEFINE(HAVE_BSD_FLOCK)
@@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.14 2012/04/28 16:56:58 ryoon Exp $
if test -z "$USE_NSPR_THREADS"; then
USE_PTHREADS=1
fi
-@@ -2962,7 +2990,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2918,7 +2946,7 @@ if test -n "$USE_PTHREADS"; then
if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
ac_cv_have_dash_pthread=yes
case "$target_os" in
@@ -62,7 +62,7 @@ $NetBSD: patch-ac,v 1.14 2012/04/28 16:56:58 ryoon Exp $
# Freebsd doesn't use -pthread for compiles, it uses them for linking
;;
*)
-@@ -3000,7 +3028,7 @@ if test -n "$USE_PTHREADS"; then
+@@ -2956,7 +2984,7 @@ if test -n "$USE_PTHREADS"; then
_PTHREAD_LDFLAGS=
fi
;;
@@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.14 2012/04/28 16:56:58 ryoon Exp $
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -3081,7 +3109,7 @@ case "$target" in
+@@ -3037,7 +3065,7 @@ case "$target" in
AC_DEFINE(_PR_NEED_PTHREAD_INIT)
fi
;;
diff --git a/mail/thunderbird/patches/patch-ad b/mail/thunderbird/patches/patch-ad
index 99a454edbf9..282c4e0326a 100644
--- a/mail/thunderbird/patches/patch-ad
+++ b/mail/thunderbird/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ad,v 1.9 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/xpcom/io/nsLocalFileUnix.h.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/io/nsLocalFileUnix.h.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/io/nsLocalFileUnix.h
-@@ -86,7 +86,7 @@
+@@ -52,7 +52,7 @@
#endif
// so we can statfs on freebsd
diff --git a/mail/thunderbird/patches/patch-ae b/mail/thunderbird/patches/patch-ae
index 55235d3a628..aa308cf5bc2 100644
--- a/mail/thunderbird/patches/patch-ae
+++ b/mail/thunderbird/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.10 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ae,v 1.11 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig 2012-04-20 22:40:20.000000000 +0000
+--- mozilla/nsprpub/pr/src/misc/prnetdb.c.orig 2012-08-25 00:31:27.000000000 +0000
+++ mozilla/nsprpub/pr/src/misc/prnetdb.c
-@@ -105,7 +105,7 @@ PRLock *_pr_dnsLock = NULL;
+@@ -73,7 +73,7 @@ PRLock *_pr_dnsLock = NULL;
|| defined(AIX4_3_PLUS) || (defined(AIX) && defined(_THREAD_SAFE)) \
|| (defined(HPUX10_10) && defined(_REENTRANT)) \
|| (defined(HPUX10_20) && defined(_REENTRANT)) \
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.10 2012/04/28 16:56:58 ryoon Exp $
#define _PR_HAVE_GETPROTO_R
#define _PR_HAVE_GETPROTO_R_INT
#endif
-@@ -115,6 +115,11 @@ PRLock *_pr_dnsLock = NULL;
+@@ -83,6 +83,11 @@ PRLock *_pr_dnsLock = NULL;
#define _PR_HAVE_5_ARG_GETPROTO_R
#endif
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.10 2012/04/28 16:56:58 ryoon Exp $
/* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
#if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
#define _PR_HAVE_GETPROTO_R
-@@ -332,7 +337,7 @@ _pr_QueryNetIfs(void)
+@@ -300,7 +305,7 @@ _pr_QueryNetIfs(void)
}
#elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
@@ -32,7 +32,7 @@ $NetBSD: patch-ae,v 1.10 2012/04/28 16:56:58 ryoon Exp $
/*
* Use the BSD getifaddrs function.
-@@ -2076,6 +2081,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+@@ -2044,6 +2049,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
*/
hints.ai_socktype = SOCK_STREAM;
@@ -44,7 +44,7 @@ $NetBSD: patch-ae,v 1.10 2012/04/28 16:56:58 ryoon Exp $
rv = GETADDRINFO(hostname, NULL, &hints, &res);
#ifdef AI_ADDRCONFIG
if (rv == EAI_BADFLAGS && (hints.ai_flags & AI_ADDRCONFIG)) {
-@@ -2083,6 +2093,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+@@ -2051,6 +2061,11 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
rv = GETADDRINFO(hostname, NULL, &hints, &res);
}
#endif
diff --git a/mail/thunderbird/patches/patch-af b/mail/thunderbird/patches/patch-af
index f5727b473bf..501e210e532 100644
--- a/mail/thunderbird/patches/patch-af
+++ b/mail/thunderbird/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.10 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-af,v 1.11 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/config/mkdepend/imakemdep.h.orig 2012-04-20 22:39:56.000000000 +0000
+--- mozilla/config/mkdepend/imakemdep.h.orig 2012-08-25 00:30:58.000000000 +0000
+++ mozilla/config/mkdepend/imakemdep.h
@@ -235,7 +235,7 @@ in this Software without prior written a
#ifdef _CRAY
diff --git a/mail/thunderbird/patches/patch-ag b/mail/thunderbird/patches/patch-ag
index 428868cef0c..c5550bf4e61 100644
--- a/mail/thunderbird/patches/patch-ag
+++ b/mail/thunderbird/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.10 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ag,v 1.11 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2012-04-20 22:40:20.000000000 +0000
+--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2012-08-25 00:31:27.000000000 +0000
+++ mozilla/nsprpub/pr/include/md/_freebsd.h
-@@ -79,7 +79,7 @@
+@@ -47,7 +47,7 @@
#define _PR_HAVE_LARGE_OFF_T
#if defined(_PR_PTHREADS)
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.10 2012/04/28 16:56:58 ryoon Exp $
/*
* libc_r before this version of FreeBSD doesn't have poll().
* Although libc has poll(), it is not thread-safe so we can't
-@@ -88,7 +88,7 @@
+@@ -56,7 +56,7 @@
#define _PR_POLL_AVAILABLE
#endif
#else
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.10 2012/04/28 16:56:58 ryoon Exp $
#define _PR_POLL_AVAILABLE
#define _PR_USE_POLL
#endif
-@@ -97,7 +97,7 @@
+@@ -65,7 +65,7 @@
#define _PR_HAVE_SYSV_SEMAPHORES
#define PR_HAVE_SYSV_NAMED_SHARED_MEMORY
diff --git a/mail/thunderbird/patches/patch-ai b/mail/thunderbird/patches/patch-ai
index 602709d06c7..a54a6a3e7e9 100644
--- a/mail/thunderbird/patches/patch-ai
+++ b/mail/thunderbird/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.9 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ai,v 1.10 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/dbm/src/mktemp.c.orig 2012-04-20 22:39:58.000000000 +0000
+--- mozilla/dbm/src/mktemp.c.orig 2012-08-25 00:31:01.000000000 +0000
+++ mozilla/dbm/src/mktemp.c
@@ -92,7 +92,7 @@ mktemp(char *path)
static int
diff --git a/mail/thunderbird/patches/patch-aj b/mail/thunderbird/patches/patch-aj
index 779488b0a94..80c9b9ac78b 100644
--- a/mail/thunderbird/patches/patch-aj
+++ b/mail/thunderbird/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.9 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-aj,v 1.10 2012/09/02 06:43:39 ryoon Exp $
---- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2012-04-20 22:40:21.000000000 +0000
+--- mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp.orig 2012-08-25 00:31:27.000000000 +0000
+++ mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
-@@ -408,6 +408,7 @@ nsresult nsProfileLock::LockWithSymlink(
+@@ -391,6 +391,7 @@ nsresult nsProfileLock::LockWithSymlink(
#endif
sigfillset(&act.sa_mask);
@@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.9 2012/04/28 16:56:58 ryoon Exp $
#define CATCH_SIGNAL(signame) \
PR_BEGIN_MACRO \
if (sigaction(signame, NULL, &oldact) == 0 && \
-@@ -426,6 +427,7 @@ PR_BEGIN_MACRO
+@@ -409,6 +410,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 4ec7214e426..8c45c39f8f3 100644
--- a/mail/thunderbird/patches/patch-ak
+++ b/mail/thunderbird/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.9 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ak,v 1.10 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/js/src/ctypes/libffi/configure.orig 2012-04-20 22:40:07.000000000 +0000
+--- mozilla/js/src/ctypes/libffi/configure.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/js/src/ctypes/libffi/configure
@@ -11278,7 +11278,7 @@ case "$host" in
powerpc-*-aix* | rs6000-*-aix*)
diff --git a/mail/thunderbird/patches/patch-al b/mail/thunderbird/patches/patch-al
index 8dc45e7b6bc..46b59a4fbea 100644
--- a/mail/thunderbird/patches/patch-al
+++ b/mail/thunderbird/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.10 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-al,v 1.11 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/storage/src/mozStorageConnection.cpp.orig 2012-04-20 22:40:23.000000000 +0000
+--- mozilla/storage/src/mozStorageConnection.cpp.orig 2012-08-25 00:31:30.000000000 +0000
+++ mozilla/storage/src/mozStorageConnection.cpp
-@@ -718,6 +718,11 @@ Connection::initialize(nsIFile *aDatabas
+@@ -680,6 +680,11 @@ Connection::initialize(nsIFile *aDatabas
break;
}
diff --git a/mail/thunderbird/patches/patch-am b/mail/thunderbird/patches/patch-am
index 33bff1f3b8a..d56b03ce38e 100644
--- a/mail/thunderbird/patches/patch-am
+++ b/mail/thunderbird/patches/patch-am
@@ -1,12 +1,12 @@
-$NetBSD: patch-am,v 1.6 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-am,v 1.7 2012/09/02 06:43:40 ryoon Exp $
SHA1_Update conflicts with openssl which may be dynamically loaded
at runtime via libcups or libgssapi so causing a crash due to using
the wrong binding. So rename here to avoid conflict.
---- mozilla/security/nss/lib/freebl/blapi.h.orig 2012-04-20 22:40:22.000000000 +0000
+--- mozilla/security/nss/lib/freebl/blapi.h.orig 2012-08-25 00:31:29.000000000 +0000
+++ mozilla/security/nss/lib/freebl/blapi.h
-@@ -1038,6 +1038,8 @@ extern void SHA1_DestroyContext(SHA1Cont
+@@ -1043,6 +1043,8 @@ extern void SHA1_DestroyContext(SHA1Cont
*/
extern void SHA1_Begin(SHA1Context *cx);
diff --git a/mail/thunderbird/patches/patch-an b/mail/thunderbird/patches/patch-an
index b9b27ba1780..4592c7e5e86 100644
--- a/mail/thunderbird/patches/patch-an
+++ b/mail/thunderbird/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.7 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-an,v 1.8 2012/09/02 06:43:40 ryoon Exp $
SHA1_Update conflicts with openssl which may be dynamically loaded
at runtime via libcups or libgssapi so causing a crash due to using
the wrong binding. So rename here to avoid conflict.
---- mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2012-04-20 22:40:22.000000000 +0000
+--- mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s.orig 2012-08-25 00:31:29.000000000 +0000
+++ mozilla/security/nss/lib/freebl/sha-fast-amd64-sun.s
@@ -1712,9 +1712,9 @@ shaCompress:
.LFE7:
diff --git a/mail/thunderbird/patches/patch-ao b/mail/thunderbird/patches/patch-ao
index b0ba78286c1..3a82d9cab8c 100644
--- a/mail/thunderbird/patches/patch-ao
+++ b/mail/thunderbird/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.7 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ao,v 1.8 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/toolkit/mozapps/installer/packager.mk.orig 2012-04-20 22:40:25.000000000 +0000
+--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2012-08-25 00:31:33.000000000 +0000
+++ mozilla/toolkit/mozapps/installer/packager.mk
-@@ -859,8 +859,8 @@ endif
+@@ -905,8 +905,8 @@ endif
(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
(cd $(DESTDIR)$(installdir) && tar -xf -)
$(NSINSTALL) -D $(DESTDIR)$(bindir)
diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-as
index 9c66b5eda7d..a206f750b31 100644
--- a/mail/thunderbird/patches/patch-as
+++ b/mail/thunderbird/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.11 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-as,v 1.12 2012/09/02 06:43:40 ryoon Exp $
Treat DragonFly like FreeBSD.
---- mozilla/js/src/configure.in.orig 2012-04-20 22:40:07.000000000 +0000
+--- mozilla/js/src/configure.in.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/js/src/configure.in
-@@ -823,7 +823,7 @@ EOF
+@@ -786,7 +786,7 @@ EOF
AC_LANG_RESTORE
])
@@ -13,7 +13,7 @@ Treat DragonFly like FreeBSD.
AC_CACHE_CHECK(for |class __declspec(dllimport) exception| bug,
ac_cv_have_dllimport_exception_bug,
[
-@@ -2234,7 +2234,7 @@ case "$target" in
+@@ -1996,7 +1996,7 @@ case "$target" in
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
;;
@@ -22,7 +22,7 @@ Treat DragonFly like FreeBSD.
if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
DLL_SUFFIX=".so.1.0"
DSO_LDOPTS="-shared"
-@@ -3356,7 +3356,7 @@ then
+@@ -3122,7 +3122,7 @@ then
fi
case "$target" in
@@ -31,7 +31,7 @@ Treat DragonFly like FreeBSD.
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -4263,7 +4263,7 @@ if test "$MOZ_MEMORY"; then
+@@ -4015,7 +4015,7 @@ if test "$MOZ_MEMORY"; then
*-darwin*)
AC_DEFINE(MOZ_MEMORY_DARWIN)
;;
diff --git a/mail/thunderbird/patches/patch-at b/mail/thunderbird/patches/patch-at
index b84c669f9fc..4d6d54c3381 100644
--- a/mail/thunderbird/patches/patch-at
+++ b/mail/thunderbird/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.9 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-at,v 1.10 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/gfx/qcms/qcmstypes.h.orig 2012-04-20 22:40:02.000000000 +0000
+--- mozilla/gfx/qcms/qcmstypes.h.orig 2012-08-25 00:31:09.000000000 +0000
+++ mozilla/gfx/qcms/qcmstypes.h
@@ -10,6 +10,8 @@
#if defined (__SVR4) && defined (__sun)
diff --git a/mail/thunderbird/patches/patch-au b/mail/thunderbird/patches/patch-au
index a6c978f1cec..12bb2bc0edf 100644
--- a/mail/thunderbird/patches/patch-au
+++ b/mail/thunderbird/patches/patch-au
@@ -1,12 +1,12 @@
-$NetBSD: patch-au,v 1.5 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-au,v 1.6 2012/09/02 06:43:40 ryoon Exp $
- Fix device name on NetBSD
- SOUND_VERSION just isn't a reliable way to detect features supported by
particular OSS implementation.
---- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig 2012-04-20 22:40:17.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/sydney_audio_oss.c.orig 2012-08-25 00:31:24.000000000 +0000
+++ mozilla/media/libsydneyaudio/src/sydney_audio_oss.c
-@@ -55,7 +55,7 @@
+@@ -23,7 +23,7 @@
// support only versions newer than 3.6.1
#define SUPP_OSS_VERSION OSS_VERSION(3,0,1)
@@ -15,7 +15,7 @@ $NetBSD: patch-au,v 1.5 2012/04/28 16:56:58 ryoon Exp $
#error Unsupported OSS Version
#else
-@@ -205,7 +205,12 @@ sa_stream_create_pcm(
+@@ -173,7 +173,12 @@ sa_stream_create_pcm(
return SA_ERROR_SYSTEM;
}
diff --git a/mail/thunderbird/patches/patch-av b/mail/thunderbird/patches/patch-av
index 5fd3f94081a..7d9f8713562 100644
--- a/mail/thunderbird/patches/patch-av
+++ b/mail/thunderbird/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.6 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: patch-av,v 1.7 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig 2012-07-12 15:25:19.000000000 +0000
+--- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xulrunner/app/nsXULRunnerApp.cpp
-@@ -39,6 +39,27 @@
+@@ -6,6 +6,27 @@
#include "nsXPCOMGlue.h"
#include <stdio.h>
#include <stdlib.h>
@@ -30,7 +30,7 @@ $NetBSD: patch-av,v 1.6 2012/07/19 17:57:30 ryoon Exp $
#ifdef XP_WIN
#include <windows.h>
#define snprintf _snprintf
-@@ -284,6 +305,7 @@ private:
+@@ -251,6 +272,7 @@ private:
int main(int argc, char* argv[])
{
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
index e991fd4399d..641ce742506 100644
--- a/mail/thunderbird/patches/patch-aw
+++ b/mail/thunderbird/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.10 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-aw,v 1.11 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/xulrunner/stub/nsXULStub.cpp.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xulrunner/stub/nsXULStub.cpp.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xulrunner/stub/nsXULStub.cpp
-@@ -44,6 +44,29 @@
+@@ -11,6 +11,29 @@
#include "nsILocalFile.h"
#include <stdarg.h>
@@ -32,7 +32,7 @@ $NetBSD: patch-aw,v 1.10 2012/04/28 16:56:58 ryoon Exp $
#ifdef XP_WIN
#include <windows.h>
-@@ -202,7 +225,9 @@ main(int argc, char **argv)
+@@ -169,7 +192,9 @@ main(int argc, char **argv)
char greDir[MAXPATHLEN];
bool greFound = false;
diff --git a/mail/thunderbird/patches/patch-ax b/mail/thunderbird/patches/patch-ax
index f8a1abd4cf4..a6026b73a92 100644
--- a/mail/thunderbird/patches/patch-ax
+++ b/mail/thunderbird/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.11 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ax,v 1.12 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/xpcom/base/nsStackWalk.cpp.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/base/nsStackWalk.cpp.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/base/nsStackWalk.cpp
-@@ -54,7 +54,7 @@ struct CriticalAddress {
+@@ -23,7 +23,7 @@ struct CriticalAddress {
};
static CriticalAddress gCriticalAddress;
diff --git a/mail/thunderbird/patches/patch-ay b/mail/thunderbird/patches/patch-ay
index 3ffcb5cde3b..aa7d2b15732 100644
--- a/mail/thunderbird/patches/patch-ay
+++ b/mail/thunderbird/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.7 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-ay,v 1.8 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/browser/app/nsBrowserApp.cpp.orig 2012-06-01 17:19:10.000000000 +0000
+--- mozilla/browser/app/nsBrowserApp.cpp.orig 2012-08-25 00:30:56.000000000 +0000
+++ mozilla/browser/app/nsBrowserApp.cpp
-@@ -47,6 +47,31 @@
+@@ -14,6 +14,31 @@
#include <sys/resource.h>
#endif
@@ -34,7 +34,7 @@ $NetBSD: patch-ay,v 1.7 2012/06/12 19:37:49 ryoon Exp $
#ifdef XP_MACOSX
#include "MacQuirks.h"
#endif
-@@ -197,6 +222,9 @@ int main(int argc, char* argv[])
+@@ -196,6 +221,9 @@ int main(int argc, char* argv[])
#ifdef XP_MACOSX
TriggerQuirks();
#endif
diff --git a/mail/thunderbird/patches/patch-az b/mail/thunderbird/patches/patch-az
index 42820a57c3d..c2fc0a77edd 100644
--- a/mail/thunderbird/patches/patch-az
+++ b/mail/thunderbird/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-az,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig 2012-04-20 22:40:20.000000000 +0000
+--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig 2012-08-25 00:31:27.000000000 +0000
+++ mozilla/nsprpub/pr/src/pthreads/ptthread.c
-@@ -1070,12 +1070,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
+@@ -1038,12 +1038,12 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
_exit(status);
}
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index c8aee540dae..d42d923b11a 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,10 +1,10 @@
-$NetBSD: patch-ba,v 1.11 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ba,v 1.12 2012/09/02 06:43:40 ryoon Exp $
pthread_t may be 64-bit, avoid casting it.
---- mozilla/nsprpub/pr/include/private/pprthred.h.orig 2012-04-20 22:40:20.000000000 +0000
+--- mozilla/nsprpub/pr/include/private/pprthred.h.orig 2012-08-25 00:31:27.000000000 +0000
+++ mozilla/nsprpub/pr/include/private/pprthred.h
-@@ -51,6 +51,8 @@
+@@ -19,6 +19,8 @@
#include <os2.h>
#endif
@@ -13,7 +13,7 @@ pthread_t may be 64-bit, avoid casting it.
PR_BEGIN_EXTERN_C
/*---------------------------------------------------------------------------
-@@ -91,7 +93,7 @@ NSPR_API(void) PR_DetachThread(void);
+@@ -59,7 +61,7 @@ NSPR_API(void) PR_DetachThread(void);
** Get the id of the named thread. Each thread is assigned a unique id
** when it is created or attached.
*/
diff --git a/mail/thunderbird/patches/patch-bd b/mail/thunderbird/patches/patch-bd
index 0f8d74dad70..be3c824a451 100644
--- a/mail/thunderbird/patches/patch-bd
+++ b/mail/thunderbird/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.4 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: patch-bd,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/js/src/ctypes/CTypes.cpp.orig 2012-07-12 15:25:19.000000000 +0000
+--- mozilla/js/src/ctypes/CTypes.cpp.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/js/src/ctypes/CTypes.cpp
-@@ -38,6 +38,22 @@
+@@ -5,6 +5,23 @@
#include "mozilla/FloatingPoint.h"
@@ -20,6 +20,7 @@ $NetBSD: patch-bd,v 1.4 2012/07/19 17:57:30 ryoon Exp $
+#define int64_t int64_t
+#define intptr_t intptr_t
+#define uintptr_t uintptr_t
++#define off_t off_t
+#endif
+
#include "CTypes.h"
diff --git a/mail/thunderbird/patches/patch-bf b/mail/thunderbird/patches/patch-bf
index 76b5bbce099..0a0fef84ccb 100644
--- a/mail/thunderbird/patches/patch-bf
+++ b/mail/thunderbird/patches/patch-bf
@@ -1,8 +1,8 @@
-$NetBSD: patch-bf,v 1.5 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-bf,v 1.6 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/js/src/jsnativestack.cpp.orig 2012-04-20 22:40:08.000000000 +0000
+--- mozilla/js/src/jsnativestack.cpp.orig 2012-08-25 00:31:13.000000000 +0000
+++ mozilla/js/src/jsnativestack.cpp
-@@ -50,10 +50,16 @@
+@@ -19,10 +19,16 @@
#elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
# include <pthread.h>
@@ -20,7 +20,7 @@ $NetBSD: patch-bf,v 1.5 2012/04/28 16:56:58 ryoon Exp $
#else
# error "Unsupported platform"
-@@ -145,7 +151,7 @@ GetNativeStackBaseImpl()
+@@ -114,7 +120,7 @@ GetNativeStackBaseImpl()
pthread_attr_init(&sattr);
# if defined(__OpenBSD__)
stack_t ss;
diff --git a/mail/thunderbird/patches/patch-bg b/mail/thunderbird/patches/patch-bg
index fda3234351f..67c966c9b30 100644
--- a/mail/thunderbird/patches/patch-bg
+++ b/mail/thunderbird/patches/patch-bg
@@ -1,8 +1,8 @@
-$NetBSD: patch-bg,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-bg,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/storage/src/SQLiteMutex.h.orig 2012-04-20 22:40:23.000000000 +0000
+--- mozilla/storage/src/SQLiteMutex.h.orig 2012-08-25 00:31:30.000000000 +0000
+++ mozilla/storage/src/SQLiteMutex.h
-@@ -141,15 +141,19 @@ public:
+@@ -108,15 +108,19 @@ public:
void assertCurrentThreadOwns()
{
NS_ASSERTION(mMutex, "No mutex associated with this wrapper!");
diff --git a/mail/thunderbird/patches/patch-bi b/mail/thunderbird/patches/patch-bi
index 12653041709..911dbeb1de9 100644
--- a/mail/thunderbird/patches/patch-bi
+++ b/mail/thunderbird/patches/patch-bi
@@ -1,6 +1,6 @@
-$NetBSD: patch-bi,v 1.3 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-bi,v 1.4 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/gfx/angle/src/compiler/osinclude.h.orig 2012-04-20 22:40:02.000000000 +0000
+--- mozilla/gfx/angle/src/compiler/osinclude.h.orig 2012-08-25 00:31:08.000000000 +0000
+++ mozilla/gfx/angle/src/compiler/osinclude.h
@@ -16,6 +16,7 @@
#define ANGLE_OS_WIN
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
index 58d0f48f80a..7f11735cf21 100644
--- a/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
+++ b/mail/thunderbird/patches/patch-directory_c-sdk_ldap_include_portable.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.6 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-directory_c-sdk_ldap_include_portable.h,v 1.7 2012/09/02 06:43:40 ryoon Exp $
---- ldap/sdks/c-sdk/ldap/include/portable.h.orig 2012-04-20 22:40:33.000000000 +0000
+--- ldap/sdks/c-sdk/ldap/include/portable.h.orig 2012-08-25 00:31:56.000000000 +0000
+++ ldap/sdks/c-sdk/ldap/include/portable.h
@@ -122,8 +122,11 @@
* some systems don't have the BSD re_comp and re_exec routines
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
index d26659bd368..8d74ff7ae11 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_debug__util__posic.cc
@@ -1,32 +1,34 @@
-$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2012-04-20 22:40:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/debug_util_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/debug_util_posix.cc
@@ -5,7 +5,7 @@
#include "build/build_config.h"
#include "base/debug_util.h"
-#define MOZ_HAVE_EXECINFO_H (!defined(ANDROID) && !defined(__OpenBSD__))
-+#define MOZ_HAVE_EXECINFO_H (defined(__linux__) && !defined(ANDROID))
++#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID))
#include <errno.h>
#include <fcntl.h>
-@@ -17,8 +17,13 @@
+@@ -17,9 +17,16 @@
#include <unistd.h>
#if MOZ_HAVE_EXECINFO_H
#include <execinfo.h>
--#include <sys/sysctl.h>
++#endif
++
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ #include <sys/sysctl.h>
#endif
+
+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+#elif defined(OS_FREEBSD)
-+#include <sys/proc.h>
+#endif
-+#include <sys/sysctl.h>
-
++
#include "base/basictypes.h"
#include "base/eintr_wrapper.h"
-@@ -32,7 +37,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
+ #include "base/logging.h"
+@@ -32,7 +39,7 @@ bool DebugUtil::SpawnDebuggerOnProcess(u
return false;
}
@@ -35,7 +37,7 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/04/28 16:5
// Based on Apple's recommended method as described in
// http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,7 +76,13 @@ bool DebugUtil::BeingDebugged() {
+@@ -71,7 +78,15 @@ bool DebugUtil::BeingDebugged() {
// This process is being debugged if the P_TRACED flag is set.
is_set = true;
@@ -43,6 +45,8 @@ $NetBSD: patch-ipc_chromium_src_base_debug__util__posic.cc,v 1.4 2012/04/28 16:5
+ being_debugged = (info.kp_flags & P_TRACED) != 0;
+#elif defined(OS_FREEBSD)
+ being_debugged = (info.ki_flag & P_TRACED) != 0;
++#elif defined(OS_OPENBSD)
++ being_debugged = (info.p_flag & P_TRACED) != 0;
+#else
being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
+#endif
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h
deleted file mode 100644
index 06c20bff782..00000000000
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util.h,v 1.3 2012/04/28 16:56:58 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/file_util.h.orig 2012-04-20 22:40:05.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/file_util.h
-@@ -16,8 +16,8 @@
- #include <sys/stat.h>
- #elif defined(OS_POSIX)
- #include <sys/types.h>
--#include <fts.h>
- #include <sys/stat.h>
-+#include <fts.h>
- #endif
-
- #include <stdio.h>
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc
index 11295ccbdf9..d68868b8289 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_file__util__posix.cc
@@ -1,13 +1,13 @@
-$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.3 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.4 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2012-04-20 22:40:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/file_util_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/file_util_posix.cc
@@ -31,7 +31,7 @@
#include "base/time.h"
// FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine
-#if defined(OS_FREEBSD) || defined(OS_OPENBSD)
-+#ifndef __linux__
++#ifndef OS_LINUX
#define stat64 stat
#endif
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
deleted file mode 100644
index b21e49347f1..00000000000
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__file__posix.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__file__posix.cc,v 1.3 2012/04/28 16:56:58 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/platform_file_posix.cc.orig 2012-04-20 22:40:05.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/platform_file_posix.cc
-@@ -10,6 +10,7 @@
- #ifdef ANDROID
- #include <linux/stat.h>
- #endif
-+#include <sys/stat.h> /* for S_IRUSR */
-
- #include "base/logging.h"
- #include "base/string_util.h"
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
index 3c7d1fc9bf7..b5dd067960a 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
@@ -1,42 +1,77 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-04-20 22:40:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,9 +9,18 @@
+@@ -9,16 +9,31 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
+#elif defined(OS_NETBSD)
+#include <lwp.h>
++#include <nspr/prthread.h>
#elif defined(OS_LINUX)
#include <sys/syscall.h>
- #include <unistd.h>
-+#elif defined(OS_DRAGONFLY)
-+#include <unistd.h>
+-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
+ #include <sys/prctl.h>
+-#elif !defined(__NetBSD__)
+-#include <pthread_np.h>
+#elif defined(OS_FREEBSD)
++#include <sys/param.h>
++#if __FreeBSD_version > 802500
+#include <sys/thr.h>
++#else
+_Pragma("GCC visibility push(default)")
-+# include <pthread_np.h>
++extern "C" int thr_self(long *);
+_Pragma("GCC visibility pop")
#endif
++#endif
++
++#if !defined(OS_MACOSX)
+ #include <unistd.h>
+ #endif
++#if defined(OS_BSD) && !defined(OS_NETBSD)
++#include <pthread_np.h>
++#endif
++
#if defined(OS_MACOSX)
-@@ -33,6 +42,18 @@ PlatformThreadId PlatformThread::Current
+ namespace base {
+ void InitThreading();
+@@ -38,9 +53,20 @@ PlatformThreadId PlatformThread::Current
// into the kernel.
#if defined(OS_MACOSX)
return mach_thread_self();
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+- // TODO(BSD): find a better thread ID
+- return (intptr_t)(pthread_self());
+#elif defined(OS_NETBSD)
+ return _lwp_self();
+#elif defined(OS_DRAGONFLY)
+ return lwp_gettid();
+#elif defined(OS_FREEBSD)
-+# if __FreeBSD_cc_version > 900000
++# if __FreeBSD_version > 900030
+ return pthread_getthreadid_np();
+# else
-+ lwpid_t lwpid;
-+ thr_self( &lwpid );
++ long lwpid;
++ thr_self(&lwpid);
+ return lwpid;
+# endif
- #elif defined (__OpenBSD__)
- // TODO(BSD): find a better thread ID
- return (intptr_t)(pthread_self());
++#elif defined(OS_OPENBSD)
++ return (intptr_t) (pthread_self());
+ #elif defined(OS_LINUX)
+ return syscall(__NR_gettid);
+ #endif
+@@ -83,10 +109,10 @@ void PlatformThread::SetName(const char*
+ // Note that glibc also has a 'pthread_setname_np' api, but it may not be
+ // available everywhere and it's only benefit over using prctl directly is
+ // that it can set the name of threads other than the current thread.
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(OS_BSD) && !defined(OS_NETBSD)
+ pthread_set_name_np(pthread_self(), name);
+-#elif defined(__NetBSD__)
+- pthread_setname_np(pthread_self(), "%s", name);
++#elif defined(OS_NETBSD)
++ PR_SetCurrentThreadName(name);
+ #else
+ prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
+ #endif
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc b/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
index 5de51a92251..659e0564dea 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_sys__info__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_sys__info__posix.cc,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig 2012-04-20 22:40:06.000000000 +0000
+--- mozilla/ipc/chromium/src/base/sys_info_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/sys_info_posix.cc
@@ -18,6 +18,11 @@
#include <mach/mach_init.h>
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h b/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
index 58857086180..da4638e1079 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.3 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_third__party_nspr_prcpucfg.h,v 1.4 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2012-04-20 22:40:06.000000000 +0000
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
#elif defined(__APPLE__)
#include "base/third_party/nspr/prcpucfg_mac.h"
-#elif defined(__linux__) || defined(ANDROID)
-+#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__DragonFly__)
++#elif defined(__linux__) || defined(ANDROID) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
#include "base/third_party/nspr/prcpucfg_linux.h"
#elif defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_openbsd.h"
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h b/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h
index 71cfe5f9ec6..3b3b56ed6df 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_build_build__config.h
@@ -1,25 +1,31 @@
-$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_build_build__config.h,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-04-20 22:40:06.000000000 +0000
+--- mozilla/ipc/chromium/src/build/build_config.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/build/build_config.h
-@@ -19,17 +19,23 @@
+@@ -19,6 +19,12 @@
#define OS_MACOSX 1
#elif defined(__linux__) || defined(ANDROID)
#define OS_LINUX 1
-+#elif defined(__NetBSD__)
-+#define OS_NETBSD 1
+#elif defined(__DragonFly__)
+#define OS_DRAGONFLY 1
++#elif defined(__FreeBSD__)
++#define OS_FREEBSD 1
++#elif defined(__NetBSD__)
++#define OS_NETBSD 1
#elif defined(__OpenBSD__)
#define OS_OPENBSD 1
#elif defined(_WIN32)
- #define OS_WIN 1
-+#elif defined(__FreeBSD__)
-+#define OS_FREEBSD 1
- #else
+@@ -27,9 +33,16 @@
#error Please add support for your platform in build/build_config.h
#endif
++// For access to standard BSD features, use OS_BSD instead of a
++// more specific macro.
++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \
++ || defined(OS_NETBSD) || defined(OS_OPENBSD)
++#define OS_BSD 1
++#endif
++
// For access to standard POSIX features, use OS_POSIX instead of a more
// specific macro.
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD)
diff --git a/mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h b/mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
index 885a0d5ed5e..482e2c28c97 100644
--- a/mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
+++ b/mail/thunderbird/patches/patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.3 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h,v 1.4 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig 2012-04-20 22:40:06.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.h
@@ -95,7 +95,7 @@ class Channel::ChannelImpl : public Mess
};
diff --git a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index 19339d232bb..92cf39cf55e 100644
--- a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig 2012-04-20 22:40:07.000000000 +0000
+--- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/glue/GeckoChildProcessHost.cpp
-@@ -430,7 +430,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -410,7 +410,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
// and passing wstrings from one config to the other is unsafe. So
// we split the logic here.
@@ -11,7 +11,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/04/28 16:56:58 ryoo
base::environment_map newEnvVars;
// XPCOM may not be initialized in some subprocesses. We don't want
// to initialize XPCOM just for the directory service, especially
-@@ -445,8 +445,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -425,8 +425,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
if (NS_SUCCEEDED(rv)) {
nsCString path;
greDir->GetNativePath(path);
@@ -22,7 +22,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/04/28 16:56:58 ryoo
path += "/lib";
# endif // MOZ_WIDGET_ANDROID
const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -557,7 +557,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -537,7 +537,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
childArgv.push_back(pidstring);
#if defined(MOZ_CRASHREPORTER)
@@ -31,7 +31,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.2 2012/04/28 16:56:58 ryoo
int childCrashFd, childCrashRemapFd;
if (!CrashReporter::CreateNotificationPipeForChild(
&childCrashFd, &childCrashRemapFd))
-@@ -594,7 +594,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -574,7 +574,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
#endif
base::LaunchApp(childArgv, mFileMap,
diff --git a/mail/thunderbird/patches/patch-js_src_jscpucfg.h b/mail/thunderbird/patches/patch-js_src_jscpucfg.h
index ace5915bedf..f8b1933e959 100644
--- a/mail/thunderbird/patches/patch-js_src_jscpucfg.h
+++ b/mail/thunderbird/patches/patch-js_src_jscpucfg.h
@@ -1,9 +1,9 @@
-$NetBSD: patch-js_src_jscpucfg.h,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-js_src_jscpucfg.h,v 1.3 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/js/src/jscpucfg.h.orig 2012-04-20 22:40:08.000000000 +0000
+--- mozilla/js/src/jscpucfg.h.orig 2012-08-25 00:31:12.000000000 +0000
+++ mozilla/js/src/jscpucfg.h
-@@ -77,6 +77,21 @@
+@@ -44,6 +44,21 @@
# define IS_BIG_ENDIAN 1
# endif
diff --git a/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk b/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk
index dc3bbe41c15..585a71ccd93 100644
--- a/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk
+++ b/mail/thunderbird/patches/patch-ldap_sdks_c-sdk_build.mk
@@ -1,6 +1,6 @@
-$NetBSD: patch-ldap_sdks_c-sdk_build.mk,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-ldap_sdks_c-sdk_build.mk,v 1.2 2012/09/02 06:43:40 ryoon Exp $
---- ldap/sdks/c-sdk/build.mk.orig 2012-06-01 17:20:02.000000000 +0000
+--- ldap/sdks/c-sdk/build.mk.orig 2012-08-25 00:31:56.000000000 +0000
+++ ldap/sdks/c-sdk/build.mk
@@ -488,21 +488,21 @@ LINK_LIB = $(RM) $@; $(AR) $(AR_F
LINK_LIB2 = $(RM) $@; $(AR) $@ $(OBJS2); $(RANLIB) $@
diff --git a/mail/thunderbird/patches/patch-ma b/mail/thunderbird/patches/patch-ma
index 30463514eac..c495fb7b480 100644
--- a/mail/thunderbird/patches/patch-ma
+++ b/mail/thunderbird/patches/patch-ma
@@ -1,8 +1,8 @@
-$NetBSD: patch-ma,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ma,v 1.5 2012/09/02 06:43:40 ryoon Exp $
---- mozilla/config/autoconf.mk.in.orig 2012-04-20 22:39:55.000000000 +0000
+--- mozilla/config/autoconf.mk.in.orig 2012-08-25 00:30:58.000000000 +0000
+++ mozilla/config/autoconf.mk.in
-@@ -68,14 +68,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+@@ -37,14 +37,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
diff --git a/mail/thunderbird/patches/patch-ma-toplevel b/mail/thunderbird/patches/patch-ma-toplevel
index 60cc787dbf6..47cff9d2e2b 100644
--- a/mail/thunderbird/patches/patch-ma-toplevel
+++ b/mail/thunderbird/patches/patch-ma-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-ma-toplevel,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ma-toplevel,v 1.5 2012/09/02 06:43:41 ryoon Exp $
---- config/autoconf.mk.in.orig 2012-04-20 22:32:37.000000000 +0000
+--- config/autoconf.mk.in.orig 2012-08-25 00:24:32.000000000 +0000
+++ config/autoconf.mk.in
-@@ -61,14 +61,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+@@ -30,14 +30,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
diff --git a/mail/thunderbird/patches/patch-mb b/mail/thunderbird/patches/patch-mb
index 49687e5a1b6..4d699f0b908 100644
--- a/mail/thunderbird/patches/patch-mb
+++ b/mail/thunderbird/patches/patch-mb
@@ -1,8 +1,8 @@
-$NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mb,v 1.6 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -82,7 +82,7 @@ endif
+@@ -50,7 +50,7 @@ endif
endif
endif
@@ -11,7 +11,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
endif
-@@ -91,7 +91,7 @@ endif
+@@ -59,7 +59,7 @@ endif
# New code for Linux, et. al., with gcc
# Migrate other platforms here after testing
#
@@ -20,7 +20,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
# Linux/x86-64
ifeq (x86_64,$(OS_TEST))
CPPSRCS := xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_linux.cpp
-@@ -109,12 +109,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin
+@@ -77,12 +77,6 @@ ASFILES := xptcstubs_asm_ipf64.s xptcin
endif
endif
#
@@ -33,7 +33,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
# Neutrino/Intel (uses the same unixish_x86 code)
#
ifeq ($(OS_TARGET),NTO)
-@@ -190,7 +184,7 @@ endif
+@@ -158,7 +152,7 @@ endif
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -42,7 +42,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -247,7 +241,7 @@ endif
+@@ -215,7 +209,7 @@ endif
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -51,7 +51,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -319,9 +313,10 @@ endif
+@@ -287,9 +281,10 @@ endif
#
# NetBSD/PPC
#
@@ -63,7 +63,7 @@ $NetBSD: patch-mb,v 1.5 2012/04/28 16:56:58 ryoon Exp $
endif
#
-@@ -387,6 +382,13 @@ CPPSRCS := xptcinvoke_sparc64_openbsd.c
+@@ -355,6 +350,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-md b/mail/thunderbird/patches/patch-md
index ce799abd324..b5a2671f20d 100644
--- a/mail/thunderbird/patches/patch-md
+++ b/mail/thunderbird/patches/patch-md
@@ -1,8 +1,8 @@
-$NetBSD: patch-md,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-md,v 1.5 2012/09/02 06:43:41 ryoon Exp $
???. from www/firefox/patch-ax.
---- mozilla/security/coreconf/SunOS5.mk.orig 2012-04-20 22:40:21.000000000 +0000
+--- mozilla/security/coreconf/SunOS5.mk.orig 2012-08-25 00:31:28.000000000 +0000
+++ mozilla/security/coreconf/SunOS5.mk
@@ -147,6 +147,10 @@ endif
endif
diff --git a/mail/thunderbird/patches/patch-me b/mail/thunderbird/patches/patch-me
index bc91e0454bb..cc2090141e8 100644
--- a/mail/thunderbird/patches/patch-me
+++ b/mail/thunderbird/patches/patch-me
@@ -1,8 +1,8 @@
-$NetBSD: patch-me,v 1.6 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-me,v 1.7 2012/09/02 06:43:41 ryoon Exp $
Add DragonFly support.
---- mozilla/security/nss/lib/freebl/Makefile.orig 2012-04-20 22:40:22.000000000 +0000
+--- mozilla/security/nss/lib/freebl/Makefile.orig 2012-08-25 00:31:29.000000000 +0000
+++ mozilla/security/nss/lib/freebl/Makefile
@@ -279,7 +279,7 @@ endif
# to bind the blapi function references in FREEBLVector vector
diff --git a/mail/thunderbird/patches/patch-mf b/mail/thunderbird/patches/patch-mf
index 721e1f218df..c7a0d7ce33a 100644
--- a/mail/thunderbird/patches/patch-mf
+++ b/mail/thunderbird/patches/patch-mf
@@ -1,9 +1,9 @@
-$NetBSD: patch-mf,v 1.6 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mf,v 1.7 2012/09/02 06:43:41 ryoon Exp $
Add DragonFly support.
Make sure nss libraries have a run path defined.
---- mozilla/security/coreconf/config.mk.orig 2012-04-20 22:40:21.000000000 +0000
+--- mozilla/security/coreconf/config.mk.orig 2012-08-25 00:31:28.000000000 +0000
+++ mozilla/security/coreconf/config.mk
@@ -63,7 +63,7 @@ endif
#######################################################################
diff --git a/mail/thunderbird/patches/patch-mg b/mail/thunderbird/patches/patch-mg
index 6b18d4dd9e8..384ca4a0ff8 100644
--- a/mail/thunderbird/patches/patch-mg
+++ b/mail/thunderbird/patches/patch-mg
@@ -1,8 +1,8 @@
-$NetBSD: patch-mg,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mg,v 1.5 2012/09/02 06:43:41 ryoon Exp $
Add DragonFly support.
---- mozilla/security/coreconf/DragonFly.mk.orig 2012-04-26 21:04:05.000000000 +0000
+--- mozilla/security/coreconf/DragonFly.mk.orig 2012-08-31 13:21:43.000000000 +0000
+++ mozilla/security/coreconf/DragonFly.mk
@@ -0,0 +1,83 @@
+#
diff --git a/mail/thunderbird/patches/patch-mh b/mail/thunderbird/patches/patch-mh
index 33553b73373..1e927db144d 100644
--- a/mail/thunderbird/patches/patch-mh
+++ b/mail/thunderbird/patches/patch-mh
@@ -1,6 +1,6 @@
-$NetBSD: patch-mh,v 1.3 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mh,v 1.4 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/security/nss/lib/Makefile.orig 2012-04-20 22:40:21.000000000 +0000
+--- mozilla/security/nss/lib/Makefile.orig 2012-08-25 00:31:29.000000000 +0000
+++ mozilla/security/nss/lib/Makefile
@@ -70,7 +70,7 @@ endif
diff --git a/mail/thunderbird/patches/patch-mi b/mail/thunderbird/patches/patch-mi
index d9f8fb255fd..782cf5823e3 100644
--- a/mail/thunderbird/patches/patch-mi
+++ b/mail/thunderbird/patches/patch-mi
@@ -1,10 +1,10 @@
-$NetBSD: patch-mi,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mi,v 1.5 2012/09/02 06:43:41 ryoon Exp $
Add DragonFly support.
---- mozilla/config/config.mk.orig 2012-04-20 22:39:55.000000000 +0000
+--- mozilla/config/config.mk.orig 2012-08-25 00:30:58.000000000 +0000
+++ mozilla/config/config.mk
-@@ -129,7 +129,7 @@ endif
+@@ -97,7 +97,7 @@ endif
# but save the version to allow multiple versions of the same base
# platform to be built in the same tree.
#
diff --git a/mail/thunderbird/patches/patch-mj b/mail/thunderbird/patches/patch-mj
index 9109b1d4b16..0daac9d00b7 100644
--- a/mail/thunderbird/patches/patch-mj
+++ b/mail/thunderbird/patches/patch-mj
@@ -1,8 +1,8 @@
-$NetBSD: patch-mj,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mj,v 1.5 2012/09/02 06:43:41 ryoon Exp $
Add DragonFly support.
---- mozilla/security/coreconf/arch.mk.orig 2012-04-20 22:40:21.000000000 +0000
+--- mozilla/security/coreconf/arch.mk.orig 2012-08-25 00:31:28.000000000 +0000
+++ mozilla/security/coreconf/arch.mk
@@ -146,7 +146,7 @@ endif
# IRIX 6.5-ALPHA-1289139620.
diff --git a/mail/thunderbird/patches/patch-mk b/mail/thunderbird/patches/patch-mk
index 2c52de00b20..f0d98129901 100644
--- a/mail/thunderbird/patches/patch-mk
+++ b/mail/thunderbird/patches/patch-mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-mk,v 1.6 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: patch-mk,v 1.7 2012/09/02 06:43:41 ryoon Exp $
Treat DragonFly like FreeBSD.
---- mozilla/config/rules.mk.orig 2012-07-04 16:30:38.000000000 +0000
+--- mozilla/config/rules.mk.orig 2012-08-25 00:30:58.000000000 +0000
+++ mozilla/config/rules.mk
-@@ -556,6 +556,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+@@ -454,6 +454,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
endif
endif
@@ -17,32 +17,14 @@ Treat DragonFly like FreeBSD.
ifeq ($(OS_ARCH),NetBSD)
ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
ifeq ($(MODULE),layout)
-@@ -565,6 +571,10 @@ endif
+@@ -463,6 +469,10 @@ endif
endif
endif
+ifeq ($(OS_ARCH),NetBSD)
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/thunderbird
++EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner
+endif
+
#
# HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
# which uses internal symbols first
-@@ -1452,7 +1462,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
- $(PYTHON_PATH) \
- $(PLY_INCLUDE) \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1465,7 +1475,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
- $(PLY_INCLUDE) \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/mail/thunderbird/patches/patch-ml b/mail/thunderbird/patches/patch-ml
index 630c7a87d90..5f89fbd421e 100644
--- a/mail/thunderbird/patches/patch-ml
+++ b/mail/thunderbird/patches/patch-ml
@@ -1,10 +1,10 @@
-$NetBSD: patch-ml,v 1.4 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-ml,v 1.5 2012/09/02 06:43:41 ryoon Exp $
Treat DragonFly like FreeBSD.
---- mozilla/js/src/Makefile.in.orig 2012-04-20 22:40:07.000000000 +0000
+--- mozilla/js/src/Makefile.in.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/js/src/Makefile.in
-@@ -739,6 +739,9 @@ endif # WINNT
+@@ -678,6 +678,9 @@ endif # _MSC_VER
ifeq ($(OS_ARCH),FreeBSD)
EXTRA_LIBS += -pthread
endif
diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm
index 8282bf736dd..5661fe9424a 100644
--- a/mail/thunderbird/patches/patch-mm
+++ b/mail/thunderbird/patches/patch-mm
@@ -1,37 +1,24 @@
-$NetBSD: patch-mm,v 1.10 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: patch-mm,v 1.11 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/toolkit/library/Makefile.in.orig 2012-07-04 16:31:38.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig 2012-08-25 00:31:32.000000000 +0000
+++ mozilla/toolkit/library/Makefile.in
-@@ -120,6 +120,7 @@ STATIC_LIBS += ipdlunittest_s
- endif
-
- ifeq (Linux,$(OS_ARCH))
-+EXTRA_DSO_LDOPTS += -lnssutil3
- ifneq (Android,$(OS_TARGET))
- OS_LIBS += -lrt
- endif
-@@ -522,6 +523,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -535,6 +535,19 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
endif
endif
-+ifeq ($(OS_ARCH),DragonFly)
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
-+endif
-+
-+ifeq ($(OS_ARCH),FreeBSD)
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
++ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
+endif
+
++ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
+ifeq ($(OS_ARCH),NetBSD)
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
+EXTRA_DSO_LDOPTS += -lossaudio
+endif
+ifdef PKGSRC_PULSEAUDIO
+EXTRA_DSO_LDOPTS += -lpulse
+endif
++endif
+
ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs)
ifdef MOZ_CRASHREPORTER
diff --git a/mail/thunderbird/patches/patch-mn b/mail/thunderbird/patches/patch-mn
index 562e5c3f17e..cd74d261e32 100644
--- a/mail/thunderbird/patches/patch-mn
+++ b/mail/thunderbird/patches/patch-mn
@@ -1,8 +1,8 @@
-$NetBSD: patch-mn,v 1.5 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mn,v 1.6 2012/09/02 06:43:41 ryoon Exp $
Make sure we link correctly with sqlite3 from pkgsrc.
---- mozilla/security/nss/lib/softoken/config.mk.orig 2012-04-20 22:40:22.000000000 +0000
+--- mozilla/security/nss/lib/softoken/config.mk.orig 2012-08-25 00:31:30.000000000 +0000
+++ mozilla/security/nss/lib/softoken/config.mk
@@ -80,7 +80,7 @@ else
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
diff --git a/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4 b/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4
index 2ad5e0e0ab3..7b85f178478 100644
--- a/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4
+++ b/mail/thunderbird/patches/patch-mozilla_build_autoconf_nss.m4
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mozilla_build_autoconf_nss.m4,v 1.3 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/build/autoconf/nss.m4.orig 2012-04-20 22:39:55.000000000 +0000
+--- mozilla/build/autoconf/nss.m4.orig 2012-08-25 00:30:58.000000000 +0000
+++ mozilla/build/autoconf/nss.m4
@@ -22,18 +22,18 @@ AC_ARG_WITH(nss-exec-prefix,
if test -n "$nss_config_exec_prefix"; then
diff --git a/mail/thunderbird/patches/patch-mozilla_config_system-headers b/mail/thunderbird/patches/patch-mozilla_config_system-headers
new file mode 100644
index 00000000000..730c3b806c0
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_config_system-headers
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_config_system-headers,v 1.1 2012/09/02 06:43:41 ryoon Exp $
+
+--- mozilla/config/system-headers.orig 2012-08-25 00:30:58.000000000 +0000
++++ mozilla/config/system-headers
+@@ -1059,3 +1059,7 @@ gst/gst.h
+ gst/app/gstappsink.h
+ gst/app/gstappsrc.h
+ gst/video/video.h
++sys/thr.h
++sys/user.h
++kvm.h
++spawn.h
diff --git a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
index a61923e0e2a..71301a72775 100644
--- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
@@ -1,8 +1,16 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2012-04-20 22:39:59.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig 2012-08-25 00:31:04.000000000 +0000
+++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp
-@@ -236,7 +236,7 @@ PluginModuleChild::Init(const std::strin
+@@ -5,6 +5,7 @@
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ #ifdef MOZ_WIDGET_QT
++#include <unistd.h> // for _exit()
+ #include <QtCore/QTimer>
+ #include "nsQAppInstance.h"
+ #include "NestedLoopTimer.h"
+@@ -192,7 +193,7 @@ PluginModuleChild::Init(const std::strin
// TODO: use PluginPRLibrary here
@@ -11,7 +19,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.2 2012/04/28 16
mShutdownFunc =
(NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
-@@ -1821,7 +1821,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
+@@ -1811,7 +1812,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread();
@@ -20,7 +28,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.2 2012/04/28 16
return true;
#elif defined(OS_WIN) || defined(OS_MACOSX)
*_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1848,7 +1848,7 @@ PluginModuleChild::AnswerNP_Initialize(N
+@@ -1840,7 +1841,7 @@ PluginModuleChild::AnswerNP_Initialize(c
SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/));
#endif
diff --git a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
index d66cdf98fa4..35f5f91201e 100644
--- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
+++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.3 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig 2012-04-20 22:39:59.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig 2012-08-25 00:31:04.000000000 +0000
+++ mozilla/dom/plugins/ipc/PluginModuleChild.h
-@@ -360,7 +360,7 @@ private:
+@@ -330,7 +330,7 @@ private:
// we get this from the plugin
NP_PLUGINSHUTDOWN mShutdownFunc;
diff --git a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
index b8317f28770..2caed5e709d 100644
--- a/mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_gfx_thebes_gfxPlatform.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.2 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/gfx/thebes/gfxPlatform.cpp.orig 2012-04-20 22:40:03.000000000 +0000
+--- mozilla/gfx/thebes/gfxPlatform.cpp.orig 2012-08-25 00:31:09.000000000 +0000
+++ mozilla/gfx/thebes/gfxPlatform.cpp
-@@ -436,6 +436,7 @@ void SourceBufferDestroy(void *srcBuffer
+@@ -443,6 +443,7 @@ void SourceBufferDestroy(void *srcBuffer
static_cast<SourceSurface*>(srcBuffer)->Release();
}
@@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/28 16:56:58 ryoo
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
{
gfxImageSurface* origSurf =
-@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surfac
+@@ -450,6 +451,7 @@ void SourceSnapshotDetached(cairo_surfac
origSurf->SetData(&kSourceSurface, NULL, NULL);
}
@@ -18,16 +18,16 @@ $NetBSD: patch-mozilla_gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/28 16:56:58 ryoo
RefPtr<SourceSurface>
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
- imgSurface->Stride(),
- format);
+@@ -544,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
+
+ }
+ #ifdef MOZ_TREE_CAIRO
cairo_surface_t *nullSurf =
cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
cairo_surface_set_user_data(nullSurf,
-@@ -520,6 +523,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
- NULL);
+@@ -552,6 +555,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
+ NULL);
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
cairo_surface_destroy(nullSurf);
+ #endif
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
index 8a16c107824..13b2066b6b4 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.3 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/ipc/chromium/Makefile.in.orig 2012-04-20 22:40:04.000000000 +0000
+--- mozilla/ipc/chromium/Makefile.in.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/Makefile.in
-@@ -275,6 +275,34 @@ endif
+@@ -243,6 +243,34 @@ endif
endif # } OS_LINUX
@@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.2 2012/04/28 16:56:58 ryoon
+
+CPPSRCS += \
+ atomicops_internals_x86_gcc.cc \
-+ file_util_bsd.cc \
++ file_util_linux.cc \
+ process_util_bsd.cc \
+ time_posix.cc \
+ $(NULL)
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk
index 5ca94a5654f..47b6dc53853 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_chromium-config.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.3 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/ipc/chromium/chromium-config.mk.orig 2012-04-20 22:40:04.000000000 +0000
+--- mozilla/ipc/chromium/chromium-config.mk.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/chromium-config.mk
-@@ -56,17 +56,6 @@ LOCAL_INCLUDES += \
+@@ -24,17 +24,6 @@ LOCAL_INCLUDES += \
-I$(DEPTH)/ipc/ipdl/_ipdlheaders \
$(NULL)
@@ -20,7 +20,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.2 2012/04/28 16:56:58
ifeq ($(OS_ARCH),WINNT) # {
OS_LIBS += $(call EXPAND_LIBNAME,psapi shell32 dbghelp)
-@@ -93,13 +82,64 @@ DEFINES += -DCOMPILER_MSVC
+@@ -61,13 +50,65 @@ DEFINES += -DCOMPILER_MSVC
endif
else # } {
@@ -74,6 +74,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.2 2012/04/28 16:56:58
+
+OS_OPENBSD = 1
+OS_BSD = 1
++OS_LIBS += $(call EXPAND_LIBNAME,kvm)
+DEFINES += \
+ -DOS_OPENBSD=1 \
+ -DOS_BSD=1 \
@@ -88,7 +89,7 @@ $NetBSD: patch-mozilla_ipc_chromium_chromium-config.mk,v 1.2 2012/04/28 16:56:58
$(NULL)
# NB: to stop gcc warnings about exporting template instantiation
-@@ -107,4 +147,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(
+@@ -75,4 +116,8 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(
endif # }
endif # }
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
index 05df6f85406..b3230790f2c 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_base__paths.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_base__paths.h,v 1.2 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_base__paths.h,v 1.3 2012/09/02 06:43:41 ryoon Exp $
---- mozilla/ipc/chromium/src/base/base_paths.h.orig 2012-04-20 22:40:04.000000000 +0000
+--- mozilla/ipc/chromium/src/base/base_paths.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/base_paths.h
@@ -13,7 +13,7 @@
#include "base/base_paths_win.h"
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h
new file mode 100644
index 00000000000..3eb60b43d88
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h
@@ -0,0 +1,117 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_dir__reader__bsd.h,v 1.1 2012/09/02 06:43:41 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/dir_reader_bsd.h.orig 2012-08-31 13:21:44.000000000 +0000
++++ mozilla/ipc/chromium/src/base/dir_reader_bsd.h
+@@ -0,0 +1,108 @@
++// Copyright (c) 2010 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// derived from dir_reader_linux.h
++
++#ifndef BASE_DIR_READER_BSD_H_
++#define BASE_DIR_READER_BSD_H_
++#pragma once
++
++#include <dirent.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <stdint.h>
++#include <unistd.h>
++
++#include "base/logging.h"
++#include "base/eintr_wrapper.h"
++
++// See the comments in dir_reader_posix.h about this.
++
++namespace base {
++
++class DirReaderBSD {
++ public:
++ explicit DirReaderBSD(const char* directory_path)
++#ifdef O_DIRECTORY
++ : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
++#else
++ : fd_(open(directory_path, O_RDONLY)),
++#endif
++ offset_(0),
++ size_(0) {
++ memset(buf_, 0, sizeof(buf_));
++ }
++
++ ~DirReaderBSD() {
++ if (fd_ >= 0) {
++ if (HANDLE_EINTR(close(fd_)))
++ DLOG(ERROR) << "Failed to close directory handle";
++ }
++ }
++
++ bool IsValid() const {
++ return fd_ >= 0;
++ }
++
++ // Move to the next entry returning false if the iteration is complete.
++ bool Next() {
++ if (size_) {
++ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]);
++#ifdef OS_DRAGONFLY
++ offset_ += _DIRENT_DIRSIZ(dirent);
++#else
++ offset_ += dirent->d_reclen;
++#endif
++ }
++
++ if (offset_ != size_)
++ return true;
++
++#ifdef OS_OPENBSD
++ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_);
++#else
++ const int r = getdents(fd_, buf_, sizeof(buf_));
++#endif
++ if (r == 0)
++ return false;
++ if (r == -1) {
++#ifdef OS_OPENBSD
++ DLOG(ERROR) << "getdirentries returned an error: " << errno;
++#else
++ DLOG(ERROR) << "getdents returned an error: " << errno;
++#endif
++ return false;
++ }
++ size_ = r;
++ offset_ = 0;
++ return true;
++ }
++
++ const char* name() const {
++ if (!size_)
++ return NULL;
++
++ const struct dirent* dirent =
++ reinterpret_cast<const struct dirent*>(&buf_[offset_]);
++ return dirent->d_name;
++ }
++
++ int fd() const {
++ return fd_;
++ }
++
++ static bool IsFallback() {
++ return false;
++ }
++
++ private:
++ const int fd_;
++ char buf_[512];
++#ifdef OS_OPENBSD
++ off_t *basep_;
++#endif
++ size_t offset_, size_;
++
++ DISALLOW_COPY_AND_ASSIGN(DirReaderBSD);
++};
++
++} // namespace base
++
++#endif // BASE_DIR_READER_BSD_H_
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h
new file mode 100644
index 00000000000..635cdd3f0c7
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_dir__reader__posix.h,v 1.1 2012/09/02 06:43:41 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/dir_reader_posix.h.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/ipc/chromium/src/base/dir_reader_posix.h
+@@ -18,16 +18,20 @@
+ // seems worse than falling back to enumerating all file descriptors so we will
+ // probably never implement this on the Mac.
+
+-#if defined(OS_LINUX) && !defined(OS_OPENBSD)
++#if defined(OS_LINUX)
+ #include "base/dir_reader_linux.h"
++#elif defined(OS_BSD)
++#include "base/dir_reader_bsd.h"
+ #else
+ #include "base/dir_reader_fallback.h"
+ #endif
+
+ namespace base {
+
+-#if defined(OS_LINUX) && !defined(OS_OPENBSD)
++#if defined(OS_LINUX)
+ typedef DirReaderLinux DirReaderPosix;
++#elif defined(OS_BSD)
++typedef DirReaderBSD DirReaderPosix;
+ #else
+ typedef DirReaderFallback DirReaderPosix;
+ #endif
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc
deleted file mode 100644
index 572983684d3..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util__bsd.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/ipc/chromium/src/base/file_util_bsd.cc.orig 2012-04-26 21:04:05.000000000 +0000
-+++ mozilla/ipc/chromium/src/base/file_util_bsd.cc
-@@ -0,0 +1,79 @@
-+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+// this is a derivative of file_util_linux.cc
-+
-+#include "base/file_util.h"
-+
-+#include <fcntl.h>
-+
-+#include <string>
-+#include <vector>
-+
-+#include "base/eintr_wrapper.h"
-+#include "base/file_path.h"
-+#include "base/string_util.h"
-+
-+namespace file_util {
-+
-+bool GetTempDir(FilePath* path) {
-+ const char* tmp = getenv("TMPDIR");
-+ if (tmp)
-+ *path = FilePath(tmp);
-+ else
-+ *path = FilePath("/tmp");
-+ return true;
-+}
-+
-+bool GetShmemTempDir(FilePath* path) {
-+ return GetTempDir(path);
-+}
-+
-+bool CopyFile(const FilePath& from_path, const FilePath& to_path) {
-+ int infile = open(from_path.value().c_str(), O_RDONLY);
-+ if (infile < 0)
-+ return false;
-+
-+ int outfile = creat(to_path.value().c_str(), 0666);
-+ if (outfile < 0) {
-+ close(infile);
-+ return false;
-+ }
-+
-+ const size_t kBufferSize = 32768;
-+ std::vector<char> buffer(kBufferSize);
-+ bool result = true;
-+
-+ while (result) {
-+ ssize_t bytes_read = HANDLE_EINTR(read(infile, &buffer[0], buffer.size()));
-+ if (bytes_read < 0) {
-+ result = false;
-+ break;
-+ }
-+ if (bytes_read == 0)
-+ break;
-+ // Allow for partial writes
-+ ssize_t bytes_written_per_read = 0;
-+ do {
-+ ssize_t bytes_written_partial = HANDLE_EINTR(write(
-+ outfile,
-+ &buffer[bytes_written_per_read],
-+ bytes_read - bytes_written_per_read));
-+ if (bytes_written_partial < 0) {
-+ result = false;
-+ break;
-+ }
-+ bytes_written_per_read += bytes_written_partial;
-+ } while (bytes_written_per_read < bytes_read);
-+ }
-+
-+ if (HANDLE_EINTR(close(infile)) < 0)
-+ result = false;
-+ if (HANDLE_EINTR(close(outfile)) < 0)
-+ result = false;
-+
-+ return result;
-+}
-+
-+} // namespace file_util
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc
new file mode 100644
index 00000000000..2ca41740971
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_file__util__linux.cc,v 1.1 2012/09/02 06:43:41 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/file_util_linux.cc.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/ipc/chromium/src/base/file_util_linux.cc
+@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
+ }
+
+ bool GetShmemTempDir(FilePath* path) {
+-#ifdef ANDROID
++#if defined(ANDROID) || defined(OS_BSD)
+ return GetTempDir(path);
+ #else
+ *path = FilePath("/dev/shm");
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
index 7178ad58fc7..e4da5c35b1d 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_message__loop.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_message__loop.cc,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/base/message_loop.cc.orig 2012-04-20 22:40:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/message_loop.cc.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/message_loop.cc
@@ -19,7 +19,7 @@
#if defined(OS_POSIX)
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
index b265025e71c..91b095167ab 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_platform__thread.h
@@ -1,12 +1,16 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_platform__thread.h,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2012-04-20 22:40:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/platform_thread.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/platform_thread.h
-@@ -25,6 +25,8 @@ typedef pthread_t PlatformThreadHandle;
- #if defined(OS_LINUX)
+@@ -22,9 +22,11 @@ typedef void* PlatformThreadHandle; //
+ #elif defined(OS_POSIX)
+ #include <pthread.h>
+ typedef pthread_t PlatformThreadHandle;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_OPENBSD)
#include <unistd.h>
typedef pid_t PlatformThreadId;
-+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined (OS_NETBSD)
++#elif defined(OS_BSD)
+typedef lwpid_t PlatformThreadId;
#elif defined(OS_MACOSX)
#include <mach/mach.h>
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
index 385c0bef921..8a14e829ffd 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.3 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util.h,v 1.4 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/base/process_util.h.orig 2012-06-01 17:19:23.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util.h
@@ -280,6 +280,7 @@ class NamedProcessIterator {
const ProcessEntry* NextProcessEntry();
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
index 17eeb753577..6f71e91b908 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.4 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-04-26 21:04:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util_bsd.cc.orig 2012-08-31 13:56:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,326 @@
+@@ -0,0 +1,318 @@
+// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -11,36 +11,20 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/04
+
+#include "base/process_util.h"
+
-+#include <ctype.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <string>
-+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
-+/* DragonFly, as of v3.0.1, and FreeBSD 9.0-RELEASE do not explicitly mark symbols public */
-+#define PRE_SYS_INCLUDE _Pragma("GCC visibility push(default)")
-+#define POST_SYS_INCLUDE _Pragma("GCC visibility pop")
-+#else
-+#define PRE_SYS_INCLUDE
-+#define POST_SYS_INCLUDE
-+#endif
-+PRE_SYS_INCLUDE
-+#include <kvm.h>
-+POST_SYS_INCLUDE
++#include <sys/param.h>
+#include <sys/sysctl.h>
-+#include <sys/types.h>
+#include <sys/wait.h>
-+#if defined(OS_DRAGONFLY)
-+PRE_SYS_INCLUDE
-+#include <sys/user.h>
-+POST_SYS_INCLUDE
-+#define HAVE_POSIX_SPAWN 1
-+#endif
-+#if defined(OS_FREEBSD)
-+PRE_SYS_INCLUDE
++#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
+#include <sys/user.h>
-+POST_SYS_INCLUDE
+#endif
+
++#include <ctype.h>
++#include <fcntl.h>
++#include <kvm.h>
++#include <unistd.h>
++
++#include <string>
++
+#include "base/debug_util.h"
+#include "base/eintr_wrapper.h"
+#include "base/file_util.h"
@@ -48,17 +32,21 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/04
+#include "base/string_tokenizer.h"
+#include "base/string_util.h"
+
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#if __NetBSD_Version__ >= 600000000
++#if (defined(_POSIX_SPAWN) && _POSIX_SPAWN > 0) \
++ || (defined(OS_NETBSD) && __NetBSD_Version__ >= 599006500)
+#define HAVE_POSIX_SPAWN 1
+#endif
++
++#ifndef __dso_public
++# ifdef __exported
++# define __dso_public __exported
++# else
++# define __dso_public __attribute__((__visibility__("default")))
++# endif
+#endif
+
+#ifdef HAVE_POSIX_SPAWN
-+PRE_SYS_INCLUDE
+#include <spawn.h>
-+POST_SYS_INCLUDE
+extern "C" char **environ __dso_public;
+#endif
+
@@ -299,7 +287,11 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.3 2012/04
+# endif
+#else
+ kvm = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
++#if defined(OS_OPENBSD)
++ struct kinfo_proc* procs = kvm_getprocs(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc), &numEntries);
++#else
+ struct kinfo_proc2* procs = kvm_getproc2(kvm, KERN_PROC_UID, getuid(), sizeof(struct kinfo_proc2), &numEntries);
++#endif
+ if (procs != NULL && numEntries > 0) {
+ for (int i = 0; i < numEntries; i++) {
+ if (exe != procs[i].p_comm) continue;
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
index c7b4aababfc..34a29b4d4ae 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__posix.cc
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__posix.cc,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig 2012-04-20 22:40:05.000000000 +0000
+--- mozilla/ipc/chromium/src/base/process_util_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/process_util_posix.cc
@@ -116,6 +116,11 @@ void CloseSuperfluousFds(const base::Inj
#elif defined(OS_MACOSX)
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h
new file mode 100644
index 00000000000..fcb405dd97a
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_ref__counted.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_ref__counted.h,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/ref_counted.h.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/ipc/chromium/src/base/ref_counted.h
+@@ -28,7 +28,7 @@ class RefCountedBase {
+ bool in_dtor_;
+ #endif
+
+- DFAKE_MUTEX(add_release_);
++ DFAKE_MUTEX(add_release_)
+
+ DISALLOW_COPY_AND_ASSIGN(RefCountedBase);
+ };
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
index c37194dcf20..b05dc07a92b 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2012-04-20 22:40:06.000000000 +0000
+--- mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/base/third_party/nspr/prtime.cc
-@@ -212,7 +212,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
+@@ -180,7 +180,7 @@ PR_ImplodeTime(const PRExplodedTime *exp
LL_ADD(retVal, retVal, temp);
return retVal;
@@ -11,7 +11,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc,v 1.2 2
struct tm exp_tm = {0};
exp_tm.tm_sec = exploded->tm_sec;
exp_tm.tm_min = exploded->tm_min;
-@@ -245,6 +245,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
+@@ -213,6 +213,24 @@ PR_ImplodeTime(const PRExplodedTime *exp
result *= kSecondsToMicroseconds;
result += exploded->tm_usec;
return result;
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc
new file mode 100644
index 00000000000..3ca79f08253
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_time__posix.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_time__posix.cc,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/time_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/ipc/chromium/src/base/time_posix.cc
+@@ -167,7 +167,7 @@ TimeTicks TimeTicks::Now() {
+ // With numer and denom = 1 (the expected case), the 64-bit absolute time
+ // reported in nanoseconds is enough to last nearly 585 years.
+
+-#elif defined(__OpenBSD__) || defined(OS_POSIX) && \
++#elif defined(OS_OPENBSD) || defined(OS_POSIX) && \
+ defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
+
+ struct timespec ts;
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h
new file mode 100644
index 00000000000..fcbef39823f
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_file__descriptor__set__posix.h,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/ipc/chromium/src/chrome/common/file_descriptor_set_posix.h
+@@ -30,7 +30,7 @@ class FileDescriptorSet : public base::R
+ // In debugging mode, it's a fatal error to try and add more than this number
+ // of descriptors to a FileDescriptorSet.
+ enum {
+- MAX_DESCRIPTORS_PER_MESSAGE = 4,
++ MAX_DESCRIPTORS_PER_MESSAGE = 4
+ };
+
+ // ---------------------------------------------------------------------------
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc
new file mode 100644
index 00000000000..1fb88ff6213
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__channel__posix.cc,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+@@ -7,6 +7,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stddef.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
index 86ff94c39d3..37bc4d3a979 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig 2012-04-20 22:40:06.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/chrome/common/ipc_message_utils.h
@@ -195,7 +195,7 @@ struct ParamTraits<unsigned long long> {
};
#endif
-#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
-+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
++#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS)) || defined(ARCH_CPU_S390))
// There size_t is a synonym for |unsigned long| ...
template <>
struct ParamTraits<size_t> {
@@ -16,7 +16,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h,v 1.
#endif // defined(OS_MACOSX)
-#if !(defined(OS_LINUX) && defined(ARCH_CPU_64_BITS))
-+#if !((defined(OS_FREEBSD) || defined(OS_DRAGONFLY) || defined(OS_NETBSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS))
++#if !((defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS))
// int64 is |long int| on 64-bit systems, uint64 is |unsigned long|
template <>
struct ParamTraits<int64> {
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
index 9d6350b882f..65cc6e5a5f8 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig 2012-04-20 22:40:06.000000000 +0000
+--- mozilla/ipc/chromium/src/chrome/common/transport_dib.h.orig 2012-08-25 00:31:11.000000000 +0000
+++ mozilla/ipc/chromium/src/chrome/common/transport_dib.h
@@ -7,7 +7,7 @@
@@ -16,7 +16,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h,v 1.2 201
};
typedef HandleAndSequenceNum Id;
-#elif defined(OS_MACOSX)
-+#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
++#elif defined(OS_MACOSX) || defined(OS_BSD)
typedef base::SharedMemoryHandle Handle;
// On Mac, the inode number of the backing file is used as an id.
typedef base::SharedMemoryId Id;
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h b/mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h
new file mode 100644
index 00000000000..369eb5a4f59
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_glue_SharedMemorySysV.h,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+
+--- mozilla/ipc/glue/SharedMemorySysV.h.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/ipc/glue/SharedMemorySysV.h
+@@ -8,7 +8,7 @@
+ #ifndef mozilla_ipc_SharedMemorySysV_h
+ #define mozilla_ipc_SharedMemorySysV_h
+
+-#if defined(OS_LINUX) && !defined(ANDROID)
++#if defined(OS_LINUX) && !defined(ANDROID) || defined(OS_BSD)
+
+ // SysV shared memory isn't available on Windows, but we define the
+ // following macro so that #ifdefs are clearer (compared to #ifdef
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk b/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk
deleted file mode 100644
index c5ce76a0486..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-mozilla_js_src_config_rules.mk,v 1.2 2012/07/19 17:57:30 ryoon Exp $
-
---- mozilla/js/src/config/rules.mk.orig 2012-07-12 15:25:25.000000000 +0000
-+++ mozilla/js/src/config/rules.mk
-@@ -1452,7 +1452,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
- $(PYTHON_PATH) \
- $(PLY_INCLUDE) \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
- @if test -n "$(findstring $*.h, $(EXPORTS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-
-@@ -1465,7 +1465,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
- $(PLY_INCLUDE) \
- -I$(topsrcdir)/xpcom/idl-parser \
- -I$(topsrcdir)/xpcom/typelib/xpt/tools \
-- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
-
- # no need to link together if XPIDLSRCS contains only XPIDL_MODULE
- ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS)))
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_config_system-headers b/mail/thunderbird/patches/patch-mozilla_js_src_config_system-headers
new file mode 100644
index 00000000000..d44d8d58b50
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_config_system-headers
@@ -0,0 +1,12 @@
+$NetBSD: patch-mozilla_js_src_config_system-headers,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+
+--- mozilla/js/src/config/system-headers.orig 2012-08-25 00:31:11.000000000 +0000
++++ mozilla/js/src/config/system-headers
+@@ -1059,3 +1059,7 @@ gst/gst.h
+ gst/app/gstappsink.h
+ gst/app/gstappsrc.h
+ gst/video/video.h
++sys/thr.h
++sys/user.h
++kvm.h
++spawn.h
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jsgc.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jsgc.cpp
new file mode 100644
index 00000000000..5b13ce774ad
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_jsgc.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-mozilla_js_src_jsgc.cpp,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+
+--- mozilla/js/src/jsgc.cpp.orig 2012-08-25 00:31:12.000000000 +0000
++++ mozilla/js/src/jsgc.cpp
+@@ -2635,8 +2635,12 @@ GetCPUCount()
+ GetSystemInfo(&sysinfo);
+ ncpus = unsigned(sysinfo.dwNumberOfProcessors);
+ # else
++# ifdef _SC_NPROCESSORS_ONLN
+ long n = sysconf(_SC_NPROCESSORS_ONLN);
+ ncpus = (n > 0) ? unsigned(n) : 1;
++# else
++ ncpus = 1;
++# endif
+ # endif
+ }
+ return ncpus;
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
index 6a3597e967b..ae6191b561a 100644
--- a/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_methodjit_MethodJIT.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_js_src_methodjit_MethodJIT.cpp,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_methodjit_MethodJIT.cpp,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/js/src/methodjit/MethodJIT.cpp.orig 2012-04-20 22:40:08.000000000 +0000
+--- mozilla/js/src/methodjit/MethodJIT.cpp.orig 2012-08-25 00:31:13.000000000 +0000
+++ mozilla/js/src/methodjit/MethodJIT.cpp
-@@ -167,7 +167,7 @@ PopActiveVMFrame(VMFrame &f)
+@@ -135,7 +135,7 @@ PopActiveVMFrame(VMFrame &f)
JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0);
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h b/mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h
deleted file mode 100644
index 16cb24ccda3..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_js_src_yarr_pcre_pcre.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-mozilla_js_src_yarr_pcre_pcre.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/js/src/yarr/pcre/pcre.h.orig 2012-04-20 22:40:11.000000000 +0000
-+++ mozilla/js/src/yarr/pcre/pcre.h
-@@ -46,7 +46,9 @@ POSSIBILITY OF SUCH DAMAGE.
- #include "assembler/wtf/Platform.h"
- #include "jsstr.h"
- #include "jsprvtd.h"
-+#if ENABLE_ASSEMBLER
- #include "jstl.h"
-+#endif
-
- typedef jschar UChar;
- typedef JSLinearString UString;
diff --git a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_Makefile.in b/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_Makefile.in
deleted file mode 100644
index 3575a424429..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_js_xpconnect_src_Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-mozilla_js_xpconnect_src_Makefile.in,v 1.1 2012/06/12 19:37:49 ryoon Exp $
-
---- mozilla/js/xpconnect/src/Makefile.in.orig 2012-06-01 17:19:26.000000000 +0000
-+++ mozilla/js/xpconnect/src/Makefile.in
-@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quicks
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/qsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dom_quickstubs.h \
- --stub-output dom_quickstubs.cpp \
- --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
-@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output dombindings_gen.h \
- $(srcdir)/dombindings.conf
-
-@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindin
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dombindingsgen.py \
- --idlpath=$(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --stub-output dombindings_gen.cpp \
- --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \
- $(srcdir)/dombindings.conf
-@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionar
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- $(srcdir)/dictionary_helper_gen.conf
-
-@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/diction
- -I$(topsrcdir)/xpcom/idl-parser \
- $(srcdir)/dictionary_helper_gen.py \
- -I $(DEPTH)/dist/idl \
-- --cachedir=$(DEPTH)/xpcom/idl-parser \
-+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \
- --header-output DictionaryHelpers.h \
- --stub-output DictionaryHelpers.cpp \
- --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c b/mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
index 0d08a4f6cad..985725ad96d 100644
--- a/mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
+++ b/mail/thunderbird/patches/patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c,v 1.1 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c,v 1.2 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2012-04-20 22:40:17.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2012-08-25 00:31:24.000000000 +0000
+++ mozilla/media/libsydneyaudio/src/sydney_audio_pulseaudio.c
-@@ -29,7 +29,9 @@
+@@ -6,7 +6,9 @@
#include <stdio.h>
#include <string.h>
#include <pthread.h>
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
index c0d4c4f5e0b..8e844893cfe 100644
--- a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
+++ b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_media_libvpx_vpx__config.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_media_libvpx_vpx__config.h,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/media/libvpx/vpx_config.h.orig 2012-04-20 22:40:18.000000000 +0000
+--- mozilla/media/libvpx/vpx_config.h.orig 2012-08-25 00:31:24.000000000 +0000
+++ mozilla/media/libvpx/vpx_config.h
-@@ -12,12 +12,12 @@
+@@ -16,12 +16,12 @@
/* 32 bit MacOS. */
#include "vpx_config_x86-darwin9-gcc.h"
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c
index b80f78a06b9..1b3bb9e5fcf 100644
--- a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c
+++ b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_media_libvpx_vpx__config__c.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_media_libvpx_vpx__config__c.c,v 1.3 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/media/libvpx/vpx_config_c.c.orig 2012-04-20 22:40:18.000000000 +0000
+--- mozilla/media/libvpx/vpx_config_c.c.orig 2012-08-25 00:31:24.000000000 +0000
+++ mozilla/media/libvpx/vpx_config_c.c
-@@ -12,12 +12,12 @@
+@@ -15,12 +15,12 @@
/* 32 bit MacOS. */
#include "vpx_config_x86-darwin9-gcc.c"
diff --git a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp b/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
index c367af5a9ce..6437088f420 100644
--- a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.3 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.4 2012/09/02 06:43:42 ryoon Exp $
---- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig 2012-07-12 15:25:25.000000000 +0000
+--- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig 2012-08-25 00:31:26.000000000 +0000
+++ mozilla/netwerk/protocol/http/HttpChannelParent.cpp
-@@ -340,6 +340,13 @@ HttpChannelParent::RecvUpdateAssociatedC
- // Compiling this with GCC <= 4.4 fails with an internal compiler error
- #pragma GCC optimize ("O0")
- #endif
+@@ -299,6 +299,13 @@ HttpChannelParent::RecvUpdateAssociatedC
+ return true;
+ }
+
+// Compiling with a version of GCC <= 4.4 fails with an internal compiler
+// error.
+#if !defined(__GNUC__) || \
@@ -13,6 +13,6 @@ $NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.3 2012/07
+#pragma GCC optimize ("O0")
+#endif
+
-
bool
HttpChannelParent::RecvRedirect2Verify(const nsresult& result,
+ const RequestHeaderTuples& changedHeaders)
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg
deleted file mode 100644
index 311a4d6cc2a..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg
+++ /dev/null
@@ -1,199 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/nsprpub/pr/include/md/_dragonfly.cfg.orig 2012-04-26 21:04:06.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/_dragonfly.cfg
-@@ -0,0 +1,194 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is the Netscape Portable Runtime (NSPR).
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef nspr_cpucfg___
-+#define nspr_cpucfg___
-+
-+#ifndef XP_UNIX
-+#define XP_UNIX
-+#endif
-+
-+#define PR_AF_INET6 28 /* same as AF_INET6 */
-+
-+#ifndef HAVE_LONG_LONG
-+#define HAVE_LONG_LONG
-+#endif
-+
-+#if defined(__i386__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#undef HAVE_ALIGNED_DOUBLES
-+#undef HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 4
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 4
-+#define PR_BYTES_PER_DWORD 8
-+#define PR_BYTES_PER_WORD_LOG2 2
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 32
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 32
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 5
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 5
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 4
-+#define PR_ALIGN_OF_INT64 4
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 4
-+#define PR_ALIGN_OF_POINTER 4
-+
-+#elif defined(__amd64__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#else
-+
-+#error "Unknown CPU architecture"
-+
-+#endif
-+
-+#ifndef NO_NSPR_10_SUPPORT
-+
-+#define BYTES_PER_BYTE PR_BYTES_PER_BYTE
-+#define BYTES_PER_SHORT PR_BYTES_PER_SHORT
-+#define BYTES_PER_INT PR_BYTES_PER_INT
-+#define BYTES_PER_INT64 PR_BYTES_PER_INT64
-+#define BYTES_PER_LONG PR_BYTES_PER_LONG
-+#define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT
-+#define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE
-+#define BYTES_PER_WORD PR_BYTES_PER_WORD
-+#define BYTES_PER_DWORD PR_BYTES_PER_DWORD
-+
-+#define BITS_PER_BYTE PR_BITS_PER_BYTE
-+#define BITS_PER_SHORT PR_BITS_PER_SHORT
-+#define BITS_PER_INT PR_BITS_PER_INT
-+#define BITS_PER_INT64 PR_BITS_PER_INT64
-+#define BITS_PER_LONG PR_BITS_PER_LONG
-+#define BITS_PER_FLOAT PR_BITS_PER_FLOAT
-+#define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE
-+#define BITS_PER_WORD PR_BITS_PER_WORD
-+
-+#define BITS_PER_BYTE_LOG2 PR_BITS_PER_BYTE_LOG2
-+#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-+#define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2
-+#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-+#define BITS_PER_LONG_LOG2 PR_BITS_PER_LONG_LOG2
-+#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-+#define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2
-+#define BITS_PER_WORD_LOG2 PR_BITS_PER_WORD_LOG2
-+
-+#define ALIGN_OF_SHORT PR_ALIGN_OF_SHORT
-+#define ALIGN_OF_INT PR_ALIGN_OF_INT
-+#define ALIGN_OF_LONG PR_ALIGN_OF_LONG
-+#define ALIGN_OF_INT64 PR_ALIGN_OF_INT64
-+#define ALIGN_OF_FLOAT PR_ALIGN_OF_FLOAT
-+#define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE
-+#define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER
-+#define ALIGN_OF_WORD PR_ALIGN_OF_WORD
-+
-+#define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2
-+#define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2
-+#define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2
-+
-+#endif /* NO_NSPR_10_SUPPORT */
-+
-+#endif /* nspr_cpucfg___ */
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h
deleted file mode 100644
index 279511b3e73..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md___pth.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md___pth.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/nsprpub/pr/include/md/_pth.h.orig 2012-04-20 22:40:20.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/_pth.h
-@@ -146,7 +146,7 @@
- #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
- #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
- || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-- || defined(HPUX) || defined(FREEBSD) \
-+ || defined(HPUX) || defined(FREEBSD) || defined(__DragonFly__) \
- || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
- || defined(NTO) || defined(DARWIN) \
- || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
-@@ -237,7 +237,7 @@
- #endif /* defined(_PR_DCETHREADS) */
-
- #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
-- || defined(FREEBSD) || defined(SYMBIAN)
-+ || defined(FREEBSD) || defined(SYMBIAN) || defined(__DragonFly__)
- #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER)
- #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
- #elif defined(NTO)
-@@ -296,6 +296,7 @@ extern int (*_PT_aix_yield_fcn)();
- #elif defined(HPUX) || defined(SOLARIS) \
- || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
- || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
-+ || defined(__DragonFly__) \
- || defined(BSDI) || defined(NTO) || defined(DARWIN) \
- || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
- #define _PT_PTHREAD_YIELD() sched_yield()
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h
deleted file mode 100644
index a216318842c..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_include_md_prosdep.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_include_md_prosdep.h,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/nsprpub/pr/include/md/prosdep.h.orig 2012-04-20 22:40:20.000000000 +0000
-+++ mozilla/nsprpub/pr/include/md/prosdep.h
-@@ -66,7 +66,7 @@ PR_BEGIN_EXTERN_C
- #if defined(AIX)
- #include "md/_aix.h"
-
--#elif defined(FREEBSD)
-+#elif defined(FREEBSD) || defined(__DragonFly__)
- #include "md/_freebsd.h"
-
- #elif defined(NETBSD)
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c
deleted file mode 100644
index e9a71a7bf03..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig 2012-04-20 22:40:20.000000000 +0000
-+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c
-@@ -126,7 +126,7 @@ GetHighResClock(void *buf, size_t maxbyt
-
- #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
- || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \
-- || defined(SYMBIAN))
-+ || defined(SYMBIAN)) || defined(__DragonFly__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c
deleted file mode 100644
index 1432cfbdac8..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptio.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptio.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig 2012-04-20 22:40:20.000000000 +0000
-+++ mozilla/nsprpub/pr/src/pthreads/ptio.c
-@@ -212,7 +212,8 @@ static PRBool _pr_ipv6_v6only_on_by_defa
- || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
- || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
- || defined(BSDI) || defined(NTO) || defined(DARWIN) \
-- || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN)
-+ || defined(UNIXWARE) || defined(RISCOS) || defined(SYMBIAN) \
-+ || defined(__DragonFly__)
- #define _PRSelectFdSetArg_t fd_set *
- #else
- #error "Cannot determine architecture"
-@@ -3286,7 +3287,7 @@ static PRIOMethods _pr_socketpollfd_meth
- || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \
- || defined(OPENBSD) || defined(BSDI) || defined(NTO) \
- || defined(DARWIN) || defined(UNIXWARE) || defined(RISCOS) \
-- || defined(SYMBIAN)
-+ || defined(SYMBIAN) || defined(__DragonFly__)
- #define _PR_FCNTL_FLAGS O_NONBLOCK
- #else
- #error "Can't determine architecture"
diff --git a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c b/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c
deleted file mode 100644
index 09a059dd826..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c,v 1.2 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/nsprpub/pr/src/pthreads/ptsynch.c.orig 2012-04-20 22:40:20.000000000 +0000
-+++ mozilla/nsprpub/pr/src/pthreads/ptsynch.c
-@@ -842,7 +842,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor
- */
- #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
- || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \
-- || defined(DARWIN) || defined(SYMBIAN)
-+ || defined(DARWIN) || defined(SYMBIAN) || defined(__DragonFly__)
- /* union semun is defined by including <sys/sem.h> */
- #else
- /* according to X/OPEN we have to define it ourselves */
diff --git a/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in b/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
index 9afe67c0568..4132ab7e2e5 100644
--- a/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.2 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.3 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/storage/src/Makefile.in.orig 2012-07-12 15:25:26.000000000 +0000
+--- mozilla/storage/src/Makefile.in.orig 2012-08-25 00:31:30.000000000 +0000
+++ mozilla/storage/src/Makefile.in
-@@ -67,6 +67,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY
+@@ -34,6 +34,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY
endif
endif
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
index 428efe20d73..9187f68059f 100644
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.3 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_Makefile.in,v 1.4 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xpcom/Makefile.in.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/Makefile.in.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/Makefile.in
-@@ -67,6 +67,10 @@ DIRS += windbgdlg
+@@ -35,6 +35,10 @@ DIRS += windbgdlg
endif
endif
+ifeq ($(OS_ARCH),NetBSD)
-+EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/thunderbird
++EXTRA_DSO_LDOPTS += -Wl,-rpath,${PREFIX}/lib/xulrunner-sdk/sdk/lib
+endif
+
ifdef ENABLE_TESTS
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
index b97c5cd6d6b..1c2f629970d 100644
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.2 2012/07/19 17:57:30 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.3 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xpcom/idl-parser/Makefile.in.orig 2012-07-12 15:25:26.000000000 +0000
+--- mozilla/xpcom/idl-parser/Makefile.in.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/idl-parser/Makefile.in
-@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
+@@ -29,7 +29,7 @@ include $(topsrcdir)/config/rules.mk
+ export:: $(PARSER_SRCS) $(PLY_PROGS)
$(PYTHON_PATH) \
$(PLY_INCLUDE) \
- -I$(topsrcdir)/xpcom/idl-parser \
-- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
-+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
+- $(srcdir)/header.py --cachedir=. --regen
++ $(srcdir)/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen
check::
$(PYTHON_PATH) \
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py
deleted file mode 100644
index edb91e508de..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_header.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-mozilla_xpcom_idl-parser_header.py,v 1.4 2012/06/12 19:37:49 ryoon Exp $
-
---- mozilla/xpcom/idl-parser/header.py.orig 2012-06-01 17:19:53.000000000 +0000
-+++ mozilla/xpcom/idl-parser/header.py
-@@ -505,10 +505,9 @@ if __name__ == '__main__':
- print >>sys.stderr, "--regen useless without --cachedir"
- # Delete the lex/yacc files. Ply is too stupid to regenerate them
- # properly
-- deadfiles = os.path.join(options.cachedir, "*.py*")
-- for filename in glob.glob(deadfiles):
-- print filename
-- os.remove(filename)
-+ for fileglobs in [os.path.join(options.cachedir, f) for f in ["xpidllex.py*", "xpidlyacc.py*"]]:
-+ for filename in glob.glob(fileglobs):
-+ os.remove(filename)
-
- # Instantiate the parser.
- p = xpidl.IDLParser(outputdir=options.cachedir)
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
index 9890c0787cf..86233f780f6 100644
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_typelib_xpidl_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_xpcom_typelib_xpidl_Makefile.in,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_typelib_xpidl_Makefile.in,v 1.2 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xpcom/typelib/xpidl/Makefile.in.orig 2012-06-01 17:19:53.000000000 +0000
+--- mozilla/xpcom/typelib/xpidl/Makefile.in.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xpcom/typelib/xpidl/Makefile.in
-@@ -48,8 +48,8 @@ SDK_BINARY = \
+@@ -16,8 +16,8 @@ SDK_BINARY = \
$(topsrcdir)/xpcom/idl-parser/xpidl.py \
$(topsrcdir)/xpcom/idl-parser/header.py \
$(topsrcdir)/xpcom/idl-parser/typelib.py \
diff --git a/mail/thunderbird/patches/patch-mp b/mail/thunderbird/patches/patch-mp
index 19799ebf266..d3f8bac9d65 100644
--- a/mail/thunderbird/patches/patch-mp
+++ b/mail/thunderbird/patches/patch-mp
@@ -1,8 +1,8 @@
-$NetBSD: patch-mp,v 1.6 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mp,v 1.7 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2012-04-20 22:40:17.000000000 +0000
+--- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2012-08-25 00:31:24.000000000 +0000
+++ mozilla/media/libsydneyaudio/src/Makefile.in
-@@ -104,6 +104,12 @@ ifeq ($(OS_ARCH),WINNT)
+@@ -72,6 +72,12 @@ ifeq ($(OS_ARCH),WINNT)
OS_LIBS += winmm.lib
endif
diff --git a/mail/thunderbird/patches/patch-pa b/mail/thunderbird/patches/patch-pa
index f9aeba1c7ac..1888b8dc92f 100644
--- a/mail/thunderbird/patches/patch-pa
+++ b/mail/thunderbird/patches/patch-pa
@@ -1,6 +1,6 @@
-$NetBSD: patch-pa,v 1.6 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-pa,v 1.7 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xulrunner/installer/mozilla-js.pc.in.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-js.pc.in.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xulrunner/installer/mozilla-js.pc.in
@@ -6,5 +6,5 @@ Name: JavaScript
Description: The Mozilla JavaScript Library
diff --git a/mail/thunderbird/patches/patch-pb b/mail/thunderbird/patches/patch-pb
index ad5100b04e0..bdc0cb3b466 100644
--- a/mail/thunderbird/patches/patch-pb
+++ b/mail/thunderbird/patches/patch-pb
@@ -1,6 +1,6 @@
-$NetBSD: patch-pb,v 1.6 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-pb,v 1.7 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xulrunner/installer/libxul.pc.in.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xulrunner/installer/libxul.pc.in.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xulrunner/installer/libxul.pc.in
@@ -7,5 +7,5 @@ Name: libxul
Description: The Mozilla Runtime and Embedding Engine
diff --git a/mail/thunderbird/patches/patch-pc b/mail/thunderbird/patches/patch-pc
index 5f9548a7783..085937be957 100644
--- a/mail/thunderbird/patches/patch-pc
+++ b/mail/thunderbird/patches/patch-pc
@@ -1,6 +1,6 @@
-$NetBSD: patch-pc,v 1.6 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-pc,v 1.7 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xulrunner/installer/libxul-embedding.pc.in
@@ -6,5 +6,6 @@ idldir=%idldir%
Name: libxul-embedding
diff --git a/mail/thunderbird/patches/patch-pd b/mail/thunderbird/patches/patch-pd
index ffdb6ab5452..17a5c70433a 100644
--- a/mail/thunderbird/patches/patch-pd
+++ b/mail/thunderbird/patches/patch-pd
@@ -1,6 +1,6 @@
-$NetBSD: patch-pd,v 1.6 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-pd,v 1.7 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-nss.pc.in.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xulrunner/installer/mozilla-nss.pc.in
@@ -6,5 +6,5 @@ Name: NSS
Description: Mozilla Network Security Services
diff --git a/mail/thunderbird/patches/patch-pg b/mail/thunderbird/patches/patch-pg
index 866a62688e9..cdaf46e448f 100644
--- a/mail/thunderbird/patches/patch-pg
+++ b/mail/thunderbird/patches/patch-pg
@@ -1,6 +1,6 @@
-$NetBSD: patch-pg,v 1.6 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-pg,v 1.7 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xulrunner/installer/mozilla-nspr.pc.in.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xulrunner/installer/mozilla-nspr.pc.in
@@ -5,7 +5,5 @@ includedir=%includedir%
Name: NSPR
diff --git a/mail/thunderbird/patches/patch-rc b/mail/thunderbird/patches/patch-rc
index 0e3270da42c..f9e9fa106c6 100644
--- a/mail/thunderbird/patches/patch-rc
+++ b/mail/thunderbird/patches/patch-rc
@@ -1,8 +1,11 @@
-$NetBSD: patch-rc,v 1.5 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-rc,v 1.6 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig 2012-04-20 22:39:54.000000000 +0000
+--- mozilla/browser/branding/unofficial/locales/en-US/brand.dtd.orig 2012-08-25 00:30:57.000000000 +0000
+++ mozilla/browser/branding/unofficial/locales/en-US/brand.dtd
-@@ -1,4 +1,4 @@
+@@ -2,7 +2,7 @@
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
-<!ENTITY brandShortName "Mozilla Developer Preview">
-<!ENTITY brandFullName "Mozilla Developer Preview">
+<!ENTITY brandShortName "Browser">
diff --git a/mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh b/mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh
deleted file mode 100644
index 2248384e37a..00000000000
--- a/mail/thunderbird/patches/patch-security_nss_cmd_shlibsign_sign.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-security_nss_cmd_shlibsign_sign.sh,v 1.3 2012/04/28 16:56:59 ryoon Exp $
-
-This tries to dlopen libsoftokn3.so which is linked against sqlite3,
-so we need a directory containing libsqlite3.so in the search path,
-beside the directory containing libsoftokn3.so itself.
-
---- mozilla/security/nss/cmd/shlibsign/sign.sh.orig 2012-04-20 22:40:21.000000000 +0000
-+++ mozilla/security/nss/cmd/shlibsign/sign.sh
-@@ -26,7 +26,7 @@ WIN*)
- export LIBPATH
- SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
- export SHLIB_PATH
-- LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH=${1}/lib:${4}:${PREFIX}/lib:$LD_LIBRARY_PATH
- export LD_LIBRARY_PATH
- DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH
diff --git a/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk b/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk
index b06ee4d0e33..0b02e34d638 100644
--- a/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk
+++ b/mail/thunderbird/patches/patch-toolkit_toolkit-tiers.mk
@@ -1,8 +1,8 @@
-$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.3 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.4 2012/09/02 06:43:43 ryoon Exp $
---- mozilla/toolkit/toolkit-tiers.mk.orig 2012-04-20 22:40:26.000000000 +0000
+--- mozilla/toolkit/toolkit-tiers.mk.orig 2012-08-25 00:31:34.000000000 +0000
+++ mozilla/toolkit/toolkit-tiers.mk
-@@ -80,7 +80,7 @@ ifdef MOZ_UPDATER
+@@ -47,7 +47,7 @@ ifdef MOZ_UPDATER
ifndef MOZ_NATIVE_BZ2
tier_platform_dirs += modules/libbz2
endif
diff --git a/mail/thunderbird/patches/patch-xa b/mail/thunderbird/patches/patch-xa
index 64a7290658d..59da6682a5f 100644
--- a/mail/thunderbird/patches/patch-xa
+++ b/mail/thunderbird/patches/patch-xa
@@ -1,8 +1,8 @@
-$NetBSD: patch-xa,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xa,v 1.5 2012/09/02 06:43:43 ryoon Exp $
NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig 2012-04-26 21:04:06.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s.orig 2012-08-31 13:21:49.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_netbsd.s
@@ -0,0 +1,112 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/mail/thunderbird/patches/patch-xb b/mail/thunderbird/patches/patch-xb
index 651e3f2309c..9a01cf876a4 100644
--- a/mail/thunderbird/patches/patch-xb
+++ b/mail/thunderbird/patches/patch-xb
@@ -1,8 +1,8 @@
-$NetBSD: patch-xb,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xb,v 1.5 2012/09/02 06:43:43 ryoon Exp $
NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2012-04-26 21:04:06.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp.orig 2012-08-31 13:21:49.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_netbsd.cpp
@@ -0,0 +1,84 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/mail/thunderbird/patches/patch-xc b/mail/thunderbird/patches/patch-xc
index ae749b7d97a..756adb7395b 100644
--- a/mail/thunderbird/patches/patch-xc
+++ b/mail/thunderbird/patches/patch-xc
@@ -1,8 +1,8 @@
-$NetBSD: patch-xc,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xc,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2012-04-26 21:04:06.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s.orig 2012-08-31 13:21:49.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_netbsd.s
@@ -0,0 +1,66 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/mail/thunderbird/patches/patch-xd b/mail/thunderbird/patches/patch-xd
index 050537f53ec..fdeded7d27a 100644
--- a/mail/thunderbird/patches/patch-xd
+++ b/mail/thunderbird/patches/patch-xd
@@ -1,8 +1,8 @@
-$NetBSD: patch-xd,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xd,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD/sparc64 xptcall support code. From pkgsrc/www/firefox3/files/
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig 2012-04-26 21:04:06.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp.orig 2012-08-31 13:21:49.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_netbsd.cpp
@@ -0,0 +1,119 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
diff --git a/mail/thunderbird/patches/patch-xe b/mail/thunderbird/patches/patch-xe
index b27752ba92d..088c4e633d8 100644
--- a/mail/thunderbird/patches/patch-xe
+++ b/mail/thunderbird/patches/patch-xe
@@ -1,10 +1,10 @@
-$NetBSD: patch-xe,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xe,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
-@@ -132,6 +132,15 @@ extern "C" {
+@@ -100,6 +100,15 @@ extern "C" {
}
}
@@ -20,7 +20,7 @@ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
XPTC_PUBLIC_API(nsresult)
XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
PRUint32 paramCount, nsXPTCVariant* params)
-@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
+@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
PRUint32 result;
__asm__ __volatile__(
diff --git a/mail/thunderbird/patches/patch-xf b/mail/thunderbird/patches/patch-xf
index 4982af1e41f..500d9a86cb8 100644
--- a/mail/thunderbird/patches/patch-xf
+++ b/mail/thunderbird/patches/patch-xf
@@ -1,10 +1,10 @@
-$NetBSD: patch-xf,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xf,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ae.
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
-@@ -123,17 +123,27 @@ extern "C" {
+@@ -91,17 +91,27 @@ extern "C" {
}
}
diff --git a/mail/thunderbird/patches/patch-xg b/mail/thunderbird/patches/patch-xg
index 1e7eee2d47d..ba863e251f7 100644
--- a/mail/thunderbird/patches/patch-xg
+++ b/mail/thunderbird/patches/patch-xg
@@ -1,10 +1,10 @@
-$NetBSD: patch-xg,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xg,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD/arm xptcall support code. From pkgsrc/www/firefox/patch-bm.
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
-@@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -86,18 +86,23 @@ PrepareAndDispatch(nsXPTCStubBase* self,
* so they are contiguous with values passed on the stack, and then calls
* PrepareAndDispatch() to do the dirty work.
*/
diff --git a/mail/thunderbird/patches/patch-xj b/mail/thunderbird/patches/patch-xj
index f9de2a2330c..4f50d097fb7 100644
--- a/mail/thunderbird/patches/patch-xj
+++ b/mail/thunderbird/patches/patch-xj
@@ -1,10 +1,10 @@
-$NetBSD: patch-xj,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xj,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
-@@ -41,6 +41,7 @@
+@@ -6,6 +6,7 @@
// Implement shared vtbl methods.
#include "xptcprivate.h"
@@ -12,7 +12,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
// The Linux/PPC ABI (aka PPC/SYSV ABI) passes the first 8 integral
// parameters and the first 8 floating point parameters in registers
-@@ -71,7 +72,6 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -36,7 +37,6 @@ PrepareAndDispatch(nsXPTCStubBase* self,
{
nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
nsXPTCMiniVariant* dispatchParams = NULL;
@@ -20,7 +20,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
const nsXPTMethodInfo* info;
PRUint32 paramCount;
PRUint32 i;
-@@ -79,12 +79,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -44,12 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
NS_ASSERTION(self,"no self");
@@ -34,7 +34,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
NS_ASSERTION(info,"no method info");
if (! info)
return NS_ERROR_UNEXPECTED;
-@@ -119,8 +114,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -84,8 +79,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
dp->val.d = *(double*) ap;
ap += 2;
@@ -45,7 +45,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
}
continue;
}
-@@ -130,8 +127,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -95,8 +92,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
else {
dp->val.f = *(float*) ap;
ap += 1;
@@ -56,7 +56,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
}
continue;
}
-@@ -179,9 +178,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -144,9 +143,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
}
}
@@ -69,7 +69,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
if (dispatchParams != paramBuffer)
delete [] dispatchParams;
-@@ -195,7 +194,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -160,7 +159,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
// however, it's quick, dirty, and'll break when the ABI changes on
// us, which is what we want ;-).
@@ -80,7 +80,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
__asm__ ( \
".section \".text\" \n\t" \
".align 2 \n\t" \
-@@ -206,6 +207,46 @@ __asm__ (
+@@ -171,6 +172,46 @@ __asm__ (
"li 11,"#n" \n\t" \
"b SharedStub@local \n" \
);
diff --git a/mail/thunderbird/patches/patch-xk b/mail/thunderbird/patches/patch-xk
index 5414a76ee9b..1a7be2d88bc 100644
--- a/mail/thunderbird/patches/patch-xk
+++ b/mail/thunderbird/patches/patch-xk
@@ -1,94 +1,10 @@
-$NetBSD: patch-xk,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xk,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2012-08-25 00:31:36.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
-@@ -1,43 +1,43 @@
--# -*- Mode: Asm -*-
--#
--# ***** BEGIN LICENSE BLOCK *****
--# Version: MPL 1.1/GPL 2.0/LGPL 2.1
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License. You may obtain a copy of the License at
--# http://www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is
--# Netscape Communications Corporation.
--# Portions created by the Initial Developer are Copyright (C) 1999
--# the Initial Developer. All Rights Reserved.
--#
--# Contributor(s):
--# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--# beard@netscape.com (Patrick Beard)
--# waterson@netscape.com (Chris Waterson)
--#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 2 or later (the "GPL"), or
--# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--# in which case the provisions of the GPL or the LGPL are applicable instead
--# of those above. If you wish to allow use of your version of this file only
--# under the terms of either the GPL or the LGPL, and not to allow others to
--# use your version of this file under the terms of the MPL, indicate your
--# decision by deleting the provisions above and replace them with the notice
--# and other provisions required by the GPL or the LGPL. If you do not delete
--# the provisions above, a recipient may use your version of this file under
--# the terms of any one of the MPL, the GPL or the LGPL.
--#
--# ***** END LICENSE BLOCK *****
-+// -*- Mode: Asm -*-
-+//
-+// ***** BEGIN LICENSE BLOCK *****
-+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+//
-+// The contents of this file are subject to the Mozilla Public License Version
-+// 1.1 (the "License"); you may not use this file except in compliance with
-+// the License. You may obtain a copy of the License at
-+// http://www.mozilla.org/MPL/
-+//
-+// Software distributed under the License is distributed on an "AS IS" basis,
-+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+// for the specific language governing rights and limitations under the
-+// License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is
-+// Netscape Communications Corporation.
-+// Portions created by the Initial Developer are Copyright (C) 1999
-+// the Initial Developer. All Rights Reserved.
-+//
-+// Contributor(s):
-+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+// beard@netscape.com (Patrick Beard)
-+// waterson@netscape.com (Chris Waterson)
-+//
-+// Alternatively, the contents of this file may be used under the terms of
-+// either the GNU General Public License Version 2 or later (the "GPL"), or
-+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+// in which case the provisions of the GPL or the LGPL are applicable instead
-+// of those above. If you wish to allow use of your version of this file only
-+// under the terms of either the GPL or the LGPL, and not to allow others to
-+// use your version of this file under the terms of the MPL, indicate your
-+// decision by deleting the provisions above and replace them with the notice
-+// and other provisions required by the GPL or the LGPL. If you do not delete
-+// the provisions above, a recipient may use your version of this file under
-+// the terms of any one of the MPL, the GPL or the LGPL.
-+//
-+// ***** END LICENSE BLOCK *****
-
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-@@ -60,23 +60,23 @@
+@@ -25,23 +25,23 @@
.type SharedStub,@function
SharedStub:
@@ -122,7 +38,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
stfd f2,48(sp)
stfd f3,56(sp)
stfd f4,64(sp)
-@@ -85,21 +85,21 @@ SharedStub:
+@@ -50,21 +50,21 @@ SharedStub:
stfd f7,88(sp)
stfd f8,96(sp)
diff --git a/mail/thunderbird/patches/patch-xl b/mail/thunderbird/patches/patch-xl
index 11916188e0e..b43d86e15ae 100644
--- a/mail/thunderbird/patches/patch-xl
+++ b/mail/thunderbird/patches/patch-xl
@@ -1,94 +1,10 @@
-$NetBSD: patch-xl,v 1.4 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xl,v 1.5 2012/09/02 06:43:44 ryoon Exp $
NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -1,43 +1,43 @@
--# -*- Mode: Asm -*-
--#
--# ***** BEGIN LICENSE BLOCK *****
--# Version: MPL 1.1/GPL 2.0/LGPL 2.1
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License. You may obtain a copy of the License at
--# http://www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is
--# Netscape Communications Corporation.
--# Portions created by the Initial Developer are Copyright (C) 1999
--# the Initial Developer. All Rights Reserved.
--#
--# Contributor(s):
--# Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--# beard@netscape.com (Patrick Beard)
--# waterson@netscape.com (Chris Waterson)
--#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 2 or later (the "GPL"), or
--# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--# in which case the provisions of the GPL or the LGPL are applicable instead
--# of those above. If you wish to allow use of your version of this file only
--# under the terms of either the GPL or the LGPL, and not to allow others to
--# use your version of this file under the terms of the MPL, indicate your
--# decision by deleting the provisions above and replace them with the notice
--# and other provisions required by the GPL or the LGPL. If you do not delete
--# the provisions above, a recipient may use your version of this file under
--# the terms of any one of the MPL, the GPL or the LGPL.
--#
--# ***** END LICENSE BLOCK *****
-+// -*- Mode: Asm -*-
-+//
-+// ***** BEGIN LICENSE BLOCK *****
-+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+//
-+// The contents of this file are subject to the Mozilla Public License Version
-+// 1.1 (the "License"); you may not use this file except in compliance with
-+// the License. You may obtain a copy of the License at
-+// http://www.mozilla.org/MPL/
-+//
-+// Software distributed under the License is distributed on an "AS IS" basis,
-+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+// for the specific language governing rights and limitations under the
-+// License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is
-+// Netscape Communications Corporation.
-+// Portions created by the Initial Developer are Copyright (C) 1999
-+// the Initial Developer. All Rights Reserved.
-+//
-+// Contributor(s):
-+// Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+// beard@netscape.com (Patrick Beard)
-+// waterson@netscape.com (Chris Waterson)
-+//
-+// Alternatively, the contents of this file may be used under the terms of
-+// either the GNU General Public License Version 2 or later (the "GPL"), or
-+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+// in which case the provisions of the GPL or the LGPL are applicable instead
-+// of those above. If you wish to allow use of your version of this file only
-+// under the terms of either the GPL or the LGPL, and not to allow others to
-+// use your version of this file under the terms of the MPL, indicate your
-+// decision by deleting the provisions above and replace them with the notice
-+// and other provisions required by the GPL or the LGPL. If you do not delete
-+// the provisions above, a recipient may use your version of this file under
-+// the terms of any one of the MPL, the GPL or the LGPL.
-+//
-+// ***** END LICENSE BLOCK *****
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
- .set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
-@@ -55,41 +55,41 @@
+@@ -20,41 +20,41 @@
.section ".text"
.align 2
@@ -155,7 +71,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
lfd f2,40(r30)
lfd f3,48(r30)
lfd f4,56(r30)
-@@ -98,18 +98,13 @@ XPTC_InvokeByIndex:
+@@ -63,18 +63,13 @@ XPTC_InvokeByIndex:
lfd f7,80(r30)
lfd f8,88(r30)
@@ -180,7 +96,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
lwz r5,8(r30)
lwz r6,12(r30)
lwz r7,16(r30)
-@@ -117,13 +112,13 @@ XPTC_InvokeByIndex:
+@@ -82,13 +77,13 @@ XPTC_InvokeByIndex:
lwz r9,24(r30)
lwz r10,28(r30)
diff --git a/mail/thunderbird/patches/patch-xm b/mail/thunderbird/patches/patch-xm
deleted file mode 100644
index cf6e64290be..00000000000
--- a/mail/thunderbird/patches/patch-xm
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-xm,v 1.4 2012/04/28 16:56:59 ryoon Exp $
-
-NetBSD/ppc xptcall support code. Originally from pkgsrc/www/mozilla.
-
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2012-04-20 22:40:27.000000000 +0000
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
-@@ -40,9 +40,9 @@
-
- // Platform specific code to invoke XPCOM methods on native objects
-
--// The purpose of XPTC_InvokeByIndex() is to map a platform
-+// The purpose of NS_InvokeByIndex_P() is to map a platform
- // indepenpent call to the platform ABI. To do that,
--// XPTC_InvokeByIndex() has to determine the method to call via vtable
-+// NS_InvokeByIndex_P() has to determine the method to call via vtable
- // access. The parameters for the method are read from the
- // nsXPTCVariant* and prepared for the native ABI. For the Linux/PPC
- // ABI this means that the first 8 integral and floating point
-@@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d,
- if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
- *((double*) d) = s->val.d;
- d += 2;
-+#if __GXX_ABI_VERSION < 100
- if (gpr < GPR_COUNT)
- gpr += 2;
-+#endif
- }
- }
- else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-@@ -114,8 +116,10 @@ invoke_copy_to_stack(PRUint32* d,
- else {
- *((float*) d) = s->val.f;
- d += 1;
-+#if __GXX_ABI_VERSION < 100
- if (gpr < GPR_COUNT)
- gpr += 1;
-+#endif
- }
- }
- else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
-@@ -142,6 +146,6 @@ invoke_copy_to_stack(PRUint32* d,
- }
-
- extern "C"
--XPTC_PUBLIC_API(nsresult)
--XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-+EXPORT_XPCOM_API(nsresult)
-+NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
- PRUint32 paramCount, nsXPTCVariant* params);
diff --git a/mail/thunderbird/patches/patch-xn b/mail/thunderbird/patches/patch-xn
index eb6fb23f694..9e2a72d0ac8 100644
--- a/mail/thunderbird/patches/patch-xn
+++ b/mail/thunderbird/patches/patch-xn
@@ -1,53 +1,52 @@
-$NetBSD: patch-xn,v 1.3 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xn,v 1.4 2012/09/02 06:43:44 ryoon Exp $
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
-@@ -42,8 +42,46 @@
+@@ -16,6 +16,47 @@
+ #include <sys/asm.h>
+ #endif
- /* 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
++# define fp s8
+# endif
+# ifndef PTRLOG
+# if SZREG == 4
-+# define PTRLOG 2
++# define PTRLOG 2
+# else
-+# define PTRLOG 3
++# 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
++# 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)
++# define SETUP_GP
++# define SAVE_GP(x)
+# endif
+# endif
+# ifndef ALSZ
+# if defined(__mips_n32) || defined(__mips_n64)
-+# define ALSZ 15
-+# define ALMASK ~15
++# define ALSZ 15
++# define ALMASK ~15
+# else
-+# define ALSZ 7
-+# define ALMASK ~7
++# 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
+ # argument slots is sometimes predefined in the header files.
diff --git a/mail/thunderbird/patches/patch-xo b/mail/thunderbird/patches/patch-xo
index c07c38f27b4..56cf60e85ad 100644
--- a/mail/thunderbird/patches/patch-xo
+++ b/mail/thunderbird/patches/patch-xo
@@ -1,53 +1,52 @@
-$NetBSD: patch-xo,v 1.3 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-xo,v 1.4 2012/09/02 06:43:44 ryoon Exp $
---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.orig 2012-08-25 00:31:35.000000000 +0000
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
-@@ -26,8 +26,46 @@
+@@ -14,6 +14,47 @@
+ #include <sys/asm.h>
+ #endif
- /* 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
++# define fp s8
+# endif
+# ifndef PTRLOG
+# if SZREG == 4
-+# define PTRLOG 2
++# define PTRLOG 2
+# else
-+# define PTRLOG 3
++# 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
++# 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)
++# define SETUP_GP
++# define SAVE_GP(x)
+# endif
+# endif
+# ifndef ALSZ
+# if defined(__mips_n32) || defined(__mips_n64)
-+# define ALSZ 15
-+# define ALMASK ~15
++# define ALSZ 15
++# define ALMASK ~15
+# else
-+# define ALSZ 7
-+# define ALMASK ~7
++# 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
+ # argument slots is sometimes predefined in the header files.
diff --git a/mail/thunderbird/patches/patch-zb b/mail/thunderbird/patches/patch-zb
index 5dad8a93707..4aeb89b14c4 100644
--- a/mail/thunderbird/patches/patch-zb
+++ b/mail/thunderbird/patches/patch-zb
@@ -1,8 +1,8 @@
-$NetBSD: patch-zb,v 1.6 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-zb,v 1.7 2012/09/02 06:43:44 ryoon Exp $
---- mail/app/Makefile.in.orig 2012-06-01 17:11:49.000000000 +0000
+--- mail/app/Makefile.in.orig 2012-08-25 00:24:32.000000000 +0000
+++ mail/app/Makefile.in
-@@ -96,6 +96,10 @@ LOCAL_INCLUDES += \
+@@ -63,6 +63,10 @@ LOCAL_INCLUDES += \
DEFINES += -DXPCOM_GLUE
STL_FLAGS=
diff --git a/mail/thunderbird/patches/patch-zc b/mail/thunderbird/patches/patch-zc
index cc9cd4e4aa6..6986f144536 100644
--- a/mail/thunderbird/patches/patch-zc
+++ b/mail/thunderbird/patches/patch-zc
@@ -1,8 +1,8 @@
-$NetBSD: patch-zc,v 1.3 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-zc,v 1.4 2012/09/02 06:43:44 ryoon Exp $
---- mail/app/nsMailApp.cpp.orig 2012-04-20 22:32:37.000000000 +0000
+--- mail/app/nsMailApp.cpp.orig 2012-08-25 00:24:32.000000000 +0000
+++ mail/app/nsMailApp.cpp
-@@ -52,6 +52,27 @@
+@@ -19,6 +19,27 @@
#include <stdio.h>
#include <stdarg.h>
@@ -30,7 +30,7 @@ $NetBSD: patch-zc,v 1.3 2012/04/28 16:56:59 ryoon Exp $
#include "nsCOMPtr.h"
#include "nsILocalFile.h"
-@@ -151,6 +172,7 @@ static int do_main(const char *exePath,
+@@ -115,6 +136,7 @@ static int do_main(const char *exePath,
int main(int argc, char* argv[])
{