Update to 17.0

Changelog:
    NEW
    A Menu Button is now shown to new users by default
    NEW
    Tabs are now drawn in the title bar on Windows
    FIXED
    An issue causing spell-checking only parts of words in Thunderbird 16 is now fixed (790475)
    FIXED
    An issue causing Thunderbird 16 to repeatedly download emails is now fixed (806760)
    FIXED
    RSS feeds can now be viewed in the Wide View Layout (531397)
    FIXED
    Various fixes and performance improvements
    FIXED
    Various security fixes
    CHANGED
    Mac OS X 10.5 is no longer supported

Security fixes:
Fixed in Thunderbird 17
MFSA 2012-106 Use-after-free, buffer overflow, and memory corruption issues found using Address Sanitizer
MFSA 2012-105 Use-after-free and buffer overflow issues found using Address Sanitizer
MFSA 2012-103 Frames can shadow top.location
MFSA 2012-101 Improper character decoding in HZ-GB-2312 charset
MFSA 2012-100 Improper security filtering for cross-origin wrappers
MFSA 2012-99 XrayWrappers exposes chrome-only properties when not in chrome compartment
MFSA 2012-97 XMLHttpRequest inherits incorrect principal within sandbox
MFSA 2012-96 Memory corruption in str_unescape
MFSA 2012-94 Crash when combining SVG text on path with CSS
MFSA 2012-93 evalInSanbox location context incorrectly applied
MFSA 2012-92 Buffer overflow while rendering GIF images
MFSA 2012-91 Miscellaneous memory safety hazards (rv:17.0/ rv:10.0.11)

33 files changed, 580 insertions, 387 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index c266a6bac3e..efada09c88c 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.103 2012/11/03 22:51:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.104 2012/11/23 07:17:53 ryoon Exp $
 #
 
 DISTNAME=	# empty
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		16.0.2
+TB_VER=		17.0
+LIGHTNINGVER=	1.9
 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.8.source.tar.bz2
-SITES.lightning-1.8.source.tar.bz2=	${MASTER_SITE_MOZILLA:=calendar/lightning/releases/1.8/source/}
-EXTRACT_DIR.lightning-1.8.source.tar.bz2=	${WRKSRC}/lightning
+MASTER_SITES=	${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/} \
+		${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}esr/source/}
+DISTFILES=	thunderbird-${TB_VER}esr.source.tar.bz2 \
+		lightning-${LIGHTNINGVER}.source.tar.bz2
+SITES.lightning-${LIGHTNINGVER}.source.tar.bz2=	${MASTER_SITE_MOZILLA:=calendar/lightning/releases/${LIGHTNINGVER}/source/}
+EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2=	${WRKSRC}/lightning
 
 MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://www.mozillamessaging.com/en-US/thunderbird/
 COMMENT=	Organize, secure and customize your mail
 
 USE_TOOLS+=	unzip pax
-WRKSRC=		${WRKDIR}/comm-release
+WRKSRC=		${WRKDIR}/comm-esr17
 MOZILLA_DIR=	mozilla/
 PLIST_SRC+=	${PLIST_SRC_DFLT}
 
@@ -40,8 +41,8 @@ ALL_ENV+=		MOZILLA_PKG_NAME=thunderbird
 
 post-extract:
 	cd ${WRKSRC} && ${RM} -r calendar
-	${CP} -r ${EXTRACT_DIR.lightning-1.8.source.tar.bz2}/comm-beta/calendar ${WRKSRC}
-	${RM} -r ${EXTRACT_DIR.lightning-1.8.source.tar.bz2}
+	${CP} -r ${EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2}/comm-beta/calendar ${WRKSRC}
+	${RM} -r ${EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2}
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index a7a5521c30f..09258701d95 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,18 +1,25 @@
-@comment $NetBSD: PLIST,v 1.44 2012/10/12 18:28:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.45 2012/11/23 07:17:53 ryoon Exp $
 bin/thunderbird
 include/thunderbird/.mkdir.done
+include/thunderbird/AccEvent.h
+include/thunderbird/AnimationCommon.h
 include/thunderbird/AudioSegment.h
 include/thunderbird/BasicImplData.h
 include/thunderbird/BasicLayers.h
 include/thunderbird/BasicTiledThebesLayer.h
+include/thunderbird/CompositorChild.h
+include/thunderbird/CompositorParent.h
 include/thunderbird/CustomQS_Canvas.h
 include/thunderbird/CustomQS_Canvas2D.h
 include/thunderbird/CustomQS_WebGL.h
+include/thunderbird/DOMCameraManager.h
+include/thunderbird/DeviceStorage.h
 include/thunderbird/DictionaryHelpers.h
 include/thunderbird/EventTracer.h
 include/thunderbird/FileBlockCache.h
 include/thunderbird/ForceDiscreteGPUHelperCGL.h
 include/thunderbird/FrameLayerBuilder.h
+include/thunderbird/FrameMetrics.h
 include/thunderbird/FramePropertyTable.h
 include/thunderbird/GLContext.h
 include/thunderbird/GLContextProvider.h
@@ -21,18 +28,23 @@ include/thunderbird/GLContextSymbols.h
 include/thunderbird/GLDefs.h
 include/thunderbird/GLLibraryLoader.h
 include/thunderbird/GLXLibrary.h
+include/thunderbird/GeneratedEvents.h
 include/thunderbird/GfxInfoCollector.h
+include/thunderbird/GonkIOSurfaceImage.h
 include/thunderbird/IJSDebugger.h
 include/thunderbird/IPC/IPCMessageUtils.h
 include/thunderbird/IPC/nsGUIEventIPC.h
-include/thunderbird/ImageErrors.h
+include/thunderbird/ImageContainer.h
 include/thunderbird/ImageLayers.h
 include/thunderbird/ImageLogging.h
+include/thunderbird/ImageTypes.h
+include/thunderbird/InputData.h
 include/thunderbird/LayerManagerOGL.h
 include/thunderbird/LayerManagerOGLProgram.h
 include/thunderbird/LayerManagerOGLShaders.h
 include/thunderbird/LayerSorter.h
 include/thunderbird/Layers.h
+include/thunderbird/LayersTypes.h
 include/thunderbird/MailNewsTypes.h
 include/thunderbird/MailNewsTypes2.h
 include/thunderbird/MediaEngine.h
@@ -41,11 +53,12 @@ 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/ScrollbarActivity.h
 include/thunderbird/Selection.h
+include/thunderbird/SerializedLoadContext.h
+include/thunderbird/ShadowLayersManager.h
 include/thunderbird/SharedBuffer.h
 include/thunderbird/SharedTextureImage.h
 include/thunderbird/StackArena.h
@@ -80,6 +93,7 @@ include/thunderbird/gc/Barrier.h
 include/thunderbird/gc/Heap.h
 include/thunderbird/gc/Root.h
 include/thunderbird/gc/Statistics.h
+include/thunderbird/gc/StoreBuffer.h
 include/thunderbird/gfx2DGlue.h
 include/thunderbird/gfx3DMatrix.h
 include/thunderbird/gfxASurface.h
@@ -129,17 +143,16 @@ include/thunderbird/graphite2/Font.h
 include/thunderbird/graphite2/Log.h
 include/thunderbird/graphite2/Segment.h
 include/thunderbird/graphite2/Types.h
-include/thunderbird/gtk2compat.h
 include/thunderbird/gtk2xtbin.h
 include/thunderbird/harfbuzz/hb-blob.h
 include/thunderbird/harfbuzz/hb-buffer.h
 include/thunderbird/harfbuzz/hb-common.h
 include/thunderbird/harfbuzz/hb-font.h
 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-plan.h
 include/thunderbird/harfbuzz/hb-shape.h
 include/thunderbird/harfbuzz/hb-unicode.h
 include/thunderbird/harfbuzz/hb-version.h
@@ -161,6 +174,7 @@ include/thunderbird/imgIContainerObserver.h
 include/thunderbird/imgIDecoderObserver.h
 include/thunderbird/imgIEncoder.h
 include/thunderbird/imgILoader.h
+include/thunderbird/imgIOnloadBlocker.h
 include/thunderbird/imgIRequest.h
 include/thunderbird/imgITools.h
 include/thunderbird/inICSSValueSearch.h
@@ -194,7 +208,6 @@ include/thunderbird/jsdebug.h
 include/thunderbird/jsdhash.h
 include/thunderbird/jsfriendapi.h
 include/thunderbird/jsgc.h
-include/thunderbird/jshash.h
 include/thunderbird/jslock.h
 include/thunderbird/json.h
 include/thunderbird/jsperf.h
@@ -227,9 +240,11 @@ include/thunderbird/modlmime.h
 include/thunderbird/modmimee.h
 include/thunderbird/mozAutoDocUpdate.h
 include/thunderbird/mozFlushType.h
+include/thunderbird/mozIApplication.h
 include/thunderbird/mozIAsyncFavicons.h
 include/thunderbird/mozIAsyncHistory.h
 include/thunderbird/mozIAsyncLivemarks.h
+include/thunderbird/mozIColorAnalyzer.h
 include/thunderbird/mozIJSSubScriptLoader.h
 include/thunderbird/mozINewMailListener.h
 include/thunderbird/mozINewMailNotificationService.h
@@ -261,12 +276,12 @@ include/thunderbird/mozIStorageVacuumParticipant.h
 include/thunderbird/mozIStorageValueArray.h
 include/thunderbird/mozITXTToHTMLConv.h
 include/thunderbird/mozIThirdPartyUtil.h
-include/thunderbird/mozStorage.h
 include/thunderbird/mozStorageCID.h
 include/thunderbird/mozStorageHelper.h
 include/thunderbird/mozcontainer.h
 include/thunderbird/mozilla-config.h
 include/thunderbird/mozilla/AppData.h
+include/thunderbird/mozilla/AppProcessPermissions.h
 include/thunderbird/mozilla/Assertions.h
 include/thunderbird/mozilla/Attributes.h
 include/thunderbird/mozilla/AutoRestore.h
@@ -280,6 +295,7 @@ include/thunderbird/mozilla/CharTokenizer.h
 include/thunderbird/mozilla/CheckedInt.h
 include/thunderbird/mozilla/ClearOnShutdown.h
 include/thunderbird/mozilla/CondVar.h
+include/thunderbird/mozilla/Constants.h
 include/thunderbird/mozilla/DeadlockDetector.h
 include/thunderbird/mozilla/ErrorResult.h
 include/thunderbird/mozilla/FileLocation.h
@@ -301,14 +317,17 @@ include/thunderbird/mozilla/IntentionalCrash.h
 include/thunderbird/mozilla/LazyIdleThread.h
 include/thunderbird/mozilla/Likely.h
 include/thunderbird/mozilla/LinkedList.h
+include/thunderbird/mozilla/LoadContext.h
 include/thunderbird/mozilla/LookAndFeel.h
 include/thunderbird/mozilla/MSStdInt.h
 include/thunderbird/mozilla/MapsMemoryReporter.h
+include/thunderbird/mozilla/MathAlgorithms.h
 include/thunderbird/mozilla/Module.h
 include/thunderbird/mozilla/ModuleLoader.h
 include/thunderbird/mozilla/ModuleUtils.h
 include/thunderbird/mozilla/Monitor.h
 include/thunderbird/mozilla/Mutex.h
+include/thunderbird/mozilla/NullPtr.h
 include/thunderbird/mozilla/OSFileConstants.h
 include/thunderbird/mozilla/Observer.h
 include/thunderbird/mozilla/Omnijar.h
@@ -316,9 +335,11 @@ include/thunderbird/mozilla/PaintTracker.h
 include/thunderbird/mozilla/PluginLibrary.h
 include/thunderbird/mozilla/PluginPRLibrary.h
 include/thunderbird/mozilla/Preferences.h
+include/thunderbird/mozilla/ProcessedStack.h
 include/thunderbird/mozilla/RangedPtr.h
 include/thunderbird/mozilla/ReentrantMonitor.h
 include/thunderbird/mozilla/RefPtr.h
+include/thunderbird/mozilla/SHA1.h
 include/thunderbird/mozilla/SSE.h
 include/thunderbird/mozilla/Scoped.h
 include/thunderbird/mozilla/Selection.h
@@ -327,26 +348,34 @@ include/thunderbird/mozilla/Services.h
 include/thunderbird/mozilla/StackWalk.h
 include/thunderbird/mozilla/StandardInteger.h
 include/thunderbird/mozilla/StartupTimeline.h
+include/thunderbird/mozilla/StaticPtr.h
 include/thunderbird/mozilla/StringBuilder.h
 include/thunderbird/mozilla/Telemetry.h
-include/thunderbird/mozilla/TelemetryHistograms.h
+include/thunderbird/mozilla/TelemetryHistogramEnums.h
 include/thunderbird/mozilla/ThreadLocal.h
 include/thunderbird/mozilla/TimeStamp.h
 include/thunderbird/mozilla/TypeTraits.h
 include/thunderbird/mozilla/Types.h
 include/thunderbird/mozilla/Util.h
 include/thunderbird/mozilla/VisualEventTracer.h
+include/thunderbird/mozilla/WeakPtr.h
 include/thunderbird/mozilla/WidgetTraceEvent.h
+include/thunderbird/mozilla/WidgetUtils.h
 include/thunderbird/mozilla/X11Util.h
 include/thunderbird/mozilla/XPCOM.h
 include/thunderbird/mozilla/a11y/Accessible.h
+include/thunderbird/mozilla/a11y/AccessibleWrap.h
+include/thunderbird/mozilla/a11y/DocAccessible.h
 include/thunderbird/mozilla/a11y/FocusManager.h
+include/thunderbird/mozilla/a11y/HyperTextAccessible.h
+include/thunderbird/mozilla/a11y/HyperTextAccessibleWrap.h
 include/thunderbird/mozilla/a11y/Role.h
 include/thunderbird/mozilla/a11y/States.h
 include/thunderbird/mozilla/arm.h
 include/thunderbird/mozilla/chrome/RegistryMessageUtils.h
 include/thunderbird/mozilla/css/Declaration.h
 include/thunderbird/mozilla/css/GroupRule.h
+include/thunderbird/mozilla/css/ImageLoader.h
 include/thunderbird/mozilla/css/ImportRule.h
 include/thunderbird/mozilla/css/Loader.h
 include/thunderbird/mozilla/css/NameSpaceRule.h
@@ -354,9 +383,12 @@ include/thunderbird/mozilla/css/Rule.h
 include/thunderbird/mozilla/css/StyleRule.h
 include/thunderbird/mozilla/docshell/OfflineCacheUpdateChild.h
 include/thunderbird/mozilla/docshell/OfflineCacheUpdateParent.h
+include/thunderbird/mozilla/dom/Activity.h
 include/thunderbird/mozilla/dom/AudioChild.h
 include/thunderbird/mozilla/dom/AudioParent.h
 include/thunderbird/mozilla/dom/BindingUtils.h
+include/thunderbird/mozilla/dom/CSS2PropertiesBinding.h
+include/thunderbird/mozilla/dom/CSSStyleDeclarationBinding.h
 include/thunderbird/mozilla/dom/CanvasRenderingContext2DBinding.h
 include/thunderbird/mozilla/dom/ContentChild.h
 include/thunderbird/mozilla/dom/ContentParent.h
@@ -365,23 +397,33 @@ 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/DOMJSProxyHandler.h
 include/thunderbird/mozilla/dom/DOMRequest.h
+include/thunderbird/mozilla/dom/DirectionalityUtils.h
 include/thunderbird/mozilla/dom/Element.h
+include/thunderbird/mozilla/dom/Errors.msg
 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/FragmentOrElement.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/PerformanceBinding.h
+include/thunderbird/mozilla/dom/PerformanceNavigationBinding.h
+include/thunderbird/mozilla/dom/PerformanceTimingBinding.h
+include/thunderbird/mozilla/dom/PermissionMessageUtils.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
 include/thunderbird/mozilla/dom/StructuredCloneTags.h
+include/thunderbird/mozilla/dom/StructuredCloneUtils.h
 include/thunderbird/mozilla/dom/TabChild.h
 include/thunderbird/mozilla/dom/TabMessageUtils.h
 include/thunderbird/mozilla/dom/TabParent.h
@@ -397,6 +439,11 @@ include/thunderbird/mozilla/dom/battery/Constants.h
 include/thunderbird/mozilla/dom/battery/Types.h
 include/thunderbird/mozilla/dom/devicestorage/DeviceStorageRequestChild.h
 include/thunderbird/mozilla/dom/devicestorage/DeviceStorageRequestParent.h
+include/thunderbird/mozilla/dom/file/ArchiveEvent.h
+include/thunderbird/mozilla/dom/file/ArchiveReader.h
+include/thunderbird/mozilla/dom/file/ArchiveRequest.h
+include/thunderbird/mozilla/dom/file/ArchiveZipEvent.h
+include/thunderbird/mozilla/dom/file/ArchiveZipFile.h
 include/thunderbird/mozilla/dom/file/DOMFileHandle.h
 include/thunderbird/mozilla/dom/file/File.h
 include/thunderbird/mozilla/dom/file/FileCommon.h
@@ -423,6 +470,9 @@ include/thunderbird/mozilla/dom/indexedDB/IndexedDatabaseManager.h
 include/thunderbird/mozilla/dom/indexedDB/Key.h
 include/thunderbird/mozilla/dom/indexedDB/KeyPath.h
 include/thunderbird/mozilla/dom/indexedDB/SerializationHelpers.h
+include/thunderbird/mozilla/dom/ipc/Blob.h
+include/thunderbird/mozilla/dom/ipc/ProcessPriorityManager.h
+include/thunderbird/mozilla/dom/ipc/nsIRemoteBlob.h
 include/thunderbird/mozilla/dom/network/Constants.h
 include/thunderbird/mozilla/dom/network/Types.h
 include/thunderbird/mozilla/dom/network/Utils.h
@@ -469,8 +519,10 @@ include/thunderbird/mozilla/ipc/DocumentRendererNativeIDParent.h
 include/thunderbird/mozilla/ipc/DocumentRendererParent.h
 include/thunderbird/mozilla/ipc/DocumentRendererShmemChild.h
 include/thunderbird/mozilla/ipc/DocumentRendererShmemParent.h
+include/thunderbird/mozilla/ipc/FileDescriptor.h
 include/thunderbird/mozilla/ipc/GeckoChildProcessHost.h
 include/thunderbird/mozilla/ipc/IOThreadChild.h
+include/thunderbird/mozilla/ipc/InputStreamUtils.h
 include/thunderbird/mozilla/ipc/ProcessChild.h
 include/thunderbird/mozilla/ipc/ProtocolUtils.h
 include/thunderbird/mozilla/ipc/RPCChannel.h
@@ -485,15 +537,20 @@ include/thunderbird/mozilla/ipc/TestShellChild.h
 include/thunderbird/mozilla/ipc/TestShellParent.h
 include/thunderbird/mozilla/ipc/Transport.h
 include/thunderbird/mozilla/ipc/Transport_posix.h
+include/thunderbird/mozilla/ipc/URIUtils.h
 include/thunderbird/mozilla/ipc/XPCShellEnvironment.h
 include/thunderbird/mozilla/jsipc/CPOWTypes.h
 include/thunderbird/mozilla/jsipc/ContextWrapperChild.h
 include/thunderbird/mozilla/jsipc/ContextWrapperParent.h
 include/thunderbird/mozilla/jsipc/ObjectWrapperChild.h
 include/thunderbird/mozilla/jsipc/ObjectWrapperParent.h
+include/thunderbird/mozilla/layers/AsyncPanZoomController.h
+include/thunderbird/mozilla/layers/Axis.h
 include/thunderbird/mozilla/layers/CompositorChild.h
 include/thunderbird/mozilla/layers/CompositorCocoaWidgetHelper.h
 include/thunderbird/mozilla/layers/CompositorParent.h
+include/thunderbird/mozilla/layers/GeckoContentController.h
+include/thunderbird/mozilla/layers/GestureEventListener.h
 include/thunderbird/mozilla/layers/ImageBridgeChild.h
 include/thunderbird/mozilla/layers/ImageBridgeParent.h
 include/thunderbird/mozilla/layers/ImageContainerChild.h
@@ -508,6 +565,7 @@ include/thunderbird/mozilla/layers/SharedImageUtils.h
 include/thunderbird/mozilla/layout/FrameChildList.h
 include/thunderbird/mozilla/layout/RenderFrameChild.h
 include/thunderbird/mozilla/layout/RenderFrameParent.h
+include/thunderbird/mozilla/layout/RenderFrameUtils.h
 include/thunderbird/mozilla/mozPoisonWrite.h
 include/thunderbird/mozilla/mozalloc.h
 include/thunderbird/mozilla/mozalloc_abort.h
@@ -594,6 +652,7 @@ include/thunderbird/nsAccessNodeWrap.h
 include/thunderbird/nsAccessibilityService.h
 include/thunderbird/nsAgg.h
 include/thunderbird/nsAlgorithm.h
+include/thunderbird/nsAnimationManager.h
 include/thunderbird/nsAppDirectoryServiceDefs.h
 include/thunderbird/nsAppShellCID.h
 include/thunderbird/nsArenaMemoryStats.h
@@ -677,7 +736,6 @@ include/thunderbird/nsComposeStrings.h
 include/thunderbird/nsContentCID.h
 include/thunderbird/nsContentCreatorFunctions.h
 include/thunderbird/nsContentDLF.h
-include/thunderbird/nsContentErrors.h
 include/thunderbird/nsContentList.h
 include/thunderbird/nsContentPermissionHelper.h
 include/thunderbird/nsContentPolicyUtils.h
@@ -685,7 +743,6 @@ include/thunderbird/nsContentSink.h
 include/thunderbird/nsContentUtils.h
 include/thunderbird/nsCoord.h
 include/thunderbird/nsCopySupport.h
-include/thunderbird/nsCoreAnimationSupport.h
 include/thunderbird/nsCppSharedAllocator.h
 include/thunderbird/nsCrossSiteListenerProxy.h
 include/thunderbird/nsCycleCollectionParticipant.h
@@ -698,7 +755,7 @@ include/thunderbird/nsDOMCSSAttrDeclaration.h
 include/thunderbird/nsDOMCSSDeclaration.h
 include/thunderbird/nsDOMClassInfoClasses.h
 include/thunderbird/nsDOMClassInfoID.h
-include/thunderbird/nsDOMError.h
+include/thunderbird/nsDOMEvent.h
 include/thunderbird/nsDOMEventTargetHelper.h
 include/thunderbird/nsDOMFile.h
 include/thunderbird/nsDOMJSUtils.h
@@ -706,6 +763,8 @@ include/thunderbird/nsDOMMediaQueryList.h
 include/thunderbird/nsDOMMediaStream.h
 include/thunderbird/nsDOMScriptObjectHolder.h
 include/thunderbird/nsDOMString.h
+include/thunderbird/nsDOMTouchEvent.h
+include/thunderbird/nsDOMUIEvent.h
 include/thunderbird/nsDataHashtable.h
 include/thunderbird/nsDateTimeFormatCID.h
 include/thunderbird/nsDebug.h
@@ -717,7 +776,6 @@ 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
@@ -877,6 +935,8 @@ include/thunderbird/nsIAccessibleValue.h
 include/thunderbird/nsIActivity.h
 include/thunderbird/nsIActivityManager.h
 include/thunderbird/nsIActivityManagerUI.h
+include/thunderbird/nsIActivityProxy.h
+include/thunderbird/nsIActivityUIGlue.h
 include/thunderbird/nsIAddbookUrl.h
 include/thunderbird/nsIAddrDBAnnouncer.h
 include/thunderbird/nsIAddrDBListener.h
@@ -1055,10 +1115,16 @@ include/thunderbird/nsIDBFolderInfo.h
 include/thunderbird/nsIDNSListener.h
 include/thunderbird/nsIDNSRecord.h
 include/thunderbird/nsIDNSService.h
+include/thunderbird/nsIDOMActivity.h
+include/thunderbird/nsIDOMActivityHandlerDescription.h
+include/thunderbird/nsIDOMActivityOptions.h
+include/thunderbird/nsIDOMActivityRequestHandler.h
 include/thunderbird/nsIDOMAlarmsManager.h
 include/thunderbird/nsIDOMAnimationEvent.h
 include/thunderbird/nsIDOMApplicationRegistry.h
 include/thunderbird/nsIDOMApplicationRegistry2.h
+include/thunderbird/nsIDOMArchiveReader.h
+include/thunderbird/nsIDOMArchiveRequest.h
 include/thunderbird/nsIDOMAttr.h
 include/thunderbird/nsIDOMBarProp.h
 include/thunderbird/nsIDOMBatteryManager.h
@@ -1078,9 +1144,11 @@ include/thunderbird/nsIDOMCSSRuleList.h
 include/thunderbird/nsIDOMCSSStyleDeclaration.h
 include/thunderbird/nsIDOMCSSStyleRule.h
 include/thunderbird/nsIDOMCSSStyleSheet.h
+include/thunderbird/nsIDOMCSSSupportsRule.h
 include/thunderbird/nsIDOMCSSUnknownRule.h
 include/thunderbird/nsIDOMCSSValue.h
 include/thunderbird/nsIDOMCSSValueList.h
+include/thunderbird/nsIDOMCameraManager.h
 include/thunderbird/nsIDOMCanvasRenderingContext2D.h
 include/thunderbird/nsIDOMCharacterData.h
 include/thunderbird/nsIDOMChromeWindow.h
@@ -1116,7 +1184,9 @@ include/thunderbird/nsIDOMDeviceMotionEvent.h
 include/thunderbird/nsIDOMDeviceOrientationEvent.h
 include/thunderbird/nsIDOMDeviceProximityEvent.h
 include/thunderbird/nsIDOMDeviceStorage.h
+include/thunderbird/nsIDOMDeviceStorageChangeEvent.h
 include/thunderbird/nsIDOMDeviceStorageCursor.h
+include/thunderbird/nsIDOMDeviceStorageStat.h
 include/thunderbird/nsIDOMDocument.h
 include/thunderbird/nsIDOMDocumentFragment.h
 include/thunderbird/nsIDOMDocumentType.h
@@ -1234,9 +1304,12 @@ include/thunderbird/nsIDOMMobileConnection.h
 include/thunderbird/nsIDOMModalContentWindow.h
 include/thunderbird/nsIDOMMouseEvent.h
 include/thunderbird/nsIDOMMouseScrollEvent.h
+include/thunderbird/nsIDOMMozApplicationEvent.h
 include/thunderbird/nsIDOMMozBrowserFrame.h
 include/thunderbird/nsIDOMMozCSSKeyframeRule.h
 include/thunderbird/nsIDOMMozCSSKeyframesRule.h
+include/thunderbird/nsIDOMMozContactChangeEvent.h
+include/thunderbird/nsIDOMMozSettingsEvent.h
 include/thunderbird/nsIDOMMozTouchEvent.h
 include/thunderbird/nsIDOMMutationEvent.h
 include/thunderbird/nsIDOMMutationObserver.h
@@ -1246,6 +1319,8 @@ include/thunderbird/nsIDOMNSRGBAColor.h
 include/thunderbird/nsIDOMNSXPathExpression.h
 include/thunderbird/nsIDOMNamedNodeMap.h
 include/thunderbird/nsIDOMNavigator.h
+include/thunderbird/nsIDOMNavigatorActivities.h
+include/thunderbird/nsIDOMNavigatorCamera.h
 include/thunderbird/nsIDOMNavigatorDesktopNotification.h
 include/thunderbird/nsIDOMNavigatorDeviceStorage.h
 include/thunderbird/nsIDOMNavigatorGeolocation.h
@@ -1265,9 +1340,6 @@ include/thunderbird/nsIDOMPageTransitionEvent.h
 include/thunderbird/nsIDOMPaintRequest.h
 include/thunderbird/nsIDOMPaintRequestList.h
 include/thunderbird/nsIDOMParser.h
-include/thunderbird/nsIDOMPerformance.h
-include/thunderbird/nsIDOMPerformanceNavigation.h
-include/thunderbird/nsIDOMPerformanceTiming.h
 include/thunderbird/nsIDOMPkcs11.h
 include/thunderbird/nsIDOMPlugin.h
 include/thunderbird/nsIDOMPluginArray.h
@@ -1385,6 +1457,7 @@ include/thunderbird/nsIDOMStorageManager.h
 include/thunderbird/nsIDOMStorageObsolete.h
 include/thunderbird/nsIDOMStyleSheet.h
 include/thunderbird/nsIDOMStyleSheetList.h
+include/thunderbird/nsIDOMTCPSocket.h
 include/thunderbird/nsIDOMText.h
 include/thunderbird/nsIDOMTimeEvent.h
 include/thunderbird/nsIDOMTimeRanges.h
@@ -1400,6 +1473,7 @@ include/thunderbird/nsIDOMValidityState.h
 include/thunderbird/nsIDOMWakeLock.h
 include/thunderbird/nsIDOMWakeLockListener.h
 include/thunderbird/nsIDOMWebGLRenderingContext.h
+include/thunderbird/nsIDOMWheelEvent.h
 include/thunderbird/nsIDOMWindow.h
 include/thunderbird/nsIDOMWindowCollection.h
 include/thunderbird/nsIDOMWindowUtils.h
@@ -1539,7 +1613,6 @@ include/thunderbird/nsIFormatConverter.h
 include/thunderbird/nsIFragmentContentSink.h
 include/thunderbird/nsIFrame.h
 include/thunderbird/nsIFrameLoader.h
-include/thunderbird/nsIFrameMessageManager.h
 include/thunderbird/nsIFrameRequestCallback.h
 include/thunderbird/nsIFrameTraversal.h
 include/thunderbird/nsIFrameUtil.h
@@ -1602,7 +1675,8 @@ include/thunderbird/nsIINIParser.h
 include/thunderbird/nsIIOService.h
 include/thunderbird/nsIIOService2.h
 include/thunderbird/nsIIOUtil.h
-include/thunderbird/nsIIPCSerializable.h
+include/thunderbird/nsIIPCSerializableInputStream.h
+include/thunderbird/nsIIPCSerializableURI.h
 include/thunderbird/nsIIconURI.h
 include/thunderbird/nsIIdentityCryptoService.h
 include/thunderbird/nsIIdentityInfo.h
@@ -1705,6 +1779,7 @@ include/thunderbird/nsIMIMEHeaderParam.h
 include/thunderbird/nsIMIMEInfo.h
 include/thunderbird/nsIMIMEInputStream.h
 include/thunderbird/nsIMIMEService.h
+include/thunderbird/nsIMailGlue.h
 include/thunderbird/nsIMailProfileMigrator.h
 include/thunderbird/nsIMailboxService.h
 include/thunderbird/nsIMailboxSpec.h
@@ -1716,6 +1791,7 @@ include/thunderbird/nsIMemory.h
 include/thunderbird/nsIMemoryReporter.h
 include/thunderbird/nsIMenuBoxObject.h
 include/thunderbird/nsIMenuBuilder.h
+include/thunderbird/nsIMessageManager.h
 include/thunderbird/nsIMessenger.h
 include/thunderbird/nsIMessengerMigrator.h
 include/thunderbird/nsIMessengerOSIntegration.h
@@ -1850,7 +1926,6 @@ include/thunderbird/nsINoneService.h
 include/thunderbird/nsIOCSPResponder.h
 include/thunderbird/nsIOS2Locale.h
 include/thunderbird/nsIOSFileConstantsService.h
-include/thunderbird/nsIOSurface.h
 include/thunderbird/nsIObjectFrame.h
 include/thunderbird/nsIObjectInputStream.h
 include/thunderbird/nsIObjectLoadingContent.h
@@ -2022,7 +2097,6 @@ include/thunderbird/nsIScriptChannel.h
 include/thunderbird/nsIScriptContext.h
 include/thunderbird/nsIScriptElement.h
 include/thunderbird/nsIScriptError.h
-include/thunderbird/nsIScriptEventHandlerOwner.h
 include/thunderbird/nsIScriptExternalNameSet.h
 include/thunderbird/nsIScriptGlobalObject.h
 include/thunderbird/nsIScriptGlobalObjectOwner.h
@@ -2048,6 +2122,7 @@ include/thunderbird/nsISecureBrowserUI.h
 include/thunderbird/nsISecurityCheckedComponent.h
 include/thunderbird/nsISecurityEventSink.h
 include/thunderbird/nsISecurityInfoProvider.h
+include/thunderbird/nsISecurityUITelemetry.h
 include/thunderbird/nsISecurityWarningDialogs.h
 include/thunderbird/nsISeekableStream.h
 include/thunderbird/nsISelectControlFrame.h
@@ -2069,6 +2144,7 @@ include/thunderbird/nsISimpleEnumerator.h
 include/thunderbird/nsISimpleMimeConverter.h
 include/thunderbird/nsISimpleStreamListener.h
 include/thunderbird/nsISimpleUnicharStreamFactory.h
+include/thunderbird/nsISiteSpecificUserAgent.h
 include/thunderbird/nsISizeOf.h
 include/thunderbird/nsISliderListener.h
 include/thunderbird/nsISmsDatabaseService.h
@@ -2239,6 +2315,7 @@ include/thunderbird/nsIWebSocket.h
 include/thunderbird/nsIWebSocketChannel.h
 include/thunderbird/nsIWebSocketListener.h
 include/thunderbird/nsIWidget.h
+include/thunderbird/nsIWidgetListener.h
 include/thunderbird/nsIWifiEventInits.h
 include/thunderbird/nsIWindowCreator.h
 include/thunderbird/nsIWindowCreator2.h
@@ -2298,12 +2375,12 @@ include/thunderbird/nsImapMailDatabase.h
 include/thunderbird/nsImapMoveCoalescer.h
 include/thunderbird/nsInterfaceHashtable.h
 include/thunderbird/nsInterfaceRequestorAgg.h
+include/thunderbird/nsJARURI.h
 include/thunderbird/nsJSON.h
 include/thunderbird/nsJSPrincipals.h
 include/thunderbird/nsJSProtocolHandler.h
 include/thunderbird/nsLWBrkCIID.h
 include/thunderbird/nsLayoutCID.h
-include/thunderbird/nsLayoutErrors.h
 include/thunderbird/nsLayoutStatics.h
 include/thunderbird/nsLayoutStylesheetCache.h
 include/thunderbird/nsLayoutUtils.h
@@ -2313,6 +2390,7 @@ include/thunderbird/nsLiteralString.h
 include/thunderbird/nsLocalFile.h
 include/thunderbird/nsLocalFileUnix.h
 include/thunderbird/nsLocaleCID.h
+include/thunderbird/nsMIMEInputStream.h
 include/thunderbird/nsMailDatabase.h
 include/thunderbird/nsMailDirServiceDefs.h
 include/thunderbird/nsMailHeaders.h
@@ -2375,7 +2453,6 @@ include/thunderbird/nsNSSShutDown.h
 include/thunderbird/nsNativeCharsetUtils.h
 include/thunderbird/nsNativeWidget.h
 include/thunderbird/nsNetCID.h
-include/thunderbird/nsNetError.h
 include/thunderbird/nsNetStrings.h
 include/thunderbird/nsNetUtil.h
 include/thunderbird/nsNewsDatabase.h
@@ -2388,7 +2465,6 @@ include/thunderbird/nsObserverList.h
 include/thunderbird/nsObserverService.h
 include/thunderbird/nsOggCodecState.h
 include/thunderbird/nsOggDecoder.h
-include/thunderbird/nsOggDecoderStateMachine.h
 include/thunderbird/nsOpenWindowEventDetail.h
 include/thunderbird/nsPIBoxObject.h
 include/thunderbird/nsPICommandUpdater.h
@@ -2408,7 +2484,6 @@ include/thunderbird/nsParserConstants.h
 include/thunderbird/nsParserUtils.h
 include/thunderbird/nsPgpMimeProxy.h
 include/thunderbird/nsPluginDirServiceProvider.h
-include/thunderbird/nsPluginError.h
 include/thunderbird/nsPluginHost.h
 include/thunderbird/nsPluginInstanceOwner.h
 include/thunderbird/nsPluginLogging.h
@@ -2464,6 +2539,7 @@ include/thunderbird/nsSVGForeignObjectFrame.h
 include/thunderbird/nsSVGIntegrationUtils.h
 include/thunderbird/nsSVGRect.h
 include/thunderbird/nsSVGUtils.h
+include/thunderbird/nsSandboxFlags.h
 include/thunderbird/nsScannerString.h
 include/thunderbird/nsScriptLoader.h
 include/thunderbird/nsScriptableInputStream.h
@@ -2490,6 +2566,7 @@ include/thunderbird/nsStructuredCloneContainer.h
 include/thunderbird/nsStubDocumentObserver.h
 include/thunderbird/nsStubImageDecoderObserver.h
 include/thunderbird/nsStubMutationObserver.h
+include/thunderbird/nsStyleAnimation.h
 include/thunderbird/nsStyleChangeList.h
 include/thunderbird/nsStyleConsts.h
 include/thunderbird/nsStyleContext.h
@@ -2572,6 +2649,7 @@ include/thunderbird/nsWildCard.h
 include/thunderbird/nsWin32Locale.h
 include/thunderbird/nsWindowMemoryReporter.h
 include/thunderbird/nsWrapperCache.h
+include/thunderbird/nsWrapperCacheInlines.h
 include/thunderbird/nsXBLBinding.h
 include/thunderbird/nsXMLNameSpaceMap.h
 include/thunderbird/nsXPCOM.h
@@ -2736,6 +2814,7 @@ include/thunderbird/theora/codec.h
 include/thunderbird/theora/theora.h
 include/thunderbird/theora/theoradec.h
 include/thunderbird/theora/theoraenc.h
+include/thunderbird/tremor/ivorbiscodec.h
 include/thunderbird/txIEXSLTRegExFunctions.h
 include/thunderbird/txIFunctionEvaluationContext.h
 include/thunderbird/txINodeSet.h
@@ -2743,7 +2822,6 @@ include/thunderbird/txIXPathObject.h
 include/thunderbird/uconvutil.h
 include/thunderbird/updatedefines.h
 include/thunderbird/updatelogging.h
-include/thunderbird/vorbis/codec.h
 include/thunderbird/xpcIJSGetFactory.h
 include/thunderbird/xpcIJSModuleLoader.h
 include/thunderbird/xpcIJSWeakReference.h
@@ -3063,6 +3141,7 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/preferences/security.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/preferences/selected.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/primaryToolbar.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/quickFilterBar.css
+lib/thunderbird/chrome/classic/skin/classic/messenger/sanitizeDialog.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/searchBox.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/searchDialog.css
 lib/thunderbird/chrome/classic/skin/classic/messenger/section_collapsed.png
@@ -3479,6 +3558,7 @@ lib/thunderbird/chrome/en-US/locale/en-US/messenger/prefs.properties
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/quickFilterBar.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/renameFolderDialog.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/safeMode.dtd
+lib/thunderbird/chrome/en-US/locale/en-US/messenger/sanitize.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/search-attributes.properties
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/search-operators.properties
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/search.properties
@@ -3893,6 +3973,10 @@ lib/thunderbird/chrome/messenger/content/messenger/renameFolderDialog.xul
 lib/thunderbird/chrome/messenger/content/messenger/retention.js
 lib/thunderbird/chrome/messenger/content/messenger/safeMode.js
 lib/thunderbird/chrome/messenger/content/messenger/safeMode.xul
+lib/thunderbird/chrome/messenger/content/messenger/sanitize.js
+lib/thunderbird/chrome/messenger/content/messenger/sanitize.xul
+lib/thunderbird/chrome/messenger/content/messenger/sanitizeDialog.css
+lib/thunderbird/chrome/messenger/content/messenger/sanitizeDialog.js
 lib/thunderbird/chrome/messenger/content/messenger/search.xml
 lib/thunderbird/chrome/messenger/content/messenger/search/searchOverlay.js
 lib/thunderbird/chrome/messenger/content/messenger/search/searchOverlay.xul
@@ -4045,6 +4129,7 @@ lib/thunderbird/chrome/toolkit/content/global/aboutRights.xhtml
 lib/thunderbird/chrome/toolkit/content/global/aboutSupport.js
 lib/thunderbird/chrome/toolkit/content/global/aboutSupport.xhtml
 lib/thunderbird/chrome/toolkit/content/global/accessibility/AccessFu.css
+lib/thunderbird/chrome/toolkit/content/global/alerts/alert.css
 lib/thunderbird/chrome/toolkit/content/global/alerts/alert.js
 lib/thunderbird/chrome/toolkit/content/global/alerts/alert.xul
 lib/thunderbird/chrome/toolkit/content/global/appPicker.js
@@ -4480,6 +4565,7 @@ lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.pn
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/selectAddons.css
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-error.png
+lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-negative-small.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-negative.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-info-positive.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/extensions/stripes-warning.png
@@ -4502,6 +4588,7 @@ lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginBlocked.
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginCrashed.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginGeneric.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/notifyPluginOutdated.png
+lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked-64.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/pluginDisabled.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric-16.png
@@ -4522,6 +4609,7 @@ lib/thunderbird/components/FeedProcessor.js
 lib/thunderbird/components/GPSDGeolocationProvider.js
 lib/thunderbird/components/NetworkGeolocationProvider.js
 lib/thunderbird/components/PlacesCategoriesStarter.js
+lib/thunderbird/components/TCPSocket.js
 lib/thunderbird/components/TelemetryPing.js
 lib/thunderbird/components/aboutRedirector.js
 lib/thunderbird/components/addonManager.js
@@ -4687,6 +4775,7 @@ lib/thunderbird/libmozalloc.so
 lib/thunderbird/libprldap60.so
 lib/thunderbird/libxpcom.so
 lib/thunderbird/libxul.so
+lib/thunderbird/modules/ActivitiesService.jsm
 lib/thunderbird/modules/AddonLogging.jsm
 lib/thunderbird/modules/AddonManager.jsm
 lib/thunderbird/modules/AddonRepository.jsm
@@ -4698,6 +4787,9 @@ lib/thunderbird/modules/BrowserElementPromptService.jsm
 lib/thunderbird/modules/CSPUtils.jsm
 lib/thunderbird/modules/CertUtils.jsm
 lib/thunderbird/modules/ChromeManifestParser.jsm
+lib/thunderbird/modules/ClusterLib.js
+lib/thunderbird/modules/ColorAnalyzer_worker.js
+lib/thunderbird/modules/ColorConversion.js
 lib/thunderbird/modules/CommonDialog.jsm
 lib/thunderbird/modules/ConsoleAPIStorage.jsm
 lib/thunderbird/modules/ContactDB.jsm
@@ -4723,11 +4815,16 @@ lib/thunderbird/modules/LightweightThemeManager.jsm
 lib/thunderbird/modules/LogUtils.jsm
 lib/thunderbird/modules/MailConsts.js
 lib/thunderbird/modules/MailUtils.js
+lib/thunderbird/modules/MessagePortBase.jsm
+lib/thunderbird/modules/MessagePortWorker.js
 lib/thunderbird/modules/Microformats.js
+lib/thunderbird/modules/MozSocialAPI.jsm
 lib/thunderbird/modules/MsgHdrSyntheticView.js
 lib/thunderbird/modules/NetUtil.jsm
+lib/thunderbird/modules/ObjectWrapper.jsm
 lib/thunderbird/modules/PageMenu.jsm
 lib/thunderbird/modules/PerfMeasurement.jsm
