Update to 14.0

* Use Lightning 1.6 release
* Enigmail is not tested fully

Changelog: from http://www.mozilla.org/en-US/products/thunderbird/14.0/releasenotes/
    FIXED
    Various fixes and performance improvements
    FIXED
    Various security fixes

14 files changed, 147 insertions, 133 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index eee0b891699..b4167b714c4 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.94 2012/06/14 07:43:59 sbd Exp $
+# $NetBSD: Makefile,v 1.95 2012/07/19 17:57:30 ryoon Exp $
 #
 
 DISTNAME=	# empty
 PKGNAME=	thunderbird-${TB_VER}
-TB_VER=		13.0
-PKGREVISION=	1
+TB_VER=		14.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} \
 		${MASTER_SITE_MOZILLA_ALL:=thunderbird/releases/${TB_VER}/source/}
 DISTFILES=	thunderbird-${TB_VER}.source.tar.bz2 \
-		lightning-1.5.source.tar.bz2
-SITES.lightning-1.5.source.tar.bz2=	${MASTER_SITE_MOZILLA:=calendar/lightning/releases/1.5/source/}
-EXTRACT_DIR.lightning-1.5.source.tar.bz2=	${WRKSRC}/lightning
+		lightning-1.6.source.tar.bz2
+SITES.lightning-1.6.source.tar.bz2=	${MASTER_SITE_MOZILLA:=calendar/lightning/releases/1.6/source/}
+EXTRACT_DIR.lightning-1.6.source.tar.bz2=	${WRKSRC}/lightning
 
 MAINTAINER=	tnn@NetBSD.org
 HOMEPAGE=	http://www.mozillamessaging.com/en-US/thunderbird/
@@ -43,8 +42,8 @@ ALL_ENV+=		MOZILLA_PKG_NAME=thunderbird
 
 post-extract:
 	cd ${WRKSRC} && ${RM} -r calendar
-	${CP} -r ${EXTRACT_DIR.lightning-1.5.source.tar.bz2}/comm-release/calendar ${WRKSRC}
-	${RM} -r ${EXTRACT_DIR.lightning-1.5.source.tar.bz2}
+	${CP} -r ${EXTRACT_DIR.lightning-1.6.source.tar.bz2}/comm-beta/calendar ${WRKSRC}
+	${RM} -r ${EXTRACT_DIR.lightning-1.6.source.tar.bz2}
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 148669b112b..bf7f4ff5570 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.41 2012/06/12 19:37:48 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.42 2012/07/19 17:57:30 ryoon Exp $
 bin/thunderbird
+include/thunderbird/ARIAGridAccessibleWrap.h
 include/thunderbird/AtkSocketAccessible.h
+include/thunderbird/BasicImplData.h
 include/thunderbird/BasicLayers.h
+include/thunderbird/BasicTiledThebesLayer.h
 include/thunderbird/CheckedInt.h
+include/thunderbird/CustomQS_Canvas.h
 include/thunderbird/CustomQS_Canvas2D.h
 include/thunderbird/CustomQS_WebGL.h
 include/thunderbird/DictionaryHelpers.h
-include/thunderbird/EGLUtils.h
 include/thunderbird/EventTracer.h
+include/thunderbird/FileBlockCache.h
 include/thunderbird/ForceDiscreteGPUHelperCGL.h
 include/thunderbird/FrameLayerBuilder.h
 include/thunderbird/FramePropertyTable.h
@@ -16,6 +20,7 @@ include/thunderbird/GLContextProvider.h
 include/thunderbird/GLContextProviderImpl.h
 include/thunderbird/GLContextSymbols.h
 include/thunderbird/GLDefs.h
+include/thunderbird/GLLibraryLoader.h
 include/thunderbird/GLXLibrary.h
 include/thunderbird/GfxInfoCollector.h
 include/thunderbird/IJSDebugger.h
@@ -39,6 +44,7 @@ include/thunderbird/SVGAttrValueWrapper.h
 include/thunderbird/TabMessageUtils.h
 include/thunderbird/VideoFrameContainer.h
 include/thunderbird/VideoUtils.h
+include/thunderbird/WebGLContext.h
 include/thunderbird/a11yGeneric.h
 include/thunderbird/amIInstallTrigger.h
 include/thunderbird/amIWebInstallListener.h
@@ -59,6 +65,7 @@ include/thunderbird/expat_external.h
 include/thunderbird/extIApplication.h
 include/thunderbird/ftpCore.h
 include/thunderbird/gc/Barrier.h
+include/thunderbird/gc/Root.h
 include/thunderbird/gc/Statistics.h
 include/thunderbird/gfx2DGlue.h
 include/thunderbird/gfx3DMatrix.h
@@ -94,6 +101,7 @@ include/thunderbird/gfxPointH3D.h
 include/thunderbird/gfxQuad.h
 include/thunderbird/gfxQuaternion.h
 include/thunderbird/gfxRect.h
+include/thunderbird/gfxReusableSurfaceWrapper.h
 include/thunderbird/gfxSharedImageSurface.h
 include/thunderbird/gfxSkipChars.h
 include/thunderbird/gfxTeeSurface.h
@@ -160,6 +168,7 @@ include/thunderbird/js/Vector.h
 include/thunderbird/jsalloc.h
 include/thunderbird/jsapi.h
 include/thunderbird/jsatom.h
+include/thunderbird/jsatom.tbl
 include/thunderbird/jscell.h
 include/thunderbird/jsclass.h
 include/thunderbird/jsclist.h
@@ -179,13 +188,11 @@ include/thunderbird/jsproto.tbl
 include/thunderbird/jsproxy.h
 include/thunderbird/jsprvtd.h
 include/thunderbird/jspubtd.h
-include/thunderbird/jstypedarray.h
 include/thunderbird/jstypes.h
 include/thunderbird/jsutil.h
 include/thunderbird/jsval.h
 include/thunderbird/jsversion.h
 include/thunderbird/jswrapper.h
-include/thunderbird/jsxdrapi.h
 include/thunderbird/mar.h
 include/thunderbird/mar_cmdline.h
 include/thunderbird/mdb.h
@@ -211,7 +218,6 @@ include/thunderbird/mozIAsyncLivemarks.h
 include/thunderbird/mozIJSSubScriptLoader.h
 include/thunderbird/mozIPersonalDictionary.h
 include/thunderbird/mozIPlacesAutoComplete.h
-include/thunderbird/mozISanitizingSerializer.h
 include/thunderbird/mozISpellCheckingEngine.h
 include/thunderbird/mozISpellI18NManager.h
 include/thunderbird/mozISpellI18NUtil.h
@@ -256,6 +262,7 @@ include/thunderbird/mozilla/CondVar.h
 include/thunderbird/mozilla/DeadlockDetector.h
 include/thunderbird/mozilla/FileLocation.h
 include/thunderbird/mozilla/FileUtils.h
+include/thunderbird/mozilla/FloatingPoint.h
 include/thunderbird/mozilla/FunctionTimer.h
 include/thunderbird/mozilla/GenericFactory.h
 include/thunderbird/mozilla/GuardObjects.h
@@ -290,6 +297,7 @@ include/thunderbird/mozilla/RangedPtr.h
 include/thunderbird/mozilla/ReentrantMonitor.h
 include/thunderbird/mozilla/RefPtr.h
 include/thunderbird/mozilla/SSE.h
+include/thunderbird/mozilla/Scoped.h
 include/thunderbird/mozilla/ServiceList.h
 include/thunderbird/mozilla/Services.h
 include/thunderbird/mozilla/StackWalk.h
@@ -331,7 +339,9 @@ include/thunderbird/mozilla/dom/Element.h
 include/thunderbird/mozilla/dom/ExternalHelperAppChild.h
 include/thunderbird/mozilla/dom/ExternalHelperAppParent.h
 include/thunderbird/mozilla/dom/FromParser.h
+include/thunderbird/mozilla/dom/ImageData.h
 include/thunderbird/mozilla/dom/Link.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
@@ -340,6 +350,17 @@ include/thunderbird/mozilla/dom/TabMessageUtils.h
 include/thunderbird/mozilla/dom/TabParent.h
 include/thunderbird/mozilla/dom/battery/Constants.h
 include/thunderbird/mozilla/dom/battery/Types.h
+include/thunderbird/mozilla/dom/bindings/Common.h
+include/thunderbird/mozilla/dom/bindings/DOMJSClass.h
+include/thunderbird/mozilla/dom/bindings/EventListenerBinding.h
+include/thunderbird/mozilla/dom/bindings/EventTargetBinding.h
+include/thunderbird/mozilla/dom/bindings/FunctionBinding.h
+include/thunderbird/mozilla/dom/bindings/Nullable.h
+include/thunderbird/mozilla/dom/bindings/PrototypeList.h
+include/thunderbird/mozilla/dom/bindings/Utils.h
+include/thunderbird/mozilla/dom/bindings/XMLHttpRequestBinding.h
+include/thunderbird/mozilla/dom/bindings/XMLHttpRequestEventTargetBinding.h
+include/thunderbird/mozilla/dom/bindings/XMLHttpRequestUploadBinding.h
 include/thunderbird/mozilla/dom/indexedDB/FileInfo.h
 include/thunderbird/mozilla/dom/indexedDB/FileManager.h
 include/thunderbird/mozilla/dom/indexedDB/IDBCursor.h
@@ -369,6 +390,13 @@ include/thunderbird/mozilla/dom/sms/SmsRequestManager.h
 include/thunderbird/mozilla/dom/sms/SmsServicesFactory.h
 include/thunderbird/mozilla/dom/sms/Types.h
 include/thunderbird/mozilla/dom/workers/Workers.h
+include/thunderbird/mozilla/dom/workers/bindings/DOMBindingBase.h
+include/thunderbird/mozilla/dom/workers/bindings/EventListenerManager.h
+include/thunderbird/mozilla/dom/workers/bindings/EventTarget.h
+include/thunderbird/mozilla/dom/workers/bindings/WorkerFeature.h
+include/thunderbird/mozilla/dom/workers/bindings/XMLHttpRequest.h
+include/thunderbird/mozilla/dom/workers/bindings/XMLHttpRequestEventTarget.h
+include/thunderbird/mozilla/dom/workers/bindings/XMLHttpRequestUpload.h
 include/thunderbird/mozilla/gfx/2D.h
 include/thunderbird/mozilla/gfx/BaseMargin.h
 include/thunderbird/mozilla/gfx/BasePoint.h
@@ -418,6 +446,7 @@ include/thunderbird/mozilla/jsipc/ObjectWrapperParent.h
 include/thunderbird/mozilla/layers/CompositorChild.h
 include/thunderbird/mozilla/layers/CompositorCocoaWidgetHelper.h
 include/thunderbird/mozilla/layers/CompositorParent.h
+include/thunderbird/mozilla/layers/RenderTrace.h
 include/thunderbird/mozilla/layers/ShadowLayerUtilsX11.h
 include/thunderbird/mozilla/layers/ShadowLayers.h
 include/thunderbird/mozilla/layers/ShadowLayersChild.h
@@ -500,8 +529,6 @@ include/thunderbird/npruntime.h
 include/thunderbird/nptypes.h
 include/thunderbird/nsAHtml5TreeBuilderState.h
 include/thunderbird/nsAHtml5TreeOpSink.h
-include/thunderbird/nsARIAGridAccessibleWrap.h
-include/thunderbird/nsARIAMap.h
 include/thunderbird/nsASocketHandler.h
 include/thunderbird/nsAString.h
 include/thunderbird/nsAXPCNativeCallContext.h
@@ -579,6 +606,7 @@ include/thunderbird/nsChannelProperties.h
 include/thunderbird/nsCharSeparatedTokenizer.h
 include/thunderbird/nsCharTraits.h
 include/thunderbird/nsCharsetAlias.h
+include/thunderbird/nsCharsetSource.h
 include/thunderbird/nsCheapSets.h
 include/thunderbird/nsClassHashtable.h
 include/thunderbird/nsClientRect.h
@@ -631,7 +659,7 @@ include/thunderbird/nsDeprecatedOperationList.h
 include/thunderbird/nsDeque.h
 include/thunderbird/nsDetectionConfident.h
 include/thunderbird/nsDeviceContext.h
-include/thunderbird/nsDeviceMotion.h
+include/thunderbird/nsDeviceSensors.h
 include/thunderbird/nsDirectoryService.h
 include/thunderbird/nsDirectoryServiceAtomList.h
 include/thunderbird/nsDirectoryServiceDefs.h
@@ -689,7 +717,6 @@ include/thunderbird/nsGridRowLeafLayout.h
 include/thunderbird/nsHTMLAudioElement.h
 include/thunderbird/nsHTMLCanvasElement.h
 include/thunderbird/nsHTMLDNSPrefetch.h
-include/thunderbird/nsHTMLFormControlAccessible.h
 include/thunderbird/nsHTMLImageAccessibleWrap.h
 include/thunderbird/nsHTMLMediaElement.h
 include/thunderbird/nsHTMLParts.h
@@ -1038,7 +1065,6 @@ include/thunderbird/nsIDOMEvent.h
 include/thunderbird/nsIDOMEventListener.h
 include/thunderbird/nsIDOMEventTarget.h
 include/thunderbird/nsIDOMFile.h
-include/thunderbird/nsIDOMFileException.h
 include/thunderbird/nsIDOMFileList.h
 include/thunderbird/nsIDOMFileReader.h
 include/thunderbird/nsIDOMFontFace.h
@@ -1046,12 +1072,10 @@ include/thunderbird/nsIDOMFontFaceList.h
 include/thunderbird/nsIDOMFormData.h
 include/thunderbird/nsIDOMGeoGeolocation.h
 include/thunderbird/nsIDOMGeoPosition.h
-include/thunderbird/nsIDOMGeoPositionAddress.h
 include/thunderbird/nsIDOMGeoPositionCallback.h
 include/thunderbird/nsIDOMGeoPositionCoords.h
 include/thunderbird/nsIDOMGeoPositionError.h
 include/thunderbird/nsIDOMGeoPositionErrorCallback.h
-include/thunderbird/nsIDOMGeoPositionOptions.h
 include/thunderbird/nsIDOMGetSVGDocument.h
 include/thunderbird/nsIDOMGlobalPropertyInitializer.h
 include/thunderbird/nsIDOMHTMLAnchorElement.h
@@ -1135,6 +1159,7 @@ include/thunderbird/nsIDOMMediaQueryList.h
 include/thunderbird/nsIDOMMessageEvent.h
 include/thunderbird/nsIDOMMimeType.h
 include/thunderbird/nsIDOMMimeTypeArray.h
+include/thunderbird/nsIDOMMobileConnection.h
 include/thunderbird/nsIDOMModalContentWindow.h
 include/thunderbird/nsIDOMMouseEvent.h
 include/thunderbird/nsIDOMMouseScrollEvent.h
@@ -1143,8 +1168,8 @@ include/thunderbird/nsIDOMMozCSSKeyframeRule.h
 include/thunderbird/nsIDOMMozCSSKeyframesRule.h
 include/thunderbird/nsIDOMMozTouchEvent.h
 include/thunderbird/nsIDOMMutationEvent.h
+include/thunderbird/nsIDOMMutationObserver.h
 include/thunderbird/nsIDOMNSEditableElement.h
-include/thunderbird/nsIDOMNSElement.h
 include/thunderbird/nsIDOMNSEvent.h
 include/thunderbird/nsIDOMNSRGBAColor.h
 include/thunderbird/nsIDOMNSXPathExpression.h
@@ -1269,6 +1294,7 @@ include/thunderbird/nsIDOMScreen.h
 include/thunderbird/nsIDOMScriptObjectFactory.h
 include/thunderbird/nsIDOMScrollAreaEvent.h
 include/thunderbird/nsIDOMSerializer.h
+include/thunderbird/nsIDOMSettingsManager.h
 include/thunderbird/nsIDOMSimpleGestureEvent.h
 include/thunderbird/nsIDOMSmartCardEvent.h
 include/thunderbird/nsIDOMSmsCursor.h
@@ -1282,7 +1308,6 @@ include/thunderbird/nsIDOMStorageEvent.h
 include/thunderbird/nsIDOMStorageEventObsolete.h
 include/thunderbird/nsIDOMStorageIndexedDB.h
 include/thunderbird/nsIDOMStorageItem.h
-include/thunderbird/nsIDOMStorageList.h
 include/thunderbird/nsIDOMStorageManager.h
 include/thunderbird/nsIDOMStorageObsolete.h
 include/thunderbird/nsIDOMStyleSheet.h
@@ -1336,7 +1361,7 @@ include/thunderbird/nsIDateTimeFormat.h
 include/thunderbird/nsIDebug.h
 include/thunderbird/nsIDebug2.h
 include/thunderbird/nsIDeviceContextSpec.h
-include/thunderbird/nsIDeviceMotion.h
+include/thunderbird/nsIDeviceSensors.h
 include/thunderbird/nsIDialogCreator.h
 include/thunderbird/nsIDialogParamBlock.h
 include/thunderbird/nsIDirIndex.h
@@ -1488,7 +1513,6 @@ include/thunderbird/nsIID.h
 include/thunderbird/nsIIDBCursor.h
 include/thunderbird/nsIIDBCursorWithValue.h
 include/thunderbird/nsIIDBDatabase.h
-include/thunderbird/nsIIDBDatabaseException.h
 include/thunderbird/nsIIDBFactory.h
 include/thunderbird/nsIIDBIndex.h
 include/thunderbird/nsIIDBKeyRange.h
@@ -1627,6 +1651,7 @@ include/thunderbird/nsIMimeHeaders.h
 include/thunderbird/nsIMimeMiscStatus.h
 include/thunderbird/nsIMimeObjectClassAccess.h
 include/thunderbird/nsIMimeStreamConverter.h
+include/thunderbird/nsIMobileConnectionProvider.h
 include/thunderbird/nsIModule.h
 include/thunderbird/nsIMovemailIncomingServer.h
 include/thunderbird/nsIMovemailService.h
@@ -1716,7 +1741,6 @@ include/thunderbird/nsIMultiplexInputStream.h
 include/thunderbird/nsIMutable.h
 include/thunderbird/nsIMutableArray.h
 include/thunderbird/nsIMutationObserver.h
-include/thunderbird/nsIMutationObserver2.h
 include/thunderbird/nsINIParser.h
 include/thunderbird/nsINNTPArticleList.h
 include/thunderbird/nsINNTPNewsgroupList.h
@@ -2392,6 +2416,7 @@ include/thunderbird/nsSupportsArray.h
 include/thunderbird/nsSupportsPrimitives.h
 include/thunderbird/nsTArray-inl.h
 include/thunderbird/nsTArray.h
+include/thunderbird/nsTArrayHelpers.h
 include/thunderbird/nsTDependentString.h
 include/thunderbird/nsTDependentSubstring.h
 include/thunderbird/nsTHashtable.h
@@ -2644,7 +2669,9 @@ lib/thunderbird-sdk/sdk/bin/header.py
 lib/thunderbird-sdk/sdk/bin/ply/__init__.py
 lib/thunderbird-sdk/sdk/bin/ply/lex.py
 lib/thunderbird-sdk/sdk/bin/ply/yacc.py
+lib/thunderbird-sdk/sdk/bin/run-mozilla.sh
 lib/thunderbird-sdk/sdk/bin/typelib.py
+lib/thunderbird-sdk/sdk/bin/xpcshell
 lib/thunderbird-sdk/sdk/bin/xpidl.py
 lib/thunderbird-sdk/sdk/bin/xpidllex.py
 lib/thunderbird-sdk/sdk/bin/xpidlyacc.py
@@ -2871,6 +2898,7 @@ lib/thunderbird/chrome/classic/skin/classic/messenger/icons/thread.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/tick.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/timeline-inverted.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/timeline.png
+lib/thunderbird/chrome/classic/skin/classic/messenger/icons/ubuntuone.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/update.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/yousendit.png
 lib/thunderbird/chrome/classic/skin/classic/messenger/icons/zoomout-hover.png
@@ -3083,6 +3111,7 @@ lib/thunderbird/chrome/en-US/locale/en-US/global-platform/win/accessible.propert
 lib/thunderbird/chrome/en-US/locale/en-US/global-platform/win/intl.properties
 lib/thunderbird/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
 lib/thunderbird/chrome/en-US/locale/en-US/global-region/region.properties
+lib/thunderbird/chrome/en-US/locale/en-US/global/AccessFu.properties
 lib/thunderbird/chrome/en-US/locale/en-US/global/about.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/global/aboutAbout.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/global/aboutRights.dtd
@@ -3235,6 +3264,7 @@ lib/thunderbird/chrome/en-US/locale/en-US/messenger/baseMenuOverlay.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/chat.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/chat.properties
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/Dropbox/management.dtd
+lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/Dropbox/settings.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/YouSendIt/management.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/YouSendIt/settings.dtd
 lib/thunderbird/chrome/en-US/locale/en-US/messenger/cloudfile/addAccountDialog.dtd
@@ -3574,6 +3604,9 @@ lib/thunderbird/chrome/messenger/content/messenger/chat/joinchat.xul
 lib/thunderbird/chrome/messenger/content/messenger/cloudfile/Dropbox/management.js
 lib/thunderbird/chrome/messenger/content/messenger/cloudfile/Dropbox/management.xhtml
 lib/thunderbird/chrome/messenger/content/messenger/cloudfile/Dropbox/settings.xhtml
+lib/thunderbird/chrome/messenger/content/messenger/cloudfile/UbuntuOne/management.xhtml
+lib/thunderbird/chrome/messenger/content/messenger/cloudfile/UbuntuOne/settings.js
+lib/thunderbird/chrome/messenger/content/messenger/cloudfile/UbuntuOne/settings.xhtml
 lib/thunderbird/chrome/messenger/content/messenger/cloudfile/YouSendIt/management.js
 lib/thunderbird/chrome/messenger/content/messenger/cloudfile/YouSendIt/management.xhtml
 lib/thunderbird/chrome/messenger/content/messenger/cloudfile/YouSendIt/settings.js
@@ -3793,8 +3826,10 @@ lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Footer.html
 lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Incoming/Content.html
 lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Incoming/Context.html
 lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Incoming/NextContent.html
+lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Incoming/buddy_icon.png
 lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Info.plist
 lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/NextStatus.html
+lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Outgoing/buddy_icon.png
 lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/Status.html
 lib/thunderbird/chrome/messenger/skin/classic/messenger/messages/main.css
 lib/thunderbird/chrome/messenger/skin/classic/messenger/smileys/angry.png
@@ -3900,6 +3935,7 @@ lib/thunderbird/chrome/toolkit/content/global/aboutRights-unbranded.xhtml
 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.js
 lib/thunderbird/chrome/toolkit/content/global/alerts/alert.xul
 lib/thunderbird/chrome/toolkit/content/global/appPicker.js
@@ -3967,6 +4003,7 @@ lib/thunderbird/chrome/toolkit/content/global/customizeToolbar.js
 lib/thunderbird/chrome/toolkit/content/global/customizeToolbar.xul
 lib/thunderbird/chrome/toolkit/content/global/devtools/dbg-browser-actors.js
 lib/thunderbird/chrome/toolkit/content/global/devtools/dbg-script-actors.js
+lib/thunderbird/chrome/toolkit/content/global/devtools/dbg-server.js
 lib/thunderbird/chrome/toolkit/content/global/devtools/dbg-transport.js
 lib/thunderbird/chrome/toolkit/content/global/dialogOverlay.js
 lib/thunderbird/chrome/toolkit/content/global/dialogOverlay.xul
@@ -4121,6 +4158,8 @@ lib/thunderbird/chrome/toolkit/res/quirk.css
 lib/thunderbird/chrome/toolkit/res/ua.css
 lib/thunderbird/chrome/toolkit/res/viewsource.css
 lib/thunderbird/chrome/toolkit/skin/classic/global/Filepicker.png
+lib/thunderbird/chrome/toolkit/skin/classic/global/TopLevelImageDocument.css
+lib/thunderbird/chrome/toolkit/skin/classic/global/TopLevelVideoDocument.css
 lib/thunderbird/chrome/toolkit/skin/classic/global/about.css
 lib/thunderbird/chrome/toolkit/skin/classic/global/aboutCache.css
 lib/thunderbird/chrome/toolkit/skin/classic/global/aboutCacheEntry.css
@@ -4345,6 +4384,7 @@ lib/thunderbird/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-64.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png
+lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClickToPlay.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png
 lib/thunderbird/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDownload.png
@@ -4395,6 +4435,8 @@ lib/thunderbird/components/interfaces.manifest
 lib/thunderbird/components/irc.js
 lib/thunderbird/components/jsconsole-clhandler.js
 lib/thunderbird/components/jsmimeemitter.js
+${PLIST.gnome}lib/thunderbird/components/libdbusservice.so
+${PLIST.gnome}lib/thunderbird/components/libmozgnome.so
 lib/thunderbird/components/logger.js
 lib/thunderbird/components/mail.xpt
 lib/thunderbird/components/mailContentHandler.js
@@ -4442,6 +4484,7 @@ lib/thunderbird/components/nsSearchSuggestions.js
 lib/thunderbird/components/nsSetDefaultMail.js
 lib/thunderbird/components/nsTaggingService.js
 lib/thunderbird/components/nsURLFormatter.js
+lib/thunderbird/components/nsUbuntuOne.js
 lib/thunderbird/components/nsUpdateService.js
 lib/thunderbird/components/nsUpdateServiceStub.js
 lib/thunderbird/components/nsUpdateTimerManager.js
@@ -4537,6 +4580,7 @@ lib/thunderbird/modules/AddonLogging.jsm
 lib/thunderbird/modules/AddonManager.jsm
 lib/thunderbird/modules/AddonRepository.jsm
 lib/thunderbird/modules/AddonUpdateChecker.jsm
+lib/thunderbird/modules/BookmarkHTMLUtils.jsm
 lib/thunderbird/modules/CSPUtils.jsm
 lib/thunderbird/modules/CertUtils.jsm
 lib/thunderbird/modules/ChromeManifestParser.jsm
@@ -4578,6 +4622,10 @@ lib/thunderbird/modules/XPCOMUtils.jsm
 lib/thunderbird/modules/XPIProvider.jsm
 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/UtteranceGenerator.jsm
+lib/thunderbird/modules/accessibility/VirtualCursorController.jsm
 lib/thunderbird/modules/activity/activityModules.js
 lib/thunderbird/modules/activity/alertHook.js
 lib/thunderbird/modules/activity/autosync.js
@@ -5068,7 +5116,6 @@ share/idl/thunderbird/nsIDOMEvent.idl
 share/idl/thunderbird/nsIDOMEventListener.idl
 share/idl/thunderbird/nsIDOMEventTarget.idl
 share/idl/thunderbird/nsIDOMFile.idl
-share/idl/thunderbird/nsIDOMFileException.idl
 share/idl/thunderbird/nsIDOMFileList.idl
 share/idl/thunderbird/nsIDOMFileReader.idl
 share/idl/thunderbird/nsIDOMFontFace.idl
@@ -5076,12 +5123,10 @@ share/idl/thunderbird/nsIDOMFontFaceList.idl
 share/idl/thunderbird/nsIDOMFormData.idl
 share/idl/thunderbird/nsIDOMGeoGeolocation.idl
 share/idl/thunderbird/nsIDOMGeoPosition.idl
-share/idl/thunderbird/nsIDOMGeoPositionAddress.idl
 share/idl/thunderbird/nsIDOMGeoPositionCallback.idl
 share/idl/thunderbird/nsIDOMGeoPositionCoords.idl
 share/idl/thunderbird/nsIDOMGeoPositionError.idl
 share/idl/thunderbird/nsIDOMGeoPositionErrorCallback.idl
-share/idl/thunderbird/nsIDOMGeoPositionOptions.idl
 share/idl/thunderbird/nsIDOMGetSVGDocument.idl
 share/idl/thunderbird/nsIDOMGlobalPropertyInitializer.idl
 share/idl/thunderbird/nsIDOMHTMLAnchorElement.idl
@@ -5165,6 +5210,7 @@ share/idl/thunderbird/nsIDOMMediaQueryList.idl
 share/idl/thunderbird/nsIDOMMessageEvent.idl
 share/idl/thunderbird/nsIDOMMimeType.idl
 share/idl/thunderbird/nsIDOMMimeTypeArray.idl
+share/idl/thunderbird/nsIDOMMobileConnection.idl
 share/idl/thunderbird/nsIDOMModalContentWindow.idl
 share/idl/thunderbird/nsIDOMMouseEvent.idl
 share/idl/thunderbird/nsIDOMMouseScrollEvent.idl
@@ -5173,8 +5219,8 @@ share/idl/thunderbird/nsIDOMMozCSSKeyframeRule.idl
 share/idl/thunderbird/nsIDOMMozCSSKeyframesRule.idl
 share/idl/thunderbird/nsIDOMMozTouchEvent.idl
 share/idl/thunderbird/nsIDOMMutationEvent.idl
+share/idl/thunderbird/nsIDOMMutationObserver.idl
 share/idl/thunderbird/nsIDOMNSEditableElement.idl
-share/idl/thunderbird/nsIDOMNSElement.idl
 share/idl/thunderbird/nsIDOMNSEvent.idl
 share/idl/thunderbird/nsIDOMNSRGBAColor.idl
 share/idl/thunderbird/nsIDOMNSXPathExpression.idl
@@ -5298,6 +5344,7 @@ share/idl/thunderbird/nsIDOMSVGZoomEvent.idl
 share/idl/thunderbird/nsIDOMScreen.idl
 share/idl/thunderbird/nsIDOMScrollAreaEvent.idl
 share/idl/thunderbird/nsIDOMSerializer.idl
+share/idl/thunderbird/nsIDOMSettingsManager.idl
 share/idl/thunderbird/nsIDOMSimpleGestureEvent.idl
 share/idl/thunderbird/nsIDOMSmartCardEvent.idl
 share/idl/thunderbird/nsIDOMSmsCursor.idl
@@ -5311,7 +5358,6 @@ share/idl/thunderbird/nsIDOMStorageEvent.idl
 share/idl/thunderbird/nsIDOMStorageEventObsolete.idl
 share/idl/thunderbird/nsIDOMStorageIndexedDB.idl
 share/idl/thunderbird/nsIDOMStorageItem.idl
-share/idl/thunderbird/nsIDOMStorageList.idl
 share/idl/thunderbird/nsIDOMStorageManager.idl
 share/idl/thunderbird/nsIDOMStorageObsolete.idl
 share/idl/thunderbird/nsIDOMStyleSheet.idl
@@ -5362,7 +5408,7 @@ share/idl/thunderbird/nsIDOMXULTreeElement.idl
 share/idl/thunderbird/nsIDataSignatureVerifier.idl
 share/idl/thunderbird/nsIDebug.idl
 share/idl/thunderbird/nsIDebug2.idl
-share/idl/thunderbird/nsIDeviceMotion.idl
+share/idl/thunderbird/nsIDeviceSensors.idl
 share/idl/thunderbird/nsIDialogCreator.idl
 share/idl/thunderbird/nsIDialogParamBlock.idl
 share/idl/thunderbird/nsIDirIndex.idl
@@ -5496,7 +5542,6 @@ share/idl/thunderbird/nsIHttpProtocolHandler.idl
 share/idl/thunderbird/nsIIDBCursor.idl
 share/idl/thunderbird/nsIIDBCursorWithValue.idl
 share/idl/thunderbird/nsIIDBDatabase.idl
-share/idl/thunderbird/nsIIDBDatabaseException.idl
 share/idl/thunderbird/nsIIDBFactory.idl
 share/idl/thunderbird/nsIIDBIndex.idl
 share/idl/thunderbird/nsIIDBKeyRange.idl
@@ -5618,6 +5663,7 @@ share/idl/thunderbird/nsIMimeEmitter.idl
 share/idl/thunderbird/nsIMimeHeaders.idl
 share/idl/thunderbird/nsIMimeMiscStatus.idl
 share/idl/thunderbird/nsIMimeStreamConverter.idl
+share/idl/thunderbird/nsIMobileConnectionProvider.idl
 share/idl/thunderbird/nsIModule.idl
 share/idl/thunderbird/nsIMovemailIncomingServer.idl
 share/idl/thunderbird/nsIMovemailService.idl
diff --git a/mail/thunderbird/PLIST.lightning b/mail/thunderbird/PLIST.lightning
index b94858f63e2..4dc01aa95d1 100644
--- a/mail/thunderbird/PLIST.lightning
+++ b/mail/thunderbird/PLIST.lightning
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.lightning,v 1.10 2012/06/12 19:37:48 ryoon Exp $
+@comment $NetBSD: PLIST.lightning,v 1.11 2012/07/19 17:57:30 ryoon Exp $
 include/thunderbird/calBaseCID.h
 include/thunderbird/calIAlarm.h
 include/thunderbird/calIAlarmService.h
@@ -363,6 +363,7 @@ lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm
+lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItemUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
 lib/thunderbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index 559b08a6fea..bf8e0a479f1 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.98 2012/06/12 19:37:48 ryoon Exp $
+$NetBSD: distinfo,v 1.99 2012/07/19 17:57:30 ryoon Exp $
 
-SHA1 (enigmail-1.4.2.tar.gz) = b4c076851ce0718d1895692178593598713254a9
-RMD160 (enigmail-1.4.2.tar.gz) = fa0115408d0b43f347ccb7d2c6d54ef6ee4836ce
-Size (enigmail-1.4.2.tar.gz) = 1319995 bytes
-SHA1 (lightning-1.5.source.tar.bz2) = 8f8668333272cf16a4e436ccc807dabefd2a4350
-RMD160 (lightning-1.5.source.tar.bz2) = 7f436bace6fcbd972c5132bdeb44b66f5abdd6a0
-Size (lightning-1.5.source.tar.bz2) = 102998436 bytes
-SHA1 (thunderbird-13.0.source.tar.bz2) = 7cd374e7a123d989ec58f64253d242295f96181a
-RMD160 (thunderbird-13.0.source.tar.bz2) = 5406d00e6bfe8a3b25be1fc3b7d5b19bd1b10206
-Size (thunderbird-13.0.source.tar.bz2) = 102799262 bytes
+SHA1 (enigmail-1.4.3.tar.gz) = 3b89155bbd4a36b912304481d293d451fa52f66e
+RMD160 (enigmail-1.4.3.tar.gz) = 94ad953a5494ab2ccd135be84acf434128108fb1
+Size (enigmail-1.4.3.tar.gz) = 1337811 bytes
+SHA1 (lightning-1.6.source.tar.bz2) = 1aa9cb31d2400412b3c5ac4f74c1199a2ca88b2e
+RMD160 (lightning-1.6.source.tar.bz2) = f299834459b92cd4dc0e50803ac81e71a3ea3e10
+Size (lightning-1.6.source.tar.bz2) = 105730907 bytes
+SHA1 (thunderbird-14.0.source.tar.bz2) = 834d7aed141792204cbc8057dc80b20dafba9193
+RMD160 (thunderbird-14.0.source.tar.bz2) = da9eeb8c89da0c751d17a681a51698d2c4faefc2
+Size (thunderbird-14.0.source.tar.bz2) = 105235591 bytes
 SHA1 (patch-aa) = ac0b89346aec8ef8ba937ef494395f526f20054d
 SHA1 (patch-aa-toplevel) = 8891fcadbea806950f2248f290ad34e08d8f6ef2
 SHA1 (patch-ab) = 693567e7c029a7ef07c4ccd3680dc987081ead21
@@ -27,13 +27,13 @@ SHA1 (patch-ao) = 9a17785de51706df413dcc84128d17f7072a07c3
 SHA1 (patch-as) = 033cdd39261910525413250f6b58c25de9fd47f0
 SHA1 (patch-at) = 66547d1cd153e384855426bb95f02dc5308fbd79
 SHA1 (patch-au) = 3fa326682ac9d39f92f5e64dc575932d99d5ac9a
-SHA1 (patch-av) = 9f0a1deaa5da6871e9e42728b0dbf6073e32c2cb
+SHA1 (patch-av) = b13b213dcb119f5695bf0c54216a0a29c4160b6e
 SHA1 (patch-aw) = 7d067f1a86a3f1e7acc7376e15465e6801fb4d60
 SHA1 (patch-ax) = cc50b68037e5b94f4dc5ba2cb48c660f1cc1a914
 SHA1 (patch-ay) = 745c63fe7270b14ab69d3a3d9ac578f8703a08a3
 SHA1 (patch-az) = 7bdac9e086304b84ce97093dfe192a308711cea0
 SHA1 (patch-ba) = b7f3169e96eedbf40a4de3914ce0c6f89a2a179b
-SHA1 (patch-bd) = 0235d2ef4c801be6ddb33ab8532e151f20d905c9
+SHA1 (patch-bd) = 5c688930ad900274a5db4a5bafa7e0414a9e5dc5
 SHA1 (patch-bf) = 776b70f53149e9ca719f9f256da9ed90046451f0
 SHA1 (patch-bg) = b3a2f6414c2932ca9931cb1880ee1128c10a35fc
 SHA1 (patch-bi) = b2804f162ec6cca35832d21947b8de68cf9c8a21
@@ -60,9 +60,9 @@ SHA1 (patch-mg) = ae6b0cfa61f7a7dc900a7b9ee0e1249c655b1b05
 SHA1 (patch-mh) = 2f93a6e83397ee660f66e9df6ab589176a5c3377
 SHA1 (patch-mi) = f651f021979e0363de6a1237a6a2185431f4e2e3
 SHA1 (patch-mj) = f8daad020e06010cda91f0459ccd85f26af57bba
-SHA1 (patch-mk) = a85a7de099830dc3bbc94ccb239c79763bd2c04f
+SHA1 (patch-mk) = 40a07f63d9ef5b95db028409663f834137c20ce4
 SHA1 (patch-ml) = dba2b2cf9ce4198d3da7bb426bb38dc3f889612e
-SHA1 (patch-mm) = ea984ec5afaef188c387fcd9165c41c25860c295
+SHA1 (patch-mm) = 4476720ea3cac6317be6f3e5cea44d2df66fc992
 SHA1 (patch-mn) = 8497e12ca0d19766f192b8d27203c59f60b8209b
 SHA1 (patch-mozilla_build_autoconf_nss.m4) = 1cfc292b1af8a81bca1323358676afaf10615364
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = bb3f0bbc3cfafcfad9ddd714d82700cb7f7f8268
@@ -80,24 +80,23 @@ SHA1 (patch-mozilla_ipc_chromium_src_base_process__util__posix.cc) = ba5533e5571
 SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = c5ba1624ff07794181839f99ec2b376369b2ca54
 SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = 446d6d55189e09dfb8cb59f98d0985f0961390da
 SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = dd3c5469cac9803ee6b14fd8590d807676a8417d
-SHA1 (patch-mozilla_js_src_config_rules.mk) = 66fec8c2a41413e3c6c4b466610bd0fc4c2f595c
+SHA1 (patch-mozilla_js_src_config_rules.mk) = 867e1fc9a3ec5b7d38e9f7a0be855e96016f265d
 SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = e16054358a082408bbcd4831407cb5658b1f21f9
 SHA1 (patch-mozilla_js_src_yarr_pcre_pcre.h) = e4d1c540d3b6b6ca21cec710d37198441cfd0b50
 SHA1 (patch-mozilla_js_xpconnect_src_Makefile.in) = bac60c2224b5f1c4ddd902d124a13a30d916b884
 SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = 82cf2de23c75abfe914fb6cc56607c2065c3327d
 SHA1 (patch-mozilla_media_libvpx_vpx__config.h) = 388cd6ef14afe35d337cb7f738011f4d84faab2c
 SHA1 (patch-mozilla_media_libvpx_vpx__config__c.c) = 19e00552a957b8495759916edbbd7d58324da951
-SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = 63f657ff4c2a2ae059f7ad3db6e0d72618a97359
+SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = bbe6d513984fcb6d72b35d2c7349499531578a24
 SHA1 (patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg) = e7d3a880ec8c96a098cc91c0aad5bfa34078c7da
 SHA1 (patch-mozilla_nsprpub_pr_include_md___pth.h) = c5a5d1946cd159bd2c8cdc45d399408a100fae2d
 SHA1 (patch-mozilla_nsprpub_pr_include_md_prosdep.h) = dacb08cbe415c96c087528daa90262652391d009
 SHA1 (patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c) = b22b25aa3cadba68ae7a388d3ff57cbaaf64390d
 SHA1 (patch-mozilla_nsprpub_pr_src_pthreads_ptio.c) = 8a3ee0b80884a7deb7b075fb812ee98e07ce6358
 SHA1 (patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c) = 4ad5111f774e93d0a993d6f019827d45e3187cdb
-SHA1 (patch-mozilla_storage_src_Makefile.in) = 992056af8ffadcbe471df8eb143e2d001a3d70cd
-SHA1 (patch-mozilla_storage_src_mozStorageService.cpp) = e64024894d04e4137fe983777561f540d8069c51
+SHA1 (patch-mozilla_storage_src_Makefile.in) = 15b82a6ac6dee39f1e156789279960e72e9e3e24
 SHA1 (patch-mozilla_xpcom_Makefile.in) = 6466f1f44f6a0db7cc86905113a09102556afe0c
-SHA1 (patch-mozilla_xpcom_idl-parser_Makefile.in) = cf6406b57e0550c4c79c89cae4a4ec7ac5376ec9
+SHA1 (patch-mozilla_xpcom_idl-parser_Makefile.in) = 7248c3179b72dde2183ba53bd39d2cf4325868dd
 SHA1 (patch-mozilla_xpcom_idl-parser_header.py) = fa8b5f0caf0d5485b13b64fb7a043d66bebd0294
 SHA1 (patch-mozilla_xpcom_typelib_xpidl_Makefile.in) = 07dd6ff65fe98e9e507f3735075fd6a3c540ceb5
 SHA1 (patch-mp) = 1f7c2bf940904d0d040e8a6d1aba5f87c7e09b53
diff --git a/mail/thunderbird/enigmail.mk b/mail/thunderbird/enigmail.mk
index e6e9cb7c337..10adaac3ee7 100644
--- a/mail/thunderbird/enigmail.mk
+++ b/mail/thunderbird/enigmail.mk
@@ -1,9 +1,9 @@
-# $NetBSD: enigmail.mk,v 1.8 2012/06/12 19:37:49 ryoon Exp $
+# $NetBSD: enigmail.mk,v 1.9 2012/07/19 17:57:30 ryoon Exp $
 #
 # This Makefile fragment hooks the Enigmail OpenPGP extension
 # (see http://www.mozilla-enigmail.org/ ) into the build.
 
-ENIGMAIL_DIST=		enigmail-1.4.2.tar.gz
+ENIGMAIL_DIST=		enigmail-1.4.3.tar.gz
 XPI_FILES+=		${WRKDIR}/enigmail.xpi
 .if !defined(DISTFILES)
 DISTFILES=		${DEFAULT_DISTFILES}
diff --git a/mail/thunderbird/patches/patch-av b/mail/thunderbird/patches/patch-av
index b1ea9c944d7..5fd3f94081a 100644
--- a/mail/thunderbird/patches/patch-av
+++ b/mail/thunderbird/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.5 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-av,v 1.6 2012/07/19 17:57:30 ryoon Exp $
 
---- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-04-20 22:40:27.000000000 +0000
+--- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-07-12 15:25:19.000000000 +0000
 +++ mozilla/xulrunner/app/nsXULRunnerApp.cpp
-@@ -37,6 +37,27 @@
- 
+@@ -39,6 +39,27 @@
+ #include "nsXPCOMGlue.h"
  #include <stdio.h>
  #include <stdlib.h>
 +#include <sys/resource.h>
@@ -29,12 +29,12 @@ $NetBSD: patch-av,v 1.5 2012/04/28 16:56:58 ryoon Exp $
 +}
  #ifdef XP_WIN
  #include <windows.h>
- #endif
-@@ -274,6 +295,7 @@ private:
+ #define snprintf _snprintf
+@@ -284,6 +305,7 @@ private:
  
  int main(int argc, char* argv[])
  {
 +  netbsd_fixrlimit();
-   if (argc > 1 && (IsArg(argv[1], "h") ||
-                    IsArg(argv[1], "help") ||
-                    IsArg(argv[1], "?")))
+   char exePath[MAXPATHLEN];
+   nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
+   if (NS_FAILED(rv)) {
diff --git a/mail/thunderbird/patches/patch-bd b/mail/thunderbird/patches/patch-bd
index d09fc22fdba..0f8d74dad70 100644
--- a/mail/thunderbird/patches/patch-bd
+++ b/mail/thunderbird/patches/patch-bd
@@ -1,10 +1,10 @@
-$NetBSD: patch-bd,v 1.3 2012/04/28 16:56:58 ryoon Exp $
+$NetBSD: patch-bd,v 1.4 2012/07/19 17:57:30 ryoon Exp $
 
---- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-04-20 22:40:07.000000000 +0000
+--- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-07-12 15:25:19.000000000 +0000
 +++ mozilla/js/src/ctypes/CTypes.cpp
-@@ -36,6 +36,22 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
+@@ -38,6 +38,22 @@
+ 
+ #include "mozilla/FloatingPoint.h"
  
 +#if defined(__NetBSD__)
 +#include <stdint.h>
diff --git a/mail/thunderbird/patches/patch-mk b/mail/thunderbird/patches/patch-mk
index 3d47de6ab59..2c52de00b20 100644
--- a/mail/thunderbird/patches/patch-mk
+++ b/mail/thunderbird/patches/patch-mk
@@ -1,10 +1,10 @@
-$NetBSD: patch-mk,v 1.5 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-mk,v 1.6 2012/07/19 17:57:30 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- mozilla/config/rules.mk.orig	2012-06-01 17:19:12.000000000 +0000
+--- mozilla/config/rules.mk.orig	2012-07-04 16:30:38.000000000 +0000
 +++ mozilla/config/rules.mk
-@@ -588,6 +588,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+@@ -556,6 +556,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
  endif
  endif
  
@@ -17,7 +17,7 @@ Treat DragonFly like FreeBSD.
  ifeq ($(OS_ARCH),NetBSD)
  ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
  ifeq ($(MODULE),layout)
-@@ -597,6 +603,10 @@ endif
+@@ -565,6 +571,10 @@ endif
  endif
  endif
  
@@ -28,17 +28,17 @@ Treat DragonFly like FreeBSD.
  #
  # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
  # which uses internal symbols first
-@@ -1479,7 +1489,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
+@@ -1452,7 +1462,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
  	$(PYTHON_PATH) \
- 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  $(PLY_INCLUDE) \
  	  -I$(topsrcdir)/xpcom/idl-parser \
 -	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 +	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
  	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
  	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
  
-@@ -1492,7 +1502,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
- 	  -I$(topsrcdir)/other-licenses/ply \
+@@ -1465,7 +1475,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
+ 	  $(PLY_INCLUDE) \
  	  -I$(topsrcdir)/xpcom/idl-parser \
  	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
 -	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
diff --git a/mail/thunderbird/patches/patch-mm b/mail/thunderbird/patches/patch-mm
index 65d0762db4f..8282bf736dd 100644
--- a/mail/thunderbird/patches/patch-mm
+++ b/mail/thunderbird/patches/patch-mm
@@ -1,8 +1,8 @@
-$NetBSD: patch-mm,v 1.9 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-mm,v 1.10 2012/07/19 17:57:30 ryoon Exp $
 
---- mozilla/toolkit/library/Makefile.in.orig	2012-06-01 17:19:46.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig	2012-07-04 16:31:38.000000000 +0000
 +++ mozilla/toolkit/library/Makefile.in
-@@ -119,6 +119,7 @@ STATIC_LIBS += ipdlunittest_s
+@@ -120,6 +120,7 @@ STATIC_LIBS += ipdlunittest_s
  endif
  
  ifeq (Linux,$(OS_ARCH))
@@ -10,7 +10,7 @@ $NetBSD: patch-mm,v 1.9 2012/06/12 19:37:49 ryoon Exp $
  ifneq (Android,$(OS_TARGET))
  OS_LIBS += -lrt
  endif
-@@ -520,6 +521,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -522,6 +523,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
@@ -33,5 +33,5 @@ $NetBSD: patch-mm,v 1.9 2012/06/12 19:37:49 ryoon Exp $
 +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 t2embed secur32)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32)
  ifdef MOZ_CRASHREPORTER
