update to 1.6.1

changes:
-JavaScriptCore library can be used independently
-New DOM methods
-API extensions: spell checking, local storage database path
-bugfixes

7 files changed, 99 insertions, 66 deletions

diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
index dc3311fe894..0564e3fa418 100644
--- a/www/webkit-gtk/Makefile.common
+++ b/www/webkit-gtk/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2011/09/06 19:20:31 drochner Exp $
+# $NetBSD: Makefile.common,v 1.3 2011/10/07 12:17:25 drochner Exp $
 # used by www/webkit-gtk/Makefile
 # used by www/webkit-gtk3/Makefile
 
-DISTNAME=	webkit-1.4.3
+DISTNAME=	webkit-1.6.1
 CATEGORIES=	www
 MASTER_SITES=	http://www.webkitgtk.org/
 
@@ -26,6 +26,8 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-target=x11 \
 			--with-font-backend=freetype
+CONFIGURE_ENV+= ZLIB_CFLAGS=-I${BUILDLINK_PREFIX.zlib}/include ZLIB_LIBS=-lz
+
 .include "options.mk"
 
 REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table \
@@ -42,6 +44,7 @@ BUILDLINK_DEPMETHOD.python= build
 .include "../../lang/python/application.mk"
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/flex/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 76c1f2b2972..f4491d07dcf 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2011/06/09 11:00:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2011/10/07 12:17:25 drochner Exp $
 bin/jsc-1
 include/webkit-1.0/JavaScriptCore/JSBase.h
 include/webkit-1.0/JavaScriptCore/JSContextRef.h
@@ -22,6 +22,7 @@ include/webkit-1.0/webkit/WebKitDOMCSSValue.h
 include/webkit-1.0/webkit/WebKitDOMCharacterData.h
 include/webkit-1.0/webkit/WebKitDOMComment.h
 include/webkit-1.0/webkit/WebKitDOMConsole.h
+include/webkit-1.0/webkit/WebKitDOMCustom.h
 include/webkit-1.0/webkit/WebKitDOMDOMApplicationCache.h
 include/webkit-1.0/webkit/WebKitDOMDOMImplementation.h
 include/webkit-1.0/webkit/WebKitDOMDOMMimeType.h
@@ -51,7 +52,6 @@ include/webkit-1.0/webkit/WebKitDOMHTMLAudioElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLBRElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLBaseElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLBaseFontElement.h
-include/webkit-1.0/webkit/WebKitDOMHTMLBlockquoteElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLBodyElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLButtonElement.h
 include/webkit-1.0/webkit/WebKitDOMHTMLCanvasElement.h
@@ -158,6 +158,7 @@ include/webkit-1.0/webkit/webkitnetworkrequest.h
 include/webkit-1.0/webkit/webkitnetworkresponse.h
 include/webkit-1.0/webkit/webkitsecurityorigin.h
 include/webkit-1.0/webkit/webkitsoupauthdialog.h
+include/webkit-1.0/webkit/webkitspellchecker.h
 include/webkit-1.0/webkit/webkitversion.h
 include/webkit-1.0/webkit/webkitviewportattributes.h
 include/webkit-1.0/webkit/webkitwebbackforwardlist.h
@@ -174,19 +175,22 @@ include/webkit-1.0/webkit/webkitwebresource.h
 include/webkit-1.0/webkit/webkitwebsettings.h
 include/webkit-1.0/webkit/webkitwebview.h
 include/webkit-1.0/webkit/webkitwebwindowfeatures.h
+lib/libjavascriptcoregtk-1.0.la
 lib/libwebkitgtk-1.0.la
+lib/pkgconfig/javascriptcoregtk-1.0.pc
 lib/pkgconfig/webkit-1.0.pc
 share/locale/ar/LC_MESSAGES/webkit-2.0.mo
 share/locale/bg/LC_MESSAGES/webkit-2.0.mo
 share/locale/cs/LC_MESSAGES/webkit-2.0.mo
 share/locale/de/LC_MESSAGES/webkit-2.0.mo
+share/locale/el/LC_MESSAGES/webkit-2.0.mo
+share/locale/en_CA/LC_MESSAGES/webkit-2.0.mo
 share/locale/en_GB/LC_MESSAGES/webkit-2.0.mo
 share/locale/es/LC_MESSAGES/webkit-2.0.mo
 share/locale/et/LC_MESSAGES/webkit-2.0.mo
 share/locale/eu/LC_MESSAGES/webkit-2.0.mo
 share/locale/fr/LC_MESSAGES/webkit-2.0.mo
 share/locale/gl/LC_MESSAGES/webkit-2.0.mo
-share/locale/gr/LC_MESSAGES/webkit-2.0.mo
 share/locale/gu/LC_MESSAGES/webkit-2.0.mo
 share/locale/he/LC_MESSAGES/webkit-2.0.mo
 share/locale/hu/LC_MESSAGES/webkit-2.0.mo
@@ -209,7 +213,6 @@ share/locale/sv/LC_MESSAGES/webkit-2.0.mo
 share/locale/uk/LC_MESSAGES/webkit-2.0.mo
 share/locale/vi/LC_MESSAGES/webkit-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/webkit-2.0.mo
-share/webkit-1.0/resources/error.html
 share/webkitgtk-1.0/images/deleteButton.png
 share/webkitgtk-1.0/images/inputSpeech.png
 share/webkitgtk-1.0/images/missingImage.png
@@ -217,6 +220,7 @@ share/webkitgtk-1.0/images/nullPlugin.png
 share/webkitgtk-1.0/images/panIcon.png
 share/webkitgtk-1.0/images/textAreaResizeCorner.png
 share/webkitgtk-1.0/images/urlIcon.png
+share/webkitgtk-1.0/resources/error.html
 share/webkitgtk-1.0/webinspector/ApplicationCacheItemsView.js
 share/webkitgtk-1.0/webinspector/AuditCategories.js
 share/webkitgtk-1.0/webinspector/AuditFormatters.js
@@ -224,8 +228,8 @@ share/webkitgtk-1.0/webinspector/AuditLauncherView.js
 share/webkitgtk-1.0/webinspector/AuditResultView.js
 share/webkitgtk-1.0/webinspector/AuditRules.js
 share/webkitgtk-1.0/webinspector/AuditsPanel.js
+share/webkitgtk-1.0/webinspector/BinarySearch.js
 share/webkitgtk-1.0/webinspector/BottomUpProfileDataGridTree.js
-share/webkitgtk-1.0/webinspector/Breakpoint.js
 share/webkitgtk-1.0/webinspector/BreakpointManager.js
 share/webkitgtk-1.0/webinspector/BreakpointsSidebarPane.js
 share/webkitgtk-1.0/webinspector/CSSCompletions.js
@@ -234,6 +238,9 @@ share/webkitgtk-1.0/webinspector/CSSStyleModel.js
 share/webkitgtk-1.0/webinspector/CallStackSidebarPane.js
 share/webkitgtk-1.0/webinspector/Checkbox.js
 share/webkitgtk-1.0/webinspector/Color.js
+share/webkitgtk-1.0/webinspector/CompilerSourceMapping.js
+share/webkitgtk-1.0/webinspector/ConsoleMessage.js
+share/webkitgtk-1.0/webinspector/ConsoleModel.js
 share/webkitgtk-1.0/webinspector/ConsolePanel.js
 share/webkitgtk-1.0/webinspector/ConsoleView.js
 share/webkitgtk-1.0/webinspector/ContextMenu.js
@@ -241,6 +248,7 @@ share/webkitgtk-1.0/webinspector/CookieItemsView.js
 share/webkitgtk-1.0/webinspector/CookieParser.js
 share/webkitgtk-1.0/webinspector/CookiesTable.js
 share/webkitgtk-1.0/webinspector/DOMAgent.js
+share/webkitgtk-1.0/webinspector/DOMBreakpointsSidebarPane.js
 share/webkitgtk-1.0/webinspector/DOMStorage.js
 share/webkitgtk-1.0/webinspector/DOMStorageItemsView.js
 share/webkitgtk-1.0/webinspector/DOMSyntaxHighlighter.js
