Switch to webkit1-gtk* in preparation for package update to v2.

Packages can switch to that version when they're tested to build with it.

17 files changed, 35 insertions, 43 deletions

diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index d6510717916..ab8d6aa75c4 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/05/05 00:47:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=	gmpc-wikipedia-11.8.16
 PKGREVISION=	5
@@ -16,5 +16,5 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	intltool pkg-config
 
 .include "../../audio/gmpc/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index 80511a5db4b..eaed5beb02a 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2014/05/17 16:10:41 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=	empathy-2.34.0
 PKGREVISION=	40
@@ -56,7 +56,7 @@ BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.12.0
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 # notyet
-#.include "../../www/webkit-gtk/buildlink3.mk"
+#.include "../../www/webkit1-gtk/buildlink3.mk"
 #.include "../../graphics/clutter-mx/buildlink3.mk"
 #.include "../../chat/telepathy-logger/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index ece50cd7fff..88bf22b436d 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2014/05/29 23:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=		devhelp-2.32.0
 PKGREVISION=		31
@@ -27,7 +27,7 @@ GCONF_SCHEMAS=		devhelp.schemas
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
diff --git a/devel/devhelp/buildlink3.mk b/devel/devhelp/buildlink3.mk
index 1bef23eb73c..fcc91c93b9a 100644
--- a/devel/devhelp/buildlink3.mk
+++ b/devel/devhelp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2014/05/05 00:47:43 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2014/08/03 22:13:19 wiz Exp $
 
 BUILDLINK_TREE+=	devhelp
 
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.devhelp?=	../../devel/devhelp
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # DEVHELP_BUILDLINK3_MK
 
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 3b8a9be4833..694853a7e12 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.206 2014/05/29 23:36:34 wiz Exp $
+# $NetBSD: Makefile,v 1.207 2014/08/03 22:13:20 wiz Exp $
 
 DISTNAME=		gnucash-2.6.3
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		finance
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnucash/}
 EXTRACT_SUFX=		.tar.bz2
@@ -61,6 +61,6 @@ BUILDLINK_API_DEPENDS.gnome-keyring+=	gnome-keyring>=0.6
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/shotwell-gtk3/Makefile b/graphics/shotwell-gtk3/Makefile
index 3f3c7ab297c..19c1d42a031 100644
--- a/graphics/shotwell-gtk3/Makefile
+++ b/graphics/shotwell-gtk3/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/06/07 12:11:24 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.30 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=		shotwell-0.15.1
 PKGREVISION=		4
@@ -45,7 +44,7 @@ BUILDLINK_DEPMETHOD.vala= build
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
-.include "../../www/webkit-gtk3/buildlink3.mk"
+.include "../../www/webkit1-gtk3/buildlink3.mk"
 .include "../../www/librest07/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libunique3/buildlink3.mk"
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index fe52cfb2048..5e0f08e15ef 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2014/06/07 12:11:24 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.57 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=		shotwell-0.11.6
 PKGREVISION=		25
@@ -52,7 +51,7 @@ BUILDLINK_DEPMETHOD.vala= build
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/yelp3/Makefile b/misc/yelp3/Makefile
index c6821b5cf1d..49b4af08a0d 100644
--- a/misc/yelp3/Makefile
+++ b/misc/yelp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/05/05 00:48:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.29 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=		yelp-3.8.1
 PKGREVISION=		10
@@ -26,7 +26,7 @@ BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=1.1.4
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../www/webkit-gtk3/buildlink3.mk"
+.include "../../www/webkit1-gtk3/buildlink3.mk"
 .include "../../textproc/yelp-xsl/buildlink3.mk"
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/www/deforaos-surfer/Makefile b/www/deforaos-surfer/Makefile
index 4575558479a..66042025b82 100644
--- a/www/deforaos-surfer/Makefile
+++ b/www/deforaos-surfer/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/05/05 00:48:26 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.16 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=	Surfer-0.2.6
 PKGNAME=	deforaos-surfer-0.2.6
@@ -33,7 +32,7 @@ post-install:
 .include "options.mk"
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index f1e0f5eef15..d2c6aa44604 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.152 2014/05/05 00:48:26 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.153 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=	epiphany-2.30.6
 PKGREVISION=	37
@@ -40,7 +39,7 @@ GCONF_SCHEMAS+=	epiphany-lockdown.schemas
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.18.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 32e04c28767..6c5aecf48a3 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.64 2014/05/05 00:48:26 ryoon Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.65 2014/08/03 22:13:19 wiz Exp $
 
 BUILDLINK_TREE+=	epiphany
 
@@ -14,7 +13,7 @@ BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 6add81f74d7..ec797518ec0 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2014/05/05 00:48:26 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.66 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=	kazehakase-0.5.8
 PKGREVISION=	32
@@ -42,7 +41,7 @@ CONF_FILES+=	${EGDIR}/mozilla/encodings.xml ${PKG_SYSCONFDIR}/mozilla/encodings.
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/www/liferea-current/Makefile b/www/liferea-current/Makefile
index 52177edf58e..1d73287f771 100644
--- a/www/liferea-current/Makefile
+++ b/www/liferea-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2014/05/29 23:37:58 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=		liferea-1.8.15
 PKGREVISION=		9
@@ -31,7 +31,7 @@ GCONF_SCHEMAS=		liferea.schemas
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 3f4556e011d..cba7e83ba45 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2014/05/29 23:37:57 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=		liferea-1.4.28
 PKGREVISION=		42
@@ -29,7 +29,7 @@ PLIST.gtkhtml=	yes
 .endif
 .if !empty(PKG_OPTIONS:Mliferea-webkit)
 CONFIGURE_ARGS+=	--disable-gecko
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 PLIST.webkit=	yes
 .endif
 
diff --git a/www/midori/Makefile b/www/midori/Makefile
index eb86b7f6869..8d1050e62bb 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2014/05/09 07:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2014/08/03 22:13:19 wiz Exp $
 
 DISTNAME=	midori-0.4.9
 PKGREVISION=	13
@@ -72,7 +72,7 @@ BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0
 #.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../www/webkit1-gtk/buildlink3.mk"
 .include "../../x11/libunique/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/ruby-gnome2-webkit-gtk/Makefile b/www/ruby-gnome2-webkit-gtk/Makefile
index b6f42b4bd20..b0baff6848e 100644
--- a/www/ruby-gnome2-webkit-gtk/Makefile
+++ b/www/ruby-gnome2-webkit-gtk/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/06/20 09:12:14 obache Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/08/03 22:13:20 wiz Exp $
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-webkit-gtk-${VERSION}
 COMMENT=		Ruby binding of WebKitGTK+
@@ -7,7 +6,7 @@ CATEGORIES=		www
 
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
-DEPENDS+=	webkit-gtk3>=1.10.2nb6:../../www/webkit-gtk3
+DEPENDS+=	webkit-gtk3>=1.10.2nb6:../../www/webkit1-gtk3
 
 RUBY_SETUP_SUBDIRS=	webkit-gtk
 USE_RUBY_EXTCONF=	no
diff --git a/www/ruby-gnome2-webkit-gtk2/Makefile b/www/ruby-gnome2-webkit-gtk2/Makefile
index 6750c4184d0..cdede415949 100644
--- a/www/ruby-gnome2-webkit-gtk2/Makefile
+++ b/www/ruby-gnome2-webkit-gtk2/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/06/20 09:12:14 obache Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/08/03 22:13:20 wiz Exp $
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-webkit-gtk2-${VERSION}
 COMMENT=		Ruby binding of WebKitGTK+ for GTK2+
@@ -7,7 +6,7 @@ CATEGORIES=		www
 
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
-DEPENDS+=	webkit-gtk>=1.10.2nb8:../../www/webkit-gtk
+DEPENDS+=	webkit-gtk>=1.10.2nb8:../../www/webkit1-gtk
 
 RUBY_SETUP_SUBDIRS=	webkit-gtk2
 USE_RUBY_EXTCONF=	no