Update to 12.0

Changelog:
* Page Source now has line numbers
* Line breaks are now supported in the title attribute
* Improvements to "Find in Page" to center search result
* URLs pasted into the download manager window are now automatically downloaded
* Support for the text-align-last CSS property has been added
* Various security fixes
* Some TinyMCE-based editors failed to load (739141)

17 files changed, 396 insertions, 274 deletions

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 171c69fb334..2a664a751db 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.70 2012/03/21 10:40:25 drochner Exp $
+# $NetBSD: Makefile,v 1.71 2012/04/26 13:30:29 ryoon Exp $
 
 .include "dist.mk"
 PKGNAME=	xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	tnn@NetBSD.org
@@ -29,7 +28,7 @@ ALL_ENV+=		MOZILLA_PKG_NAME=xulrunner
 MAKE_ENV+=		FREEBL_NO_DEPEND=0
 
 # workround for link of xulrunner-bin etc.
-LDFLAGS+=		-Wl,-rpath,${PREFIX}/lib/xulrunner
+LDFLAGS+=		-Wl,-rpath,${PREFIX}/lib/xulrunner -Wl,-rpath,${PREFIX}/lib
 
 .include "mozilla-common.mk"
 .include "options.mk"
@@ -54,5 +53,9 @@ post-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/lib/xulrunner-sdk/sdk/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/dist/sdk/bin/xpt.py			\
 	  ${DESTDIR}${PREFIX}/lib/xulrunner-sdk/sdk/bin
+	${INSTALL_LIB} ${WRKSRC}/mozglue/build/libmozglue.a		\
+		${DESTDIR}${PREFIX}/lib/xulrunner
+	${INSTALL_LIB} ${WRKSRC}/mozglue/build/libmozglue.a		\
+		${DESTDIR}${PREFIX}/lib/xulrunner-sdk/sdk/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST
index dd479d87865..cc6dd2e2534 100644
--- a/devel/xulrunner/PLIST
+++ b/devel/xulrunner/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.40 2012/03/29 20:32:34 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.41 2012/04/26 13:30:29 ryoon Exp $
 bin/xulrunner
 include/xulrunner/AtkSocketAccessible.h
 include/xulrunner/BasicLayers.h
 include/xulrunner/CheckedInt.h
 include/xulrunner/CustomQS_Canvas2D.h
 include/xulrunner/CustomQS_WebGL.h
+include/xulrunner/DictionaryHelpers.h
 include/xulrunner/EGLUtils.h
+include/xulrunner/EventTracer.h
+include/xulrunner/ForceDiscreteGPUHelperCGL.h
 include/xulrunner/FrameLayerBuilder.h
 include/xulrunner/FramePropertyTable.h
 include/xulrunner/GLContext.h
@@ -14,15 +17,16 @@ include/xulrunner/GLContextProviderImpl.h
 include/xulrunner/GLContextSymbols.h
 include/xulrunner/GLDefs.h
 include/xulrunner/GLXLibrary.h
+include/xulrunner/GfxInfoCollector.h
 include/xulrunner/IJSDebugger.h
 include/xulrunner/IPC/IPCMessageUtils.h
-include/xulrunner/IPC/ShadowLayerUtils.h
 include/xulrunner/IPC/nsGUIEventIPC.h
 include/xulrunner/ImageErrors.h
 include/xulrunner/ImageLayers.h
 include/xulrunner/ImageLogging.h
 include/xulrunner/LayerManagerOGL.h
 include/xulrunner/LayerManagerOGLProgram.h
+include/xulrunner/LayerSorter.h
 include/xulrunner/Layers.h
 include/xulrunner/PCOMContentPermissionRequestChild.h
 include/xulrunner/PPrefTuple.h
@@ -34,17 +38,20 @@ include/xulrunner/a11yGeneric.h
 include/xulrunner/amIInstallTrigger.h
 include/xulrunner/amIWebInstallListener.h
 include/xulrunner/amIWebInstaller.h
-include/xulrunner/angle/ResourceLimits.h
 include/xulrunner/angle/ShaderLang.h
 include/xulrunner/chromium_types.h
 include/xulrunner/dmd.h
+include/xulrunner/dombindings.h
+include/xulrunner/dombindings_gen.h
 include/xulrunner/domstubs.h
+include/xulrunner/ds/BitArray.h
 include/xulrunner/expat.h
 include/xulrunner/expat_config.h
 include/xulrunner/expat_external.h
 include/xulrunner/extIApplication.h
 include/xulrunner/ftpCore.h
 include/xulrunner/gc/Barrier.h
+include/xulrunner/gc/Statistics.h
 include/xulrunner/gfx2DGlue.h
 include/xulrunner/gfx3DMatrix.h
 include/xulrunner/gfxASurface.h
@@ -64,6 +71,7 @@ include/xulrunner/gfxFontTest.h
 include/xulrunner/gfxFontUtils.h
 include/xulrunner/gfxGdkNativeRenderer.h
 include/xulrunner/gfxImageSurface.h
+include/xulrunner/gfxLineSegment.h
 include/xulrunner/gfxMatrix.h
 include/xulrunner/gfxPDFSurface.h
 include/xulrunner/gfxPSSurface.h
@@ -75,23 +83,23 @@ include/xulrunner/gfxPlatformGtk.h
 include/xulrunner/gfxPoint.h
 include/xulrunner/gfxPoint3D.h
 include/xulrunner/gfxPointH3D.h
+include/xulrunner/gfxQuad.h
 include/xulrunner/gfxQuaternion.h
 include/xulrunner/gfxRect.h
 include/xulrunner/gfxSharedImageSurface.h
 include/xulrunner/gfxSkipChars.h
 include/xulrunner/gfxTeeSurface.h
-include/xulrunner/gfxTextRunCache.h
-include/xulrunner/gfxTextRunWordCache.h
 include/xulrunner/gfxTypes.h
 include/xulrunner/gfxUnicodeProperties.h
 include/xulrunner/gfxUserFontSet.h
 include/xulrunner/gfxUtils.h
 include/xulrunner/gfxXlibNativeRenderer.h
 include/xulrunner/gfxXlibSurface.h
+include/xulrunner/gfxipc/ShadowLayerUtils.h
 include/xulrunner/graphite2/Font.h
+include/xulrunner/graphite2/Log.h
 include/xulrunner/graphite2/Segment.h
 include/xulrunner/graphite2/Types.h
-include/xulrunner/graphite2/XmlLog.h
 include/xulrunner/gtk2xtbin.h
 include/xulrunner/harfbuzz/hb-blob.h
 include/xulrunner/harfbuzz/hb-buffer.h
@@ -121,13 +129,17 @@ include/xulrunner/inIDeepTreeWalker.h
 include/xulrunner/inIFlasher.h
 include/xulrunner/inISearchObserver.h
 include/xulrunner/inISearchProcess.h
-${PLIST.jemalloc}include/xulrunner/jemalloc.h
-${PLIST.jemalloc}include/xulrunner/jemalloc_types.h
 include/xulrunner/jArray.h
 ${PLIST.jemalloc}include/xulrunner/jemalloc.h
 ${PLIST.jemalloc}include/xulrunner/jemalloc_types.h
 include/xulrunner/js-config.h
 include/xulrunner/js.msg
+include/xulrunner/js/HashTable.h
+include/xulrunner/js/LegacyIntTypes.h
+include/xulrunner/js/MemoryMetrics.h
+include/xulrunner/js/TemplateLib.h
+include/xulrunner/js/Utility.h
+include/xulrunner/js/Vector.h
 include/xulrunner/jsalloc.h
 include/xulrunner/jsapi.h
 include/xulrunner/jsatom.h
@@ -136,11 +148,9 @@ include/xulrunner/jscell.h
 include/xulrunner/jsclass.h
 include/xulrunner/jsclist.h
 include/xulrunner/jsclone.h
-include/xulrunner/jscntxt.h
 include/xulrunner/jscompat.h
-include/xulrunner/jscrashreport.h
+include/xulrunner/jscpucfg.h
 include/xulrunner/jsdIDebuggerService.h
-include/xulrunner/jsdate.h
 include/xulrunner/jsdbgapi.h
 include/xulrunner/jsdebug.h
 include/xulrunner/jsdhash.h
@@ -155,15 +165,11 @@ include/xulrunner/jsopcode.h
 include/xulrunner/jsopcode.tbl
 include/xulrunner/jsperf.h
 include/xulrunner/jsprf.h
-include/xulrunner/jspropertycache.h
-include/xulrunner/jspropertytree.h
 include/xulrunner/jsproto.tbl
 include/xulrunner/jsproxy.h
 include/xulrunner/jsprvtd.h
 include/xulrunner/jspubtd.h
-include/xulrunner/jsreflect.h
 include/xulrunner/jsstdint.h
-include/xulrunner/jsstr.h
 include/xulrunner/jstypedarray.h
 include/xulrunner/jstypes.h
 include/xulrunner/jsutil.h
@@ -172,6 +178,7 @@ include/xulrunner/jsversion.h
 include/xulrunner/jswrapper.h
 include/xulrunner/jsxdrapi.h
 include/xulrunner/mar.h
+include/xulrunner/mar_cmdline.h
 include/xulrunner/mozAutoDocUpdate.h
 include/xulrunner/mozFlushType.h
 include/xulrunner/mozIAsyncFavicons.h
@@ -210,24 +217,38 @@ include/xulrunner/mozStorageCID.h
 include/xulrunner/mozStorageHelper.h
 include/xulrunner/mozcontainer.h
 include/xulrunner/mozilla-config.h
+include/xulrunner/mozilla/Assertions.h
+include/xulrunner/mozilla/Attributes.h
 include/xulrunner/mozilla/AutoRestore.h
+include/xulrunner/mozilla/AvailableMemoryTracker.h
 include/xulrunner/mozilla/Base64.h
 include/xulrunner/mozilla/BlockingResourceBase.h
 include/xulrunner/mozilla/CharTokenizer.h
+include/xulrunner/mozilla/ClearOnShutdown.h
 include/xulrunner/mozilla/CondVar.h
 include/xulrunner/mozilla/DeadlockDetector.h
+include/xulrunner/mozilla/FileLocation.h
 include/xulrunner/mozilla/FileUtils.h
 include/xulrunner/mozilla/FunctionTimer.h
 include/xulrunner/mozilla/GenericFactory.h
+include/xulrunner/mozilla/GuardObjects.h
+include/xulrunner/mozilla/Hal.h
+include/xulrunner/mozilla/HalImpl.h
+include/xulrunner/mozilla/HalSandbox.h
+include/xulrunner/mozilla/HangMonitor.h
 include/xulrunner/mozilla/IHistory.h
 include/xulrunner/mozilla/IntentionalCrash.h
+include/xulrunner/mozilla/LazyIdleThread.h
+include/xulrunner/mozilla/LinkedList.h
 include/xulrunner/mozilla/LookAndFeel.h
+include/xulrunner/mozilla/MSStdInt.h
 include/xulrunner/mozilla/MapsMemoryReporter.h
 include/xulrunner/mozilla/Module.h
 include/xulrunner/mozilla/ModuleLoader.h
 include/xulrunner/mozilla/ModuleUtils.h
 include/xulrunner/mozilla/Monitor.h
 include/xulrunner/mozilla/Mutex.h