diff --git a/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk b/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk
index 6f734f4d0a5..c5ce76a0486 100644
--- a/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk
+++ b/mail/thunderbird/patches/patch-mozilla_js_src_config_rules.mk
@@ -1,18 +1,18 @@
-$NetBSD: patch-mozilla_js_src_config_rules.mk,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_config_rules.mk,v 1.2 2012/07/19 17:57:30 ryoon Exp $
 
---- mozilla/js/src/config/rules.mk.orig	2012-06-01 17:19:23.000000000 +0000
+--- mozilla/js/src/config/rules.mk.orig	2012-07-12 15:25:25.000000000 +0000
 +++ mozilla/js/src/config/rules.mk
-@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
+@@ -1452,7 +1452,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS
  	$(PYTHON_PATH) \
- 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  $(PLY_INCLUDE) \
  	  -I$(topsrcdir)/xpcom/idl-parser \
 -	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
 +	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
  	@if test -n "$(findstring $*.h, $(EXPORTS))"; \
  	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
  
-@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
- 	  -I$(topsrcdir)/other-licenses/ply \
+@@ -1465,7 +1465,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DE
+ 	  $(PLY_INCLUDE) \
  	  -I$(topsrcdir)/xpcom/idl-parser \
  	  -I$(topsrcdir)/xpcom/typelib/xpt/tools \
 -	  $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@
diff --git a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp b/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
index 927dfdef3e2..c367af5a9ce 100644
--- a/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
+++ b/mail/thunderbird/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
@@ -1,24 +1,18 @@
-$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.2 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.3 2012/07/19 17:57:30 ryoon Exp $
 
-* Fix build with gcc<4.5, for example, DragonFly 3.0.1.
-  See https://bugzilla.mozilla.org/show_bug.cgi?id=621446
-
---- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig	2012-04-20 22:40:20.000000000 +0000
+--- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig	2012-07-12 15:25:25.000000000 +0000
 +++ mozilla/netwerk/protocol/http/HttpChannelParent.cpp
-@@ -331,10 +331,15 @@ HttpChannelParent::RecvUpdateAssociatedC
-   return true;
- }
- 
--// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be
-+// Bug 621446 investigation, we don't want conditional PR_Aborts below to be
- // merged to a single address.
- #pragma warning(disable : 4068)
+@@ -340,6 +340,13 @@ HttpChannelParent::RecvUpdateAssociatedC
+ // Compiling this with GCC <= 4.4 fails with an internal compiler error
+ #pragma GCC optimize ("O0")
+ #endif
 +// Compiling with a version of GCC <= 4.4 fails with an internal compiler
 +// error.
 +#if !defined(__GNUC__) || \
 +  (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
- #pragma GCC optimize ("O0")
++#pragma GCC optimize ("O0")
 +#endif
++
  
  bool
  HttpChannelParent::RecvRedirect2Verify(const nsresult& result, 
diff --git a/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in b/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
index f549da329b4..9afe67c0568 100644
--- a/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_storage_src_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.1 2012/04/28 16:56:59 ryoon Exp $
+$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.2 2012/07/19 17:57:30 ryoon Exp $
 
---- mozilla/storage/src/Makefile.in.orig	2012-04-20 22:40:23.000000000 +0000
+--- mozilla/storage/src/Makefile.in.orig	2012-07-12 15:25:26.000000000 +0000
 +++ mozilla/storage/src/Makefile.in
-@@ -55,6 +55,22 @@ ifeq ($(OS_ARCH),Linux)
- DEFINES += -DXP_LINUX
+@@ -67,6 +67,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY
+ endif
  endif
  
 +ifeq ($(OS_ARCH),DragonFly)
diff --git a/mail/thunderbird/patches/patch-mozilla_storage_src_mozStorageService.cpp b/mail/thunderbird/patches/patch-mozilla_storage_src_mozStorageService.cpp
deleted file mode 100644
index 9c4a68140e3..00000000000
--- a/mail/thunderbird/patches/patch-mozilla_storage_src_mozStorageService.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-mozilla_storage_src_mozStorageService.cpp,v 1.1 2012/04/28 16:56:59 ryoon Exp $
-
---- mozilla/storage/src/mozStorageService.cpp.orig	2012-04-20 22:40:23.000000000 +0000
-+++ mozilla/storage/src/mozStorageService.cpp
-@@ -515,7 +515,7 @@ sqlite3_vfs *ConstructTelemetryVFS();
- 
- #ifdef MOZ_MEMORY
- 
--#  if defined(XP_WIN) || defined(SOLARIS) || defined(ANDROID) || defined(XP_MACOSX)
-+#  if defined(XP_WIN) || defined(SOLARIS) || defined(ANDROID) || defined(XP_MACOSX) || defined(XP_BSD)
- #    include "jemalloc.h"
- #  elif defined(XP_LINUX)
- // jemalloc is directly linked into firefox-bin; libxul doesn't link
-@@ -565,7 +565,10 @@ static int sqliteMemSize(void *p)
- 
- static int sqliteMemRoundup(int n)
- {
--  n = je_malloc_usable_size_in_advance(n);
-+  if (je_malloc_usable_size_in_advance)
-+  {
-+      n = je_malloc_usable_size_in_advance(n);
-+  }
- 
-   // jemalloc can return blocks of size 2 and 4, but SQLite requires that all
-   // allocations be 8-aligned.  So we round up sub-8 requests to 8.  This
diff --git a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
index 830591f2295..b97c5cd6d6b 100644
--- a/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
+++ b/mail/thunderbird/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.1 2012/06/12 19:37:49 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.2 2012/07/19 17:57:30 ryoon Exp $
 
---- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-06-01 17:19:53.000000000 +0000
+--- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-07-12 15:25:26.000000000 +0000
 +++ mozilla/xpcom/idl-parser/Makefile.in
 @@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS)
  	$(PYTHON_PATH) \
- 	  -I$(topsrcdir)/other-licenses/ply \
+ 	  $(PLY_INCLUDE) \
  	  -I$(topsrcdir)/xpcom/idl-parser \
 -	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen
 +	  $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen