From 56760fbd6b6fca004d6adde8dd4764a8150436d1 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 23 Sep 2011 08:49:41 +0000
Subject: [PATCH] Fix dependencies and bump after recent vte switch to FLAVORS
 and gtk+3 support by default.

---
 audio/grip/Makefile              | 6 +++---
 devel/geany/Makefile             | 6 +++---
 devel/giggle/Makefile            | 6 +++---
 www/cssed/Makefile               | 6 +++---
 www/vteplugin/Makefile           | 6 +++---
 x11/gnome/anjuta/Makefile        | 6 +++---
 x11/gnome/gedit-plugins/Makefile | 6 +++---
 x11/gnome/genius/Makefile        | 6 +++---
 x11/gnome/terminal/Makefile      | 6 +++---
 x11/remmina/core/Makefile        | 6 +++---
 x11/roxterm/Makefile             | 6 +++---
 x11/terminator/Makefile          | 6 +++---
 x11/tilda/Makefile               | 6 +++---
 x11/xfce4/terminal/Makefile      | 6 +++---
 14 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index b6afd3a2585..d6ae9078ed5 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.43 2011/09/16 08:26:10 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=	front-end to external cd audio rippers and mp3 encoders
 
 DISTNAME=	grip-3.2.0
-REVISION=	21
+REVISION=	22
 CATEGORIES=	audio
 
 HOMEPAGE=	http://www.nostatic.org/grip/
@@ -37,7 +37,7 @@ BUILD_DEPENDS=	textproc/rarian
 LIB_DEPENDS=	x11/gnome/libgnomeui \
 		audio/id3lib \
 		net/curl \
-		devel/vte \
+		devel/vte,gtk2 \
 		audio/cdparanoia
 RUN_DEPENDS=	x11/gnome/yelp \
 		audio/vorbis-tools \
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 1d9426008a8..d5c8b9fe1bc 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2011/09/16 09:24:49 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2011/09/23 08:49:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	small and lightweight IDE
 
 DISTNAME=	geany-0.20
-REVISION =	0
+REVISION =	1
 
 CATEGORIES=	devel
 
@@ -37,7 +37,7 @@ WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread pthread-stubs stdc++ xcb
 WANTLIB += xcb-render xcb-shm z
 
-LIB_DEPENDS=	devel/vte \
+LIB_DEPENDS=	devel/vte,gtk2 \
 		x11/gtk+2
 RUN_DEPENDS=	devel/desktop-file-utils
 
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 58f02a7cbba..9dbc776d8fe 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/19 07:31:45 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=	gtk-based git repository viewer
 CATEGORIES=	devel x11
 GNOME_VERSION=	0.5
 GNOME_PROJECT=	giggle
-REVISION=	4
+REVISION=	5
 
 SHARED_LIBS +=  giggle               0.0      # 0.0
 SHARED_LIBS +=  giggle-git           0.0      # 0.0
@@ -34,7 +34,7 @@ WANTLIB += vte xcb xcb-render xcb-shm xml2 z
 
 RUN_DEPENDS=	devel/git
 BUILD_DEPENDS+=	devel/git
-LIB_DEPENDS=	devel/vte \
+LIB_DEPENDS=	devel/vte,gtk2 \
 		x11/gtksourceview
 
 MODGNOME_DESKTOP_FILE=	Yes
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index 1b9e5f515c7..77fb3d53537 100755
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2011/09/16 12:00:06 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=	CSS editor
 
 DISTNAME=	cssed-0.4.0
-REVISION=	10
+REVISION=	11
 CATEGORIES=	www editors
 
 HOMEPAGE=	http://cssed.sourceforge.net/
@@ -24,7 +24,7 @@ WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
 WANTLIB += pthread pthread-stubs stdc++ xcb z vte xml2
 WANTLIB += xcb-render xcb-render-util
 
-LIB_DEPENDS=	devel/vte \
+LIB_DEPENDS=	devel/vte,gtk2 \
 		textproc/libxml
 
 MODULES=	devel/gettext
diff --git a/www/vteplugin/Makefile b/www/vteplugin/Makefile
index a06786df84e..ea32af928d9 100644
--- a/www/vteplugin/Makefile
+++ b/www/vteplugin/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:09 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT =	npapi vte-based terminal for web browsers
 
 DISTNAME =	vteplugin-0.1
-REVISION =	7
+REVISION =	8
 CATEGORIES =	www x11
 
 # WTFPL
@@ -27,7 +27,7 @@ MODULES =	devel/gettext \
 		devel/waf
 
 LIB_DEPENDS =	x11/gtk+2 \
-		devel/vte
+		devel/vte,gtk2
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/wscript
diff --git a/x11/gnome/anjuta/Makefile b/x11/gnome/anjuta/Makefile
index 24a5a7e288b..d61bdde4eb5 100644
--- a/x11/gnome/anjuta/Makefile
+++ b/x11/gnome/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2011/09/22 11:35:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.41 2011/09/23 08:49:41 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		versatile IDE for GNOME
 
 GNOME_PROJECT=		anjuta
 GNOME_VERSION=		3.1.92
-REVISION=		1
+REVISION=		2
 
 SHARED_LIBS +=  anjuta-3             0.0      # 0.0
 
@@ -52,7 +52,7 @@ RUN_DEPENDS=		misc/shared-mime-info
 LIB_DEPENDS=		${MODPY_LIB_DEPENDS} \
 			devel/glade \
 			devel/subversion,gnome_keyring \
-			devel/vte,gtk3 \
+			devel/vte \
 			lang/vala>=0.13.4 \
 			textproc/icu4c \
 			x11/gnome/devhelp \
diff --git a/x11/gnome/gedit-plugins/Makefile b/x11/gnome/gedit-plugins/Makefile
index 58d2462c218..6795178546b 100644
--- a/x11/gnome/gedit-plugins/Makefile
+++ b/x11/gnome/gedit-plugins/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.39 2011/09/20 22:54:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.40 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=		plugins for Gedit
 
 GNOME_PROJECT=		gedit-plugins
 GNOME_VERSION=		3.0.7
 
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		editors
 
@@ -34,7 +34,7 @@ BUILD_DEPENDS=		${RUN_DEPENDS} \
 LIB_DEPENDS=		devel/libpeas \
 			x11/gtksourceview3
 RUN_DEPENDS=		devel/gsettings-desktop-schemas \
-			devel/vte,gtk3 \
+			devel/vte \
 			x11/dbus-python \
 			x11/gnome/gedit>3.0.0 \
 			x11/gnome/gucharmap
diff --git a/x11/gnome/genius/Makefile b/x11/gnome/genius/Makefile
index 68493976197..2f6031eba2f 100644
--- a/x11/gnome/genius/Makefile
+++ b/x11/gnome/genius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2011/09/20 21:10:00 jasper Exp $
+# $OpenBSD: Makefile,v 1.29 2011/09/23 08:49:41 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	advanced general purpose calculator
 
 GNOME_PROJECT=	genius
 GNOME_VERSION=	1.0.14
-REVISION=	1
+REVISION=	2
 
 HOMEPAGE=	http://www.jirka.org/genius.html
 
@@ -37,7 +37,7 @@ RUN_DEPENDS +=	print/ghostscript/gnu
 LIB_DEPENDS=	x11/gtksourceview \
 		devel/gmp \
 		devel/mpfr \
-		devel/vte
+		devel/vte,gtk2
 
 MODGNOME_TOOLS= yelp
 MODGNOME_DESKTOP_FILE=	Yes
diff --git a/x11/gnome/terminal/Makefile b/x11/gnome/terminal/Makefile
index 3810f7d143a..8e3ad11dd3d 100644
--- a/x11/gnome/terminal/Makefile
+++ b/x11/gnome/terminal/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.73 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.74 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=	GNOME terminal
 
 GNOME_PROJECT=	gnome-terminal
 GNOME_VERSION=	3.0.1
-REVISION=	1
+REVISION=	2
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM=	Yes
@@ -28,7 +28,7 @@ WANTLIB += vte2_90 xcb xcb-render xcb-shm z
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	devel/gsettings-desktop-schemas
-LIB_DEPENDS=	devel/vte,gtk3
+LIB_DEPENDS=	devel/vte
 
 MODGNOME_TOOLS= yelp
 MODGNOME_DESKTOP_FILE=		Yes
diff --git a/x11/remmina/core/Makefile b/x11/remmina/core/Makefile
index c0b73ed0f27..fa66f17bd0f 100644
--- a/x11/remmina/core/Makefile
+++ b/x11/remmina/core/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2011/09/16 12:29:17 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=		GTK+2 remote desktop client
 
 DISTNAME=		remmina-0.9.3
-REVISION=	0
+REVISION=		1
 
 WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 avahi-client
@@ -15,7 +15,7 @@ WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs unique-1.0
 WANTLIB += vte xcb xcb-render xcb-shm z
 
 LIB_DEPENDS=		devel/libunique \
-			devel/vte \
+			devel/vte,gtk2
 			net/avahi,-gtk,no_mono,no_qt3,no_qt4 \
 			security/libgcrypt
 
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index cd262e7659e..7384ab9732e 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2011/09/16 12:29:17 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=		terminal emulator for X
 
 DISTNAME=		roxterm-2.0.1
-REVISION=	0
+REVISION=		1
 CATEGORIES=		x11
 
 HOMEPAGE=		http://roxterm.sourceforge.net/
@@ -28,7 +28,7 @@ WANTLIB+=	GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=		devel/vte \
+LIB_DEPENDS=		devel/vte,gtk2 \
 			x11/dbus-glib \
 			devel/libglade2 
 
diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index 22b9a753445..4a185eab75a 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2011/09/16 12:29:17 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=		GTK2 terminal emulator with split-window and tabs support
 
 MODPY_EGG_VERSION=	0.95
 DISTNAME=		terminator-${MODPY_EGG_VERSION}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		x11
 
@@ -22,7 +22,7 @@ MASTER_SITES=		http://launchpad.net/terminator/trunk/${MODPY_EGG_VERSION}/+downl
 
 MODULES=		lang/python \
 			textproc/intltool
-RUN_DEPENDS=		devel/vte,-python \
+RUN_DEPENDS=		devel/vte,-python,gtk2 \
 			devel/py-notify \
 			devel/desktop-file-utils
 
diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 0c212d8459d..358682c1401 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2011/09/16 12:29:17 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=		drop-down terminal emulator
 
 DISTNAME=		tilda-0.9.6
-REVISION=		6
+REVISION=		7
 CATEGORIES=		x11
 
 HOMEPAGE=		http://tilda.sourceforge.net/
@@ -29,7 +29,7 @@ WANTLIB += GL Xxf86vm drm xcb-render xcb-shm
 RUN_DEPENDS=		devel/desktop-file-utils
 LIB_DEPENDS=		devel/libconfuse \
 			devel/libglade2 \
-			devel/vte
+			devel/vte,gtk2
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
diff --git a/x11/xfce4/terminal/Makefile b/x11/xfce4/terminal/Makefile
index 6f7e69541e7..d190632c5bc 100644
--- a/x11/xfce4/terminal/Makefile
+++ b/x11/xfce4/terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/09/19 07:53:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/23 08:49:41 ajacoutot Exp $
 
 COMMENT=	Xfce4 vte-based terminal
 
@@ -6,7 +6,7 @@ XFCE_VERSION=	0.4.8
 XFCE_GOODIE=	Terminal
 # :L is here for a reason
 PKGNAME=	xfce4-${DISTNAME:L}
-REVISION=	0
+REVISION=	1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -22,7 +22,7 @@ CONFIGURE_ARGS +=	--program-transform-name='s/Terminal/xfce4-terminal/' \
 
 LIB_DEPENDS=	x11/xfce4/exo \
 		x11/dbus-glib \
-		devel/vte
+		devel/vte,gtk2
 
 WANTLIB=	X11 atk-1.0 c dbus-1 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
 		ICE SM Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \