Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/www/webkit-gtk/Makefile	2011/04/14 18:11:45	1.40
+++ pkgsrc/www/webkit-gtk/Makefile	2015/11/04 07:03:57	1.104
@@ -1,59 +1,112 @@
-# $NetBSD: Makefile,v 1.40 2011/04/14 18:11:45 drochner Exp $
+# $NetBSD: Makefile,v 1.104 2015/11/04 07:03:57 leot Exp $
 
-DISTNAME=	webkit-1.2.7
-PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
-PKGREVISION=	3
+DISTNAME=	webkitgtk-2.10.3
+PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=	www
-MASTER_SITES=	http://www.webkitgtk.org/
+MASTER_SITES=	http://www.webkitgtk.org/releases/
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.webkitgtk.org/
-COMMENT=	GTK2 port of the WebKit browser engine
+COMMENT=	GTK port of the WebKit browser engine
+LICENSE=	2-clause-bsd AND gnu-lgpl-v2
 
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	bison gmake perl:build pkg-config msgfmt
+# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
+NOT_FOR_PLATFORM=	NetBSD-[1-6]*-*
 
-PKGCONFIG_OVERRIDE=	WebKit/gtk/webkit.pc.in
+BUILD_DEPENDS+=	gettext-tools>=0.18:../../devel/gettext-tools
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-MAKE_JOBS_SAFE=		no
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+#USE_LIBTOOL=	yes
+USE_TOOLS+=	automake bison gmake perl:build pkg-config msgfmt
 
-MAKE_FILE=	GNUmakefile
-GNU_CONFIGURE=	yes
+# GCC >= 4.7 or Clang >= 3.3
+# XXX: Kludge, upstream needs GCC 4.9.0 for IndexedDB support.
+# XXX: patches/patch-Source_cmake_OptionsGTK.cmake disables that to
+# XXX: avoid requiring GCC 4.9.0.
+GCC_REQD+=	4.7
+
+# Using ld.gold subverts Pkgsrc wrappers, and this package also crashes buggy
+# versions of ld.gold.
+CMAKE_ARGS+=	-DUSE_LD_GOLD=OFF
+
+PKGCONFIG_OVERRIDE+=	Source/JavaScriptCore/javascriptcoregtk.pc.in
+PKGCONFIG_OVERRIDE+=	Source/WebKit2/webkit2gtk.pc.in
+PKGCONFIG_OVERRIDE+=	Source/WebKit2/webkit2gtk-web-extension.pc.in
+
+CMAKE_ARGS+=		-DPORT=GTK
+CMAKE_ARGS+=		-DENABLE_X11_TARGET=ON
+CMAKE_ARGS+=		-DENABLE_MINIBROWSER=ON
+CMAKE_ARGS+=		-DENABLE_GEOLOCATION=OFF
+CMAKE_ARGS+=		-DUSE_LIBHYPHEN=OFF
+
+REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table \
+		Source/WebCore/bindings/scripts/*.pl \
+		Source/WebCore/bindings/scripts/InFilesCompiler.pm \
+		Source/WebCore/bindings/scripts/InFilesParser.pm \
+		Source/WebCore/css/*.pl \
+		Source/WebCore/dom/*.pl \
+		Source/WebCore/make-hash-tools.pl
+
+REPLACE_PYTHON+=	Tools/gtk/*.py \
+			Tools/gtk/generate-gtkdoc
+
+.include "../../lang/ruby/rubyversion.mk"
+BUILD_DEPENDS+=	${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
+CMAKE_ARGS+=	-DRUBY_EXECUTABLE=${RUBY}
+
+PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.10.2
+.include "../../lang/python/application.mk"
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHONBIN}
+
+CXXFLAGS.SunOS+=	-fpermissive
+
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+CXXFLAGS+=	-std=c++11 -Wno-c++11-narrowing
+.endif
+
+.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+CMAKE_ARGS+=	-DUSE_SYSTEM_MALLOC=ON
+.endif
 
-CONFIGURE_ARGS+=	--with-target=x11 \
-			--with-font-backend=freetype
 .include "options.mk"
 
-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
-
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
+.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CMAKE_ARGS+=	-DENABLE_INTROSPECTION=ON
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+# A correct Webkit build requires flex 2.5.33
 .include "../../devel/flex/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
-# This is optional, but needs testing.
-#.include "../../devel/pango/buildlink3.mk"
-# A correct Webkit build requires flex 2.5.33
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/cairo-gobject/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
 .include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.28.0
-.include "../../net/libsoup24/buildlink3.mk"
-.include "../../textproc/enchant/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gstreamer1+=	gstreamer1>=1.0.3
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gst-plugins1-base+=	gst-plugins1-base>=1.0.3
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
+.include "../../net/libsoup/buildlink3.mk"
+.include "../../security/libsecret/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.24.17nb3
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"