Update to 1.1.3. Changes:

2009-03-15  Xan Lopez  <xlopez@igalia.com>

        Bump version to 1.1.3 for release and fix soversion
        calculation (oops). Thanks to Frederik Himpe for pointing this
        out.

        * configure.ac:

2009-03-15  Xan Lopez  <xlopez@igalia.com>

        Bump version and libtool version for release.

        * configure.ac:

2009-03-14  Xan Lopez  <xlopez@igalia.com>

        No review, build fix.

        Split clean rules to make distcheck pass.

        * GNUmakefile.am:

2009-03-13  Mark Rowe  <mrowe@apple.com>

        Reviewed by Dan Bernstein.

        Remove rarely used Makefile targets from the Makefile.

        There are many situations in which the targets don't work as expected,
        and their primary use is addressed by having the build system default
        to building the appropriate architecture.

        * Makefile.shared:

2009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>

        Reviewed by Holger Freyther.

        [Gtk] Fix make clean targets
        https://bugs.webkit.org/show_bug.cgi?id=24450

        Fix 'make' clean targets. We shouldn't be removing DerivedSources
        if it's only clean. Only remove it if it's distclean or
        maintainer-clean. Also remove build-related auxillary files on
        dist/maintainer clean.

        * GNUmakefile.am:

2009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>

        Reviewed by Holger Freyther

        [GTK]DumpRenderTree doesn't compile for non-X11 GTK ports anymore
        https://bugs.webkit.org/show_bug.cgi?id=2260

        pangoft2 is also used in directfb builds so use it for all targets

        * configure.ac:

2009-03-02  Xan Lopez  <xan@gnome.org>

        Reviewed by Mark Rowe.

        https://bugs.webkit.org/show_bug.cgi?id=24287
        [GTK] Move auth dialog feature to WebKit/

        Add WebKitSoupAuthDialog files to build.

        * GNUmakefile.am:

2009-03-03  Gustavo Noronha Silva  <gns@gnome.org>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=16826
        [Gtk] Implement WebKitDownload

        Adding new files related to WebKitDownload to the GTK+ port.

        * GNUmakefile.am:

2009-03-02  Gustavo Noronha Silva  <gns@gnome.org>

        Unreviewed build fix; adding missing files to EXTRA_DIST, so that
        they show up in the tarball.

        * GNUmakefile.am:

2009-03-01  Christian Dywan  <christian@twotoasts.de>

        * configure.ac: Bump GTK port version to 1.1.1.

2009-02-27  Gustavo Noronha Silva  <gns@gnome.org>

        Unreviewed build fix. Adding the WebKit/gtk/webkitmarshal.list
        file to EXTRA_DIST to fix make dist.

        * GNUmakefile.am:

2009-02-26  Xan Lopez  <xan@gnome.org>

        Reviewed by Holger Freyther.

        https://bugs.webkit.org/show_bug.cgi?id=16947
        [GTK] Missing HTTP Auth challenge

        Add HTTP authentication dialog with optional GNOME Keyring
        storage.

        * GNUmakefile.am:
        * configure.ac:

2009-02-26  Xan Lopez  <xan@gnome.org>

        Reviewed by Holger Freyther.

        https://bugs.webkit.org/show_bug.cgi?id=16947
        [GTK] Missing HTTP Auth challenge

        Take marshallers to be built from a manually maintained list
        instead of grepping the sources.

        It's much faster, especially so now that we want to add
        marshallers from WebCore too. A system to only take into account
        the modified files when generating the marshallers from sources
        could be hacked, but I think it's overkill considering how rarely
        a new marshaller is added.

        * GNUmakefile.am:

2009-02-24  Jan Michael Alonzo  <jmalonzo@webkit.org>

        Reviewed by Alexey Proskuryakov.

        [Gtk] add options for 3D transforms and HTML5 channel messaging to the build
        https://bugs.webkit.org/show_bug.cgi?id=24072

        Add options for toggling 3D transforms and HTML5 channel messaging
        support on or off.

        Also fix the web-workers option. It should be web-workers and not workers.

        * configure.ac:

2009-02-23  Xan Lopez  <xan@gnome.org>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=22624
        [SOUP][GTK] Need API to get SoupSession from WebKit.

        Remove CURL support, the only supported HTTP backend is SOUP now.

        * GNUmakefile.am:
        * configure.ac:

2009-02-19  Christian Dywan  <christian@twotoasts.de>

        Rubber-stamped by Holger Freyther.

        http://bugs.webkit.org/show_bug.cgi?id=22811
        Underlinking in Programs_UnitTests (GTK+ build)

        * GNUmakefile.am: Add GLIB_LIBS to unit test library flags.

2009-02-18  Gustavo Noronha Silva  <gns@gnome.org>

        Reviewed by Holger Freyther.

        Fix symbols.filter location, and add other missing files to the
        autotools build, so that make dist works.

        * GNUmakefile.am:

2009-02-17  Gustavo Noronha Silva  <gns@gnome.org>

        Reviewed by Alexey Proskuryakov.

        https://bugs.webkit.org/show_bug.cgi?id=23939
        Release build being built with debugging symbols

        * configure.ac: Revert change done in revision 40790, since we
        already have a AC_PROG_CXX macro call as part of WEBKIT_INIT

2009-02-12  Gustavo Noronha Silva  <gns@gnome.org>

        Reviewed by Eric Seidel.

        * configure.ac: Make soup the default HTTP backend for the Gtk port.

2009-02-09  Calvin Walton  <calvin.walton@gmail.com>

        Reviewed by Holger Freyther.

        https://bugs.webkit.org/show_bug.cgi?id=23823

        [Gtk] Fix build with recent autotools

        Current versions of automake/libtool don't assume you want C++ enabled
        by default any more, so explicitly check for a C++ compiler.

        * configure.ac: Add AC_PROG_CXX macro

2009-02-02  Christian Dywan  <christian@twotoasts.de>

        Rubber-stamped by Holger Freyther.

        Don't require Geolocation by default.

        * configure.ac:

2009-01-30  Jan Michael Alonzo  <jmalonzo@webkit.org>

        Reviewed by Nikolas Zimmermann.

        [Gtk] Refactor autoconf/configure.ac in preparation for jsc and webkit build splits
        https://bugs.webkit.org/show_bug.cgi?id=22136

        * GNUmakefile.am:
        * acinclude.m4: Removed.
        * autogen.sh:
        * autotools/acinclude.m4: Added.
        * autotools/dolt.m4: Added.
        * autotools/symbols.filter: Renamed from symbols.filter.
        * autotools/webkit.m4: Added.
        * configure.ac:

2009-01-30  Holger Hans Peter Freyther  <zecke@selfish.org>

        Reviewed by Nikolas Zimmermann.

        [GTK] Implement GeolocationService using the Geoclue library

        https://bugs.webkit.org/show_bug.cgi?id=22022

        Untested implementation of the GeolocationService using the geoclue
        library. Velocity handling is completely missing and the accuracy
        handling might be wrong.

        * GNUmakefile.am:
        * configure.ac:

2009-01-11  Xan Lopez  <xan@gnome.org>

        Reviewed by Holger Freyther.

        Bump version to 1.1.0 since we are breaking ABI and adding new
        major features.

        * configure.ac:

2008-12-19  Marco Barisione  <marco.barisione@collabora.co.uk>

        Reviewed by Holger Freyther.

        http://bugs.webkit.org/show_bug.cgi?id=16562
        [gtk] Implement WebPolicyDelegate methods

        Original work by Pierre-Luc Beaudoin. Final touches by Gustavo
        Noronha.

        This implements the delegates methods of WebPolicyDelegate.
        Since Gtk+/C doesn't have delegate methods, they are replaced with
        signals.

        A new object WebKitWebPolicyDecision allows the browser to delay its
        response in certain cases. WebKitWebNavigationAction contains the
        information about what caused a navigation request.

        * GNUmakefile.am: Add new files

2008-12-19  Gustavo Noronha Silva  <gns@gnome.org>

        Reviewed by Holger Freyther.

        Use ustar tar format for WebKit/GTK+'s make dist target, so that
        storing files whose filenames are > 99 is possible.

        * configure.ac:

2008-12-19  Holger Hans Peter Freyther  <zecke@selfish.org>

        [GTK] Build fix by defining WTF_USE_JIT_STUB_ARGUMENT_VA_LIST

        Fix the jit compilation on i*686 on Linux by using the va_list
        to pass arguments to the CTI. This is done on the MAC as well
        and sunspider and javascriptcore seem to work with that.

        * configure.ac:

2008-12-18  Pamela Greene  <pam@chromium.org>

        Submitted without review.
        Right, remove the whole misplaced directory, not just the tests.

        * fast: Removed.
        * fast/dom: Removed.

2008-12-18  Pamela Greene  <pam@chromium.org>

        Submitted without review.
        Moving layout test into LayoutTests where it belongs.

        * fast/dom/setter-type-enforcement-expected.txt: Removed.
        * fast/dom/setter-type-enforcement.html: Removed.

2008-12-15  Daniel Macks  <dmacks@netspace.org>

        Reviewed by Darin Adler.

        Default to use external libicu-config if avail on all platforms.
        https://bugs.webkit.org/show_bug.cgi?id=22713

        * configure.ac:

9 files changed, 44 insertions, 181 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 2d89c210193..ad4bf5664fc 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,56 +1,42 @@
-# $NetBSD: Makefile,v 1.3 2008/12/29 14:57:32 hasso Exp $
-#
-# pkg-config says 1.0.3, let's combine it with the revision
-# to give a sane version number.
-#
-DISTNAME=	WebKit-r39230
-PKGNAME=	${DISTNAME:S/WebKit/webkit-gtk/:S/r/1.0.3./}
+# $NetBSD: Makefile,v 1.4 2009/03/18 03:13:12 snj Exp $
+
+DISTNAME=	webkit-1.1.3
+PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
 CATEGORIES=	www
-MASTER_SITES=	http://nightly.webkit.org/files/trunk/src/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://www.webkitgtk.org/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://webkit.org/
+HOMEPAGE=	http://www.webkitgtk.org/
 COMMENT=	GTK2 port of the WebKit browser engine
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	bison gmake perl:build \
-		automake autoconf autoheader \
-		aclocal pkg-config bash:build
+USE_TOOLS+=	bison gmake perl:build pkg-config
+
+PKGCONFIG_OVERRIDE=	WebKit/gtk/webkit.pc.in
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_FILE=	GNUmakefile
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-target=x11 \
-			--with-http-backend=curl \
 			--with-font-backend=freetype
 
-REPLACE_PERL+=	JavaScriptCore/kjs/create_hash_table \
-		JavaScriptCore/pcre/dftables \
-		SunSpider/make-hosted \
-		SunSpider/sunspider \
-		SunSpider/sunspider-compare-results \
-		WebCore/bindings/scripts/*.pl \
+REPLACE_PERL+=	JavaScriptCore/pcre/dftables \
+		JavaScriptCore/create_hash_table \
+		WebCore/bindings/scripts/generate-bindings.pl \
+		WebCore/bindings/scripts/InFilesParser.pm \
+		WebCore/platform/text/mac/make-charset-table.pl \
 		WebCore/css/*.pl \
 		WebCore/dom/*.pl \
-		WebCore/platform/text/mac/*.pl \
-		WebKit/WebKit.xcodeproj/project.pbxproj \
-		WebKit/win/WebKit.vcproj/*.pl \
-		WebKitTools/BuildSlaveSupport/build-launcher-app \
-		WebKitTools/BuildSlaveSupport/build-launcher-dmg \
-		WebKitTools/BuildSlaveSupport/run-performance-tests \
-		WebKitTools/Scripts/*
-
-pre-configure:
-	cd ${WRKSRC} && ${BASH} autogen.sh
+		WebCore/platform/text/mac/*.pl
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-# These are optional, but they need testing.
-#.include "../../net/libsoup24/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
+# This is optional, but needs testing.
 #.include "../../devel/pango/buildlink3.mk"
 # A correct Webkit build requires flex 2.5.33
 .include "../../devel/flex/buildlink3.mk"
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 517d5a0c2f1..35614eaa4a9 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/12/13 02:35:15 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/03/18 03:13:12 snj Exp $
 bin/jsc
 include/webkit-1.0/JavaScriptCore/JSBase.h
 include/webkit-1.0/JavaScriptCore/JSContextRef.h
@@ -12,17 +12,20 @@ include/webkit-1.0/JavaScriptCore/JavaScriptCore.h
 include/webkit-1.0/JavaScriptCore/WebKitAvailability.h
 include/webkit-1.0/webkit/webkit.h
 include/webkit-1.0/webkit/webkitdefines.h
+include/webkit-1.0/webkit/webkitdownload.h
 include/webkit-1.0/webkit/webkitenumtypes.h
 include/webkit-1.0/webkit/webkitnetworkrequest.h
+include/webkit-1.0/webkit/webkitsoupauthdialog.h
 include/webkit-1.0/webkit/webkitversion.h
 include/webkit-1.0/webkit/webkitwebbackforwardlist.h
 include/webkit-1.0/webkit/webkitwebframe.h
 include/webkit-1.0/webkit/webkitwebhistoryitem.h
 include/webkit-1.0/webkit/webkitwebinspector.h
+include/webkit-1.0/webkit/webkitwebnavigationaction.h
+include/webkit-1.0/webkit/webkitwebpolicydecision.h
 include/webkit-1.0/webkit/webkitwebsettings.h
 include/webkit-1.0/webkit/webkitwebview.h
 include/webkit-1.0/webkit/webkitwebwindowfeatures.h
-lib/libtestnetscapeplugin.la
 lib/libwebkit-1.0.la
 lib/pkgconfig/webkit-1.0.pc
 share/webkit-1.0/webinspector/Images/back.png
@@ -48,6 +51,7 @@ share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
 share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
 share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
 share/webkit-1.0/webinspector/Images/dockButtons.png
+share/webkit-1.0/webinspector/Images/domStorage.png
 share/webkit-1.0/webinspector/Images/elementsIcon.png
 share/webkit-1.0/webinspector/Images/enableButtons.png
 share/webkit-1.0/webinspector/Images/errorIcon.png
@@ -133,6 +137,7 @@ share/webkit-1.0/webinspector/Images/treeUpTriangleBlack.png
 share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png
 share/webkit-1.0/webinspector/Images/userInputIcon.png
 share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
+share/webkit-1.0/webinspector/Images/userInputResultIcon.png
 share/webkit-1.0/webinspector/Images/warningIcon.png
 share/webkit-1.0/webinspector/Images/warningMediumIcon.png
 share/webkit-1.0/webinspector/Images/warningsErrors.png
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index 8a7264bb37e..de229f9485d 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/11 19:38:57 ahoka Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/03/18 03:13:12 snj Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WEBKIT_GTK_BUILDLINK3_MK:=	${WEBKIT_GTK_BUILDLINK3_MK}+
@@ -12,19 +12,19 @@ BUILDLINK_PACKAGES+=	webkit-gtk
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}webkit-gtk
 
 .if ${WEBKIT_GTK_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.webkit-gtk+=	webkit-gtk>=1.0.2.35289
+BUILDLINK_API_DEPENDS.webkit-gtk+=	webkit-gtk>=1.1.3
 BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
 .endif	# WEBKIT_GTK_BUILDLINK3_MK
 
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/gperf/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../devel/gperf/buildlink3.mk"
+.include "../../net/libsoup24/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index dc4cf48fd72..bc21fdef90a 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/12/29 14:57:32 hasso Exp $
+$NetBSD: distinfo,v 1.5 2009/03/18 03:13:12 snj Exp $
 
-SHA1 (WebKit-r39230.tar.bz2) = dd253c9f350519c6e0da9280491a1a7ebf59ae52
-RMD160 (WebKit-r39230.tar.bz2) = f13f083c42ac8e0cd2bbe3782019479b453281de
-Size (WebKit-r39230.tar.bz2) = 9897435 bytes
-SHA1 (patch-aa) = a89653a6cee06a6573fd8111c0dd35f887782337
-SHA1 (patch-ab) = 19d9ac9a362a8c41025775bc60634dc1e5c3c28c
-SHA1 (patch-ac) = 85b8bd43f4198daebbd9ae91ccd45d1237d3fa8b
-SHA1 (patch-ad) = a37c8987f7f729db40606f7a266515aeab4c1580
-SHA1 (patch-ae) = dc873da0b7555fec1ccad382ee776e6a7e0fe0b6
+SHA1 (webkit-1.1.3.tar.gz) = 581fffda1f8a14341b9b038e4684fac00e648869
+RMD160 (webkit-1.1.3.tar.gz) = 24f8de2e440215250b3cfb1d8f03fac946fe065f
+Size (webkit-1.1.3.tar.gz) = 5793127 bytes
+SHA1 (patch-ad) = 6a53ac32606c1985c15430f14f45dd6215e1d86a
diff --git a/www/webkit-gtk/patches/patch-aa b/www/webkit-gtk/patches/patch-aa
deleted file mode 100644
index 58937c6f268..00000000000
--- a/www/webkit-gtk/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/11 19:38:57 ahoka Exp $
-
---- WebKitTools/wx/install-unix-extras.orig	2008-04-28 20:40:06.000000000 +0200
-+++ WebKitTools/wx/install-unix-extras
-@@ -41,7 +41,7 @@ DL_DIR=/tmp/webkit-deps
- DEPS_PREFIX=$WK_ROOT/WebKitLibraries/unix
- DLLEXT=so
- 
--if [ "${OSTYPE:0:6}" == "darwin" ]; then
-+if [ "${OSTYPE:0:6}" = "darwin" ]; then
-     DLLEXT=dylib
- fi
- 
-@@ -84,7 +84,7 @@ if [ `which icu-config >/dev/null 2>&1` 
-   
-   chmod +x configure install-sh
- 
--  if [ "${OSTYPE:0:6}" == "darwin" ]; then  
-+  if [ "${OSTYPE:0:6}" = "darwin" ]; then  
-     ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
-     make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
-     LDFLAGS="-arch i386 -arch ppc"
-@@ -107,7 +107,7 @@ if [ ! -f $DEPS_PREFIX/lib/libiconv.$DLL
-   tar xzvf $DL_DIR/$ICONV_TARBALL
-   cd $DL_DIR/libiconv-$ICONV_VERSION
- 
--  if [ "${OSTYPE:0:6}" == "darwin" ]; then  
-+  if [ "${OSTYPE:0:6}" = "darwin" ]; then  
-     ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
-     make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
-     LDFLAGS="-arch i386 -arch ppc"
-@@ -131,7 +131,7 @@ if [ ! -f $DEPS_PREFIX/lib/libjpeg.a ]; 
-   # jpeg install command expects this to exist.
-   mkdir -p $DEPS_PREFIX/man/man1
- 
--  if [ "${OSTYPE:0:6}" == "darwin" ]; then
-+  if [ "${OSTYPE:0:6}" = "darwin" ]; then
-     ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
-     make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
-     LDFLAGS="-arch i386 -arch ppc"
-@@ -155,7 +155,7 @@ if [ ! -f $DEPS_PREFIX/lib/libpng.a ]; t
-   tar xzvf $DL_DIR/$LIBPNG_TARBALL
-   cd $DL_DIR/libpng-$LIBPNG_VERSION
- 
--  if [ "${OSTYPE:0:6}" == "darwin" ]; then
-+  if [ "${OSTYPE:0:6}" = "darwin" ]; then
-     ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
-     make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
-     LDFLAGS="-arch i386 -arch ppc"
diff --git a/www/webkit-gtk/patches/patch-ab b/www/webkit-gtk/patches/patch-ab
deleted file mode 100644
index 166dadf7951..00000000000
--- a/www/webkit-gtk/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/11 19:38:57 ahoka Exp $
-
---- autogen.sh.orig	2008-04-17 23:37:24.000000000 +0200
-+++ autogen.sh
-@@ -53,5 +53,3 @@ automake --foreign --add-missing || exit
- autoconf || exit $?
- 
- cd $ORIGDIR || exit 1
--
--$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
diff --git a/www/webkit-gtk/patches/patch-ac b/www/webkit-gtk/patches/patch-ac
deleted file mode 100644
index 8b6ca596868..00000000000
--- a/www/webkit-gtk/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2008/12/13 02:35:16 jmcneill Exp $
-
---- JavaScriptCore/kjs/collector.cpp.orig	2008-07-20 06:53:10.000000000 +0200
-+++ JavaScriptCore/runtime/Collector.cpp
-@@ -386,7 +386,7 @@ static inline void* currentThreadStackBa
-     if (stackBase == 0 || thread != stackThread) {
-         pthread_attr_t sattr;
-         pthread_attr_init(&sattr);
--#if HAVE(PTHREAD_NP_H)
-+#if HAVE(PTHREAD_NP_H) || PLATFORM(NETBSD)
-         // e.g. on FreeBSD 5.4, neundorf@kde.org
-         pthread_attr_get_np(thread, &sattr);
- #else
diff --git a/www/webkit-gtk/patches/patch-ad b/www/webkit-gtk/patches/patch-ad
index efdbbec144d..8609a4c87e0 100644
--- a/www/webkit-gtk/patches/patch-ad
+++ b/www/webkit-gtk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2008/12/29 14:57:32 hasso Exp $
+$NetBSD: patch-ad,v 1.4 2009/03/18 03:13:12 snj Exp $
 
---- JavaScriptCore/wtf/Platform.h.orig	2008-12-12 08:58:12 +0200
-+++ JavaScriptCore/wtf/Platform.h	2008-12-26 14:02:38 +0200
-@@ -60,7 +60,7 @@
+--- JavaScriptCore/wtf/Platform.h.orig	2009-03-15 10:41:39.000000000 -0700
++++ JavaScriptCore/wtf/Platform.h	2009-03-17 16:33:41.000000000 -0700
+@@ -70,7 +70,7 @@
  /* PLATFORM(FREEBSD) */
  /* Operating system level dependencies for FreeBSD-like systems that */
  /* should be used regardless of operating environment */
@@ -11,17 +11,3 @@ $NetBSD: patch-ad,v 1.3 2008/12/29 14:57:32 hasso Exp $
  #define WTF_PLATFORM_FREEBSD 1
  #endif
  
-@@ -71,6 +71,13 @@
- #define WTF_PLATFORM_OPENBSD 1
- #endif
- 
-+/* PLATFORM(NETBSD) */
-+/* Operating system level dependencies for OpenBSD systems that */
-+/* should be used regardless of operating environment */
-+#ifdef __NetBSD__
-+#define WTF_PLATFORM_NETBSD 1
-+#endif
-+
- /* PLATFORM(SOLARIS) */
- /* Operating system level dependencies for Solaris that should be used */
- /* regardless of operating environment */
diff --git a/www/webkit-gtk/patches/patch-ae b/www/webkit-gtk/patches/patch-ae
deleted file mode 100644
index cc023d084f9..00000000000
--- a/www/webkit-gtk/patches/patch-ae
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2008/12/13 02:35:16 jmcneill Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=22205
-
---- WebCore/css/CSSGrammar.y.orig	2008-12-04 23:38:15.000000000 -0500
-+++ WebCore/css/CSSGrammar.y
-@@ -94,6 +94,8 @@ static int cssyylex(YYSTYPE* yylval, voi
- 
- %expect 49
- 
-+%nonassoc LOWEST_PREC
-+
- %left UNIMPORTANT_TOK
- 
- %token WHITESPACE SGML_CD
-@@ -349,7 +351,7 @@ maybe_charset:
- 
- closing_brace:
-     '}'
--  | %prec maybe_sgml TOKEN_EOF
-+  | %prec LOWEST_PREC TOKEN_EOF
-   ;
- 
- charset:
-@@ -1355,10 +1357,10 @@ term:
-       $$.string = $1;
-   }
-   /* We might need to actually parse the number from a dimension, but we can't just put something that uses $$.string into unary_term. */
--  | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION }
--  | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION }
-+  | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
-+  | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
-   | URI maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; }
--  | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE }
-+  | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
-   | hexcolor { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
-   | '#' maybe_space { $$.id = 0; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */
-   /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */