Update to 2.11

* Use Lightning 1.6 release
* Enigmail is not tested fully

Changelog: from http://www.seamonkey-project.org/releases/seamonkey2.11/
SeaMonkey-specific changes
    A click-to-play option (off by default for now) has been implemented for plugins.

Mozilla platform changes
    The Pointer Lock API has been implemented.
    A new API to prevent your display from sleeping is available.
    New text-transform and font-variant CSS improvements have been made for Turkic languages and Greek.
    Fixed several stability issues.

15 files changed, 215 insertions, 149 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index d3750a02bb7..ff91086c851 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.73 2012/06/14 11:27:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.74 2012/07/19 17:33:28 ryoon Exp $
 #
 
 DISTNAME=	# empty
 PKGNAME=	seamonkey-${SM_VER}
-SM_VER=		2.10
+SM_VER=		2.11
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
+MASTER_SITES=	${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} \
+		${MASTER_SITE_MOZILLA_ALL:=seamonkey/releases/${SM_VER}/source/}
 DISTFILES=	seamonkey-${SM_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.seamonkey-project.org/
@@ -40,8 +41,8 @@ BUILD_DEPENDS+=		yasm>=1.1.0:../../devel/yasm
 
 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/www/seamonkey/PLIST b/www/seamonkey/PLIST
index 043e34cb1ba..c7da3532380 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.27 2012/06/14 11:27:34 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.28 2012/07/19 17:33:28 ryoon Exp $
 bin/seamonkey
+include/seamonkey/ARIAGridAccessibleWrap.h
 include/seamonkey/AtkSocketAccessible.h
+include/seamonkey/BasicImplData.h
 include/seamonkey/BasicLayers.h
+include/seamonkey/BasicTiledThebesLayer.h
 include/seamonkey/CheckedInt.h
+include/seamonkey/CustomQS_Canvas.h
 include/seamonkey/CustomQS_Canvas2D.h
 include/seamonkey/CustomQS_WebGL.h
 include/seamonkey/DictionaryHelpers.h
-include/seamonkey/EGLUtils.h
 include/seamonkey/EventTracer.h
+include/seamonkey/FileBlockCache.h
 include/seamonkey/ForceDiscreteGPUHelperCGL.h
 include/seamonkey/FrameLayerBuilder.h
 include/seamonkey/FramePropertyTable.h
@@ -16,6 +20,7 @@ include/seamonkey/GLContextProvider.h
 include/seamonkey/GLContextProviderImpl.h
 include/seamonkey/GLContextSymbols.h
 include/seamonkey/GLDefs.h
+include/seamonkey/GLLibraryLoader.h
 include/seamonkey/GLXLibrary.h
 include/seamonkey/GfxInfoCollector.h
 include/seamonkey/IJSDebugger.h
@@ -39,6 +44,7 @@ include/seamonkey/SVGAttrValueWrapper.h
 include/seamonkey/TabMessageUtils.h
 include/seamonkey/VideoFrameContainer.h
 include/seamonkey/VideoUtils.h
+include/seamonkey/WebGLContext.h
 include/seamonkey/a11yGeneric.h
 include/seamonkey/amIInstallTrigger.h
 include/seamonkey/amIWebInstallListener.h
@@ -59,6 +65,7 @@ include/seamonkey/expat_external.h
 include/seamonkey/extIApplication.h
 include/seamonkey/ftpCore.h
 include/seamonkey/gc/Barrier.h
+include/seamonkey/gc/Root.h
 include/seamonkey/gc/Statistics.h
 include/seamonkey/gfx2DGlue.h
 include/seamonkey/gfx3DMatrix.h
@@ -94,6 +101,7 @@ include/seamonkey/gfxPointH3D.h
 include/seamonkey/gfxQuad.h
 include/seamonkey/gfxQuaternion.h
 include/seamonkey/gfxRect.h
+include/seamonkey/gfxReusableSurfaceWrapper.h
 include/seamonkey/gfxSharedImageSurface.h
 include/seamonkey/gfxSkipChars.h
 include/seamonkey/gfxTeeSurface.h
@@ -137,6 +145,8 @@ include/seamonkey/inIFlasher.h
 include/seamonkey/inISearchObserver.h
 include/seamonkey/inISearchProcess.h
 include/seamonkey/jArray.h
+${PLIST.jemalloc}include/seamonkey/jemalloc.h
+${PLIST.jemalloc}include/seamonkey/jemalloc_types.h
 include/seamonkey/js-config.h
 include/seamonkey/js.msg
 include/seamonkey/js/HashTable.h
@@ -148,6 +158,7 @@ include/seamonkey/js/Vector.h
 include/seamonkey/jsalloc.h
 include/seamonkey/jsapi.h
 include/seamonkey/jsatom.h
+include/seamonkey/jsatom.tbl
 include/seamonkey/jscell.h
 include/seamonkey/jsclass.h
 include/seamonkey/jsclist.h
@@ -167,13 +178,11 @@ include/seamonkey/jsproto.tbl
 include/seamonkey/jsproxy.h
 include/seamonkey/jsprvtd.h
 include/seamonkey/jspubtd.h
-include/seamonkey/jstypedarray.h
 include/seamonkey/jstypes.h
 include/seamonkey/jsutil.h
 include/seamonkey/jsval.h
 include/seamonkey/jsversion.h
 include/seamonkey/jswrapper.h
-include/seamonkey/jsxdrapi.h
 include/seamonkey/mar.h
 include/seamonkey/mar_cmdline.h
 include/seamonkey/mdb.h
@@ -199,7 +208,6 @@ include/seamonkey/mozIAsyncLivemarks.h
 include/seamonkey/mozIJSSubScriptLoader.h
 include/seamonkey/mozIPersonalDictionary.h
 include/seamonkey/mozIPlacesAutoComplete.h
-include/seamonkey/mozISanitizingSerializer.h
 include/seamonkey/mozISpellCheckingEngine.h
 include/seamonkey/mozISpellI18NManager.h
 include/seamonkey/mozISpellI18NUtil.h
@@ -244,6 +252,7 @@ include/seamonkey/mozilla/CondVar.h
 include/seamonkey/mozilla/DeadlockDetector.h
 include/seamonkey/mozilla/FileLocation.h
 include/seamonkey/mozilla/FileUtils.h
+include/seamonkey/mozilla/FloatingPoint.h
 include/seamonkey/mozilla/FunctionTimer.h
 include/seamonkey/mozilla/GenericFactory.h
 include/seamonkey/mozilla/GuardObjects.h
@@ -278,6 +287,7 @@ include/seamonkey/mozilla/RangedPtr.h
 include/seamonkey/mozilla/ReentrantMonitor.h
 include/seamonkey/mozilla/RefPtr.h
 include/seamonkey/mozilla/SSE.h
+include/seamonkey/mozilla/Scoped.h
 include/seamonkey/mozilla/ServiceList.h
 include/seamonkey/mozilla/Services.h
 include/seamonkey/mozilla/StackWalk.h
@@ -319,7 +329,9 @@ include/seamonkey/mozilla/dom/Element.h
 include/seamonkey/mozilla/dom/ExternalHelperAppChild.h
 include/seamonkey/mozilla/dom/ExternalHelperAppParent.h
 include/seamonkey/mozilla/dom/FromParser.h
+include/seamonkey/mozilla/dom/ImageData.h
 include/seamonkey/mozilla/dom/Link.h
+include/seamonkey/mozilla/dom/ScreenOrientation.h
 include/seamonkey/mozilla/dom/StorageChild.h
 include/seamonkey/mozilla/dom/StorageParent.h
 include/seamonkey/mozilla/dom/StructuredCloneTags.h
@@ -328,6 +340,17 @@ include/seamonkey/mozilla/dom/TabMessageUtils.h
 include/seamonkey/mozilla/dom/TabParent.h
 include/seamonkey/mozilla/dom/battery/Constants.h
 include/seamonkey/mozilla/dom/battery/Types.h
+include/seamonkey/mozilla/dom/bindings/Common.h
+include/seamonkey/mozilla/dom/bindings/DOMJSClass.h
+include/seamonkey/mozilla/dom/bindings/EventListenerBinding.h
+include/seamonkey/mozilla/dom/bindings/EventTargetBinding.h
+include/seamonkey/mozilla/dom/bindings/FunctionBinding.h
+include/seamonkey/mozilla/dom/bindings/Nullable.h
+include/seamonkey/mozilla/dom/bindings/PrototypeList.h
+include/seamonkey/mozilla/dom/bindings/Utils.h
+include/seamonkey/mozilla/dom/bindings/XMLHttpRequestBinding.h
+include/seamonkey/mozilla/dom/bindings/XMLHttpRequestEventTargetBinding.h
+include/seamonkey/mozilla/dom/bindings/XMLHttpRequestUploadBinding.h
 include/seamonkey/mozilla/dom/indexedDB/FileInfo.h
 include/seamonkey/mozilla/dom/indexedDB/FileManager.h
 include/seamonkey/mozilla/dom/indexedDB/IDBCursor.h
@@ -357,6 +380,13 @@ include/seamonkey/mozilla/dom/sms/SmsRequestManager.h
 include/seamonkey/mozilla/dom/sms/SmsServicesFactory.h
 include/seamonkey/mozilla/dom/sms/Types.h
 include/seamonkey/mozilla/dom/workers/Workers.h
+include/seamonkey/mozilla/dom/workers/bindings/DOMBindingBase.h
+include/seamonkey/mozilla/dom/workers/bindings/EventListenerManager.h
+include/seamonkey/mozilla/dom/workers/bindings/EventTarget.h
+include/seamonkey/mozilla/dom/workers/bindings/WorkerFeature.h
+include/seamonkey/mozilla/dom/workers/bindings/XMLHttpRequest.h
+include/seamonkey/mozilla/dom/workers/bindings/XMLHttpRequestEventTarget.h
+include/seamonkey/mozilla/dom/workers/bindings/XMLHttpRequestUpload.h
 include/seamonkey/mozilla/gfx/2D.h
 include/seamonkey/mozilla/gfx/BaseMargin.h
 include/seamonkey/mozilla/gfx/BasePoint.h
@@ -406,6 +436,7 @@ include/seamonkey/mozilla/jsipc/ObjectWrapperParent.h
 include/seamonkey/mozilla/layers/CompositorChild.h
 include/seamonkey/mozilla/layers/CompositorCocoaWidgetHelper.h
 include/seamonkey/mozilla/layers/CompositorParent.h
+include/seamonkey/mozilla/layers/RenderTrace.h
 include/seamonkey/mozilla/layers/ShadowLayerUtilsX11.h
 include/seamonkey/mozilla/layers/ShadowLayers.h
 include/seamonkey/mozilla/layers/ShadowLayersChild.h
@@ -488,8 +519,6 @@ include/seamonkey/npruntime.h
 include/seamonkey/nptypes.h
 include/seamonkey/nsAHtml5TreeBuilderState.h
 include/seamonkey/nsAHtml5TreeOpSink.h
-include/seamonkey/nsARIAGridAccessibleWrap.h
-include/seamonkey/nsARIAMap.h
 include/seamonkey/nsASocketHandler.h
 include/seamonkey/nsAString.h
 include/seamonkey/nsAXPCNativeCallContext.h
@@ -567,6 +596,7 @@ include/seamonkey/nsChannelProperties.h
 include/seamonkey/nsCharSeparatedTokenizer.h
 include/seamonkey/nsCharTraits.h
 include/seamonkey/nsCharsetAlias.h
+include/seamonkey/nsCharsetSource.h
 include/seamonkey/nsCheapSets.h
 include/seamonkey/nsClassHashtable.h
 include/seamonkey/nsClientRect.h
@@ -619,7 +649,7 @@ include/seamonkey/nsDeprecatedOperationList.h
 include/seamonkey/nsDeque.h
 include/seamonkey/nsDetectionConfident.h
 include/seamonkey/nsDeviceContext.h
-include/seamonkey/nsDeviceMotion.h
+include/seamonkey/nsDeviceSensors.h
 include/seamonkey/nsDirectoryService.h
 include/seamonkey/nsDirectoryServiceAtomList.h
 include/seamonkey/nsDirectoryServiceDefs.h
@@ -677,7 +707,6 @@ include/seamonkey/nsGridRowLeafLayout.h
 include/seamonkey/nsHTMLAudioElement.h
 include/seamonkey/nsHTMLCanvasElement.h
 include/seamonkey/nsHTMLDNSPrefetch.h
-include/seamonkey/nsHTMLFormControlAccessible.h
 include/seamonkey/nsHTMLImageAccessibleWrap.h
 include/seamonkey/nsHTMLMediaElement.h
 include/seamonkey/nsHTMLParts.h
@@ -1023,7 +1052,6 @@ include/seamonkey/nsIDOMEvent.h
 include/seamonkey/nsIDOMEventListener.h
 include/seamonkey/nsIDOMEventTarget.h
 include/seamonkey/nsIDOMFile.h
-include/seamonkey/nsIDOMFileException.h
 include/seamonkey/nsIDOMFileList.h
 include/seamonkey/nsIDOMFileReader.h
 include/seamonkey/nsIDOMFontFace.h
@@ -1031,12 +1059,10 @@ include/seamonkey/nsIDOMFontFaceList.h
 include/seamonkey/nsIDOMFormData.h
 include/seamonkey/nsIDOMGeoGeolocation.h
 include/seamonkey/nsIDOMGeoPosition.h
-include/seamonkey/nsIDOMGeoPositionAddress.h
 include/seamonkey/nsIDOMGeoPositionCallback.h
 include/seamonkey/nsIDOMGeoPositionCoords.h
 include/seamonkey/nsIDOMGeoPositionError.h
 include/seamonkey/nsIDOMGeoPositionErrorCallback.h
-include/seamonkey/nsIDOMGeoPositionOptions.h
 include/seamonkey/nsIDOMGetSVGDocument.h
 include/seamonkey/nsIDOMGlobalPropertyInitializer.h
 include/seamonkey/nsIDOMHTMLAnchorElement.h
@@ -1120,6 +1146,7 @@ include/seamonkey/nsIDOMMediaQueryList.h
 include/seamonkey/nsIDOMMessageEvent.h
 include/seamonkey/nsIDOMMimeType.h
 include/seamonkey/nsIDOMMimeTypeArray.h
+include/seamonkey/nsIDOMMobileConnection.h
 include/seamonkey/nsIDOMModalContentWindow.h
 include/seamonkey/nsIDOMMouseEvent.h
 include/seamonkey/nsIDOMMouseScrollEvent.h
@@ -1128,8 +1155,8 @@ include/seamonkey/nsIDOMMozCSSKeyframeRule.h
 include/seamonkey/nsIDOMMozCSSKeyframesRule.h
 include/seamonkey/nsIDOMMozTouchEvent.h
 include/seamonkey/nsIDOMMutationEvent.h
+include/seamonkey/nsIDOMMutationObserver.h
 include/seamonkey/nsIDOMNSEditableElement.h
-include/seamonkey/nsIDOMNSElement.h
 include/seamonkey/nsIDOMNSEvent.h
 include/seamonkey/nsIDOMNSRGBAColor.h
 include/seamonkey/nsIDOMNSXPathExpression.h
@@ -1254,6 +1281,7 @@ include/seamonkey/nsIDOMScreen.h
 include/seamonkey/nsIDOMScriptObjectFactory.h
 include/seamonkey/nsIDOMScrollAreaEvent.h
 include/seamonkey/nsIDOMSerializer.h
+include/seamonkey/nsIDOMSettingsManager.h
 include/seamonkey/nsIDOMSimpleGestureEvent.h
 include/seamonkey/nsIDOMSmartCardEvent.h
 include/seamonkey/nsIDOMSmsCursor.h
@@ -1267,7 +1295,6 @@ include/seamonkey/nsIDOMStorageEvent.h
 include/seamonkey/nsIDOMStorageEventObsolete.h
 include/seamonkey/nsIDOMStorageIndexedDB.h
 include/seamonkey/nsIDOMStorageItem.h
-include/seamonkey/nsIDOMStorageList.h
 include/seamonkey/nsIDOMStorageManager.h
 include/seamonkey/nsIDOMStorageObsolete.h
 include/seamonkey/nsIDOMStyleSheet.h
@@ -1321,7 +1348,7 @@ include/seamonkey/nsIDateTimeFormat.h
 include/seamonkey/nsIDebug.h
 include/seamonkey/nsIDebug2.h
 include/seamonkey/nsIDeviceContextSpec.h
-include/seamonkey/nsIDeviceMotion.h
+include/seamonkey/nsIDeviceSensors.h
 include/seamonkey/nsIDialogCreator.h
 include/seamonkey/nsIDialogParamBlock.h
 include/seamonkey/nsIDirIndex.h
@@ -1475,7 +1502,6 @@ include/seamonkey/nsIID.h
 include/seamonkey/nsIIDBCursor.h
 include/seamonkey/nsIIDBCursorWithValue.h
 include/seamonkey/nsIIDBDatabase.h
-include/seamonkey/nsIIDBDatabaseException.h
 include/seamonkey/nsIIDBFactory.h
 include/seamonkey/nsIIDBIndex.h
 include/seamonkey/nsIIDBKeyRange.h
@@ -1613,6 +1639,7 @@ include/seamonkey/nsIMimeHeaders.h
 include/seamonkey/nsIMimeMiscStatus.h
 include/seamonkey/nsIMimeObjectClassAccess.h
 include/seamonkey/nsIMimeStreamConverter.h
+include/seamonkey/nsIMobileConnectionProvider.h
 include/seamonkey/nsIModule.h
 include/seamonkey/nsIMovemailIncomingServer.h
 include/seamonkey/nsIMovemailService.h
@@ -1701,7 +1728,6 @@ include/seamonkey/nsIMultiplexInputStream.h
 include/seamonkey/nsIMutable.h
 include/seamonkey/nsIMutableArray.h
 include/seamonkey/nsIMutationObserver.h
-include/seamonkey/nsIMutationObserver2.h
 include/seamonkey/nsINIParser.h
 include/seamonkey/nsINNTPArticleList.h
 include/seamonkey/nsINNTPNewsgroupList.h
@@ -2083,6 +2109,12 @@ include/seamonkey/nsIUpdateService.h
 include/seamonkey/nsIUpdateTimerManager.h
 include/seamonkey/nsIUploadChannel.h
 include/seamonkey/nsIUploadChannel2.h
+include/seamonkey/nsIUrlClassifierDBService.h
+include/seamonkey/nsIUrlClassifierHashCompleter.h
+include/seamonkey/nsIUrlClassifierPrefixSet.h
+include/seamonkey/nsIUrlClassifierStreamUpdater.h
+include/seamonkey/nsIUrlClassifierUtils.h
+include/seamonkey/nsIUrlListManager.h
 include/seamonkey/nsIUrlListener.h
 include/seamonkey/nsIUserCertPicker.h
 include/seamonkey/nsIUserInfo.h
@@ -2376,6 +2408,7 @@ include/seamonkey/nsSupportsArray.h
 include/seamonkey/nsSupportsPrimitives.h
 include/seamonkey/nsTArray-inl.h
 include/seamonkey/nsTArray.h
+include/seamonkey/nsTArrayHelpers.h
 include/seamonkey/nsTDependentString.h
 include/seamonkey/nsTDependentSubstring.h
 include/seamonkey/nsTHashtable.h
@@ -2622,7 +2655,9 @@ lib/seamonkey-sdk/sdk/bin/header.py
 lib/seamonkey-sdk/sdk/bin/ply/__init__.py
 lib/seamonkey-sdk/sdk/bin/ply/lex.py
 lib/seamonkey-sdk/sdk/bin/ply/yacc.py
+lib/seamonkey-sdk/sdk/bin/run-mozilla.sh
 lib/seamonkey-sdk/sdk/bin/typelib.py
+lib/seamonkey-sdk/sdk/bin/xpcshell
 lib/seamonkey-sdk/sdk/bin/xpidl.py
 lib/seamonkey-sdk/sdk/bin/xpidllex.py
 lib/seamonkey-sdk/sdk/bin/xpidlyacc.py
@@ -2646,6 +2681,7 @@ lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-dis.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-open.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-item-dis.png
+lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-item-updated.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-item.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmarks.css
@@ -2655,7 +2691,6 @@ lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmarksToolba
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmarksToolbar.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/editBookmarkOverlay.css
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/livemark-folder.png
-lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/livemark-item.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/query.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/toolbarDropMarker.png
 lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/unsortedBookmarks.png
@@ -3678,6 +3713,7 @@ lib/seamonkey/chrome/en-US/locale/en-US/global-platform/win/accessible.propertie
 lib/seamonkey/chrome/en-US/locale/en-US/global-platform/win/intl.properties
 lib/seamonkey/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
 lib/seamonkey/chrome/en-US/locale/en-US/global-region/region.properties
+lib/seamonkey/chrome/en-US/locale/en-US/global/AccessFu.properties
 lib/seamonkey/chrome/en-US/locale/en-US/global/about.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/global/aboutAbout.dtd
 lib/seamonkey/chrome/en-US/locale/en-US/global/aboutRights.dtd
@@ -3977,12 +4013,9 @@ lib/seamonkey/chrome/icons/default/ablistWindow48.png
 lib/seamonkey/chrome/icons/default/addressbookWindow.png
 lib/seamonkey/chrome/icons/default/addressbookWindow16.png
 lib/seamonkey/chrome/icons/default/addressbookWindow48.png
-lib/seamonkey/chrome/icons/default/bmPropsWindow.png
-lib/seamonkey/chrome/icons/default/bmPropsWindow16.png
-lib/seamonkey/chrome/icons/default/bmPropsWindow48.png
-lib/seamonkey/chrome/icons/default/bookmark-window.png
-lib/seamonkey/chrome/icons/default/bookmark-window16.png
-lib/seamonkey/chrome/icons/default/bookmark-window48.png
+lib/seamonkey/chrome/icons/default/bookmarkproperties.png
+lib/seamonkey/chrome/icons/default/bookmarkproperties16.png
+lib/seamonkey/chrome/icons/default/bookmarkproperties48.png
 lib/seamonkey/chrome/icons/default/default.png
 lib/seamonkey/chrome/icons/default/default16.png
 lib/seamonkey/chrome/icons/default/default48.png
@@ -4010,6 +4043,9 @@ lib/seamonkey/chrome/icons/default/messengerWindow48.png
 lib/seamonkey/chrome/icons/default/msgcomposeWindow.png
 lib/seamonkey/chrome/icons/default/msgcomposeWindow16.png
 lib/seamonkey/chrome/icons/default/msgcomposeWindow48.png
+lib/seamonkey/chrome/icons/default/places.png
+lib/seamonkey/chrome/icons/default/places16.png
+lib/seamonkey/chrome/icons/default/places48.png
 lib/seamonkey/chrome/icons/default/seamonkey.png
 lib/seamonkey/chrome/icons/default/venkman-window.png
 lib/seamonkey/chrome/icons/default/venkman-window16.png
@@ -4326,6 +4362,7 @@ lib/seamonkey/chrome/toolkit/content/global/aboutRights-unbranded.xhtml
 lib/seamonkey/chrome/toolkit/content/global/aboutRights.xhtml
 lib/seamonkey/chrome/toolkit/content/global/aboutSupport.js
 lib/seamonkey/chrome/toolkit/content/global/aboutSupport.xhtml
+lib/seamonkey/chrome/toolkit/content/global/accessibility/AccessFu.css
 lib/seamonkey/chrome/toolkit/content/global/alerts/alert.js
 lib/seamonkey/chrome/toolkit/content/global/alerts/alert.xul
 lib/seamonkey/chrome/toolkit/content/global/appPicker.js
@@ -4393,6 +4430,7 @@ lib/seamonkey/chrome/toolkit/content/global/customizeToolbar.js
 lib/seamonkey/chrome/toolkit/content/global/customizeToolbar.xul
 lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-browser-actors.js
 lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-script-actors.js
+lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-server.js
 lib/seamonkey/chrome/toolkit/content/global/devtools/dbg-transport.js
 lib/seamonkey/chrome/toolkit/content/global/dialogOverlay.js
 lib/seamonkey/chrome/toolkit/content/global/dialogOverlay.xul
@@ -4552,6 +4590,8 @@ lib/seamonkey/chrome/toolkit/res/quirk.css
 lib/seamonkey/chrome/toolkit/res/ua.css
 lib/seamonkey/chrome/toolkit/res/viewsource.css
 lib/seamonkey/chrome/toolkit/skin/classic/global/Filepicker.png
+lib/seamonkey/chrome/toolkit/skin/classic/global/TopLevelImageDocument.css
+lib/seamonkey/chrome/toolkit/skin/classic/global/TopLevelVideoDocument.css
 lib/seamonkey/chrome/toolkit/skin/classic/global/about.css
 lib/seamonkey/chrome/toolkit/skin/classic/global/aboutCache.css
 lib/seamonkey/chrome/toolkit/skin/classic/global/aboutCacheEntry.css
@@ -4782,6 +4822,7 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/passwordmgr/key-64.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/passwordmgr/key.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png
+lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClickToPlay.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDisabled.png
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginDownload.png
@@ -4804,6 +4845,7 @@ lib/seamonkey/chrome/toolkit/skin/classic/mozapps/update/updates.css
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/viewsource/viewsource.css
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallConfirm.css
 lib/seamonkey/chrome/toolkit/skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png
+lib/seamonkey/components/BrowserElementAPI.js
 lib/seamonkey/components/ConsoleAPI.js
 lib/seamonkey/components/ContactManager.js
 lib/seamonkey/components/FeedConverter.js
@@ -4812,9 +4854,11 @@ lib/seamonkey/components/FeedWriter.js
 lib/seamonkey/components/GPSDGeolocationProvider.js
 lib/seamonkey/components/NetworkGeolocationProvider.js
 lib/seamonkey/components/PlacesCategoriesStarter.js
+lib/seamonkey/components/SettingsManager.js
 lib/seamonkey/components/TelemetryPing.js
 lib/seamonkey/components/Weave.js
 lib/seamonkey/components/WebContentConverter.js
+lib/seamonkey/components/Webapps.js
 lib/seamonkey/components/addonManager.js
 lib/seamonkey/components/amContentHandler.js
 lib/seamonkey/components/amWebInstallListener.js
@@ -4879,6 +4923,9 @@ lib/seamonkey/components/nsURLFormatter.js
 lib/seamonkey/components/nsUpdateService.js
 lib/seamonkey/components/nsUpdateServiceStub.js
 lib/seamonkey/components/nsUpdateTimerManager.js
+lib/seamonkey/components/nsUrlClassifierHashCompleter.js
+lib/seamonkey/components/nsUrlClassifierLib.js
+lib/seamonkey/components/nsUrlClassifierListManager.js
 lib/seamonkey/components/nsWebHandlerApp.js
 lib/seamonkey/components/offlineStartup.js
 lib/seamonkey/components/smileApplication.js
@@ -4907,8 +4954,6 @@ lib/seamonkey/dependentlibs.list
 lib/seamonkey/dictionaries/en-US.aff
 lib/seamonkey/dictionaries/en-US.dic
 lib/seamonkey/extensions/inspector@mozilla.org/chrome.manifest
-lib/seamonkey/extensions/inspector@mozilla.org/chrome/icons/default/winInspectorMain.xpm
-lib/seamonkey/extensions/inspector@mozilla.org/chrome/icons/default/winInspectorMain16.xpm
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/content/inspector/Flasher.js
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/content/inspector/ViewerRegistry.js
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/content/inspector/commandOverlay.xul
@@ -5033,6 +5078,29 @@ lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspec
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspector/viewers/styleRules.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspector/viewers/stylesheets.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/de/inspector/viewers/xblBindings.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/editing.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/inspector.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/inspector.properties
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/prefs.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/tasksOverlay.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewer-registry.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEvent.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEvents.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEvents.properties
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleEventsHandlerHelpDialog.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleProps.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleProps.properties
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleRelations.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleTree.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/accessibleTreeEvalJSDialog.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/boxModel.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/computedStyle.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/dom.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/domNode.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/jsObject.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/styleRules.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/stylesheets.dtd
+lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/el/inspector/viewers/xblBindings.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/en-GB/inspector/editing.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/en-GB/inspector/inspector.dtd
 lib/seamonkey/extensions/inspector@mozilla.org/chrome/inspector/locale/en-GB/inspector/inspector.properties
@@ -5234,6 +5302,7 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/com
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmark-folder-dis.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmark-folder-open.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmark-item-dis.gif
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmark-item-updated.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmark-item.gif
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmark-item.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmark.png
@@ -5244,7 +5313,6 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/com
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/bookmarksToolbar.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/editBookmarkOverlay.css
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/livemark-folder.png
-lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/livemark-item.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/query.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/tagContainerIcon.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/bookmarks/toolbarDropMarker.png
@@ -5801,6 +5869,7 @@ lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/moz
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/passwordmgr/key-64.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/passwordmgr/key.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/plugins/contentPluginBlocked.png
+lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/plugins/contentPluginClickToPlay.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/plugins/contentPluginCrashed.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/plugins/contentPluginDisabled.png
 lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/plugins/contentPluginDownload.png
@@ -6179,6 +6248,7 @@ lib/seamonkey/modules/AddonLogging.jsm
 lib/seamonkey/modules/AddonManager.jsm
 lib/seamonkey/modules/AddonRepository.jsm
 lib/seamonkey/modules/AddonUpdateChecker.jsm
+lib/seamonkey/modules/BookmarkHTMLUtils.jsm
 lib/seamonkey/modules/CSPUtils.jsm
 lib/seamonkey/modules/CertUtils.jsm
 lib/seamonkey/modules/ChromeManifestParser.jsm
@@ -6218,6 +6288,10 @@ lib/seamonkey/modules/Webapps.jsm
 lib/seamonkey/modules/WindowDraggingUtils.jsm
 lib/seamonkey/modules/XPCOMUtils.jsm
 lib/seamonkey/modules/XPIProvider.jsm
+lib/seamonkey/modules/accessibility/AccessFu.jsm
+lib/seamonkey/modules/accessibility/Presenters.jsm
+lib/seamonkey/modules/accessibility/UtteranceGenerator.jsm
+lib/seamonkey/modules/accessibility/VirtualCursorController.jsm
 lib/seamonkey/modules/ctypes.jsm
 lib/seamonkey/modules/debug.js
 lib/seamonkey/modules/devtools/dbg-client.jsm
@@ -6257,9 +6331,16 @@ lib/seamonkey/modules/mailServices.js
 lib/seamonkey/modules/mailnewsMigrator.js
 lib/seamonkey/modules/nsFormAutoCompleteResult.jsm
 lib/seamonkey/modules/reflect.jsm
+lib/seamonkey/modules/services-common/async.js
+lib/seamonkey/modules/services-common/log4moz.js
+lib/seamonkey/modules/services-common/observers.js
+lib/seamonkey/modules/services-common/preferences.js
+lib/seamonkey/modules/services-common/rest.js
+lib/seamonkey/modules/services-common/stringbundle.js
+lib/seamonkey/modules/services-common/tokenserverclient.js
+lib/seamonkey/modules/services-common/utils.js
 lib/seamonkey/modules/services-crypto/WeaveCrypto.js
 lib/seamonkey/modules/services-sync/addonsreconciler.js
-lib/seamonkey/modules/services-sync/async.js
 lib/seamonkey/modules/services-sync/constants.js
 lib/seamonkey/modules/services-sync/engines.js
 lib/seamonkey/modules/services-sync/engines/addons.js
@@ -6271,12 +6352,9 @@ lib/seamonkey/modules/services-sync/engines/history.js
 lib/seamonkey/modules/services-sync/engines/passwords.js
 lib/seamonkey/modules/services-sync/engines/prefs.js
 lib/seamonkey/modules/services-sync/engines/tabs.js
-lib/seamonkey/modules/services-sync/ext/Observers.js
-lib/seamonkey/modules/services-sync/ext/Preferences.js
-lib/seamonkey/modules/services-sync/ext/StringBundle.js
 lib/seamonkey/modules/services-sync/identity.js
 lib/seamonkey/modules/services-sync/jpakeclient.js
-lib/seamonkey/modules/services-sync/log4moz.js
+lib/seamonkey/modules/services-sync/keys.js
 lib/seamonkey/modules/services-sync/main.js
 lib/seamonkey/modules/services-sync/notifications.js
 lib/seamonkey/modules/services-sync/policies.js
@@ -6676,7 +6754,6 @@ share/idl/seamonkey/nsIDOMEvent.idl
 share/idl/seamonkey/nsIDOMEventListener.idl
 share/idl/seamonkey/nsIDOMEventTarget.idl
 share/idl/seamonkey/nsIDOMFile.idl
-share/idl/seamonkey/nsIDOMFileException.idl
 share/idl/seamonkey/nsIDOMFileList.idl
 share/idl/seamonkey/nsIDOMFileReader.idl
 share/idl/seamonkey/nsIDOMFontFace.idl
@@ -6684,12 +6761,10 @@ share/idl/seamonkey/nsIDOMFontFaceList.idl
 share/idl/seamonkey/nsIDOMFormData.idl
 share/idl/seamonkey/nsIDOMGeoGeolocation.idl
 share/idl/seamonkey/nsIDOMGeoPosition.idl
-share/idl/seamonkey/nsIDOMGeoPositionAddress.idl
 share/idl/seamonkey/nsIDOMGeoPositionCallback.idl
 share/idl/seamonkey/nsIDOMGeoPositionCoords.idl
 share/idl/seamonkey/nsIDOMGeoPositionError.idl
 share/idl/seamonkey/nsIDOMGeoPositionErrorCallback.idl
-share/idl/seamonkey/nsIDOMGeoPositionOptions.idl
 share/idl/seamonkey/nsIDOMGetSVGDocument.idl
 share/idl/seamonkey/nsIDOMGlobalPropertyInitializer.idl
 share/idl/seamonkey/nsIDOMHTMLAnchorElement.idl
@@ -6773,6 +6848,7 @@ share/idl/seamonkey/nsIDOMMediaQueryList.idl
 share/idl/seamonkey/nsIDOMMessageEvent.idl
 share/idl/seamonkey/nsIDOMMimeType.idl
 share/idl/seamonkey/nsIDOMMimeTypeArray.idl
+share/idl/seamonkey/nsIDOMMobileConnection.idl
 share/idl/seamonkey/nsIDOMModalContentWindow.idl
 share/idl/seamonkey/nsIDOMMouseEvent.idl
 share/idl/seamonkey/nsIDOMMouseScrollEvent.idl
@@ -6781,8 +6857,8 @@ share/idl/seamonkey/nsIDOMMozCSSKeyframeRule.idl
 share/idl/seamonkey/nsIDOMMozCSSKeyframesRule.idl
 share/idl/seamonkey/nsIDOMMozTouchEvent.idl
 share/idl/seamonkey/nsIDOMMutationEvent.idl
+share/idl/seamonkey/nsIDOMMutationObserver.idl
 share/idl/seamonkey/nsIDOMNSEditableElement.idl
-share/idl/seamonkey/nsIDOMNSElement.idl
 share/idl/seamonkey/nsIDOMNSEvent.idl
 share/idl/seamonkey/nsIDOMNSRGBAColor.idl
 share/idl/seamonkey/nsIDOMNSXPathExpression.idl
@@ -6906,6 +6982,7 @@ share/idl/seamonkey/nsIDOMSVGZoomEvent.idl
 share/idl/seamonkey/nsIDOMScreen.idl
 share/idl/seamonkey/nsIDOMScrollAreaEvent.idl
 share/idl/seamonkey/nsIDOMSerializer.idl
+share/idl/seamonkey/nsIDOMSettingsManager.idl
 share/idl/seamonkey/nsIDOMSimpleGestureEvent.idl
 share/idl/seamonkey/nsIDOMSmartCardEvent.idl
 share/idl/seamonkey/nsIDOMSmsCursor.idl
@@ -6919,7 +6996,6 @@ share/idl/seamonkey/nsIDOMStorageEvent.idl
 share/idl/seamonkey/nsIDOMStorageEventObsolete.idl
 share/idl/seamonkey/nsIDOMStorageIndexedDB.idl
 share/idl/seamonkey/nsIDOMStorageItem.idl
-share/idl/seamonkey/nsIDOMStorageList.idl
 share/idl/seamonkey/nsIDOMStorageManager.idl
 share/idl/seamonkey/nsIDOMStorageObsolete.idl
 share/idl/seamonkey/nsIDOMStyleSheet.idl
@@ -6970,7 +7046,7 @@ share/idl/seamonkey/nsIDOMXULTreeElement.idl
 share/idl/seamonkey/nsIDataSignatureVerifier.idl
 share/idl/seamonkey/nsIDebug.idl
 share/idl/seamonkey/nsIDebug2.idl
-share/idl/seamonkey/nsIDeviceMotion.idl
+share/idl/seamonkey/nsIDeviceSensors.idl
 share/idl/seamonkey/nsIDialogCreator.idl
 share/idl/seamonkey/nsIDialogParamBlock.idl
 share/idl/seamonkey/nsIDirIndex.idl
@@ -7106,7 +7182,6 @@ share/idl/seamonkey/nsIHttpProtocolHandler.idl
 share/idl/seamonkey/nsIIDBCursor.idl
 share/idl/seamonkey/nsIIDBCursorWithValue.idl
 share/idl/seamonkey/nsIIDBDatabase.idl
-share/idl/seamonkey/nsIIDBDatabaseException.idl
 share/idl/seamonkey/nsIIDBFactory.idl
 share/idl/seamonkey/nsIIDBIndex.idl
 share/idl/seamonkey/nsIIDBKeyRange.idl
@@ -7227,6 +7302,7 @@ share/idl/seamonkey/nsIMimeEmitter.idl
 share/idl/seamonkey/nsIMimeHeaders.idl
 share/idl/seamonkey/nsIMimeMiscStatus.idl
 share/idl/seamonkey/nsIMimeStreamConverter.idl
+share/idl/seamonkey/nsIMobileConnectionProvider.idl
 share/idl/seamonkey/nsIModule.idl
 share/idl/seamonkey/nsIMovemailIncomingServer.idl
 share/idl/seamonkey/nsIMovemailService.idl
@@ -7628,6 +7704,12 @@ share/idl/seamonkey/nsIUpdateService.idl
 share/idl/seamonkey/nsIUpdateTimerManager.idl
 share/idl/seamonkey/nsIUploadChannel.idl
 share/idl/seamonkey/nsIUploadChannel2.idl
+share/idl/seamonkey/nsIUrlClassifierDBService.idl
+share/idl/seamonkey/nsIUrlClassifierHashCompleter.idl
+share/idl/seamonkey/nsIUrlClassifierPrefixSet.idl
+share/idl/seamonkey/nsIUrlClassifierStreamUpdater.idl
+share/idl/seamonkey/nsIUrlClassifierUtils.idl
+share/idl/seamonkey/nsIUrlListManager.idl
 share/idl/seamonkey/nsIUrlListener.idl
 share/idl/seamonkey/nsIUserCertPicker.idl
 share/idl/seamonkey/nsIUserInfo.idl
diff --git a/www/seamonkey/PLIST.lightning b/www/seamonkey/PLIST.lightning
index bf7aeff8ada..d0b7faa62da 100644
--- a/www/seamonkey/PLIST.lightning
+++ b/www/seamonkey/PLIST.lightning
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.lightning,v 1.3 2012/06/14 11:27:34 ryoon Exp $
+@comment $NetBSD: PLIST.lightning,v 1.4 2012/07/19 17:33:28 ryoon Exp $
 include/seamonkey/calBaseCID.h
 include/seamonkey/calIAlarm.h
 include/seamonkey/calIAlarmService.h
@@ -363,6 +363,7 @@ lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
 lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm
 lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm
 lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm
+lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItemUtils.jsm
 lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm
 lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
 lib/seamonkey/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index dd3a349dae3..3d6c1e71bf2 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.83 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: distinfo,v 1.84 2012/07/19 17:33:28 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 (seamonkey-2.10.source.tar.bz2) = c5d92bfb1f2a6d209d8dce003734f6ec4d9ea10c
-RMD160 (seamonkey-2.10.source.tar.bz2) = 8599a08b118d67adcbd841c4996ab77fcae879da
-Size (seamonkey-2.10.source.tar.bz2) = 103476738 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 (seamonkey-2.11.source.tar.bz2) = 08acc70c272b10977b62036ab111d0f833cf30cc
+RMD160 (seamonkey-2.11.source.tar.bz2) = a9fb949940b159ed18f45cd3d786cd56298c4aef
+Size (seamonkey-2.11.source.tar.bz2) = 105846143 bytes
 SHA1 (patch-aa) = e4f2c7c9dfe2698a23096e54cb6e3903139760de
 SHA1 (patch-aa-toplevel) = dfd11228e1ee7af0c3ba04aae076a0957152ab28
 SHA1 (patch-ab) = 71df8cca38abfcb2a9225002c567473144c2ba01
@@ -27,13 +27,13 @@ SHA1 (patch-ao) = 75abba76fe02d124e7af58355ddccc120845d79f
 SHA1 (patch-as) = 27c143972cab42e6782d36554f7f8a0f5c5c5564
 SHA1 (patch-at) = 9542346ba6f744eb45c5e2efa3981fab85796e95
 SHA1 (patch-au) = 5df625af014970bba28f9f5f64653b12540cb12e
-SHA1 (patch-av) = 256559d5b70861e4b56a3af67ea9e344c9efc887
+SHA1 (patch-av) = 7855a0a734da72e8373d0b17bdb3ab2e54f58e77
 SHA1 (patch-aw) = eddbf931e7710d2cb71e36e5ce2eb29e8320229f
 SHA1 (patch-ax) = 04b0dc6396b194f4252b2a8a9f048d3c7d665a8d
 SHA1 (patch-ay) = d6796fd58965eeff6289adb8e3000de377786dc0
 SHA1 (patch-az) = 744c41d2a3ca1a6e85729b854e721898274388ae
 SHA1 (patch-ba) = 77d50806968bb32c85ea0e922551661162be91a2
-SHA1 (patch-bd) = bd816541cd6de03525b981bc4f2981236ee74866
+SHA1 (patch-bd) = d197a8d53ef3a53d75704f9d6992c318f1995039
 SHA1 (patch-bf) = bd9b969c890f5e9ad053bcc2dd4d22ecd03de2b1
 SHA1 (patch-bg) = 6f7bed05a083d417c5a5ab7dfd72a444e70dbe23
 SHA1 (patch-bi) = 56d95150bc4073fc1797d348056ff495510cefeb
@@ -60,9 +60,9 @@ SHA1 (patch-mg) = 07906c9c6b2e20d5e101524188029bfbe325c517
 SHA1 (patch-mh) = 756ab10179e415ee8e9893165da936c60322b0ad
 SHA1 (patch-mi) = 727a663e4203ef09b5ef201109cbad5269fe52e5
 SHA1 (patch-mj) = 2e481ab989704e9ff7702cb9dfbc8a7595fc7738
-SHA1 (patch-mk) = a1e47a1547265d99ef93def3ac876220af41572e
+SHA1 (patch-mk) = 0b3b98b776e77fa33e805c580e49b266cf2bda8a
 SHA1 (patch-ml) = 2742b11522acfb673f85d05c45e683890dcaa4fe
-SHA1 (patch-mm) = e9dd140df1068d8f3048a2551efd9038c43426e6
+SHA1 (patch-mm) = 26aa6329e80d4d27976fe4d042468f60791cd468
 SHA1 (patch-mn) = 258c4261082f021214e25f07a8b30b80af56c874
 SHA1 (patch-mozilla_build_autoconf_nss.m4) = a45239f6dbd1f8cb6e03c4b7d088434aab42cde3
 SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = ef6aaa77e3c66609eb76af0402d474f271c7cbc6
@@ -81,7 +81,7 @@ SHA1 (patch-mozilla_ipc_chromium_src_base_third__party_nspr_prtime.cc) = 95556cf
 SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_ipc__message__utils.h) = 32236504d654307425f4d465876def8af40574d4
 SHA1 (patch-mozilla_ipc_chromium_src_chrome_common_transport__dib.h) = aa5e9aff097e9a07765020fbc025bc8058cfdb4a
 SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = da5bda45c1c458a44b752cbe79c24c422c0e761a