@@ -255,10 +263,10 @@ share/webkitgtk-1.0/webinspector/DetailedHeapshotView.js
 share/webkitgtk-1.0/webinspector/Drawer.js
 share/webkitgtk-1.0/webinspector/ElementsPanel.js
 share/webkitgtk-1.0/webinspector/ElementsTreeOutline.js
+share/webkitgtk-1.0/webinspector/EmptyView.js
 share/webkitgtk-1.0/webinspector/EventListenersSidebarPane.js
 share/webkitgtk-1.0/webinspector/ExtensionAPI.js
 share/webkitgtk-1.0/webinspector/ExtensionAuditCategory.js
-share/webkitgtk-1.0/webinspector/ExtensionCommon.js
 share/webkitgtk-1.0/webinspector/ExtensionPanel.js
 share/webkitgtk-1.0/webinspector/ExtensionRegistryStub.js
 share/webkitgtk-1.0/webinspector/ExtensionServer.js
@@ -266,23 +274,20 @@ share/webkitgtk-1.0/webinspector/FontView.js
 share/webkitgtk-1.0/webinspector/GoToLineDialog.js
 share/webkitgtk-1.0/webinspector/HAREntry.js
 share/webkitgtk-1.0/webinspector/HeapSnapshot.js
-share/webkitgtk-1.0/webinspector/HeapSnapshotView.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotProxy.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotWorker.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotWorkerDispatcher.js
 share/webkitgtk-1.0/webinspector/HelpScreen.js
+share/webkitgtk-1.0/webinspector/IFrameView.js
 share/webkitgtk-1.0/webinspector/ImageView.js
 share/webkitgtk-1.0/webinspector/Images/applicationCache.png
-share/webkitgtk-1.0/webinspector/Images/auditsIcon.png
 share/webkitgtk-1.0/webinspector/Images/back.png
 share/webkitgtk-1.0/webinspector/Images/breakpointBorder.png
 share/webkitgtk-1.0/webinspector/Images/breakpointConditionalBorder.png
 share/webkitgtk-1.0/webinspector/Images/breakpointConditionalCounterBorder.png
 share/webkitgtk-1.0/webinspector/Images/breakpointCounterBorder.png
-share/webkitgtk-1.0/webinspector/Images/breakpointsActivateButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/breakpointsDeactivateButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/checker.png
-share/webkitgtk-1.0/webinspector/Images/clearConsoleButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/closeButtons.png
-share/webkitgtk-1.0/webinspector/Images/consoleButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/consoleIcon.png
 share/webkitgtk-1.0/webinspector/Images/cookie.png
 share/webkitgtk-1.0/webinspector/Images/database.png
 share/webkitgtk-1.0/webinspector/Images/databaseTable.png
@@ -291,6 +296,7 @@ share/webkitgtk-1.0/webinspector/Images/debuggerPause.png
 share/webkitgtk-1.0/webinspector/Images/debuggerStepInto.png
 share/webkitgtk-1.0/webinspector/Images/debuggerStepOut.png
 share/webkitgtk-1.0/webinspector/Images/debuggerStepOver.png
+share/webkitgtk-1.0/webinspector/Images/deleteIcon.png
 share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDown.png
 share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
 share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
@@ -300,19 +306,11 @@ share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
 share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
 share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
 share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
-share/webkitgtk-1.0/webinspector/Images/dockButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/elementsIcon.png
-share/webkitgtk-1.0/webinspector/Images/enableOutlineButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/enableSolidButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/errorIcon.png
 share/webkitgtk-1.0/webinspector/Images/errorMediumIcon.png
 share/webkitgtk-1.0/webinspector/Images/errorRedDot.png
-share/webkitgtk-1.0/webinspector/Images/excludeButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/focusButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/forward.png
 share/webkitgtk-1.0/webinspector/Images/frame.png
-share/webkitgtk-1.0/webinspector/Images/garbageCollectButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/gearButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/glossyHeader.png
 share/webkitgtk-1.0/webinspector/Images/glossyHeaderPressed.png
 share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelected.png
@@ -320,40 +318,31 @@ share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
 share/webkitgtk-1.0/webinspector/Images/goArrow.png
 share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutLeft.png
 share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutRight.png
-share/webkitgtk-1.0/webinspector/Images/helpButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/largerResourcesButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/localStorage.png
-share/webkitgtk-1.0/webinspector/Images/networkIcon.png
-share/webkitgtk-1.0/webinspector/Images/nodeSearchButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/paneAddButtons.png
 share/webkitgtk-1.0/webinspector/Images/paneBottomGrow.png
 share/webkitgtk-1.0/webinspector/Images/paneBottomGrowActive.png
+share/webkitgtk-1.0/webinspector/Images/paneElementStateButtons.png
+share/webkitgtk-1.0/webinspector/Images/paneFilterButtons.png
 share/webkitgtk-1.0/webinspector/Images/paneGrowHandleLine.png
+share/webkitgtk-1.0/webinspector/Images/paneRefreshButtons.png
 share/webkitgtk-1.0/webinspector/Images/paneSettingsButtons.png
-share/webkitgtk-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/percentButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/popoverArrows.png
 share/webkitgtk-1.0/webinspector/Images/popoverBackground.png
 share/webkitgtk-1.0/webinspector/Images/profileGroupIcon.png
 share/webkitgtk-1.0/webinspector/Images/profileIcon.png
 share/webkitgtk-1.0/webinspector/Images/profileSmallIcon.png
-share/webkitgtk-1.0/webinspector/Images/profilesIcon.png
 share/webkitgtk-1.0/webinspector/Images/profilesSilhouette.png
 share/webkitgtk-1.0/webinspector/Images/programCounterBorder.png
 share/webkitgtk-1.0/webinspector/Images/radioDot.png
-share/webkitgtk-1.0/webinspector/Images/recordButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/recordToggledButtonGlyph.png
-share/webkitgtk-1.0/webinspector/Images/reloadButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/resourceCSSIcon.png
 share/webkitgtk-1.0/webinspector/Images/resourceDocumentIcon.png
 share/webkitgtk-1.0/webinspector/Images/resourceDocumentIconSmall.png
 share/webkitgtk-1.0/webinspector/Images/resourceJSIcon.png
 share/webkitgtk-1.0/webinspector/Images/resourcePlainIcon.png
 share/webkitgtk-1.0/webinspector/Images/resourcePlainIconSmall.png
-share/webkitgtk-1.0/webinspector/Images/resourcesIcon.png
 share/webkitgtk-1.0/webinspector/Images/resourcesSizeGraphIcon.png
 share/webkitgtk-1.0/webinspector/Images/resourcesTimeGraphIcon.png
-share/webkitgtk-1.0/webinspector/Images/scriptsIcon.png
 share/webkitgtk-1.0/webinspector/Images/scriptsSilhouette.png
 share/webkitgtk-1.0/webinspector/Images/searchSmallBlue.png
 share/webkitgtk-1.0/webinspector/Images/searchSmallBrightBlue.png
@@ -367,10 +356,15 @@ share/webkitgtk-1.0/webinspector/Images/segmentSelected.png
 share/webkitgtk-1.0/webinspector/Images/segmentSelectedEnd.png
 share/webkitgtk-1.0/webinspector/Images/sessionStorage.png
 share/webkitgtk-1.0/webinspector/Images/spinner.gif
+share/webkitgtk-1.0/webinspector/Images/spinnerActive.gif
+share/webkitgtk-1.0/webinspector/Images/spinnerActiveSelected.gif
+share/webkitgtk-1.0/webinspector/Images/spinnerInactive.gif
+share/webkitgtk-1.0/webinspector/Images/spinnerInactiveSelected.gif
 share/webkitgtk-1.0/webinspector/Images/splitviewDimple.png
 share/webkitgtk-1.0/webinspector/Images/splitviewDividerBackground.png
 share/webkitgtk-1.0/webinspector/Images/statusbarBackground.png
 share/webkitgtk-1.0/webinspector/Images/statusbarBottomBackground.png
+share/webkitgtk-1.0/webinspector/Images/statusbarButtonGlyphs.png
 share/webkitgtk-1.0/webinspector/Images/statusbarButtons.png
 share/webkitgtk-1.0/webinspector/Images/statusbarMenuButton.png
 share/webkitgtk-1.0/webinspector/Images/statusbarMenuButtonSelected.png
@@ -399,7 +393,6 @@ share/webkitgtk-1.0/webinspector/Images/timelineHollowPillOrange.png
 share/webkitgtk-1.0/webinspector/Images/timelineHollowPillPurple.png
 share/webkitgtk-1.0/webinspector/Images/timelineHollowPillRed.png
 share/webkitgtk-1.0/webinspector/Images/timelineHollowPillYellow.png
-share/webkitgtk-1.0/webinspector/Images/timelineIcon.png
 share/webkitgtk-1.0/webinspector/Images/timelinePillBlue.png
 share/webkitgtk-1.0/webinspector/Images/timelinePillGray.png
 share/webkitgtk-1.0/webinspector/Images/timelinePillGreen.png
@@ -407,6 +400,8 @@ share/webkitgtk-1.0/webinspector/Images/timelinePillOrange.png
 share/webkitgtk-1.0/webinspector/Images/timelinePillPurple.png
 share/webkitgtk-1.0/webinspector/Images/timelinePillRed.png
 share/webkitgtk-1.0/webinspector/Images/timelinePillYellow.png
+share/webkitgtk-1.0/webinspector/Images/toolbarIcons.png
+share/webkitgtk-1.0/webinspector/Images/toolbarIconsSmall.png
 share/webkitgtk-1.0/webinspector/Images/toolbarItemSelected.png
 share/webkitgtk-1.0/webinspector/Images/trackHoriz.png
 share/webkitgtk-1.0/webinspector/Images/trackVert.png
@@ -416,7 +411,6 @@ share/webkitgtk-1.0/webinspector/Images/treeRightTriangleBlack.png
 share/webkitgtk-1.0/webinspector/Images/treeRightTriangleWhite.png
 share/webkitgtk-1.0/webinspector/Images/treeUpTriangleBlack.png
 share/webkitgtk-1.0/webinspector/Images/treeUpTriangleWhite.png
-share/webkitgtk-1.0/webinspector/Images/undockButtonGlyph.png
 share/webkitgtk-1.0/webinspector/Images/userInputIcon.png
 share/webkitgtk-1.0/webinspector/Images/userInputPreviousIcon.png
 share/webkitgtk-1.0/webinspector/Images/userInputResultIcon.png
@@ -427,17 +421,21 @@ share/webkitgtk-1.0/webinspector/Images/warningsErrors.png
 share/webkitgtk-1.0/webinspector/InjectedFakeWorker.js
 share/webkitgtk-1.0/webinspector/InspectorBackendStub.js
 share/webkitgtk-1.0/webinspector/InspectorFrontendHostStub.js
+share/webkitgtk-1.0/webinspector/JavaScriptContextManager.js
+share/webkitgtk-1.0/webinspector/JavaScriptFormatter.js
+share/webkitgtk-1.0/webinspector/JavaScriptSourceFrame.js
 share/webkitgtk-1.0/webinspector/KeyboardShortcut.js
 share/webkitgtk-1.0/webinspector/MetricsSidebarPane.js
 share/webkitgtk-1.0/webinspector/NetworkItemView.js
+share/webkitgtk-1.0/webinspector/NetworkLog.js
 share/webkitgtk-1.0/webinspector/NetworkManager.js
 share/webkitgtk-1.0/webinspector/NetworkPanel.js
 share/webkitgtk-1.0/webinspector/Object.js
 share/webkitgtk-1.0/webinspector/ObjectPropertiesSection.js
 share/webkitgtk-1.0/webinspector/Panel.js
 share/webkitgtk-1.0/webinspector/PanelEnablerView.js
+share/webkitgtk-1.0/webinspector/PartialQuickSort.js
 share/webkitgtk-1.0/webinspector/Placard.js
-share/webkitgtk-1.0/webinspector/PleaseWaitMessage.js
 share/webkitgtk-1.0/webinspector/Popover.js
 share/webkitgtk-1.0/webinspector/ProfileDataGridTree.js
 share/webkitgtk-1.0/webinspector/ProfileView.js
@@ -448,7 +446,11 @@ share/webkitgtk-1.0/webinspector/RemoteObject.js
 share/webkitgtk-1.0/webinspector/Resource.js
 share/webkitgtk-1.0/webinspector/ResourceCategory.js
 share/webkitgtk-1.0/webinspector/ResourceCookiesView.js
+share/webkitgtk-1.0/webinspector/ResourceHTMLView.js
 share/webkitgtk-1.0/webinspector/ResourceHeadersView.js
+share/webkitgtk-1.0/webinspector/ResourceJSONView.js
+share/webkitgtk-1.0/webinspector/ResourcePreviewView.js
+share/webkitgtk-1.0/webinspector/ResourceResponseView.js
 share/webkitgtk-1.0/webinspector/ResourceTimingView.js
 share/webkitgtk-1.0/webinspector/ResourceTreeModel.js
 share/webkitgtk-1.0/webinspector/ResourceView.js
@@ -461,19 +463,20 @@ share/webkitgtk-1.0/webinspector/ScriptsPanel.js
 share/webkitgtk-1.0/webinspector/SearchController.js
 share/webkitgtk-1.0/webinspector/Section.js
 share/webkitgtk-1.0/webinspector/Settings.js
-share/webkitgtk-1.0/webinspector/ShortcutsHelp.js
+share/webkitgtk-1.0/webinspector/SettingsScreen.js
+share/webkitgtk-1.0/webinspector/ShortcutsScreen.js
 share/webkitgtk-1.0/webinspector/ShowMoreDataGridNode.js
 share/webkitgtk-1.0/webinspector/SidebarPane.js
 share/webkitgtk-1.0/webinspector/SidebarTreeElement.js
+share/webkitgtk-1.0/webinspector/SoftContextMenu.js
 share/webkitgtk-1.0/webinspector/SourceCSSTokenizer.js
+share/webkitgtk-1.0/webinspector/SourceFile.js
 share/webkitgtk-1.0/webinspector/SourceFrame.js
-share/webkitgtk-1.0/webinspector/SourceFrameContent.js
 share/webkitgtk-1.0/webinspector/SourceHTMLTokenizer.js
 share/webkitgtk-1.0/webinspector/SourceJavaScriptTokenizer.js
 share/webkitgtk-1.0/webinspector/SourceTokenizer.js
 share/webkitgtk-1.0/webinspector/StatusBarButton.js
 share/webkitgtk-1.0/webinspector/StylesSidebarPane.js
-share/webkitgtk-1.0/webinspector/SummaryBar.js
 share/webkitgtk-1.0/webinspector/TabbedPane.js
 share/webkitgtk-1.0/webinspector/TestController.js
 share/webkitgtk-1.0/webinspector/TextEditorHighlighter.js
@@ -482,23 +485,32 @@ share/webkitgtk-1.0/webinspector/TextPrompt.js
 share/webkitgtk-1.0/webinspector/TextViewer.js
 share/webkitgtk-1.0/webinspector/TimelineAgent.js
 share/webkitgtk-1.0/webinspector/TimelineGrid.js
+share/webkitgtk-1.0/webinspector/TimelineManager.js
 share/webkitgtk-1.0/webinspector/TimelineOverviewPane.js
 share/webkitgtk-1.0/webinspector/TimelinePanel.js
 share/webkitgtk-1.0/webinspector/Toolbar.js
 share/webkitgtk-1.0/webinspector/TopDownProfileDataGridTree.js
+share/webkitgtk-1.0/webinspector/UISourceCode.js
+share/webkitgtk-1.0/webinspector/UglifyJS/parse-js.js
+share/webkitgtk-1.0/webinspector/UserMetrics.js
 share/webkitgtk-1.0/webinspector/View.js
 share/webkitgtk-1.0/webinspector/WatchExpressionsSidebarPane.js
 share/webkitgtk-1.0/webinspector/WelcomeView.js
+share/webkitgtk-1.0/webinspector/WorkerManager.js
 share/webkitgtk-1.0/webinspector/WorkersSidebarPane.js
 share/webkitgtk-1.0/webinspector/audits.css
+share/webkitgtk-1.0/webinspector/dataGrid.css
+share/webkitgtk-1.0/webinspector/externs.js
 share/webkitgtk-1.0/webinspector/goToLineDialog.css
 share/webkitgtk-1.0/webinspector/heapProfiler.css
 share/webkitgtk-1.0/webinspector/helpScreen.css
 share/webkitgtk-1.0/webinspector/inspector.css
 share/webkitgtk-1.0/webinspector/inspector.html
 share/webkitgtk-1.0/webinspector/inspector.js
+share/webkitgtk-1.0/webinspector/inspectorCommon.css
 share/webkitgtk-1.0/webinspector/inspectorSyntaxHighlight.css
 share/webkitgtk-1.0/webinspector/localizedStrings.js
+share/webkitgtk-1.0/webinspector/networkLogView.css
 share/webkitgtk-1.0/webinspector/networkPanel.css
 share/webkitgtk-1.0/webinspector/popover.css
 share/webkitgtk-1.0/webinspector/textViewer.css
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 73a81511edf..14e7718c90a 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.38 2011/09/06 19:20:31 drochner Exp $
+$NetBSD: distinfo,v 1.39 2011/10/07 12:17:25 drochner Exp $
 
-SHA1 (webkit-1.4.3.tar.gz) = a24adee9583d66ebc93ac61ce9881947a54c569d
-RMD160 (webkit-1.4.3.tar.gz) = 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa
-Size (webkit-1.4.3.tar.gz) = 8512387 bytes
-SHA1 (patch-Source_JavaScriptCore_jit_JITStubs.cpp) = 1b24daaf4bd8af75e45ceae790b43bd022540c05
-SHA1 (patch-ag) = a09f7fc1336750bc707b1bcc57aa6dc3e02a0460
-SHA1 (patch-ah) = 03e7863ad0b0a1de9a95a6b370e4259a6f7c34ac
+SHA1 (webkit-1.6.1.tar.gz) = dab3bda0708a5e0595584ca5aa33ea6bfd24ffd3
+RMD160 (webkit-1.6.1.tar.gz) = 08c6bc3f40c6a3d9fa5997bb750845e99cdb5643
+Size (webkit-1.6.1.tar.gz) = 10129874 bytes
+SHA1 (patch-Source_JavaScriptCore_jit_JITStubs.cpp) = 37d860bad704ab6920881c0401f657e49084f833
+SHA1 (patch-ag) = 220a9925ba1eb4288d334997fda24f41595de1c8
+SHA1 (patch-ah) = de2e719f67534bf64fb5968b457888e9bd824a3d
+SHA1 (patch-ai) = 8998dbb783922a866dcd00e14f33086d7edecdef
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_JITStubs.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_JITStubs.cpp
index 3646331ace5..0809164ebb4 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_JITStubs.cpp
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_JITStubs.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-Source_JavaScriptCore_jit_JITStubs.cpp,v 1.1 2011/06/22 14:05:37 wiz Exp $
+$NetBSD: patch-Source_JavaScriptCore_jit_JITStubs.cpp,v 1.2 2011/10/07 12:17:25 drochner Exp $
 
 Fix build on NetBSD-5.99.53/amd64.
 
---- Source/JavaScriptCore/jit/JITStubs.cpp.orig	2011-03-21 18:41:54.000000000 +0000
+--- Source/JavaScriptCore/jit/JITStubs.cpp.orig	2011-09-26 20:54:57.000000000 +0000
 +++ Source/JavaScriptCore/jit/JITStubs.cpp
-@@ -79,7 +79,7 @@ namespace JSC {
+@@ -80,7 +80,7 @@ namespace JSC {
  #define THUMB_FUNC_PARAM(name)
  #endif
  
 -#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
 +#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD)) && CPU(X86_64)
  #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #elif OS(DARWIN)
+ #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
  #define SYMBOL_STRING_RELOCATION(name) "_" #name
diff --git a/www/webkit-gtk/patches/patch-ag b/www/webkit-gtk/patches/patch-ag
index 3c1e569cf0e..f488bb988d2 100644
--- a/www/webkit-gtk/patches/patch-ag
+++ b/www/webkit-gtk/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2011/06/09 11:00:01 drochner Exp $
+$NetBSD: patch-ag,v 1.4 2011/10/07 12:17:25 drochner Exp $
 
---- Source/JavaScriptCore/wtf/text/AtomicString.cpp.orig	2011-03-21 18:41:46.000000000 +0000
-+++ Source/JavaScriptCore/wtf/text/AtomicString.cpp
-@@ -142,7 +142,7 @@ static inline bool equal(StringImpl* str
- 
+--- Source/JavaScriptCore/wtf/text/StringImpl.cpp.orig	2011-09-26 20:54:57.000000000 +0000
++++ Source/JavaScriptCore/wtf/text/StringImpl.cpp
+@@ -1006,7 +1006,7 @@ bool equal(const StringImpl* a, const UC
+         return false;
      // FIXME: perhaps we should have a more abstract macro that indicates when
      // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(SPARC) || CPU(SPARC64)
-     const UChar* stringCharacters = string->characters();
-     for (unsigned i = 0; i != length; ++i) {
-         if (*stringCharacters++ != *characters++)
+-#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
++#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(SPARC64) || CPU(PPC) || CPU(PPC64)
+     const UChar* as = a->characters();
+     for (unsigned i = 0; i != length; ++i)
+         if (as[i] != b[i])
diff --git a/www/webkit-gtk/patches/patch-ah b/www/webkit-gtk/patches/patch-ah
index 4bbeee7aded..bc918f8a1a9 100644
--- a/www/webkit-gtk/patches/patch-ah
+++ b/www/webkit-gtk/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.3 2011/06/09 11:00:01 drochner Exp $
+$NetBSD: patch-ah,v 1.4 2011/10/07 12:17:25 drochner Exp $
 
---- Source/JavaScriptCore/wtf/text/StringHash.h.orig	2011-03-21 18:41:46.000000000 +0000
+--- Source/JavaScriptCore/wtf/text/StringHash.h.orig	2011-09-26 20:54:57.000000000 +0000
 +++ Source/JavaScriptCore/wtf/text/StringHash.h
 @@ -55,7 +55,7 @@ namespace WTF {
  
              // FIXME: perhaps we should have a more abstract macro that indicates when
              // going 4 bytes at a time is unsafe
--#if CPU(ARM) || CPU(SH4) || CPU(MIPS)
-+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(SPARC) || CPU(SPARC64)
+-#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC)
++#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(SPARC64) || CPU(PPC) || CPU(PPC64)
              const UChar* aChars = a->characters();
              const UChar* bChars = b->characters();
              for (unsigned i = 0; i != aLength; ++i) {
diff --git a/www/webkit-gtk/patches/patch-ai b/www/webkit-gtk/patches/patch-ai
new file mode 100644
index 00000000000..1bd4e47dc2e
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-ai
@@ -0,0 +1,17 @@
+$NetBSD: patch-ai,v 1.1 2011/10/07 12:17:25 drochner Exp $
+
+--- Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp.orig	2011-09-26 20:54:57.000000000 +0000
++++ Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp
+@@ -39,6 +39,12 @@
+ #if OS(ANDROID)
+ // PTHREAD_KEYS_MAX is not defined in bionic, so explicitly define it here.
+ #define PTHREAD_KEYS_MAX 1024
++#elif OS(NETBSD)
++#include <limits.h>
++// PTHREAD_KEYS_MAX is not defined in 5.x
++#ifndef PTHREAD_KEYS_MAX
++#define PTHREAD_KEYS_MAX 256
++#endif
+ #else
+ #include <limits.h>
+ #endif