+include/xulrunner/mozilla/Observer.h
 include/xulrunner/mozilla/Omnijar.h
 include/xulrunner/mozilla/PaintTracker.h
 include/xulrunner/mozilla/PluginLibrary.h
@@ -239,6 +260,9 @@ include/xulrunner/mozilla/RefPtr.h
 include/xulrunner/mozilla/SSE.h
 include/xulrunner/mozilla/ServiceList.h
 include/xulrunner/mozilla/Services.h
+include/xulrunner/mozilla/StartupTimeline.h
+include/xulrunner/mozilla/StdInt.h
+include/xulrunner/mozilla/StringBuilder.h
 include/xulrunner/mozilla/Telemetry.h
 include/xulrunner/mozilla/TelemetryHistograms.h
 include/xulrunner/mozilla/TimeStamp.h
@@ -247,6 +271,8 @@ include/xulrunner/mozilla/Util.h
 include/xulrunner/mozilla/WidgetTraceEvent.h
 include/xulrunner/mozilla/X11Util.h
 include/xulrunner/mozilla/XPCOM.h
+include/xulrunner/mozilla/a11y/FocusManager.h
+include/xulrunner/mozilla/a11y/Role.h
 include/xulrunner/mozilla/a11y/States.h
 include/xulrunner/mozilla/arm.h
 include/xulrunner/mozilla/chrome/RegistryMessageUtils.h
@@ -266,6 +292,7 @@ include/xulrunner/mozilla/dom/ContentParent.h
 include/xulrunner/mozilla/dom/ContentProcess.h
 include/xulrunner/mozilla/dom/CrashReporterChild.h
 include/xulrunner/mozilla/dom/CrashReporterParent.h
+include/xulrunner/mozilla/dom/DOMError.h
 include/xulrunner/mozilla/dom/Element.h
 include/xulrunner/mozilla/dom/ExternalHelperAppChild.h
 include/xulrunner/mozilla/dom/ExternalHelperAppParent.h
@@ -275,7 +302,12 @@ include/xulrunner/mozilla/dom/StorageChild.h
 include/xulrunner/mozilla/dom/StorageParent.h
 include/xulrunner/mozilla/dom/StructuredCloneTags.h
 include/xulrunner/mozilla/dom/TabChild.h
+include/xulrunner/mozilla/dom/TabMessageUtils.h
 include/xulrunner/mozilla/dom/TabParent.h
+include/xulrunner/mozilla/dom/battery/Constants.h
+include/xulrunner/mozilla/dom/battery/Types.h
+include/xulrunner/mozilla/dom/indexedDB/FileInfo.h
+include/xulrunner/mozilla/dom/indexedDB/FileManager.h
 include/xulrunner/mozilla/dom/indexedDB/IDBCursor.h
 include/xulrunner/mozilla/dom/indexedDB/IDBDatabase.h
 include/xulrunner/mozilla/dom/indexedDB/IDBEvents.h
@@ -285,10 +317,21 @@ include/xulrunner/mozilla/dom/indexedDB/IDBKeyRange.h
 include/xulrunner/mozilla/dom/indexedDB/IDBObjectStore.h
 include/xulrunner/mozilla/dom/indexedDB/IDBRequest.h
 include/xulrunner/mozilla/dom/indexedDB/IDBTransaction.h
+include/xulrunner/mozilla/dom/indexedDB/IDBWrapperCache.h
 include/xulrunner/mozilla/dom/indexedDB/IndexedDatabase.h
 include/xulrunner/mozilla/dom/indexedDB/IndexedDatabaseManager.h
 include/xulrunner/mozilla/dom/indexedDB/Key.h
-include/xulrunner/mozilla/dom/indexedDB/LazyIdleThread.h
+include/xulrunner/mozilla/dom/network/Constants.h
+include/xulrunner/mozilla/dom/network/Types.h
+include/xulrunner/mozilla/dom/network/Utils.h
+include/xulrunner/mozilla/dom/sms/Constants.h
+include/xulrunner/mozilla/dom/sms/SmsChild.h
+include/xulrunner/mozilla/dom/sms/SmsMessage.h
+include/xulrunner/mozilla/dom/sms/SmsParent.h
+include/xulrunner/mozilla/dom/sms/SmsRequest.h
+include/xulrunner/mozilla/dom/sms/SmsRequestManager.h
+include/xulrunner/mozilla/dom/sms/SmsServicesFactory.h
+include/xulrunner/mozilla/dom/sms/Types.h
 include/xulrunner/mozilla/dom/workers/Workers.h
 include/xulrunner/mozilla/gfx/2D.h
 include/xulrunner/mozilla/gfx/BaseMargin.h
@@ -297,11 +340,14 @@ include/xulrunner/mozilla/gfx/BasePoint3D.h
 include/xulrunner/mozilla/gfx/BasePoint4D.h
 include/xulrunner/mozilla/gfx/BaseRect.h
 include/xulrunner/mozilla/gfx/BaseSize.h
+include/xulrunner/mozilla/gfx/Blur.h
 include/xulrunner/mozilla/gfx/Matrix.h
+include/xulrunner/mozilla/gfx/PathHelpers.h
 include/xulrunner/mozilla/gfx/Point.h
 include/xulrunner/mozilla/gfx/Rect.h
 include/xulrunner/mozilla/gfx/SharedDIB.h
 include/xulrunner/mozilla/gfx/Types.h
+include/xulrunner/mozilla/gfx/UserData.h
 include/xulrunner/mozilla/ipc/AsyncChannel.h
 include/xulrunner/mozilla/ipc/BrowserProcessSubThread.h
 include/xulrunner/mozilla/ipc/DocumentRendererChild.h
@@ -327,21 +373,18 @@ include/xulrunner/mozilla/ipc/TestShellParent.h
 include/xulrunner/mozilla/ipc/Transport.h
 include/xulrunner/mozilla/ipc/Transport_posix.h
 include/xulrunner/mozilla/ipc/XPCShellEnvironment.h
-include/xulrunner/mozilla/jetpack/Handle.h
-include/xulrunner/mozilla/jetpack/JetpackActorCommon.h
-include/xulrunner/mozilla/jetpack/JetpackChild.h
-include/xulrunner/mozilla/jetpack/JetpackParent.h
-include/xulrunner/mozilla/jetpack/JetpackProcessChild.h
-include/xulrunner/mozilla/jetpack/JetpackProcessParent.h
-include/xulrunner/mozilla/jetpack/JetpackService.h
 include/xulrunner/mozilla/jsipc/CPOWTypes.h
 include/xulrunner/mozilla/jsipc/ContextWrapperChild.h
 include/xulrunner/mozilla/jsipc/ContextWrapperParent.h
 include/xulrunner/mozilla/jsipc/ObjectWrapperChild.h
 include/xulrunner/mozilla/jsipc/ObjectWrapperParent.h
+include/xulrunner/mozilla/layers/CompositorChild.h
+include/xulrunner/mozilla/layers/CompositorCocoaWidgetHelper.h
+include/xulrunner/mozilla/layers/CompositorParent.h
 include/xulrunner/mozilla/layers/ShadowLayerUtilsX11.h
 include/xulrunner/mozilla/layers/ShadowLayers.h
 include/xulrunner/mozilla/layers/ShadowLayersChild.h
+include/xulrunner/mozilla/layers/ShadowLayersManager.h
 include/xulrunner/mozilla/layers/ShadowLayersParent.h
 include/xulrunner/mozilla/layout/FrameChildList.h
 include/xulrunner/mozilla/layout/RenderFrameChild.h
@@ -370,6 +413,7 @@ include/xulrunner/mozilla/net/WebSocketChannelChild.h
 include/xulrunner/mozilla/net/WebSocketChannelParent.h
 include/xulrunner/mozilla/net/WyciwygChannelChild.h
 include/xulrunner/mozilla/net/WyciwygChannelParent.h
+include/xulrunner/mozilla/places/Database.h
 include/xulrunner/mozilla/places/History.h
 include/xulrunner/mozilla/plugins/AStream.h
 include/xulrunner/mozilla/plugins/BrowserStreamChild.h
@@ -436,6 +480,7 @@ include/xulrunner/nsAppDirectoryServiceDefs.h
 include/xulrunner/nsAppShellCID.h
 include/xulrunner/nsArrayEnumerator.h
 include/xulrunner/nsArrayUtils.h
+include/xulrunner/nsAsyncDOMEvent.h
 include/xulrunner/nsAsyncRedirectVerifyHelper.h
 include/xulrunner/nsAtomListUtils.h
 include/xulrunner/nsAtomService.h
@@ -464,6 +509,7 @@ include/xulrunner/nsCRT.h
 include/xulrunner/nsCRTGlue.h
 include/xulrunner/nsCSSAnonBoxList.h
 include/xulrunner/nsCSSAnonBoxes.h
+include/xulrunner/nsCSSFontDescList.h
 include/xulrunner/nsCSSFrameConstructor.h
 include/xulrunner/nsCSSKeywordList.h
 include/xulrunner/nsCSSKeywords.h
@@ -492,7 +538,6 @@ include/xulrunner/nsChangeHint.h
 include/xulrunner/nsChannelProperties.h
 include/xulrunner/nsCharSeparatedTokenizer.h
 include/xulrunner/nsCharTraits.h
-include/xulrunner/nsCharsetDetectionAdaptorCID.h
 include/xulrunner/nsCheapSets.h
 include/xulrunner/nsClassHashtable.h
 include/xulrunner/nsClientRect.h
@@ -527,6 +572,7 @@ include/xulrunner/nsDOMCSSDeclaration.h
 include/xulrunner/nsDOMClassInfoClasses.h
 include/xulrunner/nsDOMClassInfoID.h
 include/xulrunner/nsDOMError.h
+include/xulrunner/nsDOMEventTargetHelper.h
 include/xulrunner/nsDOMEventTargetWrapperCache.h
 include/xulrunner/nsDOMFile.h
 include/xulrunner/nsDOMJSUtils.h
@@ -555,7 +601,6 @@ include/xulrunner/nsDocAccessibleWrap.h
 include/xulrunner/nsDocLoader.h
 include/xulrunner/nsDocShellCID.h
 include/xulrunner/nsDocShellLoadTypes.h
-include/xulrunner/nsDocumentCharsetInfoCID.h
 include/xulrunner/nsDoubleHashtable.h
 include/xulrunner/nsEditorCID.h
 include/xulrunner/nsEmbedCID.h
@@ -583,6 +628,7 @@ include/xulrunner/nsFormSubmission.h
 include/xulrunner/nsFrameList.h
 include/xulrunner/nsFrameManager.h
 include/xulrunner/nsFrameManagerBase.h
+include/xulrunner/nsFrameMessageManager.h
 include/xulrunner/nsFrameSelection.h
 include/xulrunner/nsFrameTraversal.h
 include/xulrunner/nsGTKToolkit.h
@@ -623,6 +669,7 @@ include/xulrunner/nsHtml5AtomList.h
 include/xulrunner/nsHtml5AtomTable.h
 include/xulrunner/nsHtml5Atoms.h
 include/xulrunner/nsHtml5ByteReadable.h
+include/xulrunner/nsHtml5DependentUTF16Buffer.h
 include/xulrunner/nsHtml5DocumentMode.h
 include/xulrunner/nsHtml5HtmlAttributes.h
 include/xulrunner/nsHtml5Macros.h
@@ -631,17 +678,20 @@ include/xulrunner/nsHtml5MetaScannerHSupplement.h
 include/xulrunner/nsHtml5Module.h
 include/xulrunner/nsHtml5NamedCharacters.h
 include/xulrunner/nsHtml5NamedCharactersAccel.h
+include/xulrunner/nsHtml5OwningUTF16Buffer.h
 include/xulrunner/nsHtml5Parser.h
 include/xulrunner/nsHtml5PendingNotification.h
 include/xulrunner/nsHtml5SVGLoadDispatcher.h
 include/xulrunner/nsHtml5Speculation.h
 include/xulrunner/nsHtml5SpeculativeLoad.h
 include/xulrunner/nsHtml5StreamParser.h
+include/xulrunner/nsHtml5StringParser.h
 include/xulrunner/nsHtml5TreeOpExecutor.h
 include/xulrunner/nsHtml5TreeOpStage.h
 include/xulrunner/nsHtml5TreeOperation.h
 include/xulrunner/nsHtml5UTF16Buffer.h
 include/xulrunner/nsHtml5UTF16BufferHSupplement.h
+include/xulrunner/nsHtml5ViewSourceUtils.h
 include/xulrunner/nsHttp.h
 include/xulrunner/nsHttpAtomList.h
 include/xulrunner/nsHttpHeaderArray.h
@@ -764,7 +814,6 @@ include/xulrunner/nsIChannelEventSink.h
 include/xulrunner/nsIChannelPolicy.h
 include/xulrunner/nsICharsetAlias.h
 include/xulrunner/nsICharsetConverterManager.h
-include/xulrunner/nsICharsetDetectionAdaptor.h
 include/xulrunner/nsICharsetDetectionObserver.h
 include/xulrunner/nsICharsetDetector.h
 include/xulrunner/nsIChildChannel.h
@@ -841,6 +890,7 @@ include/xulrunner/nsIDNSService.h
 include/xulrunner/nsIDOMAnimationEvent.h
 include/xulrunner/nsIDOMAttr.h
 include/xulrunner/nsIDOMBarProp.h
+include/xulrunner/nsIDOMBatteryManager.h
 include/xulrunner/nsIDOMBeforeUnloadEvent.h
 include/xulrunner/nsIDOMCDATASection.h
 include/xulrunner/nsIDOMCRMFObject.h
@@ -871,11 +921,13 @@ include/xulrunner/nsIDOMCloseEvent.h
 include/xulrunner/nsIDOMCommandEvent.h
 include/xulrunner/nsIDOMComment.h
 include/xulrunner/nsIDOMCompositionEvent.h
+include/xulrunner/nsIDOMConnection.h
 include/xulrunner/nsIDOMConstructor.h
 include/xulrunner/nsIDOMCounter.h
 include/xulrunner/nsIDOMCrypto.h
 include/xulrunner/nsIDOMCryptoDialogs.h
 include/xulrunner/nsIDOMCustomEvent.h
+include/xulrunner/nsIDOMDOMError.h
 include/xulrunner/nsIDOMDOMException.h
 include/xulrunner/nsIDOMDOMImplementation.h
 include/xulrunner/nsIDOMDOMSettableTokenList.h
@@ -1000,6 +1052,7 @@ include/xulrunner/nsIDOMMimeTypeArray.h
 include/xulrunner/nsIDOMModalContentWindow.h
 include/xulrunner/nsIDOMMouseEvent.h
 include/xulrunner/nsIDOMMouseScrollEvent.h
+include/xulrunner/nsIDOMMozBrowserFrame.h
 include/xulrunner/nsIDOMMozCSSKeyframeRule.h
 include/xulrunner/nsIDOMMozCSSKeyframesRule.h
 include/xulrunner/nsIDOMMozTouchEvent.h
@@ -1007,12 +1060,14 @@ include/xulrunner/nsIDOMMutationEvent.h
 include/xulrunner/nsIDOMNSEditableElement.h
 include/xulrunner/nsIDOMNSEvent.h
 include/xulrunner/nsIDOMNSRGBAColor.h
-include/xulrunner/nsIDOMNSRange.h
 include/xulrunner/nsIDOMNSXPathExpression.h
 include/xulrunner/nsIDOMNamedNodeMap.h
 include/xulrunner/nsIDOMNavigator.h
+include/xulrunner/nsIDOMNavigatorBattery.h
 include/xulrunner/nsIDOMNavigatorDesktopNotification.h
 include/xulrunner/nsIDOMNavigatorGeolocation.h
+include/xulrunner/nsIDOMNavigatorNetwork.h
+include/xulrunner/nsIDOMNavigatorSms.h
 include/xulrunner/nsIDOMNode.h
 include/xulrunner/nsIDOMNodeFilter.h
 include/xulrunner/nsIDOMNodeIterator.h
@@ -1102,11 +1157,13 @@ include/xulrunner/nsIDOMSVGSVGElement.h
 include/xulrunner/nsIDOMSVGScriptElement.h
 include/xulrunner/nsIDOMSVGSetElement.h
 include/xulrunner/nsIDOMSVGStopElement.h
+include/xulrunner/nsIDOMSVGStringList.h
 include/xulrunner/nsIDOMSVGStylable.h
 include/xulrunner/nsIDOMSVGStyleElement.h
 include/xulrunner/nsIDOMSVGSwitchElement.h
 include/xulrunner/nsIDOMSVGSymbolElement.h
 include/xulrunner/nsIDOMSVGTSpanElement.h
+include/xulrunner/nsIDOMSVGTests.h
 include/xulrunner/nsIDOMSVGTextContentElement.h
 include/xulrunner/nsIDOMSVGTextElement.h
 include/xulrunner/nsIDOMSVGTextPathElement.h
@@ -1127,6 +1184,12 @@ include/xulrunner/nsIDOMScrollAreaEvent.h
 include/xulrunner/nsIDOMSerializer.h
 include/xulrunner/nsIDOMSimpleGestureEvent.h
 include/xulrunner/nsIDOMSmartCardEvent.h
+include/xulrunner/nsIDOMSmsCursor.h
+include/xulrunner/nsIDOMSmsEvent.h
+include/xulrunner/nsIDOMSmsFilter.h
+include/xulrunner/nsIDOMSmsManager.h
+include/xulrunner/nsIDOMSmsMessage.h
+include/xulrunner/nsIDOMSmsRequest.h
 include/xulrunner/nsIDOMStorage.h
 include/xulrunner/nsIDOMStorageEvent.h
 include/xulrunner/nsIDOMStorageEventObsolete.h
@@ -1200,7 +1263,6 @@ include/xulrunner/nsIDocShellTreeItem.h
 include/xulrunner/nsIDocShellTreeNode.h
 include/xulrunner/nsIDocShellTreeOwner.h
 include/xulrunner/nsIDocument.h
-include/xulrunner/nsIDocumentCharsetInfo.h
 include/xulrunner/nsIDocumentEncoder.h
 include/xulrunner/nsIDocumentLoader.h
 include/xulrunner/nsIDocumentLoaderFactory.h
@@ -1288,6 +1350,7 @@ include/xulrunner/nsIFragmentContentSink.h
 include/xulrunner/nsIFrame.h
 include/xulrunner/nsIFrameLoader.h
 include/xulrunner/nsIFrameMessageManager.h
+include/xulrunner/nsIFrameRequestCallback.h
 include/xulrunner/nsIFrameTraversal.h
 include/xulrunner/nsIFrameUtil.h
 include/xulrunner/nsIGConfService.h
@@ -1338,6 +1401,7 @@ include/xulrunner/nsIIDBFactory.h
 include/xulrunner/nsIIDBIndex.h
 include/xulrunner/nsIIDBKeyRange.h
 include/xulrunner/nsIIDBObjectStore.h
+include/xulrunner/nsIIDBOpenDBRequest.h
 include/xulrunner/nsIIDBRequest.h
 include/xulrunner/nsIIDBTransaction.h
 include/xulrunner/nsIIDBVersionChangeEvent.h
@@ -1377,8 +1441,6 @@ include/xulrunner/nsIJSEventListener.h
 include/xulrunner/nsIJSNativeInitializer.h
 include/xulrunner/nsIJSON.h
 include/xulrunner/nsIJSRuntimeService.h
-include/xulrunner/nsIJetpack.h
-include/xulrunner/nsIJetpackService.h
 include/xulrunner/nsIKeyModule.h
 include/xulrunner/nsIKeygenThread.h
 include/xulrunner/nsILanguageAtomService.h
@@ -1399,7 +1461,6 @@ include/xulrunner/nsILocalFileWin.h
 include/xulrunner/nsILocalStore.h
 include/xulrunner/nsILocale.h
 include/xulrunner/nsILocaleService.h
-${PLIST.debug}include/xulrunner/nsILoggingSink.h
 include/xulrunner/nsILoginInfo.h
 include/xulrunner/nsILoginManager.h
 include/xulrunner/nsILoginManagerCrypto.h
@@ -1459,7 +1520,6 @@ include/xulrunner/nsIParentChannel.h
 include/xulrunner/nsIParentRedirectingChannel.h
 include/xulrunner/nsIParentalControlsService.h
 include/xulrunner/nsIParser.h
-include/xulrunner/nsIParserFilter.h
 include/xulrunner/nsIParserNode.h
 include/xulrunner/nsIParserService.h
 include/xulrunner/nsIPercentHeightObserver.h
@@ -1509,6 +1569,7 @@ include/xulrunner/nsIProfile.h
 include/xulrunner/nsIProfileChangeStatus.h
 include/xulrunner/nsIProfileMigrator.h
 include/xulrunner/nsIProfileUnlocker.h
+include/xulrunner/nsIProfiler.h
 include/xulrunner/nsIProgrammingLanguage.h
 include/xulrunner/nsIProgressEventSink.h
 include/xulrunner/nsIPrompt.h
@@ -1529,7 +1590,6 @@ include/xulrunner/nsIProxiedChannel.h
 include/xulrunner/nsIProxiedProtocolHandler.h
 include/xulrunner/nsIProxyAutoConfig.h
 include/xulrunner/nsIProxyInfo.h
-include/xulrunner/nsIProxyObjectManager.h
 include/xulrunner/nsIQueryContentEventResult.h
 include/xulrunner/nsIRDFCompositeDataSource.h
 include/xulrunner/nsIRDFContainer.h
@@ -1554,11 +1614,8 @@ include/xulrunner/nsIRDFXMLSource.h
 include/xulrunner/nsIRadioGroupContainer.h
 include/xulrunner/nsIRadioVisitor.h
 include/xulrunner/nsIRandomGenerator.h
-include/xulrunner/nsIRange.h
-include/xulrunner/nsIRangeUtils.h
 include/xulrunner/nsIReadConfig.h
 include/xulrunner/nsIRecentBadCertsService.h
-include/xulrunner/nsIRecyclingAllocator.h
 include/xulrunner/nsIRedirectChannelRegistrar.h
 include/xulrunner/nsIRedirectResultListener.h
 include/xulrunner/nsIReflowCallback.h
@@ -1651,6 +1708,8 @@ include/xulrunner/nsISimpleStreamListener.h
 include/xulrunner/nsISimpleTest.h
 include/xulrunner/nsISimpleUnicharStreamFactory.h
 include/xulrunner/nsISliderListener.h
+include/xulrunner/nsISmsDatabaseService.h
+include/xulrunner/nsISmsService.h
 include/xulrunner/nsISocketProvider.h
 include/xulrunner/nsISocketProviderService.h
 include/xulrunner/nsISocketTransport.h
@@ -1799,6 +1858,7 @@ include/xulrunner/nsIWebProgress.h
 include/xulrunner/nsIWebProgressListener.h
 include/xulrunner/nsIWebProgressListener2.h
 include/xulrunner/nsIWebShellServices.h
+include/xulrunner/nsIWebSocket.h
 include/xulrunner/nsIWebSocketChannel.h
 include/xulrunner/nsIWebSocketListener.h
 include/xulrunner/nsIWidget.h
@@ -1910,6 +1970,7 @@ include/xulrunner/nsPIPromptService.h
 include/xulrunner/nsPISocketTransportService.h
 include/xulrunner/nsPIWindowRoot.h
 include/xulrunner/nsPIWindowWatcher.h
+include/xulrunner/nsParserBase.h
 include/xulrunner/nsParserCIID.h
 include/xulrunner/nsParserConstants.h
 include/xulrunner/nsPluginDirServiceProvider.h
@@ -1931,16 +1992,15 @@ include/xulrunner/nsProfileDirServiceProvider.h
 include/xulrunner/nsPromiseFlatString.h
 include/xulrunner/nsPromptUtils.h
 include/xulrunner/nsPropertyTable.h
-include/xulrunner/nsProxiedService.h
 include/xulrunner/nsProxyRelease.h
 include/xulrunner/nsQueryFrame.h
 include/xulrunner/nsQuickSort.h
 include/xulrunner/nsRDFCID.h
 include/xulrunner/nsRDFResource.h
+include/xulrunner/nsRange.h
 include/xulrunner/nsReadLine.h
 include/xulrunner/nsReadableUtils.h
 include/xulrunner/nsRect.h
-include/xulrunner/nsRecyclingAllocator.h
 include/xulrunner/nsRefPtrHashtable.h
 include/xulrunner/nsReferencedElement.h
 include/xulrunner/nsRefreshDriver.h
@@ -2026,8 +2086,8 @@ include/xulrunner/nsTextFormatter.h
 include/xulrunner/nsTextFragment.h
 include/xulrunner/nsTextServicesCID.h
 include/xulrunner/nsThemeConstants.h
+include/xulrunner/nsThread.h
 include/xulrunner/nsThreadUtils.h
-include/xulrunner/nsThreadUtilsInternal.h
 include/xulrunner/nsToken.h
 include/xulrunner/nsToolkitCompsCID.h
 include/xulrunner/nsTraceRefcnt.h
@@ -2067,7 +2127,6 @@ include/xulrunner/nsWildCard.h
 include/xulrunner/nsWin32Locale.h
 include/xulrunner/nsWrapperCache.h
 include/xulrunner/nsXBLBinding.h
-include/xulrunner/nsXMLEncodingCID.h
 include/xulrunner/nsXMLNameSpaceMap.h
 include/xulrunner/nsXPCOM.h
 include/xulrunner/nsXPCOMCID.h
@@ -2093,13 +2152,120 @@ include/xulrunner/ots-memory-stream.h
 include/xulrunner/pldhash.h
 include/xulrunner/png.h
 include/xulrunner/pngconf.h
-include/xulrunner/prmjtime.h
 include/xulrunner/qcms.h
 include/xulrunner/qcmstypes.h
 include/xulrunner/rdf.h
 include/xulrunner/rdfIDataSource.h
 include/xulrunner/rdfISerializer.h
 include/xulrunner/rdfITripleVisitor.h
+include/xulrunner/readstrings.h
+include/xulrunner/sampler.h
+include/xulrunner/skia/Sk64.h
+include/xulrunner/skia/SkAdvancedTypefaceMetrics.h
+include/xulrunner/skia/SkAutoKern.h
+include/xulrunner/skia/SkBitmap.h
+include/xulrunner/skia/SkBlitRow.h
+include/xulrunner/skia/SkBlitter.h
+include/xulrunner/skia/SkBlurDrawLooper.h
+include/xulrunner/skia/SkBlurMaskFilter.h
+include/xulrunner/skia/SkBounder.h
+include/xulrunner/skia/SkBuffer.h
+include/xulrunner/skia/SkCanvas.h
+include/xulrunner/skia/SkChunkAlloc.h
+include/xulrunner/skia/SkClampRange.h
+include/xulrunner/skia/SkClipStack.h
+include/xulrunner/skia/SkColor.h
+include/xulrunner/skia/SkColorFilter.h
+include/xulrunner/skia/SkColorPriv.h
+include/xulrunner/skia/SkColorShader.h
+include/xulrunner/skia/SkComposeShader.h
+include/xulrunner/skia/SkDashPathEffect.h
+include/xulrunner/skia/SkData.h
+include/xulrunner/skia/SkDeque.h
+include/xulrunner/skia/SkDescriptor.h
+include/xulrunner/skia/SkDevice.h
+include/xulrunner/skia/SkDither.h
+include/xulrunner/skia/SkDraw.h
+include/xulrunner/skia/SkDrawFilter.h
+include/xulrunner/skia/SkDrawLooper.h
+include/xulrunner/skia/SkEdgeClipper.h
+include/xulrunner/skia/SkEmptyShader.h
+include/xulrunner/skia/SkEndian.h
+include/xulrunner/skia/SkFDot6.h
+include/xulrunner/skia/SkFixed.h
+include/xulrunner/skia/SkFlattenable.h
+include/xulrunner/skia/SkFloatBits.h
+include/xulrunner/skia/SkFloatingPoint.h
+include/xulrunner/skia/SkFontHost.h
+include/xulrunner/skia/SkGeometry.h
+include/xulrunner/skia/SkGlobals.h
+include/xulrunner/skia/SkGradientShader.h
+include/xulrunner/skia/SkGraphics.h
+include/xulrunner/skia/SkLayerDrawLooper.h
+include/xulrunner/skia/SkLayerRasterizer.h
+include/xulrunner/skia/SkLineClipper.h
+include/xulrunner/skia/SkMMapStream.h
+include/xulrunner/skia/SkMallocPixelRef.h
+include/xulrunner/skia/SkMask.h
+include/xulrunner/skia/SkMaskFilter.h
+include/xulrunner/skia/SkMath.h
+include/xulrunner/skia/SkMatrix.h
+include/xulrunner/skia/SkMetaData.h
+include/xulrunner/skia/SkOSFile.h
+include/xulrunner/skia/SkPackBits.h
+include/xulrunner/skia/SkPaint.h
+include/xulrunner/skia/SkPath.h
+include/xulrunner/skia/SkPathEffect.h
+include/xulrunner/skia/SkPathMeasure.h
+include/xulrunner/skia/SkPerspIter.h
+include/xulrunner/skia/SkPicture.h
+include/xulrunner/skia/SkPixelRef.h
+include/xulrunner/skia/SkPoint.h
+include/xulrunner/skia/SkPostConfig.h
+include/xulrunner/skia/SkPreConfig.h
+include/xulrunner/skia/SkPtrRecorder.h
+include/xulrunner/skia/SkRandom.h
+include/xulrunner/skia/SkRasterizer.h
+include/xulrunner/skia/SkReader32.h
+include/xulrunner/skia/SkRect.h
+include/xulrunner/skia/SkRefCnt.h
+include/xulrunner/skia/SkRefDict.h
+include/xulrunner/skia/SkRegion.h
+include/xulrunner/skia/SkRelay.h
+include/xulrunner/skia/SkScalar.h
+include/xulrunner/skia/SkScalarCompare.h
+include/xulrunner/skia/SkScalerContext.h
+include/xulrunner/skia/SkScan.h
+include/xulrunner/skia/SkShader.h
+include/xulrunner/skia/SkShape.h
+include/xulrunner/skia/SkSize.h
+include/xulrunner/skia/SkStream.h
+include/xulrunner/skia/SkString.h
+include/xulrunner/skia/SkStroke.h
+include/xulrunner/skia/SkTDArray.h
+include/xulrunner/skia/SkTDStack.h
+include/xulrunner/skia/SkTDict.h
+include/xulrunner/skia/SkTLazy.h
+include/xulrunner/skia/SkTRegistry.h
+include/xulrunner/skia/SkTScopedPtr.h
+include/xulrunner/skia/SkTSearch.h
+include/xulrunner/skia/SkTemplates.h
+include/xulrunner/skia/SkThread.h
+include/xulrunner/skia/SkThread_platform.h
+include/xulrunner/skia/SkTime.h
+include/xulrunner/skia/SkTrace.h
+include/xulrunner/skia/SkTypeface.h
+include/xulrunner/skia/SkTypes.h
+include/xulrunner/skia/SkUnPreMultiply.h
+include/xulrunner/skia/SkUnitMapper.h
+include/xulrunner/skia/SkUserConfig.h
+include/xulrunner/skia/SkUtils.h
+include/xulrunner/skia/SkWriter32.h
+include/xulrunner/skia/SkXfermode.h
+include/xulrunner/snappy/snappy-c.h
+include/xulrunner/snappy/snappy-stubs-public.h
+include/xulrunner/snappy/snappy.h
+include/xulrunner/sps_sampler.h
 include/xulrunner/string-template-def-char.h
 include/xulrunner/string-template-def-unichar.h
 include/xulrunner/string-template-undef.h
@@ -2108,13 +2274,15 @@ include/xulrunner/theora/codec.h
 include/xulrunner/theora/theora.h
 include/xulrunner/theora/theoradec.h
 include/xulrunner/theora/theoraenc.h
+include/xulrunner/thread_helper.h
 include/xulrunner/txIEXSLTRegExFunctions.h
 include/xulrunner/txIFunctionEvaluationContext.h
 include/xulrunner/txINodeSet.h
 include/xulrunner/txIXPathObject.h
 include/xulrunner/uconvutil.h
+include/xulrunner/updatedefines.h
+include/xulrunner/updatelogging.h
 include/xulrunner/vm/String.h
-include/xulrunner/vm/Unicode.h
 include/xulrunner/vorbis/codec.h
 include/xulrunner/xpcIJSGetFactory.h
 include/xulrunner/xpcIJSModuleLoader.h
@@ -2150,11 +2318,12 @@ lib/xulrunner-sdk/sdk/bin/ply/__init__.py
 lib/xulrunner-sdk/sdk/bin/ply/lex.py
 lib/xulrunner-sdk/sdk/bin/ply/yacc.py
 lib/xulrunner-sdk/sdk/bin/typelib.py
+lib/xulrunner-sdk/sdk/bin/xpidl.py
 lib/xulrunner-sdk/sdk/bin/xpidllex.py
 lib/xulrunner-sdk/sdk/bin/xpidlyacc.py
-lib/xulrunner-sdk/sdk/bin/xpidl.py
 lib/xulrunner-sdk/sdk/bin/xpt.py
 lib/xulrunner-sdk/sdk/lib/libmozalloc.so
+lib/xulrunner-sdk/sdk/lib/libmozglue.a
 lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a
 lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a.desc
 lib/xulrunner-sdk/sdk/lib/libxpcom.so
@@ -2231,6 +2400,7 @@ lib/xulrunner/chrome/en-US/locale/en-US/global/keys.properties
 lib/xulrunner/chrome/en-US/locale/en-US/global/languageNames.properties
 lib/xulrunner/chrome/en-US/locale/en-US/global/layout/HtmlForm.properties
 lib/xulrunner/chrome/en-US/locale/en-US/global/layout/MediaDocument.properties
+lib/xulrunner/chrome/en-US/locale/en-US/global/layout/htmlparser.properties
 lib/xulrunner/chrome/en-US/locale/en-US/global/layout/xmlparser.properties
 lib/xulrunner/chrome/en-US/locale/en-US/global/layout_errors.properties
 lib/xulrunner/chrome/en-US/locale/en-US/global/mozilla.dtd
@@ -2493,6 +2663,7 @@ lib/xulrunner/chrome/toolkit/content/global/test-ipcbrowser-chrome.js
 lib/xulrunner/chrome/toolkit/content/global/test-ipcbrowser-content.js
 lib/xulrunner/chrome/toolkit/content/global/test-ipcbrowser.xul
 lib/xulrunner/chrome/toolkit/content/global/textbox.css
+lib/xulrunner/chrome/toolkit/content/global/treeUtils.js
 lib/xulrunner/chrome/toolkit/content/global/viewPartialSource.js
 lib/xulrunner/chrome/toolkit/content/global/viewPartialSource.xul
 lib/xulrunner/chrome/toolkit/content/global/viewSource.css
@@ -2707,6 +2878,7 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/inContentUI.css
 lib/xulrunner/chrome/toolkit/skin/classic/global/inContentUI/background-texture.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/linkTree.css
 lib/xulrunner/chrome/toolkit/skin/classic/global/listbox.css
+lib/xulrunner/chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/error.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/fullscreenButton.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/muteButton.png
@@ -2717,6 +2889,7 @@ lib/xulrunner/chrome/toolkit/skin/classic/global/media/scrubberThumbWide.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/stalled.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/throbber.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/unmuteButton.png
+lib/xulrunner/chrome/toolkit/skin/classic/global/media/videoClickToPlayButton.svg
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/videocontrols.css
 lib/xulrunner/chrome/toolkit/skin/classic/global/media/volumeThumb.png
 lib/xulrunner/chrome/toolkit/skin/classic/global/menu.css
@@ -2778,6 +2951,7 @@ lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/alerticon-warning.p
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/blocklist.css
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/cancel.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-available.png
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-extensions.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-languages.png
@@ -2786,6 +2960,8 @@ lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-search.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-searchengines.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-themes.png
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric-16.png
+lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/discover-logo.png
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/eula.css
 lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.png
@@ -2849,6 +3025,7 @@ lib/xulrunner/components/TelemetryPing.manifest
 lib/xulrunner/components/addonManager.js
 lib/xulrunner/components/amContentHandler.js
 lib/xulrunner/components/amWebInstallListener.js
+${PLIST.gnome}lib/xulrunner/components/components.manifest
 lib/xulrunner/components/contentAreaDropListener.js
 lib/xulrunner/components/contentAreaDropListener.manifest
 lib/xulrunner/components/contentSecurityPolicy.js
@@ -2858,6 +3035,9 @@ lib/xulrunner/components/extensions.manifest
 lib/xulrunner/components/interfaces.manifest
 lib/xulrunner/components/jsconsole-clhandler.js
 lib/xulrunner/components/jsconsole-clhandler.manifest
+${PLIST.gnome}lib/xulrunner/components/libdbusservice.so
+${PLIST.gnome}lib/xulrunner/components/libmozgnome.so
+${PLIST.gnome}lib/xulrunner/components/libnkgnomevfs.so
 lib/xulrunner/components/messageWakeupService.js
 lib/xulrunner/components/messageWakeupService.manifest
 lib/xulrunner/components/nsBadCertHandler.js
@@ -2971,6 +3151,7 @@ lib/xulrunner/hyphenation/hyph_tr.dic
 lib/xulrunner/hyphenation/hyph_uk.dic
 lib/xulrunner/icons/updater.png
 lib/xulrunner/libmozalloc.so
+lib/xulrunner/libmozglue.a
 lib/xulrunner/libunicharutil_external_s.a
 lib/xulrunner/libxpcom.so
 lib/xulrunner/libxpcomglue.a
@@ -2982,6 +3163,7 @@ lib/xulrunner/modules/AddonRepository.jsm
 lib/xulrunner/modules/AddonUpdateChecker.jsm
 lib/xulrunner/modules/CSPUtils.jsm
 lib/xulrunner/modules/CertUtils.jsm
+lib/xulrunner/modules/ChromeManifestParser.jsm
 lib/xulrunner/modules/CommonDialog.jsm
 lib/xulrunner/modules/ConsoleAPIStorage.jsm
 lib/xulrunner/modules/Dict.jsm
@@ -3004,7 +3186,9 @@ lib/xulrunner/modules/PluginProvider.jsm
 lib/xulrunner/modules/PluralForm.jsm
 lib/xulrunner/modules/PopupNotifications.jsm
 lib/xulrunner/modules/Profiler.jsm
+lib/xulrunner/modules/PropertyListUtils.jsm
 lib/xulrunner/modules/Services.jsm
+lib/xulrunner/modules/SpellCheckDictionaryBootstrap.js
 lib/xulrunner/modules/WindowDraggingUtils.jsm
 lib/xulrunner/modules/XPCOMUtils.jsm
 lib/xulrunner/modules/XPIProvider.jsm
@@ -3287,6 +3471,7 @@ share/idl/xulrunner/nsIDNSService.idl
 share/idl/xulrunner/nsIDOMAnimationEvent.idl
 share/idl/xulrunner/nsIDOMAttr.idl
 share/idl/xulrunner/nsIDOMBarProp.idl
+share/idl/xulrunner/nsIDOMBatteryManager.idl
 share/idl/xulrunner/nsIDOMBeforeUnloadEvent.idl
 share/idl/xulrunner/nsIDOMCDATASection.idl
 share/idl/xulrunner/nsIDOMCRMFObject.idl
@@ -3316,11 +3501,13 @@ share/idl/xulrunner/nsIDOMCloseEvent.idl
 share/idl/xulrunner/nsIDOMCommandEvent.idl
 share/idl/xulrunner/nsIDOMComment.idl
 share/idl/xulrunner/nsIDOMCompositionEvent.idl
+share/idl/xulrunner/nsIDOMConnection.idl
 share/idl/xulrunner/nsIDOMConstructor.idl
 share/idl/xulrunner/nsIDOMCounter.idl
 share/idl/xulrunner/nsIDOMCrypto.idl
 share/idl/xulrunner/nsIDOMCryptoDialogs.idl
 share/idl/xulrunner/nsIDOMCustomEvent.idl
+share/idl/xulrunner/nsIDOMDOMError.idl
 share/idl/xulrunner/nsIDOMDOMException.idl
 share/idl/xulrunner/nsIDOMDOMImplementation.idl
 share/idl/xulrunner/nsIDOMDOMSettableTokenList.idl
@@ -3445,6 +3632,7 @@ share/idl/xulrunner/nsIDOMMimeTypeArray.idl
 share/idl/xulrunner/nsIDOMModalContentWindow.idl
 share/idl/xulrunner/nsIDOMMouseEvent.idl
 share/idl/xulrunner/nsIDOMMouseScrollEvent.idl
+share/idl/xulrunner/nsIDOMMozBrowserFrame.idl
 share/idl/xulrunner/nsIDOMMozCSSKeyframeRule.idl
 share/idl/xulrunner/nsIDOMMozCSSKeyframesRule.idl
 share/idl/xulrunner/nsIDOMMozTouchEvent.idl
@@ -3452,12 +3640,13 @@ share/idl/xulrunner/nsIDOMMutationEvent.idl
 share/idl/xulrunner/nsIDOMNSEditableElement.idl
 share/idl/xulrunner/nsIDOMNSEvent.idl
 share/idl/xulrunner/nsIDOMNSRGBAColor.idl
-share/idl/xulrunner/nsIDOMNSRange.idl
 share/idl/xulrunner/nsIDOMNSXPathExpression.idl
 share/idl/xulrunner/nsIDOMNamedNodeMap.idl
 share/idl/xulrunner/nsIDOMNavigator.idl
+share/idl/xulrunner/nsIDOMNavigatorBattery.idl
 share/idl/xulrunner/nsIDOMNavigatorDesktopNotification.idl
 share/idl/xulrunner/nsIDOMNavigatorGeolocation.idl
+share/idl/xulrunner/nsIDOMNavigatorNetwork.idl
 share/idl/xulrunner/nsIDOMNavigatorSms.idl
 share/idl/xulrunner/nsIDOMNode.idl
 share/idl/xulrunner/nsIDOMNodeFilter.idl
@@ -3548,11 +3737,13 @@ share/idl/xulrunner/nsIDOMSVGSVGElement.idl
 share/idl/xulrunner/nsIDOMSVGScriptElement.idl
 share/idl/xulrunner/nsIDOMSVGSetElement.idl
 share/idl/xulrunner/nsIDOMSVGStopElement.idl
+share/idl/xulrunner/nsIDOMSVGStringList.idl
 share/idl/xulrunner/nsIDOMSVGStylable.idl
 share/idl/xulrunner/nsIDOMSVGStyleElement.idl
 share/idl/xulrunner/nsIDOMSVGSwitchElement.idl
 share/idl/xulrunner/nsIDOMSVGSymbolElement.idl
 share/idl/xulrunner/nsIDOMSVGTSpanElement.idl
+share/idl/xulrunner/nsIDOMSVGTests.idl
 share/idl/xulrunner/nsIDOMSVGTextContentElement.idl
 share/idl/xulrunner/nsIDOMSVGTextElement.idl
 share/idl/xulrunner/nsIDOMSVGTextPathElement.idl
@@ -3572,9 +3763,12 @@ share/idl/xulrunner/nsIDOMScrollAreaEvent.idl
 share/idl/xulrunner/nsIDOMSerializer.idl
 share/idl/xulrunner/nsIDOMSimpleGestureEvent.idl
 share/idl/xulrunner/nsIDOMSmartCardEvent.idl
+share/idl/xulrunner/nsIDOMSmsCursor.idl
 share/idl/xulrunner/nsIDOMSmsEvent.idl
+share/idl/xulrunner/nsIDOMSmsFilter.idl
 share/idl/xulrunner/nsIDOMSmsManager.idl
 share/idl/xulrunner/nsIDOMSmsMessage.idl
+share/idl/xulrunner/nsIDOMSmsRequest.idl
 share/idl/xulrunner/nsIDOMStorage.idl
 share/idl/xulrunner/nsIDOMStorageEvent.idl
 share/idl/xulrunner/nsIDOMStorageEventObsolete.idl
@@ -3644,7 +3838,6 @@ share/idl/xulrunner/nsIDocShellLoadInfo.idl
 share/idl/xulrunner/nsIDocShellTreeItem.idl
 share/idl/xulrunner/nsIDocShellTreeNode.idl
 share/idl/xulrunner/nsIDocShellTreeOwner.idl
-share/idl/xulrunner/nsIDocumentCharsetInfo.idl
 share/idl/xulrunner/nsIDocumentEncoder.idl
 share/idl/xulrunner/nsIDocumentLoader.idl
 share/idl/xulrunner/nsIDocumentLoaderFactory.idl
@@ -3765,6 +3958,7 @@ share/idl/xulrunner/nsIIDBFactory.idl
 share/idl/xulrunner/nsIIDBIndex.idl
 share/idl/xulrunner/nsIIDBKeyRange.idl
 share/idl/xulrunner/nsIIDBObjectStore.idl
+share/idl/xulrunner/nsIIDBOpenDBRequest.idl
 share/idl/xulrunner/nsIIDBRequest.idl
 share/idl/xulrunner/nsIIDBTransaction.idl
 share/idl/xulrunner/nsIIDBVersionChangeEvent.idl
@@ -3800,8 +3994,6 @@ share/idl/xulrunner/nsIJSContextStack.idl
 share/idl/xulrunner/nsIJSEngineTelemetryStats.idl
 share/idl/xulrunner/nsIJSON.idl
 share/idl/xulrunner/nsIJSRuntimeService.idl
-share/idl/xulrunner/nsIJetpack.idl
-share/idl/xulrunner/nsIJetpackService.idl
 share/idl/xulrunner/nsIKeyModule.idl
 share/idl/xulrunner/nsIKeygenThread.idl
 share/idl/xulrunner/nsILineInputStream.idl
@@ -3920,7 +4112,6 @@ share/idl/xulrunner/nsIProxiedChannel.idl
 share/idl/xulrunner/nsIProxiedProtocolHandler.idl
 share/idl/xulrunner/nsIProxyAutoConfig.idl
 share/idl/xulrunner/nsIProxyInfo.idl
-share/idl/xulrunner/nsIProxyObjectManager.idl
 share/idl/xulrunner/nsIQueryContentEventResult.idl
 share/idl/xulrunner/nsIRDFCompositeDataSource.idl
 share/idl/xulrunner/nsIRDFContainer.idl
@@ -3944,7 +4135,6 @@ share/idl/xulrunner/nsIRDFXMLSource.idl
 share/idl/xulrunner/nsIRandomGenerator.idl
 share/idl/xulrunner/nsIReadConfig.idl
 share/idl/xulrunner/nsIRecentBadCertsService.idl
-share/idl/xulrunner/nsIRecyclingAllocator.idl
 share/idl/xulrunner/nsIRedirectChannelRegistrar.idl
 share/idl/xulrunner/nsIRedirectResultListener.idl
 share/idl/xulrunner/nsIRefreshURI.idl
@@ -4018,6 +4208,7 @@ share/idl/xulrunner/nsISimpleStreamListener.idl
 share/idl/xulrunner/nsISimpleTest.idl
 share/idl/xulrunner/nsISimpleUnicharStreamFactory.idl
 share/idl/xulrunner/nsISliderListener.idl
+share/idl/xulrunner/nsISmsDatabaseService.idl
 share/idl/xulrunner/nsISmsService.idl
 share/idl/xulrunner/nsISocketProvider.idl
 share/idl/xulrunner/nsISocketProviderService.idl
@@ -4213,84 +4404,4 @@ share/idl/xulrunner/xpcIJSWeakReference.idl
 share/idl/xulrunner/xpccomponents.idl
 share/idl/xulrunner/xpcexception.idl
 share/idl/xulrunner/xpcjsid.idl
-include/xulrunner/LayerSorter.h
-include/xulrunner/dombindings_gen.h
-include/xulrunner/ds/BitArray.h
-include/xulrunner/ds/LifoAlloc.h
-include/xulrunner/gc/Statistics.h
-include/xulrunner/gfxLineSegment.h
-include/xulrunner/gfxQuad.h
-include/xulrunner/js/HashTable.h
-include/xulrunner/js/LegacyIntTypes.h
-include/xulrunner/js/TemplateLib.h
-include/xulrunner/js/Utility.h
-include/xulrunner/js/Vector.h
-include/xulrunner/jscpucfg.h
-include/xulrunner/mozilla/Hal.h
-include/xulrunner/mozilla/HalImpl.h
-include/xulrunner/mozilla/HalSandbox.h
-include/xulrunner/mozilla/Observer.h
-include/xulrunner/mozilla/a11y/FocusManager.h
-include/xulrunner/mozilla/dom/TabMessageUtils.h
-include/xulrunner/mozilla/dom/battery/Constants.h
-include/xulrunner/mozilla/dom/battery/Types.h
-include/xulrunner/mozilla/gfx/PathHelpers.h
-include/xulrunner/mozilla/places/Database.h
-include/xulrunner/nsHtml5DependentUTF16Buffer.h
-include/xulrunner/nsHtml5OwningUTF16Buffer.h
-include/xulrunner/nsIDOMBatteryManager.h
-include/xulrunner/nsIDOMNavigatorBattery.h
-include/xulrunner/nsIIDBOpenDBRequest.h
-include/xulrunner/sampler.h
-include/xulrunner/sps_sampler.h
-include/xulrunner/vm/StackSpace.h
-lib/xulrunner/chrome/en-US/locale/en-US/global/layout/htmlparser.properties
-lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
-lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric-16.png
-lib/xulrunner/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
-lib/xulrunner/modules/ChromeManifestParser.jsm
-lib/xulrunner/modules/SpellCheckDictionaryBootstrap.js
-share/idl/xulrunner/nsIDOMBatteryManager.idl
-share/idl/xulrunner/nsIDOMNavigatorBattery.idl
-share/idl/xulrunner/nsIIDBOpenDBRequest.idl
-include/xulrunner/EventTracer.h
-include/xulrunner/GfxInfoCollector.h
-include/xulrunner/mozilla/Attributes.h
-include/xulrunner/mozilla/AvailableMemoryTracker.h
-include/xulrunner/mozilla/ClearOnShutdown.h
-include/xulrunner/mozilla/FileLocation.h
-include/xulrunner/mozilla/GuardObjects.h
-include/xulrunner/mozilla/HangMonitor.h
-include/xulrunner/mozilla/MSStdInt.h
-include/xulrunner/mozilla/StartupTimeline.h
-include/xulrunner/mozilla/StdInt.h
-include/xulrunner/mozilla/dom/indexedDB/FileInfo.h
-include/xulrunner/mozilla/dom/indexedDB/FileManager.h
-include/xulrunner/mozilla/dom/sms/Constants.h
-include/xulrunner/mozilla/dom/sms/SmsChild.h
-include/xulrunner/mozilla/dom/sms/SmsMessage.h
-include/xulrunner/mozilla/dom/sms/SmsParent.h
-include/xulrunner/mozilla/dom/sms/SmsServiceFactory.h
-include/xulrunner/mozilla/dom/sms/Types.h
-include/xulrunner/mozilla/gfx/Blur.h
-include/xulrunner/nsAsyncDOMEvent.h
-include/xulrunner/nsDOMEventTargetHelper.h
-include/xulrunner/nsFrameMessageManager.h
-include/xulrunner/nsHtml5ViewSourceUtils.h
-include/xulrunner/nsIDOMNavigatorSms.h
-include/xulrunner/nsIDOMSmsEvent.h
-include/xulrunner/nsIDOMSmsManager.h
-include/xulrunner/nsIDOMSmsMessage.h
-include/xulrunner/nsIFrameRequestCallback.h
-include/xulrunner/nsIProfiler.h
-include/xulrunner/nsISmsService.h
-include/xulrunner/nsIWebSocket.h
-include/xulrunner/nsThread.h
-include/xulrunner/snappy/snappy-c.h
-include/xulrunner/snappy/snappy-stubs-public.h
-include/xulrunner/snappy/snappy.h
-include/xulrunner/thread_helper.h
-${PLIST.gnome}lib/xulrunner/components/components.manifest
-${PLIST.gnome}lib/xulrunner/components/libdbusservice.so
-${PLIST.gnome}lib/xulrunner/components/libmozgnome.so
-${PLIST.gnome}lib/xulrunner/components/libnkgnomevfs.so
+@pkgdir lib/xulrunner/plugins
diff --git a/devel/xulrunner/dist.mk b/devel/xulrunner/dist.mk
index 3a6145d39ce..87ecde9a6d2 100644
--- a/devel/xulrunner/dist.mk
+++ b/devel/xulrunner/dist.mk
@@ -1,15 +1,14 @@
-# $NetBSD: dist.mk,v 1.29 2012/03/15 08:30:06 ryoon Exp $
+# $NetBSD: dist.mk,v 1.30 2012/04/26 13:30:29 ryoon Exp $
 #
-# used by devel/nspr/Makefile
-# used by devel/nss/Makefile
 # used by devel/xulrunner/Makefile
 # used by www/firefox/Makefile
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=	11.0
+MOZ_BRANCH=	12.0
 MOZ_BRANCH_MINOR=	
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
+MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} \
+		${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.bz2
 
 DISTINFO_FILE=	${.CURDIR}/../../devel/xulrunner/distinfo
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo
index a2074338630..80d7b4038b2 100644
--- a/devel/xulrunner/distinfo
+++ b/devel/xulrunner/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.67 2012/04/01 15:18:45 ryoon Exp $
+$NetBSD: distinfo,v 1.68 2012/04/26 13:30:29 ryoon Exp $
 
-SHA1 (firefox-11.0.source.tar.bz2) = 0b05f91b81803010502cf89f54c3d0187fb63d7e
-RMD160 (firefox-11.0.source.tar.bz2) = 13b7c7327063625904d00b58a6d6f15c04918e92
-Size (firefox-11.0.source.tar.bz2) = 78548401 bytes
-SHA1 (patch-aa) = 93efde3dab747f80a575cd7c10c045967531bb53
+SHA1 (firefox-12.0.source.tar.bz2) = 0177185e54b7d63dc36bd5bd5c80ba6afd52e199
+RMD160 (firefox-12.0.source.tar.bz2) = d83eb97543fc09f84b30a46ba8217c17f30bd572
+Size (firefox-12.0.source.tar.bz2) = 78956707 bytes
+SHA1 (patch-aa) = e4ed60efb771b1d3cae3641dd9db5fc3f22739f1
 SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997
 SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129
 SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
@@ -13,7 +13,7 @@ SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0
 SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
 SHA1 (patch-aj) = 78803641532203f878fc99ead9a440b8bf425aeb
 SHA1 (patch-ak) = 748dfb52230f384d58a9ed725d786f536a5c1a3f
-SHA1 (patch-al) = a8397fe9087a088169c639b42522306824f013b7
+SHA1 (patch-al) = c37fb66e199e301e08faae529c4b5a644b76e667
 SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
 SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
 SHA1 (patch-ao) = 353d2098564c7b29849b6f5f4f80d9ac393b23f3
@@ -29,11 +29,11 @@ SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
 SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30
 SHA1 (patch-bf) = e9a80a7a663517977d38911c2246ba4de2e1a59b
 SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759
-SHA1 (patch-bi) = b190a1c338550b70b65c02f29639338708295075
-SHA1 (patch-build_autoconf_gcc-pr49911.m4) = 252dbdf1c319e17455b5225254281b656dbb397b
+SHA1 (patch-bi) = d4601e7c284ff9dc31bb9f7065aa35d75c2993af
 SHA1 (patch-build_autoconf_nss.m4) = 2cd3f2d824273fe58c1a1f0a4b05605430ed3471
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = b4ce48ef10635feef8ac48017e03737f4a259d95
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = b036f543f2e8502c216164e80aafe7844ae4de54
+SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = ab986ba116c003a5bd2012478a275425b87be2e5
 SHA1 (patch-ipc_chromium_Makefile.in) = 050bfd7911f72b677c12e6f51ba0783a3356a367
 SHA1 (patch-ipc_chromium_chromium-config.mk) = cca3892f4f114dea7d2987d52aee862ea9c3fc33
 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = de42f64a1484ab6570637643ee79ec2e60d9ea01
@@ -56,7 +56,6 @@ SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 27ac2b7dbe1b
 SHA1 (patch-ipc_chromium_src_chrome_common_ipc__message__utils.h) = fb31bc5e58615d0297c714e8ba500e51fd2813bc
 SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = b55156f1cb5a115a3dcec2d22195fc8763c97e00
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 0e22486a1df8f5a726f675cd6055f8a455d16d9d
-SHA1 (patch-js_src_build_autoconf_gcc-pr49911.m4) = 28d546bd51cc9fe556a6f92365bdafd335629fb1
 SHA1 (patch-js_src_jscpucfg.h) = 79829d8e9fa2c3dcba07d1d90a6cf1f635791d97
 SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = aec956a2cb35ce4dffb87fded52b8436781dab85
 SHA1 (patch-js_src_yarr_pcre_pcre.h) = cf86b885ac222854a62c6ab98dad338bd76cd7d1
@@ -64,6 +63,7 @@ SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
 SHA1 (patch-mb) = 82d8243d7f7aadfad77a14df0f57c39bc93ced8a
 SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
 SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
+SHA1 (patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c) = e257c6873e426e1d037f7eb24ecc3ce4b8e329d0
 SHA1 (patch-media_libvpx_vpx__config.h) = 2be4f01b6a603a8cf8c1d5e31e98b3ee404702b6
 SHA1 (patch-media_libvpx_vpx__config__c.c) = 03be90f07f98b743b61048ad3f7390dcce77e89d
 SHA1 (patch-mf) = de2d47132013a1f6fd12a0893d21eb34dd843b3e
@@ -73,7 +73,7 @@ SHA1 (patch-mi) = 1a031ea9be110822995094c84f77c3c68f5c2a39
 SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
 SHA1 (patch-mk) = 5020178423260e37aa736f4fa4d5ec46ed48b7ea
 SHA1 (patch-ml) = ffec4dcae4a4e3683eebfc3e8aaafe15fa27443e
-SHA1 (patch-mm) = 4f13d4cd2329f6a062ca31df89f3198f956f35ae
+SHA1 (patch-mm) = 59a2c116f74db483cf1f1bbc003da541b5d1ee60
 SHA1 (patch-mn) = a59f31b58547657b96a45a2753aab93866940203
 SHA1 (patch-mp) = 18d2490b6bcd4f017cbf2734a920c3830bfe8856
 SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = d6b370377d5c397eda9b79bf2093066e9af9a35b
@@ -90,7 +90,9 @@ SHA1 (patch-pd) = 97e4c26d7b72a3ad1cbc6da5cf14431074d178e6
 SHA1 (patch-pg) = 12b5dc13c798b7d4b7fe0bca487d0f43c0dec2a7
 SHA1 (patch-rc) = fb3ae1a38eabf3f7c47e86d8ff62f79496b9bf67
 SHA1 (patch-security_nss_cmd_shlibsign_sign.sh) = 0f4a691aacd5f58ab59ce7f11e22b4f6714e6938
-SHA1 (patch-toolkit_toolkit-tiers.mk) = 53bbd10f337907d4a74a661719ab6637090b74c8
+SHA1 (patch-storage_src_Makefile.in) = 13270423f117b161c15c91c99cf1830129e826e7
+SHA1 (patch-storage_src_mozStorageService.cpp) = e8817b6cdb51b3d8bd99488fb596456896ddf8c7
+SHA1 (patch-toolkit_toolkit-tiers.mk) = f314eb57e45e43d36530403b79e56e57bdfd830e
 SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
 SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
 SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
@@ -105,4 +107,3 @@ SHA1 (patch-xm) = 072240b71e4738e96d258fcd481698464623735e
 SHA1 (patch-xn) = b0d0943b2bc39d8395055550c0fedfa447a5de01
 SHA1 (patch-xo) = 437cbc7e0ed8777ae2313165f8754759d8eee01d
 SHA1 (patch-xpcom_Makefile.in) = ad9c0ed4347b0ed4f51a6f0f34ac48c65d2152c8
-SHA1 (patch-xpcom_idl-parser_header.py) = cd14f4056a31f15066aebb85e5c14fba2aa37f13
diff --git a/devel/xulrunner/options.mk b/devel/xulrunner/options.mk
index 3ebc190879a..d2b93a28b83 100644
--- a/devel/xulrunner/options.mk
+++ b/devel/xulrunner/options.mk
@@ -1,25 +1,14 @@
-# $NetBSD: options.mk,v 1.12 2012/03/06 12:34:08 ryoon Exp $
+# $NetBSD: options.mk,v 1.13 2012/04/26 13:30:29 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xulrunner
 PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome pulseaudio
 
-PLIST_VARS+=	jit gnome jemalloc debug
+PLIST_VARS+=	gnome jemalloc debug
 
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PKG_SUGGESTED_OPTIONS+=	mozilla-jemalloc
 .endif
 
-.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc*) || \
-	!empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
-PKG_SUPPORTED_OPTIONS+=	mozilla-jit
-PKG_SUGGESTED_OPTIONS+=	mozilla-jit
-NANOJIT_ARCH.i386=	i386
-NANOJIT_ARCH.arm=	ARM
-NANOJIT_ARCH.sparc=	Sparc
-NANOJIT_ARCH.sparc64=	Sparc
-NANOJIT_ARCH.x86_64=	X64
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnome)
@@ -50,14 +39,6 @@ CONFIGURE_ARGS+=	--disable-debug --disable-debug-symbols
 CONFIGURE_ARGS+=	--enable-install-strip
 .endif
 
-.if !empty(PKG_OPTIONS:Mmozilla-jit)
-PLIST.jit=		yes
-PLIST_SUBST+=		NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}}
-CONFIGURE_ARGS+=	--enable-tracejit
-.else
-CONFIGURE_ARGS+=	--disable-tracejit
-.endif
-
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
 ALL_ENV+=	PKGSRC_PULSEAUDIO=1
diff --git a/devel/xulrunner/patches/patch-aa b/devel/xulrunner/patches/patch-aa
index 6778b516780..d13263b677c 100644
--- a/devel/xulrunner/patches/patch-aa
+++ b/devel/xulrunner/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2012/03/06 12:34:08 ryoon Exp $
+$NetBSD: patch-aa,v 1.10 2012/04/26 13:30:29 ryoon Exp $
 
---- configure.in.orig	2012-02-16 06:40:25.000000000 +0000
+--- configure.in.orig	2012-04-04 04:25:11.000000000 +0000
 +++ configure.in
-@@ -2328,7 +2328,7 @@ case "$target" in
+@@ -2413,7 +2413,7 @@ case "$target" in
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2012/03/06 12:34:08 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -2336,6 +2336,9 @@ case "$target" in
+@@ -2421,6 +2421,9 @@ case "$target" in
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.9 2012/03/06 12:34:08 ryoon Exp $
      ;;
  
  ia64*-hpux*)
-@@ -3377,6 +3380,9 @@ dnl ====================================
+@@ -3412,6 +3415,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.9 2012/03/06 12:34:08 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -4330,6 +4336,14 @@ if test -n "$YASM"; then
+@@ -4358,6 +4364,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -46,43 +46,7 @@ $NetBSD: patch-aa,v 1.9 2012/03/06 12:34:08 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5616,20 +5630,20 @@ if test -n "$MOZ_WEBM"; then
-                      [MOZ_NATIVE_LIBVPX_DEC_TEST=1],
-                      ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found]))
-         if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then
--            AC_MSG_CHECKING([for libvpx version >= v0.9.7])
--            dnl We need at least v0.9.7 to fix several crash bugs (for which we
--            dnl had local patches prior to v0.9.7).
-+            AC_MSG_CHECKING([for libvpx version >= v1.0.0])
-+            dnl We need at least v1.0.0 to fix several crash bugs (for which we
-+            dnl had local patches prior to v1.0.0).
-             dnl
-             dnl This is a terrible test for the library version, but we don't
-             dnl have a good one. There is no version number in a public header,
-             dnl and testing the headers still doesn't guarantee we link against
-             dnl the right version. While we could call vpx_codec_version() at
-             dnl run-time, that would break cross-compiling. There are no
--            dnl additional exported symbols between the v0.9.7 release and the
--            dnl v0.9.6 one to check for.
-+            dnl additional exported decoder symbols between the v1.0.0 release
-+            dnl and the v0.9.7 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],
-@@ -5639,7 +5653,7 @@ if test -n "$MOZ_WEBM"; then
-                  MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include"
-                  MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"],
-                 [AC_MSG_RESULT([no])
--                 AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])])
-+                 AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])])
-         fi
-         CFLAGS=$_SAVE_CFLAGS
-         LDFLAGS=$_SAVE_LDFLAGS
-@@ -5673,11 +5687,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
+@@ -5732,11 +5746,11 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIV
  
      dnl See if we have assembly on this platform.
      case "$OS_ARCH:$CPU_ARCH" in
@@ -96,7 +60,7 @@ $NetBSD: patch-aa,v 1.9 2012/03/06 12:34:08 ryoon Exp $
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
-@@ -8915,6 +8929,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
+@@ -9102,6 +9116,8 @@ if test -z "$MOZ_NATIVE_NSPR"; then
      AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
      if test "$OS_ARCH" != "WINNT"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
diff --git a/devel/xulrunner/patches/patch-al b/devel/xulrunner/patches/patch-al
index 58a0fcaf0bc..8ba99e7aac9 100644
--- a/devel/xulrunner/patches/patch-al
+++ b/devel/xulrunner/patches/patch-al
@@ -1,9 +1,9 @@
-$NetBSD: patch-al,v 1.4 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-al,v 1.5 2012/04/26 13:30:29 ryoon Exp $
 
---- storage/src/mozStorageConnection.cpp.orig	2011-06-15 21:57:54.000000000 +0000
+--- storage/src/mozStorageConnection.cpp.orig	2012-04-04 04:25:45.000000000 +0000
 +++ storage/src/mozStorageConnection.cpp
-@@ -595,6 +595,11 @@ Connection::initialize(nsIFile *aDatabas
-     (void)::NS_RegisterMemoryReporter(mMemoryReporters[i]);
+@@ -718,6 +718,11 @@ Connection::initialize(nsIFile *aDatabas
+       break;
    }
  
 +  // XXX tnn: the configure script demands that sqlite3 is compiled with
diff --git a/devel/xulrunner/patches/patch-bi b/devel/xulrunner/patches/patch-bi
index ae2389ac679..cc0060b4008 100644
--- a/devel/xulrunner/patches/patch-bi
+++ b/devel/xulrunner/patches/patch-bi
@@ -1,12 +1,12 @@
-$NetBSD: patch-bi,v 1.2 2012/03/06 12:34:09 ryoon Exp $
+$NetBSD: patch-bi,v 1.3 2012/04/26 13:30:29 ryoon Exp $
 
---- gfx/angle/src/compiler/osinclude.h.orig	2011-12-20 23:28:17.000000000 +0000
+--- gfx/angle/src/compiler/osinclude.h.orig	2012-04-04 04:25:20.000000000 +0000
 +++ gfx/angle/src/compiler/osinclude.h
 @@ -16,6 +16,7 @@
  #define ANGLE_OS_WIN
  #elif defined(__APPLE__) || defined(__linux__) || \
        defined(__FreeBSD__) || defined(__OpenBSD__) || \
 +      defined(__NetBSD__) || defined(__DragonFly__) || \
-       defined(__sun) || defined(ANDROID)
+       defined(__sun) || defined(ANDROID) || \
+       defined(__GLIBC__) || defined(__GNU__)
  #define ANGLE_OS_POSIX
- #else
diff --git a/devel/xulrunner/patches/patch-build_autoconf_gcc-pr49911.m4 b/devel/xulrunner/patches/patch-build_autoconf_gcc-pr49911.m4
deleted file mode 100644
index 3951d0ab335..00000000000
--- a/devel/xulrunner/patches/patch-build_autoconf_gcc-pr49911.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-build_autoconf_gcc-pr49911.m4,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- build/autoconf/gcc-pr49911.m4.orig	2011-12-20 23:28:11.000000000 +0000
-+++ build/autoconf/gcc-pr49911.m4
-@@ -56,7 +56,7 @@ CXXFLAGS="$_SAVE_CXXFLAGS"
- 
- AC_LANG_RESTORE
- 
--if test "$ac_have_gcc_pr49911" == "yes"; then
-+if test "$ac_have_gcc_pr49911" = "yes"; then
-    AC_MSG_RESULT(yes)
-    CFLAGS="$CFLAGS -fno-tree-vrp"
-    CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
diff --git a/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp b/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp
new file mode 100644
index 00000000000..128527a7293
--- /dev/null
+++ b/devel/xulrunner/patches/patch-gfx_thebes_gfxPlatform.cpp
@@ -0,0 +1,36 @@
+$NetBSD: patch-gfx_thebes_gfxPlatform.cpp,v 1.1 2012/04/26 13:30:29 ryoon Exp $
+
+--- gfx/thebes/gfxPlatform.cpp.orig	2012-04-04 04:25:21.000000000 +0000
++++ gfx/thebes/gfxPlatform.cpp
+@@ -436,6 +436,7 @@ void SourceBufferDestroy(void *srcBuffer
+   static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+ 
++#ifdef MOZ_TREE_CAIRO
+ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+ {
+   gfxImageSurface* origSurf =
+@@ -443,6 +444,7 @@ void SourceSnapshotDetached(cairo_surfac
+ 
+   origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
++#endif
+ 
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+@@ -512,6 +514,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
+                                                      imgSurface->Stride(),
+                                                      format);
+ 
++    #ifdef MOZ_TREE_CAIRO
+     cairo_surface_t *nullSurf =
+ 	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+     cairo_surface_set_user_data(nullSurf,
+@@ -520,6 +523,7 @@ gfxPlatform::GetSourceSurfaceForSurface(
+ 				NULL);
+     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+     cairo_surface_destroy(nullSurf);
++    #endif
+   }
+ 
+   srcBuffer->AddRef();
diff --git a/devel/xulrunner/patches/patch-js_src_build_autoconf_gcc-pr49911.m4 b/devel/xulrunner/patches/patch-js_src_build_autoconf_gcc-pr49911.m4
deleted file mode 100644
index 1cc8b0ef01b..00000000000
--- a/devel/xulrunner/patches/patch-js_src_build_autoconf_gcc-pr49911.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-js_src_build_autoconf_gcc-pr49911.m4,v 1.1 2012/03/06 12:34:09 ryoon Exp $
-
---- js/src/build/autoconf/gcc-pr49911.m4.orig	2011-12-20 23:28:21.000000000 +0000
-+++ js/src/build/autoconf/gcc-pr49911.m4
-@@ -56,7 +56,7 @@ CXXFLAGS="$_SAVE_CXXFLAGS"
- 
- AC_LANG_RESTORE
- 
--if test "$ac_have_gcc_pr49911" == "yes"; then
-+if test "$ac_have_gcc_pr49911" = "yes"; then
-    AC_MSG_RESULT(yes)
-    CFLAGS="$CFLAGS -fno-tree-vrp"
-    CXXFLAGS="$CXXFLAGS -fno-tree-vrp"
diff --git a/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c
new file mode 100644
index 00000000000..2a84714a35b
--- /dev/null
+++ b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c,v 1.1 2012/04/26 13:30:30 ryoon Exp $
+
+--- media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig	2012-04-04 04:25:35.000000000 +0000
++++ media/libsydneyaudio/src/sydney_audio_pulseaudio.c
+@@ -29,7 +29,9 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <pthread.h>
++_Pragma("GCC visibility push(default)")
+ #include <pulse/pulseaudio.h>
++_Pragma("GCC visibility pop")
+ #include "sydney_audio.h"
+ 
+ /* Pulseaudio implementation based heavily on sydney_audio_alsa.c */
diff --git a/devel/xulrunner/patches/patch-mm b/devel/xulrunner/patches/patch-mm
index 2bc88c1075d..05c9646b9df 100644
--- a/devel/xulrunner/patches/patch-mm
+++ b/devel/xulrunner/patches/patch-mm
@@ -1,8 +1,8 @@
-$NetBSD: patch-mm,v 1.10 2012/04/01 15:18:45 ryoon Exp $
+$NetBSD: patch-mm,v 1.11 2012/04/26 13:30:30 ryoon Exp $
 
---- toolkit/library/Makefile.in.orig	2012-03-13 01:37:16.000000000 +0000
+--- toolkit/library/Makefile.in.orig	2012-04-04 04:25:46.000000000 +0000
 +++ toolkit/library/Makefile.in
-@@ -554,6 +554,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
+@@ -549,6 +549,24 @@ EXTRA_DSO_LDOPTS += -lelf -ldemangle
  endif
  endif
  
@@ -25,5 +25,5 @@ $NetBSD: patch-mm,v 1.10 2012/04/01 15:18:45 ryoon Exp $
 +endif
 +
  ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp)
+ OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg)
  ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
diff --git a/devel/xulrunner/patches/patch-storage_src_Makefile.in b/devel/xulrunner/patches/patch-storage_src_Makefile.in
new file mode 100644
index 00000000000..606d8f9d6ab
--- /dev/null
+++ b/devel/xulrunner/patches/patch-storage_src_Makefile.in
@@ -0,0 +1,29 @@
+$NetBSD: patch-storage_src_Makefile.in,v 1.1 2012/04/26 13:30:30 ryoon Exp $
+
+* Support jemalloc on *BSD
+
+--- storage/src/Makefile.in.orig	2012-04-04 04:25:45.000000000 +0000
++++ storage/src/Makefile.in
+@@ -55,6 +55,22 @@ ifeq ($(OS_ARCH),Linux)
+ DEFINES += -DXP_LINUX
+ endif
+ 
++ifeq ($(OS_ARCH),DragonFly)
++DEFINES += -DXP_BSD
++endif
++
++ifeq ($(OS_ARCH),FreeBSD)
++DEFINES += -DXP_BSD
++endif
++
++ifeq ($(OS_ARCH),NetBSD)
++DEFINES += -DXP_BSD
++endif
++
++ifeq ($(OS_ARCH),FreeBSD)
++DEFINES += -DXP_BSD
++endif
++
+ EXPORTS_NAMESPACES = mozilla/storage
+ 
+ EXPORTS_mozilla/storage = \
diff --git a/devel/xulrunner/patches/patch-storage_src_mozStorageService.cpp b/devel/xulrunner/patches/patch-storage_src_mozStorageService.cpp
new file mode 100644
index 00000000000..e517590b3ab
--- /dev/null
+++ b/devel/xulrunner/patches/patch-storage_src_mozStorageService.cpp
@@ -0,0 +1,27 @@
+$NetBSD: patch-storage_src_mozStorageService.cpp,v 1.1 2012/04/26 13:30:30 ryoon Exp $
+
+* Support jemalloc on *BSD
+
+--- storage/src/mozStorageService.cpp.orig	2012-04-04 04:25:45.000000000 +0000
++++ 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/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk b/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk
index de087c681cf..8ce921d9729 100644
--- a/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk
+++ b/devel/xulrunner/patches/patch-toolkit_toolkit-tiers.mk
@@ -1,11 +1,11 @@
-$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.1 2011/07/11 12:46:14 tnn Exp $
+$NetBSD: patch-toolkit_toolkit-tiers.mk,v 1.2 2012/04/26 13:30:30 ryoon Exp $
 
---- toolkit/toolkit-tiers.mk.orig	2011-06-15 21:57:56.000000000 +0000
+--- toolkit/toolkit-tiers.mk.orig	2012-04-04 04:25:47.000000000 +0000
 +++ toolkit/toolkit-tiers.mk
-@@ -90,7 +90,7 @@ ifndef MOZ_NATIVE_BZ2
+@@ -80,7 +80,7 @@ ifdef MOZ_UPDATER
+ ifndef MOZ_NATIVE_BZ2
  tier_platform_dirs += modules/libbz2
  endif
- tier_platform_dirs += modules/libmar
 -tier_platform_dirs += other-licenses/bsdiff
 +#tier_platform_dirs += other-licenses/bsdiff
  endif
diff --git a/devel/xulrunner/patches/patch-xpcom_idl-parser_header.py b/devel/xulrunner/patches/patch-xpcom_idl-parser_header.py
deleted file mode 100644
index 8e55ff57a25..00000000000
--- a/devel/xulrunner/patches/patch-xpcom_idl-parser_header.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-xpcom_idl-parser_header.py,v 1.1 2011/12/23 01:16:27 joerg Exp $
-
---- xpcom/idl-parser/header.py.orig	2011-12-22 00:35:28.000000000 +0000
-+++ xpcom/idl-parser/header.py
-@@ -521,6 +521,12 @@ if __name__ == '__main__':
-         outfd.close()
- 
-     if options.depfile is not None:
-+        dirname = os.path.dirname(options.depfile)
-+        if dirname:
-+            try:
-+                os.makedirs(dirname)
-+            except:
-+                pass
-         depfd = open(options.depfile, 'w')
-         deps = [dep.replace('\\', '/') for dep in idl.deps]
-