+lib/thunderbird/modules/PermissionPromptHelper.jsm
 lib/thunderbird/modules/PlacesDBUtils.jsm
 lib/thunderbird/modules/PlacesUtils.jsm
 lib/thunderbird/modules/PluginProvider.jsm
@@ -4742,13 +4839,15 @@ lib/thunderbird/modules/Services.jsm
 lib/thunderbird/modules/SettingsChangeNotifier.jsm
 lib/thunderbird/modules/SettingsDB.jsm
 lib/thunderbird/modules/SettingsQueue.jsm
-lib/thunderbird/modules/SocialProvider.jsm
 lib/thunderbird/modules/SocialService.jsm
 lib/thunderbird/modules/SpellCheckDictionaryBootstrap.js
 lib/thunderbird/modules/StringBundle.js
+lib/thunderbird/modules/Task.jsm
 lib/thunderbird/modules/TelemetryStopwatch.jsm
+lib/thunderbird/modules/UserAgentOverrides.jsm
 lib/thunderbird/modules/WebappOSUtils.jsm
 lib/thunderbird/modules/Webapps.jsm
+lib/thunderbird/modules/WebappsInstaller.jsm
 lib/thunderbird/modules/WindowDraggingUtils.jsm
 lib/thunderbird/modules/WorkerAPI.jsm
 lib/thunderbird/modules/XPCOMUtils.jsm
@@ -4758,6 +4857,7 @@ lib/thunderbird/modules/aboutSupport.js
 lib/thunderbird/modules/aboutSupportUnix.js
 lib/thunderbird/modules/accessibility/AccessFu.jsm
 lib/thunderbird/modules/accessibility/Presenters.jsm
+lib/thunderbird/modules/accessibility/TouchAdapter.jsm
 lib/thunderbird/modules/accessibility/Utils.jsm
 lib/thunderbird/modules/accessibility/UtteranceGenerator.jsm
 lib/thunderbird/modules/accessibility/VirtualCursorController.jsm
@@ -4772,9 +4872,14 @@ lib/thunderbird/modules/appIdleManager.js
 lib/thunderbird/modules/attachmentChecker.js
 lib/thunderbird/modules/chatHandler.jsm
 lib/thunderbird/modules/cloudFileAccounts.js
+lib/thunderbird/modules/commonjs/loader.js
+lib/thunderbird/modules/commonjs/promise/core.js
 lib/thunderbird/modules/ctypes.jsm
 lib/thunderbird/modules/dbViewWrapper.js
 lib/thunderbird/modules/debug.js
+lib/thunderbird/modules/devtools/Console.jsm
+lib/thunderbird/modules/devtools/Require.jsm
+lib/thunderbird/modules/devtools/SourceMap.jsm
 lib/thunderbird/modules/devtools/dbg-client.jsm
 lib/thunderbird/modules/devtools/dbg-server.jsm
 lib/thunderbird/modules/distribution.js
@@ -4830,6 +4935,7 @@ lib/thunderbird/modules/ircCommands.jsm
 lib/thunderbird/modules/ircDCC.jsm
 lib/thunderbird/modules/ircHandlers.jsm
 lib/thunderbird/modules/ircISUPPORT.jsm
+lib/thunderbird/modules/ircNonStandard.jsm
 lib/thunderbird/modules/ircServices.jsm
 lib/thunderbird/modules/ircUtils.jsm
 lib/thunderbird/modules/ircWatchMonitor.jsm
@@ -4847,11 +4953,16 @@ lib/thunderbird/modules/msgDBCacheManager.js
 lib/thunderbird/modules/nsFormAutoCompleteResult.jsm
 lib/thunderbird/modules/oauth.jsm
 lib/thunderbird/modules/osfile.jsm
-lib/thunderbird/modules/osfile/osfile_shared.jsm
+lib/thunderbird/modules/osfile/osfile_shared_allthreads.jsm
+lib/thunderbird/modules/osfile/osfile_shared_front.jsm
+lib/thunderbird/modules/osfile/osfile_unix_allthreads.jsm
 lib/thunderbird/modules/osfile/osfile_unix_back.jsm
 lib/thunderbird/modules/osfile/osfile_unix_front.jsm
+lib/thunderbird/modules/osfile/osfile_win_allthreads.jsm
 lib/thunderbird/modules/osfile/osfile_win_back.jsm
 lib/thunderbird/modules/osfile/osfile_win_front.jsm
+lib/thunderbird/modules/osfile/ospath_unix_back.jsm
+lib/thunderbird/modules/osfile/ospath_win_back.jsm
 lib/thunderbird/modules/quickFilterManager.js
 lib/thunderbird/modules/reflect.jsm
 lib/thunderbird/modules/searchSpec.js
@@ -4952,6 +5063,7 @@ share/idl/thunderbird/imgIContainerObserver.idl
 share/idl/thunderbird/imgIDecoderObserver.idl
 share/idl/thunderbird/imgIEncoder.idl
 share/idl/thunderbird/imgILoader.idl
+share/idl/thunderbird/imgIOnloadBlocker.idl
 share/idl/thunderbird/imgIRequest.idl
 share/idl/thunderbird/imgITools.idl
 share/idl/thunderbird/inICSSValueSearch.idl
@@ -4962,9 +5074,11 @@ share/idl/thunderbird/inIFlasher.idl
 share/idl/thunderbird/inISearchObserver.idl
 share/idl/thunderbird/inISearchProcess.idl
 share/idl/thunderbird/jsdIDebuggerService.idl
+share/idl/thunderbird/mozIApplication.idl
 share/idl/thunderbird/mozIAsyncFavicons.idl
 share/idl/thunderbird/mozIAsyncHistory.idl
 share/idl/thunderbird/mozIAsyncLivemarks.idl
+share/idl/thunderbird/mozIColorAnalyzer.idl
 share/idl/thunderbird/mozIJSSubScriptLoader.idl
 share/idl/thunderbird/mozINewMailListener.idl
 share/idl/thunderbird/mozINewMailNotificationService.idl
@@ -5054,6 +5168,8 @@ share/idl/thunderbird/nsIAccessibleValue.idl
 share/idl/thunderbird/nsIActivity.idl
 share/idl/thunderbird/nsIActivityManager.idl
 share/idl/thunderbird/nsIActivityManagerUI.idl
+share/idl/thunderbird/nsIActivityProxy.idl
+share/idl/thunderbird/nsIActivityUIGlue.idl
 share/idl/thunderbird/nsIAddbookUrl.idl
 share/idl/thunderbird/nsIAddrDBAnnouncer.idl
 share/idl/thunderbird/nsIAddrDBListener.idl
@@ -5209,10 +5325,16 @@ share/idl/thunderbird/nsIDBFolderInfo.idl
 share/idl/thunderbird/nsIDNSListener.idl
 share/idl/thunderbird/nsIDNSRecord.idl
 share/idl/thunderbird/nsIDNSService.idl
+share/idl/thunderbird/nsIDOMActivity.idl
+share/idl/thunderbird/nsIDOMActivityHandlerDescription.idl
+share/idl/thunderbird/nsIDOMActivityOptions.idl
+share/idl/thunderbird/nsIDOMActivityRequestHandler.idl
 share/idl/thunderbird/nsIDOMAlarmsManager.idl
 share/idl/thunderbird/nsIDOMAnimationEvent.idl
 share/idl/thunderbird/nsIDOMApplicationRegistry.idl
 share/idl/thunderbird/nsIDOMApplicationRegistry2.idl
+share/idl/thunderbird/nsIDOMArchiveReader.idl
+share/idl/thunderbird/nsIDOMArchiveRequest.idl
 share/idl/thunderbird/nsIDOMAttr.idl
 share/idl/thunderbird/nsIDOMBarProp.idl
 share/idl/thunderbird/nsIDOMBatteryManager.idl
@@ -5232,9 +5354,11 @@ share/idl/thunderbird/nsIDOMCSSRuleList.idl
 share/idl/thunderbird/nsIDOMCSSStyleDeclaration.idl
 share/idl/thunderbird/nsIDOMCSSStyleRule.idl
 share/idl/thunderbird/nsIDOMCSSStyleSheet.idl
+share/idl/thunderbird/nsIDOMCSSSupportsRule.idl
 share/idl/thunderbird/nsIDOMCSSUnknownRule.idl
 share/idl/thunderbird/nsIDOMCSSValue.idl
 share/idl/thunderbird/nsIDOMCSSValueList.idl
+share/idl/thunderbird/nsIDOMCameraManager.idl
 share/idl/thunderbird/nsIDOMCanvasRenderingContext2D.idl
 share/idl/thunderbird/nsIDOMCharacterData.idl
 share/idl/thunderbird/nsIDOMChromeWindow.idl
@@ -5269,7 +5393,9 @@ share/idl/thunderbird/nsIDOMDeviceMotionEvent.idl
 share/idl/thunderbird/nsIDOMDeviceOrientationEvent.idl
 share/idl/thunderbird/nsIDOMDeviceProximityEvent.idl
 share/idl/thunderbird/nsIDOMDeviceStorage.idl
+share/idl/thunderbird/nsIDOMDeviceStorageChangeEvent.idl
 share/idl/thunderbird/nsIDOMDeviceStorageCursor.idl
+share/idl/thunderbird/nsIDOMDeviceStorageStat.idl
 share/idl/thunderbird/nsIDOMDocument.idl
 share/idl/thunderbird/nsIDOMDocumentFragment.idl
 share/idl/thunderbird/nsIDOMDocumentType.idl
@@ -5387,9 +5513,12 @@ share/idl/thunderbird/nsIDOMMobileConnection.idl
 share/idl/thunderbird/nsIDOMModalContentWindow.idl
 share/idl/thunderbird/nsIDOMMouseEvent.idl
 share/idl/thunderbird/nsIDOMMouseScrollEvent.idl
+share/idl/thunderbird/nsIDOMMozApplicationEvent.idl
 share/idl/thunderbird/nsIDOMMozBrowserFrame.idl
 share/idl/thunderbird/nsIDOMMozCSSKeyframeRule.idl
 share/idl/thunderbird/nsIDOMMozCSSKeyframesRule.idl
+share/idl/thunderbird/nsIDOMMozContactChangeEvent.idl
+share/idl/thunderbird/nsIDOMMozSettingsEvent.idl
 share/idl/thunderbird/nsIDOMMozTouchEvent.idl
 share/idl/thunderbird/nsIDOMMutationEvent.idl
 share/idl/thunderbird/nsIDOMMutationObserver.idl
@@ -5399,6 +5528,8 @@ share/idl/thunderbird/nsIDOMNSRGBAColor.idl
 share/idl/thunderbird/nsIDOMNSXPathExpression.idl
 share/idl/thunderbird/nsIDOMNamedNodeMap.idl
 share/idl/thunderbird/nsIDOMNavigator.idl
+share/idl/thunderbird/nsIDOMNavigatorActivities.idl
+share/idl/thunderbird/nsIDOMNavigatorCamera.idl
 share/idl/thunderbird/nsIDOMNavigatorDesktopNotification.idl
 share/idl/thunderbird/nsIDOMNavigatorDeviceStorage.idl
 share/idl/thunderbird/nsIDOMNavigatorGeolocation.idl
@@ -5418,9 +5549,6 @@ share/idl/thunderbird/nsIDOMPageTransitionEvent.idl
 share/idl/thunderbird/nsIDOMPaintRequest.idl
 share/idl/thunderbird/nsIDOMPaintRequestList.idl
 share/idl/thunderbird/nsIDOMParser.idl
-share/idl/thunderbird/nsIDOMPerformance.idl
-share/idl/thunderbird/nsIDOMPerformanceNavigation.idl
-share/idl/thunderbird/nsIDOMPerformanceTiming.idl
 share/idl/thunderbird/nsIDOMPkcs11.idl
 share/idl/thunderbird/nsIDOMPlugin.idl
 share/idl/thunderbird/nsIDOMPluginArray.idl
@@ -5537,6 +5665,7 @@ share/idl/thunderbird/nsIDOMStorageManager.idl
 share/idl/thunderbird/nsIDOMStorageObsolete.idl
 share/idl/thunderbird/nsIDOMStyleSheet.idl
 share/idl/thunderbird/nsIDOMStyleSheetList.idl
+share/idl/thunderbird/nsIDOMTCPSocket.idl
 share/idl/thunderbird/nsIDOMText.idl
 share/idl/thunderbird/nsIDOMTimeEvent.idl
 share/idl/thunderbird/nsIDOMTimeRanges.idl
@@ -5552,6 +5681,7 @@ share/idl/thunderbird/nsIDOMValidityState.idl
 share/idl/thunderbird/nsIDOMWakeLock.idl
 share/idl/thunderbird/nsIDOMWakeLockListener.idl
 share/idl/thunderbird/nsIDOMWebGLRenderingContext.idl
+share/idl/thunderbird/nsIDOMWheelEvent.idl
 share/idl/thunderbird/nsIDOMWindow.idl
 share/idl/thunderbird/nsIDOMWindowCollection.idl
 share/idl/thunderbird/nsIDOMWindowUtils.idl
@@ -5677,7 +5807,6 @@ share/idl/thunderbird/nsIFormSigningDialog.idl
 share/idl/thunderbird/nsIFormSubmitObserver.idl
 share/idl/thunderbird/nsIFormatConverter.idl
 share/idl/thunderbird/nsIFrameLoader.idl
-share/idl/thunderbird/nsIFrameMessageManager.idl
 share/idl/thunderbird/nsIFrameRequestCallback.idl
 share/idl/thunderbird/nsIFts3Tokenizer.idl
 share/idl/thunderbird/nsIGConfService.idl
@@ -5732,7 +5861,6 @@ share/idl/thunderbird/nsIINIParser.idl
 share/idl/thunderbird/nsIIOService.idl
 share/idl/thunderbird/nsIIOService2.idl
 share/idl/thunderbird/nsIIOUtil.idl
-share/idl/thunderbird/nsIIPCSerializable.idl
 share/idl/thunderbird/nsIIconURI.idl
 share/idl/thunderbird/nsIIdentityCryptoService.idl
 share/idl/thunderbird/nsIIdentityInfo.idl
@@ -5822,6 +5950,7 @@ share/idl/thunderbird/nsIMIMEHeaderParam.idl
 share/idl/thunderbird/nsIMIMEInfo.idl
 share/idl/thunderbird/nsIMIMEInputStream.idl
 share/idl/thunderbird/nsIMIMEService.idl
+share/idl/thunderbird/nsIMailGlue.idl
 share/idl/thunderbird/nsIMailProfileMigrator.idl
 share/idl/thunderbird/nsIMailboxService.idl
 share/idl/thunderbird/nsIMailboxSpec.idl
@@ -5832,6 +5961,7 @@ share/idl/thunderbird/nsIMemory.idl
 share/idl/thunderbird/nsIMemoryReporter.idl
 share/idl/thunderbird/nsIMenuBoxObject.idl
 share/idl/thunderbird/nsIMenuBuilder.idl
+share/idl/thunderbird/nsIMessageManager.idl
 share/idl/thunderbird/nsIMessenger.idl
 share/idl/thunderbird/nsIMessengerMigrator.idl
 share/idl/thunderbird/nsIMessengerOSIntegration.idl
@@ -6120,6 +6250,7 @@ share/idl/thunderbird/nsISecureBrowserUI.idl
 share/idl/thunderbird/nsISecurityCheckedComponent.idl
 share/idl/thunderbird/nsISecurityEventSink.idl
 share/idl/thunderbird/nsISecurityInfoProvider.idl
+share/idl/thunderbird/nsISecurityUITelemetry.idl
 share/idl/thunderbird/nsISecurityWarningDialogs.idl
 share/idl/thunderbird/nsISeekableStream.idl
 share/idl/thunderbird/nsISelection.idl
@@ -6140,6 +6271,7 @@ share/idl/thunderbird/nsISimpleEnumerator.idl
 share/idl/thunderbird/nsISimpleMimeConverter.idl
 share/idl/thunderbird/nsISimpleStreamListener.idl
 share/idl/thunderbird/nsISimpleUnicharStreamFactory.idl
+share/idl/thunderbird/nsISiteSpecificUserAgent.idl
 share/idl/thunderbird/nsISliderListener.idl
 share/idl/thunderbird/nsISmsDatabaseService.idl
 share/idl/thunderbird/nsISmsRequestManager.idl
diff --git a/mail/thunderbird/PLIST.lightning b/mail/thunderbird/PLIST.lightning
index d9770428d1f..aa0e75b8085 100644
--- a/mail/thunderbird/PLIST.lightning
+++ b/mail/thunderbird/PLIST.lightning
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.lightning,v 1.13 2012/10/12 18:28:58 ryoon Exp $
+@comment $NetBSD: PLIST.lightning,v 1.14 2012/11/23 07:17:53 ryoon Exp $
 include/thunderbird/calBaseCID.h
 include/thunderbird/calIAlarm.h
 include/thunderbird/calIAlarmService.h
@@ -90,6 +90,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/ca
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarSearchService.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTimeFormatter.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDavRequestHandlers.js
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDeletedItems.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calEvent.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFreeBusyService.js
@@ -227,9 +228,10 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/widgets/calendar-widget-bindings.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/widgets/calendar-widgets.xml
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/widgets/minimonth.xml
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/abcard.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/alarm-flashing.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/alarm-icons.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/attendee-icons.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/cal-icon24.png
 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
@@ -259,6 +261,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-unifinder.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/calendar-views.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/checkbox-images.png
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/classification.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-daypicker.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-management.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-task-tree.css
@@ -267,7 +270,6 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calenda
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/calendar-views.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/dialogs/calendar-alarm-dialog.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/dialogs/calendar-event-dialog.css
-lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/classification.png
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/today-pane.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/common/widgets/calendar-widgets.css
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/skin/calendar/datetimepickers/datetimepickers.css
@@ -375,6 +377,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIte
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calProviderUtils.jsm
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calRecurrenceUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageHelpers.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageUpgrade.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils.jsm
@@ -395,6 +398,7 @@ share/idl/thunderbird/calICalendarViewController.idl
 share/idl/thunderbird/calIChangeLog.idl
 share/idl/thunderbird/calIDateTime.idl
 share/idl/thunderbird/calIDateTimeFormatter.idl
+share/idl/thunderbird/calIDeletedItems.idl
 share/idl/thunderbird/calIDuration.idl
 share/idl/thunderbird/calIErrors.idl
 share/idl/thunderbird/calIEvent.idl
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index a47ae489c0b..f54356864ef 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.106 2012/11/05 22:44:10 ryoon Exp $
+$NetBSD: distinfo,v 1.107 2012/11/23 07:17:53 ryoon Exp $
 
 SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf
 RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a
 Size (enigmail-1.4.5.tar.gz) = 1269207 bytes
-SHA1 (lightning-1.8.source.tar.bz2) = a3b1c6b67a70b34917b8c0660d5cc57cafd2b8a4
-RMD160 (lightning-1.8.source.tar.bz2) = f4ce359ef676cfa9b95065457be64921f59837fa
-Size (lightning-1.8.source.tar.bz2) = 112070692 bytes
-SHA1 (thunderbird-16.0.2.source.tar.bz2) = 842d852b31a388d4cf3ac59bc89e8611474e2ec7
-RMD160 (thunderbird-16.0.2.source.tar.bz2) = 3725adfa1e863361282fa6e11eab9d69bb97eef1
-Size (thunderbird-16.0.2.source.tar.bz2) = 111401765 bytes
-SHA1 (patch-aa) = 627e93e5b61a12bc6de3cdf0e596ed9d1618353b
+SHA1 (lightning-1.9.source.tar.bz2) = 3cc625649debed6f7403c862f166b771b80b92ce
+RMD160 (lightning-1.9.source.tar.bz2) = 3396533847c05ed37537b9a78d771e55f767bea6
+Size (lightning-1.9.source.tar.bz2) = 113944316 bytes
+SHA1 (thunderbird-17.0esr.source.tar.bz2) = d1bb6a5a7d6ad55029f5104561c1394a452e54b2
+RMD160 (thunderbird-17.0esr.source.tar.bz2) = 6b61aa7acdbfeee1455c8d1540443f5f447e7923
+Size (thunderbird-17.0esr.source.tar.bz2) = 113291870 bytes
+SHA1 (patch-aa) = 5217684e8e6d587b1cfa65066bd9440b9a313cf3
 SHA1 (patch-aa-toplevel) = 3e46b3ef5e15883c882995f4de41704890605d1d
 SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8
 SHA1 (patch-ac) = 3d54eef3657bf39b73e2851a33b8ee1aa9408131
@@ -24,11 +24,11 @@ SHA1 (patch-al) = 9970e89e92ff8b120119b560cb661eabd3a387de
 SHA1 (patch-am) = 2d38162da23828ebee56e56a00ea086992d554ce
 SHA1 (patch-an) = 96139c682b84432e4e8a0be98db56abee89daf02
 SHA1 (patch-ao) = dcdffd03001b8b23ded6a6534c03c3eb300ee459
-SHA1 (patch-as) = ca2afec0498c4a6c2c25711240a5df662700da28
+SHA1 (patch-as) = fee8d4f906cf41374b28aa41ac6192063098d9e5
 SHA1 (patch-at) = 45a4f236a45d7f094f72d430a8dff7e86f696aed
 SHA1 (patch-au) = b896f1a65791007b881216e78338411b2ffb6280
 SHA1 (patch-av) = ebf5b14f3b1edc16206e8953c7037459184aa5f4
-SHA1 (patch-aw) = c7ced89c660e57617de29e7f7dcbf8048ceceb2f
+SHA1 (patch-aw) = 9f805bd267845e31a79a216ca3e4b9842e6a8b31
 SHA1 (patch-ax) = 146b26866312031aa48c5dfe20ce70da4d198e15
 SHA1 (patch-ay) = 679e1c72851fe74132e53a49b250c21b416e7a49
 SHA1 (patch-az) = e937a48ebcb235b36f50ba2fb3a91864107b7fa3
@@ -36,64 +36,66 @@ SHA1 (patch-ba) = 601d4919f36af98cedd2fc66e4c3852c4520e60a
 SHA1 (patch-bd) = 2d81010e39070cd33224619f0e1f8a329da8940a
 SHA1 (patch-bf) = 0d438453a264599041f4afef38d12d0735d8cbd4
 SHA1 (patch-bg) = 2e55ec7ad6d823b518af9bc59c4425f981f8b94d
-SHA1 (patch-bi) = 745faa7e8b01ab7bdbd790e69a4a8109d5291788
+SHA1 (patch-bi) = bc44d47f386901d261a7a5401520a3905cb29d5a
+SHA1 (patch-config_baseconfig.mk) = f5494ace3f5947715cf6918b7d3e19c25fa26bf8
 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_file__util__posix.cc) = 5f792d717f6373270dbee4aa9dbe278cc12d5f92
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 882b0987defaed4475317b8c500d3dffeb9d0866
 SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 1207a1e779ea0d48cb41f6a98edbe22f187b309b
 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-ipc_glue_GeckoChildProcessHost.cpp) = eac8b51b30b39bbb97da2e97c525fbbec7d98865
 SHA1 (patch-js_src_jscpucfg.h) = 493889df7e21be8a6b5d5b3854b908da70552de8
 SHA1 (patch-ldap_sdks_c-sdk_build.mk) = 171d81697d136abb6e02cb81445cd88fd8580de2
-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-mi) = 4dd76f01a7c3463485ae6bcdc1df622f214419b5
 SHA1 (patch-mj) = f0b7ce3767423c17953bfa511f9e80da2f262543
 SHA1 (patch-mk) = 6a835bfbf4995c7499f5c9d6bf266429e327871e
 SHA1 (patch-ml) = 71ea1c4f984b448d380ed94dabce988a74c4853f
-SHA1 (patch-mm) = 9bcdbe187524acb0cff940c9c97504d2d9f79797
+SHA1 (patch-mm) = 92d4a37be44cabe5f72c5352518a1a6566283163
 SHA1 (patch-mn) = 1d0293cce00aa5fa8aa6d0c37dade3c251ca7da6
 SHA1 (patch-mozilla_build_autoconf_nss.m4) = 4c726f98a5139eba2b4a4c34288c08092bfb90b3
-SHA1 (patch-mozilla_config_baseconfig.mk) = 91ea33fd687fb15ce3b5474d30af0cdd85453d83
-SHA1 (patch-mozilla_config_system-headers) = 55fbb269bb1d42cc50a1520a2733f75bce9436b1
-SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 66d5533eedd9221613c711486d38a5f0c65b4a62
+SHA1 (patch-mozilla_config_baseconfig.mk) = 6923112e0aae6dfd59f67473d0734eb46b29d190
+SHA1 (patch-mozilla_config_system-headers) = 03f0c0f4269289e4f8aa1a12b2fa870ff48b2bf4
+SHA1 (patch-mozilla_content_media_nsAudioStream.cpp) = a89fae3e745d045138118e3a0ddb224718f7827e
+SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = d81cb5b1c608bba1e1a8dd2ee3cf62549d6ee87a
 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_Makefile.in) = aa69d277e3cf55adf98d351ecd20e609cb236c9a
 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) = 1a7779a9fd682739caeb7219548f5d2d479fc302
 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) = 63e9b82eba6936788871530d10a02c9d08491e39
+SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc) = 25d4903bcf815e2da30902b18330cb3803e48cc6
 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_thread__collision__warner.h) = 4accbebcefe9921d6ceaf67361e379b891005675
 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_ipc_glue_SharedMemorySysV.h) = 1d18747dbdf0909ee030c5cc411f84ef8ebeeddb
+SHA1 (patch-mozilla_js_src_config_system-headers) = 9afa6535d367b77fb833bcdac4513a563ceb0a91
 SHA1 (patch-mozilla_js_src_jsgc.cpp) = 6d05c98c75c78d0deb86d780a7ee5ac2a0e69bf2
+SHA1 (patch-mozilla_js_src_jsinterp.cpp) = d1a601c56ebf9ffafd7d5d5c7ec93ebb691571ad
 SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = eaadbba9c425f67bbd0e7688a0df757645129416
+SHA1 (patch-mozilla_media_libcubeb_src_Makefile.in) = 0477f3dbdf3ce595ebce4c18f071586eb897a71d
 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_reflect_xptcall_src_md_unix_xptcinvoke__ppc__netbsd.cpp) = 58b06ebd1068edc06d3fe1f6464217da4c157e49
 SHA1 (patch-mozilla_xpcom_typelib_xpidl_Makefile.in) = addbabcf67b58605f6f8e4ccb674af7ab46d9d22
 SHA1 (patch-mp) = 6687d3583947cd3dc62f9005c38916a747326e3a
 SHA1 (patch-pa) = 659ce8e226b0683d667526df076ded8903aeb235
@@ -107,12 +109,12 @@ SHA1 (patch-xa) = ccd6112610256a5f4965db3531d131e1c35b781a
 SHA1 (patch-xb) = c293419875babf8a3cdd4cd6f0bb22037540d2b8
 SHA1 (patch-xc) = 4e7e2d2c6c117b781aaefd271e739e7242f4de19
 SHA1 (patch-xd) = 0a938219f82e86f618f16656347b7302045dfff0
-SHA1 (patch-xe) = 445281f1383cc6e8f02a0f5a4339c16d61b35fe7
+SHA1 (patch-xe) = 27c9efa8354bed65af833c5a92a9d8a7f5d8f0f5
 SHA1 (patch-xf) = 4ed26a45e79a927ed65240e390bc5582676f8665
 SHA1 (patch-xg) = e4a68a6b1eb3e3fc37077638cd347b8ee65c05d9
-SHA1 (patch-xj) = 4ab10a536e9ab925c4bd560aa32d6612e6a63778
+SHA1 (patch-xj) = c36e6b7df80869c92572851ac56d2b56dd3e6e66
 SHA1 (patch-xk) = d43cc553d6e6ebe941657be0581049c66f365b71
-SHA1 (patch-xl) = 149cfa84665e7b4c5351db79af5a56adcc21ddde
+SHA1 (patch-xl) = 3b3521979e18a91de62bd2972f71952f684edda6
 SHA1 (patch-xn) = 86fc014136f2f48c277835c10047eaf424ed256e
 SHA1 (patch-xo) = 390ed2a433103c323e8865c37932560bc01fdd1b
 SHA1 (patch-zb) = 9b94504d7b3ff6d06cecb391bdbd6df5423e715a
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 7810bbf3861..3ee802c9845 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,27 +1,18 @@
-$NetBSD: patch-aa,v 1.12 2012/09/02 06:43:39 ryoon Exp $
+$NetBSD: patch-aa,v 1.13 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/configure.in.orig	2012-08-25 00:30:59.000000000 +0000
+--- mozilla/configure.in.orig	2012-11-19 22:42:12.000000000 +0000
 +++ mozilla/configure.in
-@@ -2299,7 +2299,7 @@ case "$target" in
-     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
-     ;;
- 
--*-freebsd*)
-+*-freebsd* | *-dragonfly*)
-     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
- 	DLL_SUFFIX=".so.1.0"
- 	DSO_LDOPTS="-shared"
-@@ -2307,6 +2307,9 @@ case "$target" in
-     if test ! "$GNU_CC"; then
- 	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
+@@ -2080,6 +2080,9 @@ ia64*-hpux*)
+     if test -z "$MC"; then
+         MC=mc.exe
      fi
 +    if test "$LIBRUNPATH"; then
 +	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
 +    fi
      ;;
- 
- ia64*-hpux*)
-@@ -3309,6 +3312,9 @@ dnl ====================================
+ *-mingw*)
+     DSO_CFLAGS=
+@@ -2979,6 +2982,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +22,17 @@ $NetBSD: patch-aa,v 1.12 2012/09/02 06:43:39 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4308,6 +4314,14 @@ if test -n "$YASM"; then
+@@ -3279,6 +3285,9 @@ AC_CACHE_CHECK(
+         #ifdef linux
+         #define _BSD_SOURCE 1
+         #endif
++	#ifdef __NetBSD__
++	#error use of global _res variable in threaded programs is not portable
++	#endif
+         #include <resolv.h>
+         ],
+         [int foo = res_ninit(&_res);],
+@@ -3947,6 +3956,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,7 +47,18 @@ $NetBSD: patch-aa,v 1.12 2012/09/02 06:43:39 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5734,11 +5748,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5158,8 +5175,8 @@ fi
+ 
+ AC_SUBST(MOZ_WEBRTC)
+ 
+-case "$target_cpu" in
+-arm*)
++case "$target" in
++arm-*-linux*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+     MOZ_SAMPLE_TYPE_S16LE=1
+     AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
+     AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
+@@ -5356,11 +5373,11 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE
  
      dnl See if we have assembly on this platform.
      case "$OS_ARCH:$CPU_ARCH" in
@@ -60,21 +72,3 @@ $NetBSD: patch-aa,v 1.12 2012/09/02 06:43:39 ryoon Exp $
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
-@@ -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`
-+       AC_MSG_WARN([pkgsrc: adding run path to NSPR_LIBS for bundled NSPR.])
-+       NSPR_LIBS="-Wl,-R${prefix}/lib/\${MOZILLA_PKG_NAME} ${NSPR_LIBS}"
-        $PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
-        NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
-        $PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk
diff --git a/mail/thunderbird/patches/patch-as b/mail/thunderbird/patches/patch-as
index 22c526480fa..efac853c273 100644
--- a/mail/thunderbird/patches/patch-as
+++ b/mail/thunderbird/patches/patch-as
@@ -1,19 +1,10 @@
-$NetBSD: patch-as,v 1.13 2012/10/12 18:28:58 ryoon Exp $
+$NetBSD: patch-as,v 1.14 2012/11/23 07:17:54 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/js/src/configure.in.orig	2012-10-02 17:02:06.000000000 +0000
+--- mozilla/js/src/configure.in.orig	2012-11-19 22:42:22.000000000 +0000
 +++ mozilla/js/src/configure.in
-@@ -1679,7 +1679,7 @@ case "$target" in
-     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
-     ;;
- 
--*-freebsd*)
-+*-freebsd*|*-dragonfly*)
-     if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
- 	DLL_SUFFIX=".so.1.0"
- 	DSO_LDOPTS="-shared"
-@@ -2783,7 +2783,7 @@ then
+@@ -2701,7 +2701,7 @@ then
      fi
  
  	case "$target" in
@@ -21,8 +12,8 @@ Treat DragonFly like FreeBSD.
 +	    *-*-freebsd*|*-dragonfly*)
  			AC_DEFINE(_REENTRANT)
  			AC_DEFINE(_THREAD_SAFE)
- 			dnl -pthread links in -lc_r, so don't specify it explicitly.
-@@ -3626,7 +3626,7 @@ if test "$MOZ_MEMORY"; then
+ 			dnl -pthread links in -lpthread, so don't specify it explicitly.
+@@ -3545,7 +3545,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
diff --git a/mail/thunderbird/patches/patch-aw b/mail/thunderbird/patches/patch-aw
index ec3c9729bc4..ad4c60079a9 100644
--- a/mail/thunderbird/patches/patch-aw
+++ b/mail/thunderbird/patches/patch-aw
@@ -1,6 +1,6 @@
-$NetBSD: patch-aw,v 1.12 2012/10/12 18:28:59 ryoon Exp $
+$NetBSD: patch-aw,v 1.13 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/xulrunner/stub/nsXULStub.cpp.orig	2012-10-02 17:02:29.000000000 +0000
+--- mozilla/xulrunner/stub/nsXULStub.cpp.orig	2012-11-19 22:42:45.000000000 +0000
 +++ mozilla/xulrunner/stub/nsXULStub.cpp
 @@ -11,6 +11,29 @@
  #include "nsIFile.h"
@@ -32,14 +32,3 @@ $NetBSD: patch-aw,v 1.12 2012/10/12 18:28:59 ryoon Exp $
  
  #ifdef XP_WIN
  #include <windows.h>
-@@ -169,7 +192,9 @@ main(int argc, char **argv)
-   char greDir[MAXPATHLEN];
-   bool greFound = false;
- 
--#if defined(XP_MACOSX)
-+#if defined(__NetBSD__)
-+  netbsd_fixrlimit();
-+#elif defined(XP_MACOSX)
-   CFBundleRef appBundle = CFBundleGetMainBundle();
-   if (!appBundle)
-     return 1;
diff --git a/mail/thunderbird/patches/patch-bi b/mail/thunderbird/patches/patch-bi
index 911dbeb1de9..fecec586c50 100644
--- a/mail/thunderbird/patches/patch-bi
+++ b/mail/thunderbird/patches/patch-bi
@@ -1,6 +1,6 @@
-$NetBSD: patch-bi,v 1.4 2012/09/02 06:43:40 ryoon Exp $
+$NetBSD: patch-bi,v 1.5 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/gfx/angle/src/compiler/osinclude.h.orig	2012-08-25 00:31:08.000000000 +0000
+--- mozilla/gfx/angle/src/compiler/osinclude.h.orig	2012-11-19 22:42:19.000000000 +0000
 +++ mozilla/gfx/angle/src/compiler/osinclude.h
 @@ -16,6 +16,7 @@
  #define ANGLE_OS_WIN
@@ -8,5 +8,5 @@ $NetBSD: patch-bi,v 1.4 2012/09/02 06:43:40 ryoon Exp $
        defined(__FreeBSD__) || defined(__OpenBSD__) || \
 +      defined(__NetBSD__) || defined(__DragonFly__) || \
        defined(__sun) || defined(ANDROID) || \
-       defined(__GLIBC__) || defined(__GNU__)
- #define ANGLE_OS_POSIX
+       defined(__GLIBC__) || defined(__GNU__) || \
+       defined(__QNX__)
diff --git a/mail/thunderbird/patches/patch-config_baseconfig.mk b/mail/thunderbird/patches/patch-config_baseconfig.mk
new file mode 100644
index 00000000000..94d71cf3589
--- /dev/null
+++ b/mail/thunderbird/patches/patch-config_baseconfig.mk
@@ -0,0 +1,18 @@
+$NetBSD: patch-config_baseconfig.mk,v 1.1 2012/11/23 07:17:54 ryoon Exp $
+
+--- config/baseconfig.mk.orig	2012-11-19 22:35:28.000000000 +0000
++++ config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZILLA_PKG_NAME)
++idldir = $(datadir)/idl/$(MOZILLA_PKG_NAME)
++installdir = $(libdir)/$(MOZILLA_PKG_NAME)
++sdkdir = $(libdir)/$(MOZILLA_PKG_NAME)-sdk
+ MOZILLA_SRCDIR = $(topsrcdir)/mozilla
+ MOZDEPTH = $(DEPTH)/mozilla
+ DIST = $(MOZDEPTH)/dist
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 d68868b8289..45bee52de9a 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.4 2012/09/02 06:43:40 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.5 2012/11/23 07:17:54 ryoon Exp $
 
---- 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.orig	2012-11-19 22:42:22.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/file_util_posix.cc
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,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 OS_LINUX
++#ifndef HAVE_STAT64
  #define stat64 stat
  #endif
  
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 b5dd067960a..fb1d279f67a 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,14 +1,13 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.5 2012/09/02 06:43:40 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.6 2012/11/23 07:17:54 ryoon Exp $
 
---- 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.orig	2012-11-19 22:42:22.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc
-@@ -9,16 +9,31 @@
+@@ -9,16 +9,30 @@
  
  #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>
 -#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
@@ -37,7 +36,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.5 2012/09/02
  #if defined(OS_MACOSX)
  namespace base {
  void InitThreading();
-@@ -38,9 +53,20 @@ PlatformThreadId PlatformThread::Current
+@@ -38,9 +52,20 @@ PlatformThreadId PlatformThread::Current
    // into the kernel.
  #if defined(OS_MACOSX)
    return mach_thread_self();
@@ -61,7 +60,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.5 2012/09/02
  #elif defined(OS_LINUX)
    return syscall(__NR_gettid);
  #endif
-@@ -83,10 +109,10 @@ void PlatformThread::SetName(const char*
+@@ -83,9 +108,9 @@ 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.
@@ -69,9 +68,7 @@ $NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.5 2012/09/02
 +#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);
+   pthread_setname_np(pthread_self(), "%s", (void *)name);
  #else
    prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0); 
- #endif
diff --git a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp b/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
index 92cf39cf55e..406b1326ff8 100644
--- a/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
+++ b/mail/thunderbird/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -1,17 +1,31 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/09/02 06:43:40 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.4 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2012-08-25 00:31:11.000000000 +0000
+--- mozilla/ipc/glue/GeckoChildProcessHost.cpp.orig	2012-11-19 22:42:22.000000000 +0000
 +++ mozilla/ipc/glue/GeckoChildProcessHost.cpp
-@@ -410,7 +410,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -4,7 +4,13 @@
+  * 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/. */
+ 
++#if defined(__NetBSD__)
++_Pragma("GCC visibility push(default)")
++#endif
+ #include "GeckoChildProcessHost.h"
++#if defined(__NetBSD__)
++_Pragma("GCC visibility pop")
++#endif
+ 
+ #include "base/command_line.h"
+ #include "base/path_service.h"
+@@ -437,7 +443,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    // and passing wstrings from one config to the other is unsafe.  So
    // we split the logic here.
  
 -#if defined(OS_LINUX) || defined(OS_MACOSX)
 +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
    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
-@@ -425,8 +425,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
+   base::ChildPrivileges privs = kLowRightsSubprocesses ?
+                                 base::UNPRIVILEGED :
+@@ -455,8 +461,8 @@ GeckoChildProcessHost::PerformAsyncLaunc
        if (NS_SUCCEEDED(rv)) {
          nsCString path;
          greDir->GetNativePath(path);
@@ -22,7 +36,7 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/09/02 06:43:40 ryoo
          path += "/lib";
  #  endif  // MOZ_WIDGET_ANDROID
          const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-@@ -537,7 +537,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -575,7 +581,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
    childArgv.push_back(pidstring);
  
  #if defined(MOZ_CRASHREPORTER)
@@ -31,12 +45,12 @@ $NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.3 2012/09/02 06:43:40 ryoo
    int childCrashFd, childCrashRemapFd;
    if (!CrashReporter::CreateNotificationPipeForChild(
          &childCrashFd, &childCrashRemapFd))
-@@ -574,7 +574,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
+@@ -612,7 +618,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
  #endif
  
    base::LaunchApp(childArgv, mFileMap,
 -#if defined(OS_LINUX) || defined(OS_MACOSX)
 +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-                   newEnvVars,
+                   newEnvVars, privs,
  #endif
                    false, &process, arch);
diff --git a/mail/thunderbird/patches/patch-ma-toplevel b/mail/thunderbird/patches/patch-ma-toplevel
deleted file mode 100644
index 47cff9d2e2b..00000000000
--- a/mail/thunderbird/patches/patch-ma-toplevel
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ma-toplevel,v 1.5 2012/09/02 06:43:41 ryoon Exp $
-
---- config/autoconf.mk.in.orig	2012-08-25 00:24:32.000000000 +0000
-+++ config/autoconf.mk.in
-@@ -30,14 +30,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZILLA_PKG_NAME)
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= @datadir@/idl/$(MOZILLA_PKG_NAME)
- 
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZILLA_PKG_NAME)
-+sdkdir		= $(libdir)/$(MOZILLA_PKG_NAME)-sdk
- 
- MOZDEPTH	= $(DEPTH)/mozilla
- DIST		= $(MOZDEPTH)/dist
diff --git a/mail/thunderbird/patches/patch-mi b/mail/thunderbird/patches/patch-mi
index 782cf5823e3..68fe7badc1f 100644
--- a/mail/thunderbird/patches/patch-mi
+++ b/mail/thunderbird/patches/patch-mi
@@ -1,15 +1,15 @@
-$NetBSD: patch-mi,v 1.5 2012/09/02 06:43:41 ryoon Exp $
+$NetBSD: patch-mi,v 1.6 2012/11/23 07:17:54 ryoon Exp $
 
 Add DragonFly support.
 
---- mozilla/config/config.mk.orig	2012-08-25 00:30:58.000000000 +0000
+--- mozilla/config/config.mk.orig	2012-11-19 22:42:12.000000000 +0000
 +++ mozilla/config/config.mk
-@@ -97,7 +97,7 @@ endif
+@@ -92,7 +92,7 @@ AUTOCONF_TOOLS	= $(topsrcdir)/build/auto
  # but save the version to allow multiple versions of the same base
  # platform to be built in the same tree.
  #
--ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
-+ifneq (,$(filter DragonFly FreeBSD HP-UX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH)))
+-ifneq (,$(filter FreeBSD HP-UX Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
++ifneq (,$(filter DragonFly FreeBSD HP-UX Linux NetBSD OpenBSD SunOS,$(OS_ARCH)))
  OS_RELEASE	:= $(basename $(OS_RELEASE))
  
  # Allow the user to ignore the OS_VERSION, which is usually irrelevant.
diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm
index 54fa22f5e4c..fe0bd5e7c28 100644
--- a/mail/thunderbird/patches/patch-mm
+++ b/mail/thunderbird/patches/patch-mm
@@ -1,25 +1,21 @@
-$NetBSD: patch-mm,v 1.12 2012/09/03 15:47:49 marino Exp $
+$NetBSD: patch-mm,v 1.13 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/toolkit/library/Makefile.in.orig	2012-08-25 00:31:32.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig	2012-11-22 19:26:22.000000000 +0000
 +++ mozilla/toolkit/library/Makefile.in
-@@ -535,6 +535,20 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
- endif
- endif
+@@ -371,14 +371,11 @@ endif
+ 
+ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib) 
  
-+ifneq (,$(filter DragonFly FreeBSD,$(OS_ARCH)))
-+OS_LIBS += $(call EXPAND_LIBNAME,kvm)
-+EXTRA_DSO_LDOPTS += -lplc4 -lplds4 -lnspr4 -lnssutil3
-+endif
-+
+-ifdef MOZ_SYDNEYAUDIO
+-ifeq ($(OS_ARCH),Linux)
 +ifneq (,$(MOZ_CUBEB)$(MOZ_SYDNEYAUDIO))
-+ifeq ($(OS_ARCH),NetBSD)
-+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 sensorsapi portabledeviceguids windowscodecs)
- ifdef MOZ_CRASHREPORTER
++ifdef MOZ_ALSA
+ EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
+ endif
+-endif
+-
+ ifdef MOZ_PULSEAUDIO
+-ifdef MOZ_CUBEB
+ EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
+ endif
+ endif
diff --git a/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk b/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk
index 1e5e3ee3912..0fbd158a32e 100644
--- a/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk
+++ b/mail/thunderbird/patches/patch-mozilla_config_baseconfig.mk
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_config_baseconfig.mk,v 1.1 2012/10/12 18:29:39 ryoon Exp $
+$NetBSD: patch-mozilla_config_baseconfig.mk,v 1.2 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/config/baseconfig.mk.orig	2012-10-05 14:45:14.000000000 +0000
+--- mozilla/config/baseconfig.mk.orig	2012-11-19 22:42:12.000000000 +0000
 +++ mozilla/config/baseconfig.mk
 @@ -1,9 +1,9 @@
  INCLUDED_AUTOCONF_MK = 1
@@ -9,10 +9,10 @@ $NetBSD: patch-mozilla_config_baseconfig.mk,v 1.1 2012/10/12 18:29:39 ryoon Exp
 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZILLA_PKG_NAME)
-+idldir = $(datadir)/idl/$(MOZILLA_PKG_NAME)
-+installdir = $(libdir)/$(MOZILLA_PKG_NAME)
-+sdkdir = $(libdir)/$(MOZILLA_PKG_NAME)-sdk
++includedir := $(includedir)/${MOZILLA_PKG_NAME}
++idldir = $(datadir)/idl/${MOZILLA_PKG_NAME}
++installdir = $(libdir)/${MOZILLA_PKG_NAME}
++sdkdir = $(libdir)/${MOZILLA_PKG_NAME}
  DIST = $(DEPTH)/dist
  
  # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
diff --git a/mail/thunderbird/patches/patch-mozilla_config_system-headers b/mail/thunderbird/patches/patch-mozilla_config_system-headers
index 730c3b806c0..7c3f868ebc2 100644
--- a/mail/thunderbird/patches/patch-mozilla_config_system-headers
+++ b/mail/thunderbird/patches/patch-mozilla_config_system-headers
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_config_system-headers,v 1.1 2012/09/02 06:43:41 ryoon Exp $
+$NetBSD: patch-mozilla_config_system-headers,v 1.2 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/config/system-headers.orig	2012-08-25 00:30:58.000000000 +0000
+--- mozilla/config/system-headers.orig	2012-11-19 22:42:12.000000000 +0000
 +++ mozilla/config/system-headers
-@@ -1059,3 +1059,7 @@ gst/gst.h
+@@ -1065,5 +1065,9 @@ gst/gst.h
  gst/app/gstappsink.h
  gst/app/gstappsrc.h
  gst/video/video.h
@@ -10,3 +10,5 @@ $NetBSD: patch-mozilla_config_system-headers,v 1.1 2012/09/02 06:43:41 ryoon Exp
 +sys/user.h
 +kvm.h
 +spawn.h
+ sys/msg.h
+ sys/ipc.h
diff --git a/mail/thunderbird/patches/patch-mozilla_content_media_nsAudioStream.cpp b/mail/thunderbird/patches/patch-mozilla_content_media_nsAudioStream.cpp
new file mode 100644
index 00000000000..21e91dfda89
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_content_media_nsAudioStream.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-mozilla_content_media_nsAudioStream.cpp,v 1.1 2012/11/23 07:17:54 ryoon Exp $
+
+--- mozilla/content/media/nsAudioStream.cpp.orig	2012-11-19 22:42:14.000000000 +0000
++++ mozilla/content/media/nsAudioStream.cpp
+@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref
+       gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr));
+     }
+   } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) {
++#if defined(__FreeBSD__) && __FreeBSD_version < 800097
++    bool value = Preferences::GetBool(aPref, false);
++#else
+     bool value = Preferences::GetBool(aPref, true);
++#endif
+     mozilla::MutexAutoLock lock(*gAudioPrefsLock);
+     gUseCubeb = value;
+   } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) {
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 71301a72775..39fbf3c18c5 100644
--- a/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/09/02 06:43:41 ryoon Exp $
+$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.4 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2012-08-25 00:31:04.000000000 +0000
+--- mozilla/dom/plugins/ipc/PluginModuleChild.cpp.orig	2012-11-19 22:42:16.000000000 +0000
 +++ mozilla/dom/plugins/ipc/PluginModuleChild.cpp
 @@ -5,6 +5,7 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -10,7 +10,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/09/02 06
  #include <QtCore/QTimer>
  #include "nsQAppInstance.h"
  #include "NestedLoopTimer.h"
-@@ -192,7 +193,7 @@ PluginModuleChild::Init(const std::strin
+@@ -196,7 +197,7 @@ PluginModuleChild::Init(const std::strin
  
      // TODO: use PluginPRLibrary here
  
@@ -19,7 +19,7 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/09/02 06
      mShutdownFunc =
          (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
  
-@@ -1811,7 +1812,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
+@@ -1827,7 +1828,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
      PLUGIN_LOG_DEBUG_METHOD;
      AssertPluginThread();
  
@@ -28,8 +28,8 @@ $NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2012/09/02 06
      return true;
  #elif defined(OS_WIN) || defined(OS_MACOSX)
      *_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1840,7 +1841,7 @@ PluginModuleChild::AnswerNP_Initialize(c
-     SendBackUpXResources(FileDescriptor(xSocketFd, false/*don't close*/));
+@@ -1856,7 +1857,7 @@ PluginModuleChild::AnswerNP_Initialize(c
+     SendBackUpXResources(FileDescriptor(xSocketFd));
  #endif
  
 -#if defined(OS_LINUX)
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_Makefile.in
index 13b2066b6b4..bb15a9eddc3 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.3 2012/09/02 06:43:41 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.4 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/ipc/chromium/Makefile.in.orig	2012-08-25 00:31:11.000000000 +0000
+--- mozilla/ipc/chromium/Makefile.in.orig	2012-11-19 22:42:22.000000000 +0000
 +++ mozilla/ipc/chromium/Makefile.in
-@@ -243,6 +243,34 @@ endif
+@@ -240,6 +240,33 @@ endif
  
  endif # } OS_LINUX
  
@@ -10,7 +10,6 @@ $NetBSD: patch-mozilla_ipc_chromium_Makefile.in,v 1.3 2012/09/02 06:43:41 ryoon
 +
 +CPPSRCS += \
 +  atomicops_internals_x86_gcc.cc \
-+  file_util_linux.cc \
 +  process_util_bsd.cc \
 +  time_posix.cc \
 +  $(NULL)
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
deleted file mode 100644
index 2ca41740971..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_file__util__linux.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$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_process__util__bsd.cc b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc
index 876a17557b3..7c88220a645 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.5 2012/09/03 15:47:49 marino Exp $
+$NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.6 2012/11/23 07:17:54 ryoon Exp $
 
---- 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.orig	2012-11-22 19:23:30.000000000 +0000
 +++ mozilla/ipc/chromium/src/base/process_util_bsd.cc
-@@ -0,0 +1,321 @@
+@@ -0,0 +1,367 @@
 +// 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.
@@ -15,10 +15,7 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/09
 +#include <sys/sysctl.h>
 +#include <sys/wait.h>
 +#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD)
-+_Pragma("GCC visibility push(default)")
-+#include <kvm.h>
 +#include <sys/user.h>
-+_Pragma("GCC visibility pop")
 +#endif
 +
 +#include <ctype.h>
@@ -40,6 +37,20 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/09
 +#define HAVE_POSIX_SPAWN	1
 +#endif
 +
++/*
++ * On platforms that are not gonk based, we fall back to an arbitrary
++ * UID. This is generally the UID for user `nobody', albeit it is not
++ * always the case.
++ */
++
++#if defined(OS_NETBSD) || defined(OS_OPENBSD)
++# define CHILD_UNPRIVILEGED_UID 32767
++# define CHILD_UNPRIVILEGED_GID 32767
++#else
++# define CHILD_UNPRIVILEGED_UID 65534
++# define CHILD_UNPRIVILEGED_GID 65534
++#endif
++
 +#ifndef __dso_public
 +# ifdef __exported
 +#  define __dso_public	__exported
@@ -88,6 +99,17 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/09
 +               const environment_map& env_vars_to_set,
 +               bool wait, ProcessHandle* process_handle,
 +               ProcessArchitecture arch) {
++  return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++                   SAME_PRIVILEGES_AS_PARENT,
++                   wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++               const file_handle_mapping_vector& fds_to_remap,
++               const environment_map& env_vars_to_set,
++               ChildPrivileges privs,
++               bool wait, ProcessHandle* process_handle,
++               ProcessArchitecture arch) {
 +  bool retval = true;
 +
 +  char* argv_copy[argv.size() + 1];
@@ -202,6 +224,17 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/09
 +               const environment_map& env_vars_to_set,
 +               bool wait, ProcessHandle* process_handle,
 +               ProcessArchitecture arch) {
++  return LaunchApp(argv, fds_to_remap, env_vars_to_set,
++                   SAME_PRIVILEGES_AS_PARENT,
++                   wait, process_handle);
++}
++
++bool LaunchApp(const std::vector<std::string>& argv,
++               const file_handle_mapping_vector& fds_to_remap,
++               const environment_map& env_vars_to_set,
++               ChildPrivileges privs,
++               bool wait, ProcessHandle* process_handle,
++               ProcessArchitecture arch) {
 +  scoped_array<char*> argv_cstr(new char*[argv.size() + 1]);
 +  // Illegal to allocate memory after fork and before execvp
 +  InjectiveMultimap fd_shuffle1, fd_shuffle2;
@@ -224,19 +257,32 @@ $NetBSD: patch-mozilla_ipc_chromium_src_base_process__util__bsd.cc,v 1.5 2012/09
 +
 +    CloseSuperfluousFds(fd_shuffle2);
 +
++    for (size_t i = 0; i < argv.size(); i++)
++      argv_cstr[i] = const_cast<char*>(argv[i].c_str());
++    argv_cstr[argv.size()] = NULL;
++
++    if (privs == UNPRIVILEGED) {
++      if (setgid(CHILD_UNPRIVILEGED_GID) != 0) {
++        DLOG(ERROR) << "FAILED TO setgid() CHILD PROCESS, path: " << argv_cstr[0];
++        _exit(127);
++      }
++      if (setuid(CHILD_UNPRIVILEGED_UID) != 0) {
++        DLOG(ERROR) << "FAILED TO setuid() CHILD PROCESS, path: " << argv_cstr[0];
++        _exit(127);
++      }
++      if (chdir("/") != 0)
++        gProcessLog.print("==> could not chdir()\n");
++    }
++
 +    for (environment_map::const_iterator it = env_vars_to_set.begin();
 +         it != env_vars_to_set.end(); ++it) {
 +      if (setenv(it->first.c_str(), it->second.c_str(), 1/*overwrite*/))
 +        _exit(127);
 +    }
-+
-+    for (size_t i = 0; i < argv.size(); i++)
-+      argv_cstr[i] = const_cast<char*>(argv[i].c_str());
-+    argv_cstr[argv.size()] = NULL;
-+    execvp(argv_cstr[0], argv_cstr.get());
++    execv(argv_cstr[0], argv_cstr.get());
 +    // if we get here, we're in serious trouble and should complain loudly
 +    DLOG(ERROR) << "FAILED TO exec() CHILD PROCESS, path: " << argv_cstr[0];
-+    exit(127);
++    _exit(127);
 +  } else {
 +    gProcessLog.print("==> process %d launched child process %d\n",
 +                      GetCurrentProcId(), pid);
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_thread__collision__warner.h b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_thread__collision__warner.h
new file mode 100644
index 00000000000..3b97a1b7000
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_chromium_src_base_thread__collision__warner.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-mozilla_ipc_chromium_src_base_thread__collision__warner.h,v 1.1 2012/11/23 07:17:54 ryoon Exp $
+
+--- mozilla/ipc/chromium/src/base/thread_collision_warner.h.orig	2012-11-19 22:42:22.000000000 +0000
++++ mozilla/ipc/chromium/src/base/thread_collision_warner.h
+@@ -101,7 +101,7 @@
+ // Defines a class member that acts like a mutex. It is used only as a
+ // verification tool.
+ #define DFAKE_MUTEX(obj) \
+-     mutable base::ThreadCollisionWarner obj
++     mutable base::ThreadCollisionWarner obj;
+ // Asserts the call is never called simultaneously in two threads. Used at
+ // member function scope.
+ #define DFAKE_SCOPED_LOCK(obj) \
diff --git a/mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h b/mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h
index 369eb5a4f59..2cd87ba8aac 100644
--- a/mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h
+++ b/mail/thunderbird/patches/patch-mozilla_ipc_glue_SharedMemorySysV.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-mozilla_ipc_glue_SharedMemorySysV.h,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+$NetBSD: patch-mozilla_ipc_glue_SharedMemorySysV.h,v 1.2 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/ipc/glue/SharedMemorySysV.h.orig	2012-08-25 00:31:11.000000000 +0000
+--- mozilla/ipc/glue/SharedMemorySysV.h.orig	2012-11-19 22:42:22.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)
++#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_system-headers b/mail/thunderbird/patches/patch-mozilla_js_src_config_system-headers
index d44d8d58b50..3477594cb23 100644
--- a/mail/thunderbird/patches/patch-mozilla_js_src_config_system-headers
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_config_system-headers
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla_js_src_config_system-headers,v 1.1 2012/09/02 06:43:42 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_config_system-headers,v 1.2 2012/11/23 07:17:54 ryoon Exp $
 
---- mozilla/js/src/config/system-headers.orig	2012-08-25 00:31:11.000000000 +0000
+--- mozilla/js/src/config/system-headers.orig	2012-11-19 22:42:22.000000000 +0000
 +++ mozilla/js/src/config/system-headers
-@@ -1059,3 +1059,7 @@ gst/gst.h
+@@ -1065,5 +1065,9 @@ gst/gst.h
  gst/app/gstappsink.h
  gst/app/gstappsrc.h
  gst/video/video.h
@@ -10,3 +10,5 @@ $NetBSD: patch-mozilla_js_src_config_system-headers,v 1.1 2012/09/02 06:43:42 ry
 +sys/user.h
 +kvm.h
 +spawn.h
+ sys/msg.h
+ sys/ipc.h
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_jsinterp.cpp b/mail/thunderbird/patches/patch-mozilla_js_src_jsinterp.cpp
new file mode 100644
index 00000000000..1f35c5385a6
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_jsinterp.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-mozilla_js_src_jsinterp.cpp,v 1.1 2012/11/23 07:17:54 ryoon Exp $
+
+--- mozilla/js/src/jsinterp.cpp.orig	2012-11-19 22:42:24.000000000 +0000
++++ mozilla/js/src/jsinterp.cpp
+@@ -3664,6 +3664,7 @@ BEGIN_CASE(JSOP_LEAVEBLOCK)
+ BEGIN_CASE(JSOP_LEAVEFORLETIN)
+ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
+ {
++  {
+     DebugOnly<uint32_t> blockDepth = regs.fp()->blockChain().stackDepth();
+ 
+     regs.fp()->popBlock(cx);
+@@ -3678,7 +3679,9 @@ BEGIN_CASE(JSOP_LEAVEBLOCKEXPR)
+         regs.sp -= GET_UINT16(regs.pc);
+         JS_ASSERT(regs.stackDepth() == blockDepth + 1);
+         regs.sp[-1] = *vp;
+-    } else {
++    }
++  }
++    if (op != JSOP_LEAVEBLOCK && op != JSOP_LEAVEBLOCKEXPR)  {
+         /* Another op will pop; nothing to do here. */
+         len = JSOP_LEAVEFORLETIN_LENGTH;
+         DO_NEXT_OP(len);
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_Makefile.in b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_Makefile.in
new file mode 100644
index 00000000000..3158d6077ef
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_media_libcubeb_src_Makefile.in
@@ -0,0 +1,28 @@
+$NetBSD: patch-mozilla_media_libcubeb_src_Makefile.in,v 1.1 2012/11/23 07:17:54 ryoon Exp $
+
+--- mozilla/media/libcubeb/src/Makefile.in.orig	2012-11-19 22:42:33.000000000 +0000
++++ mozilla/media/libcubeb/src/Makefile.in
+@@ -24,10 +24,6 @@ endif
+ 
+ ifeq ($(OS_TARGET),Android)
+ # No Android implementation of libcubeb yet.
+-else ifeq ($(OS_TARGET),Linux)
+-CSRCS         = \
+-              cubeb_alsa.c \
+-              $(NULL)
+ endif
+ 
+ ifeq ($(OS_TARGET),Darwin)
+@@ -42,6 +38,12 @@ CSRCS           = \
+                 $(NULL)
+ endif
+ 
++ifdef MOZ_ALSA
++CSRCS         = \
++              cubeb_alsa.c \
++              $(NULL)
++endif
++
+ ifdef MOZ_PULSEAUDIO
+ CSRCS		= \
+ 		cubeb_pulse.c \
diff --git a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h b/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
deleted file mode 100644
index 8e844893cfe..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$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-08-25 00:31:24.000000000 +0000
-+++ mozilla/media/libvpx/vpx_config.h
-@@ -16,12 +16,12 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.h"
- 
--#elif defined(__linux__) && defined(__i386__)
--/* 32 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__i386__)
-+/* 32 bit Linux or some BSD. */
- #include "vpx_config_x86-linux-gcc.h"
- 
--#elif defined(__linux__) && defined(__x86_64__)
--/* 64 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__x86_64__)
-+/* 64 bit Linux or some BSD. */
- #include "vpx_config_x86_64-linux-gcc.h"
- 
- #elif defined(__sun) && defined(__i386)
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
deleted file mode 100644
index 1b3bb9e5fcf..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_media_libvpx_vpx__config__c.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$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-08-25 00:31:24.000000000 +0000
-+++ mozilla/media/libvpx/vpx_config_c.c
-@@ -15,12 +15,12 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.c"
- 
--#elif defined(__linux__) && defined(__i386__)
--/* 32 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__i386__)
-+/* 32 bit Linux or BSD. */
- #include "vpx_config_x86-linux-gcc.c"
- 
--#elif defined(__linux__) && defined(__x86_64__)
--/* 64 bit Linux. */
-+#elif (defined(__linux__) | defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)) && defined(__x86_64__)
-+/* 64 bit Linux or BSD. */
- #include "vpx_config_x86_64-linux-gcc.c"
- 
- #elif defined(__sun) && defined(__i386)
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke__ppc__netbsd.cpp b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke__ppc__netbsd.cpp
new file mode 100644
index 00000000000..58f3eda1310
--- /dev/null
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke__ppc__netbsd.cpp
@@ -0,0 +1,47 @@
+$NetBSD: patch-mozilla_xpcom_reflect_xptcall_src_md_unix_xptcinvoke__ppc__netbsd.cpp,v 1.1 2012/11/23 07:17:54 ryoon Exp $
+
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig	2012-11-19 22:42:44.000000000 +0000
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
+@@ -5,9 +5,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
+@@ -69,8 +69,10 @@ invoke_copy_to_stack(uint32_t* d,
+                 if ((uint32_t) 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) {
+@@ -79,8 +81,10 @@ invoke_copy_to_stack(uint32_t* 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
+@@ -107,6 +111,6 @@ invoke_copy_to_stack(uint32_t* d,
+ }
+ 
+ extern "C"
+-XPTC_PUBLIC_API(nsresult)
+-XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
++EXPORT_XPCOM_API(nsresult)
++NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
+                    uint32_t paramCount, nsXPTCVariant* params);
diff --git a/mail/thunderbird/patches/patch-xe b/mail/thunderbird/patches/patch-xe
index 088c4e633d8..c567fd29441 100644
--- a/mail/thunderbird/patches/patch-xe
+++ b/mail/thunderbird/patches/patch-xe
@@ -1,8 +1,8 @@
-$NetBSD: patch-xe,v 1.5 2012/09/02 06:43:44 ryoon Exp $
+$NetBSD: patch-xe,v 1.6 2012/11/23 07:17:54 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-08-25 00:31:35.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig	2012-11-19 22:42:44.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
 @@ -100,6 +100,15 @@ extern "C" {
      }
@@ -18,10 +18,10 @@ NetBSD/m68k xptcall support code. From pkgsrc/www/firefox/patch-ad.
 +#endif
 +
  XPTC_PUBLIC_API(nsresult)
- XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
-                    PRUint32 paramCount, nsXPTCVariant* params)
-@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR
-     PRUint32 result;
+ XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+                    uint32_t paramCount, nsXPTCVariant* params)
+@@ -107,30 +116,30 @@ XPTC_InvokeByIndex(nsISupports* that, ui
+     uint32_t result;
  
   __asm__ __volatile__(
 -    "movl  %4, sp@-\n\t"
diff --git a/mail/thunderbird/patches/patch-xj b/mail/thunderbird/patches/patch-xj
index 4f50d097fb7..76aafdf1413 100644
--- a/mail/thunderbird/patches/patch-xj
+++ b/mail/thunderbird/patches/patch-xj
@@ -1,8 +1,8 @@
-$NetBSD: patch-xj,v 1.5 2012/09/02 06:43:44 ryoon Exp $
+$NetBSD: patch-xj,v 1.6 2012/11/23 07:17:54 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-08-25 00:31:36.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig	2012-11-19 22:42:45.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
 @@ -6,6 +6,7 @@
  // Implement shared vtbl methods.
@@ -18,9 +18,9 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
      nsXPTCMiniVariant* dispatchParams = NULL;
 -    nsIInterfaceInfo* iface_info = NULL;
      const nsXPTMethodInfo* info;
-     PRUint32 paramCount;
-     PRUint32 i;
-@@ -44,12 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+     uint32_t paramCount;
+     uint32_t i;
+@@ -44,11 +44,7 @@ PrepareAndDispatch(nsXPTCStubBase* self,
  
      NS_ASSERTION(self,"no self");
  
@@ -29,13 +29,12 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 -    if (! iface_info)
 -        return NS_ERROR_UNEXPECTED;
 -
--    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
 +    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+     iface_info->GetMethodInfo(uint16_t(methodIndex), &info);
      NS_ASSERTION(info,"no method info");
      if (! info)
-         return NS_ERROR_UNEXPECTED;
-@@ -84,8 +79,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-                 if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
+@@ -84,8 +80,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+                 if ((uint32_t) ap & 4) ap++; // doubles are 8-byte aligned on stack
                  dp->val.d = *(double*) ap;
                  ap += 2;
 +#if __GXX_ABI_VERSION < 100
@@ -45,7 +44,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
              }
              continue;
          }
-@@ -95,8 +92,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -95,8 +93,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
              else {
                  dp->val.f = *(float*) ap;
  		ap += 1;
@@ -56,20 +55,20 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
              }
              continue;
          }
-@@ -144,9 +143,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -144,9 +144,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
          }
      }
  
--    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
+-    result = self->CallMethod((uint16_t) methodIndex, info, dispatchParams);
 -
 -    NS_RELEASE(iface_info);
 +    result = self->mOuter->CallMethod((PRUint16) methodIndex,
-+                                      info,
-+                                      dispatchParams);
++				      info,
++				      dispatchParams);
  
      if (dispatchParams != paramBuffer)
          delete [] dispatchParams;
-@@ -160,7 +159,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+@@ -160,7 +160,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 +79,7 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  __asm__ (                                                   \
          ".section \".text\" \n\t"                           \
          ".align 2 \n\t"                                     \
-@@ -171,6 +172,46 @@ __asm__ (                               
+@@ -171,6 +173,46 @@ __asm__ (                               
  	"li     11,"#n" \n\t"                               \
  	"b      SharedStub@local \n"                        \
  );
diff --git a/mail/thunderbird/patches/patch-xl b/mail/thunderbird/patches/patch-xl
index b43d86e15ae..c1516c0485f 100644
--- a/mail/thunderbird/patches/patch-xl
+++ b/mail/thunderbird/patches/patch-xl
@@ -1,10 +1,10 @@
-$NetBSD: patch-xl,v 1.5 2012/09/02 06:43:44 ryoon Exp $
+$NetBSD: patch-xl,v 1.6 2012/11/23 07:17:54 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-08-25 00:31:35.000000000 +0000
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig	2012-11-19 22:42:44.000000000 +0000
 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
-@@ -20,41 +20,41 @@
+@@ -20,41 +20,42 @@
  		      
          .section ".text"
  	.align 2
@@ -12,10 +12,21 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 -	.type  XPTC_InvokeByIndex,@function
 +	.globl NS_InvokeByIndex_P
 +	.type  NS_InvokeByIndex_P,@function
++
++//
++// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
++//                    PRUint32 paramCount, nsXPTCVariant* params)
++//
++
++NS_InvokeByIndex_P:
++	stwu    sp,-32(sp)                      // setup standard stack frame
++	mflr    r0                              // save LR
++	stw     r3,8(sp)                        // r3 <= that
++	stw     r4,12(sp)                       // r4 <= methodIndex
  
 -#
--# XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
--#                    PRUint32 paramCount, nsXPTCVariant* params)
+-# XPTC_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
+-#                    uint32_t paramCount, nsXPTCVariant* params)
 -#
 -
 -XPTC_InvokeByIndex:
@@ -23,16 +34,6 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
 -	mflr    r0				# save LR
 -	stw     r3,8(sp)			# r3 <= that
 -	stw     r4,12(sp)			# r4 <= methodIndex
-+//
-+// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+//                    PRUint32 paramCount, nsXPTCVariant* params)
-+//
-+
-+NS_InvokeByIndex_P:
-+	stwu    sp,-32(sp)			// setup standard stack frame
-+	mflr    r0				// save LR
-+	stw     r3,8(sp)			// r3 <= that
-+	stw     r4,12(sp)			// r4 <= methodIndex
  	stw     r30,16(sp)
  	stw     r31,20(sp)
  
@@ -71,46 +72,3 @@ NetBSD ppc xptcall support code. Originally from pkgsrc/www/mozilla.
  	lfd     f2,40(r30)   
  	lfd     f3,48(r30)  
  	lfd     f4,56(r30)  
-@@ -63,18 +63,13 @@ XPTC_InvokeByIndex:
- 	lfd     f7,80(r30)  
- 	lfd     f8,88(r30)
- 
--	lwz     r3,8(r31)			# r3 <= that
--	lwz     r4,12(r31)			# r4 <= methodIndex
--	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
--	slwi    r4,r4,3				# convert to offset ( *= 8 )
--	addi	r4,r4,8				# skip first two vtable entries
--	add	r4,r4,r5
--	lhz	r0,0(r4)			# virtual base offset
--	extsh	r0,r0
--	add	r3,r3,r0
--	lwz     r0,4(r4)			# r0 <= methodpointer ( == vtable + offset )
-+	lwz     r3,8(r31)			// r3 <= that
-+	lwz     r4,12(r31)			// r4 <= methodIndex
-+	lwz     r5,0(r3)			// r5 <= vtable ( == *that )
-+	slwi    r4,r4,2				// convert to offset ( *= 4 )
-+	lwzx	r0,r4,r5			// r0 <= methodpointer ( == vtable + offset )
- 
--        lwz     r4,4(r30)			# load GP regs with method parameters
-+        lwz     r4,4(r30)			// load GP regs with method parameters
- 	lwz     r5,8(r30)   
- 	lwz     r6,12(r30)  
- 	lwz     r7,16(r30)  
-@@ -82,13 +77,13 @@ XPTC_InvokeByIndex:
- 	lwz     r9,24(r30)  
- 	lwz     r10,28(r30)
- 
--	mtlr    r0				# copy methodpointer to LR    
--	blrl					# call method
-+	mtlr    r0				// copy methodpointer to LR    
-+	blrl					// call method
- 	
--	lwz     r30,16(r31)			# restore r30 & r31
-+	lwz     r30,16(r31)			// restore r30 & r31
- 	lwz     r31,20(r31)
- 	
--	lwz     r11,0(sp)			# clean up the stack
-+	lwz     r11,0(sp)			// clean up the stack
- 	lwz     r0,4(r11)
- 	mtlr    r0
- 	mr      sp,r11