-SHA1 (patch-mozilla_js_src_config_rules.mk) = d5428816454f401d1749530ac7e7b45027fbafaf
+SHA1 (patch-mozilla_js_src_config_rules.mk) = 1a8720fb6b9bacb92d287893b2541821ee2ccb3e
 SHA1 (patch-mozilla_js_src_jscpucfg.h) = f641536b04464e85c1b718ba6f049c3697e4e041
 SHA1 (patch-mozilla_js_src_methodjit_MethodJIT.cpp) = c3826876b3de32237441fb1f95d4b10939438a48
 SHA1 (patch-mozilla_js_src_yarr_pcre_pcre.h) = 43578405652b0f35cbd250dc64e8edf7f629f207
@@ -89,17 +89,17 @@ SHA1 (patch-mozilla_js_xpconnect_src_Makefile.in) = 91729b067b797c88af2e87bba7cd
 SHA1 (patch-mozilla_media_libsydneyaudio_src_sydney__audio__pulseaudio.c) = 31bc39332b87831c097125bbe5cd260bfa0bc61f
 SHA1 (patch-mozilla_media_libvpx_vpx_config.h) = d0270522d54b76b8b2fa4fde60681a3a09b9f65e
 SHA1 (patch-mozilla_media_libvpx_vpx_config_c.c) = e8e27699cc1f7eb2c06f860fa79ac4df65061fd0
-SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = 282aeb6164e77bbc276d5181fafe5ea0431f40e3
+SHA1 (patch-mozilla_memory_mozalloc_mozalloc.cpp) = e83876e4f5f8970e136f73a11ebe397d8245b11d
+SHA1 (patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp) = aa74c444d7a8fb563b109cf5c69d1f4f7feca524
 SHA1 (patch-mozilla_nsprpub_pr_include_md___dragonfly.cfg) = f2ef13923a3fe132b96d1fca0fac03abd3dc7139
 SHA1 (patch-mozilla_nsprpub_pr_include_md___pth.h) = 0cc775519178039a462754490e61c947bd87d5ac
 SHA1 (patch-mozilla_nsprpub_pr_include_md_prosdep.h) = 7cf8a5cf6e768be2acd06723343a3597f6485d44
 SHA1 (patch-mozilla_nsprpub_pr_src_md_unix_uxrng.c) = a73081968eee6eef64da55bfe8ce69f5d282e511
 SHA1 (patch-mozilla_nsprpub_pr_src_pthreads_ptio.c) = 0e1dbecb7a111be33f6edf90c4ea9ac3e144d58e
 SHA1 (patch-mozilla_nsprpub_pr_src_pthreads_ptsynch.c) = b0238ce2cda063deaa0dd6b24aa3e1add6462dee
-SHA1 (patch-mozilla_storage_src_Makefile.in) = 932a526e6c8aeec492aa5d37c274304d6476805c
-SHA1 (patch-mozilla_storage_src_mozStorageService.cpp) = c2996b10e0753145de47b9e8f73015d8046eb9bb
+SHA1 (patch-mozilla_storage_src_Makefile.in) = 7a4c823f79245dad4bb3e6dfd39adf2cc88ac9d5
 SHA1 (patch-mozilla_xpcom_Makefile.in) = b687dfe009815c9fa79ee7e10435b67eb2184f2c
-SHA1 (patch-mozilla_xpcom_idl-parser_Makefile.in) = fb08a88c7690c759af8f2e29b683520e39451bfb
+SHA1 (patch-mozilla_xpcom_idl-parser_Makefile.in) = 7ec5e62a8c6d2c2a51474c070d02f39c2f2c0e63
 SHA1 (patch-mozilla_xpcom_idl-parser_header.py) = d713291269bc0dddfd7912ed22c26f6fb6d13386
 SHA1 (patch-mozilla_xpcom_typelib_xpidl_Makefile.in) = 49a12531a325e2c92b284e8405865202bdc744e1
 SHA1 (patch-mp) = 5506b7f05b67e1abac6a266cc4d78ec38486b9f1
diff --git a/www/seamonkey/enigmail.mk b/www/seamonkey/enigmail.mk
index 51a61c59295..5df349cb986 100644
--- a/www/seamonkey/enigmail.mk
+++ b/www/seamonkey/enigmail.mk
@@ -1,9 +1,9 @@
-# $NetBSD: enigmail.mk,v 1.4 2012/06/14 11:27:34 ryoon Exp $
+# $NetBSD: enigmail.mk,v 1.5 2012/07/19 17:33:28 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/www/seamonkey/patches/patch-av b/www/seamonkey/patches/patch-av
index 6c090a917fe..cf8b8f4da82 100644
--- a/www/seamonkey/patches/patch-av
+++ b/www/seamonkey/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-av,v 1.5 2012/07/19 17:33:29 ryoon Exp $
 
---- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-04-23 06:28:30.000000000 +0000
+--- mozilla/xulrunner/app/nsXULRunnerApp.cpp.orig	2012-07-17 18:13:28.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.4 2012/04/28 22:48:06 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/www/seamonkey/patches/patch-bd b/www/seamonkey/patches/patch-bd
index bafc962fc78..22809d3a337 100644
--- a/www/seamonkey/patches/patch-bd
+++ b/www/seamonkey/patches/patch-bd
@@ -1,10 +1,10 @@
-$NetBSD: patch-bd,v 1.4 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-bd,v 1.5 2012/07/19 17:33:29 ryoon Exp $
 
---- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-04-23 06:27:40.000000000 +0000
+--- mozilla/js/src/ctypes/CTypes.cpp.orig	2012-07-17 18:13:28.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/www/seamonkey/patches/patch-mk b/www/seamonkey/patches/patch-mk
index 1948afad855..946bc2b7bb2 100644
--- a/www/seamonkey/patches/patch-mk
+++ b/www/seamonkey/patches/patch-mk
@@ -1,10 +1,8 @@
-$NetBSD: patch-mk,v 1.6 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-mk,v 1.7 2012/07/19 17:33:29 ryoon Exp $
 
-Treat DragonFly like FreeBSD.
-
---- mozilla/config/rules.mk.orig	2012-06-05 05:54:07.000000000 +0000
+--- mozilla/config/rules.mk.orig	2012-07-18 11:34:55.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 +15,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 +26,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/www/seamonkey/patches/patch-mm b/www/seamonkey/patches/patch-mm
index ceca5b6206b..9705d97dda6 100644
--- a/www/seamonkey/patches/patch-mm
+++ b/www/seamonkey/patches/patch-mm
@@ -1,8 +1,8 @@
-$NetBSD: patch-mm,v 1.8 2012/06/14 11:27:34 ryoon Exp $
+$NetBSD: patch-mm,v 1.9 2012/07/19 17:33:29 ryoon Exp $
 
---- mozilla/toolkit/library/Makefile.in.orig	2012-06-05 05:54:26.000000000 +0000
+--- mozilla/toolkit/library/Makefile.in.orig	2012-07-15 12:00:56.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.8 2012/06/14 11:27:34 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.8 2012/06/14 11:27:34 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/www/seamonkey/patches/patch-mozilla_js_src_config_rules.mk b/www/seamonkey/patches/patch-mozilla_js_src_config_rules.mk
index 2f545697127..c9c8088d09c 100644
--- a/www/seamonkey/patches/patch-mozilla_js_src_config_rules.mk
+++ b/www/seamonkey/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/14 11:27:34 ryoon Exp $
+$NetBSD: patch-mozilla_js_src_config_rules.mk,v 1.2 2012/07/19 17:33:29 ryoon Exp $
 
---- mozilla/js/src/config/rules.mk.orig	2012-06-05 05:54:14.000000000 +0000
+--- mozilla/js/src/config/rules.mk.orig	2012-07-17 18:13:32.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/www/seamonkey/patches/patch-mozilla_memory_mozalloc_mozalloc.cpp b/www/seamonkey/patches/patch-mozilla_memory_mozalloc_mozalloc.cpp
new file mode 100644
index 00000000000..af80654801e
--- /dev/null
+++ b/www/seamonkey/patches/patch-mozilla_memory_mozalloc_mozalloc.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-mozilla_memory_mozalloc_mozalloc.cpp,v 1.1 2012/07/19 17:33:29 ryoon Exp $
+
+* Fix build on NetBSD with mozilla-jemalloc option (functionality is not tested)
+
+--- mozilla/memory/mozalloc/mozalloc.cpp.orig	2012-07-15 12:00:39.000000000 +0000
++++ mozilla/memory/mozalloc/mozalloc.cpp
+@@ -243,7 +243,7 @@ moz_malloc_usable_size(void *ptr)
+ 
+ #if defined(XP_MACOSX)
+     return malloc_size(ptr);
+-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID))
++#elif (defined(MOZ_MEMORY) && !defined(__NetBSD__)) || (defined(XP_LINUX) && !defined(ANDROID))
+     // Android bionic libc doesn't have malloc_usable_size.
+     return malloc_usable_size(ptr);
+ #elif defined(XP_WIN)
diff --git a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
index 70f4e8cc503..a86e8b43fbe 100644
--- a/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
+++ b/www/seamonkey/patches/patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp
@@ -1,23 +1,17 @@
-$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.2 2012/04/28 22:48:06 ryoon Exp $
+$NetBSD: patch-mozilla_netwerk_protocol_http_HttpChannelParent.cpp,v 1.3 2012/07/19 17:33:29 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-23 06:28:12.000000000 +0000
+--- mozilla/netwerk/protocol/http/HttpChannelParent.cpp.orig	2012-07-17 18:35:20.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)
-+// Compiling with a version of GCC <= 4.4 fails with an internal compiler
-+// error.
+@@ -340,6 +340,10 @@ HttpChannelParent::RecvUpdateAssociatedC
+ // Compiling this with GCC <= 4.4 fails with an internal compiler error
+ #pragma GCC optimize ("O0")
+ #endif
 +#if !defined(__GNUC__) || \
 +  (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
- #pragma GCC optimize ("O0")
++#pragma GCC optimize ("O0")
 +#endif
  
  bool
diff --git a/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in b/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in
index 9ddf1462ec7..7908d024471 100644
--- a/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in
+++ b/www/seamonkey/patches/patch-mozilla_storage_src_Makefile.in
@@ -1,9 +1,9 @@
-$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.1 2012/04/28 22:48:07 ryoon Exp $
+$NetBSD: patch-mozilla_storage_src_Makefile.in,v 1.2 2012/07/19 17:33:29 ryoon Exp $
 
---- mozilla/storage/src/Makefile.in.orig	2012-04-23 06:28:20.000000000 +0000
+--- mozilla/storage/src/Makefile.in.orig	2012-07-17 18:13:34.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/www/seamonkey/patches/patch-mozilla_storage_src_mozStorageService.cpp b/www/seamonkey/patches/patch-mozilla_storage_src_mozStorageService.cpp
deleted file mode 100644
index 71702bfa819..00000000000
--- a/www/seamonkey/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 22:48:07 ryoon Exp $
-
---- mozilla/storage/src/mozStorageService.cpp.orig	2012-04-23 06:28:20.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/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_Makefile.in b/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
index 2132b9084bf..7574502749d 100644
--- a/www/seamonkey/patches/patch-mozilla_xpcom_idl-parser_Makefile.in
+++ b/www/seamonkey/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/14 11:27:34 ryoon Exp $
+$NetBSD: patch-mozilla_xpcom_idl-parser_Makefile.in,v 1.2 2012/07/19 17:33:29 ryoon Exp $
 
---- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-06-05 05:54:27.000000000 +0000
+--- mozilla/xpcom/idl-parser/Makefile.in.orig	2012-07-17 18:13:35.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