Drop gtk2 FLAVOR.

devel/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.965 2011/09/12 07:48:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.966 2011/09/12 08:21:08 ajacoutot Exp $
 # $FreeBSD: Makefile,v 1.85 1997/11/20 05:22:14 asami Exp $
 
      SUBDIR =
@@ -105,7 +105,6 @@
      SUBDIR += fribidi
      SUBDIR += gconf-editor
      SUBDIR += gconf2
-     SUBDIR += gconf2,gtk2
      SUBDIR += gconfmm
      SUBDIR += geany
      SUBDIR += geotiff

devel/gconf2/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2011/06/16 15:30:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2011/09/12 08:21:08 ajacoutot Exp $
 
 COMMENT-main=	configuration database system for GNOME
 COMMENT-polkit=	PolicyKit integration for GConf2
@@ -11,10 +11,9 @@ PKGNAME-main=	gconf2-${GNOME_VERSION}
 PKGNAME-polkit=	gconf2-polkit-${GNOME_VERSION}
 PKGNAME-gtk=	gconf2-sanity-check-${GNOME_VERSION}
 
-FULLPKGNAME-main= gconf2-${GNOME_VERSION}
+REVISION-main=	0
-FULLPKGPATH-main= devel/gconf2,-main
+REVISION-gtk=	0
-FULLPKGNAME-polkit= gconf2-polkit-${GNOME_VERSION}
+REVISION-polkit=0
-FULLPKGPATH-polkit= devel/gconf2,-polkit
 
 SHARED_LIBS +=	gconf-2              6.2      # 5.5
 
@@ -49,7 +48,7 @@ WANTLIB-gtk += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
 WANTLIB-gtk += cairo drm expat fontconfig freetype gconf-2
 WANTLIB-gtk += gdk_pixbuf-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB-gtk += pangoft2-1.0 pixman-1 png pthread-stubs xcb xcb-render
-WANTLIB-gtk += xcb-shm xml2
+WANTLIB-gtk += xcb-shm xml2 cairo-gobject gdk-3 gtk-3
 
 MODULES=	devel/gettext \
 		x11/gnome
@@ -71,7 +70,8 @@ LIB_DEPENDS-polkit= ${LIB_DEPENDS} \
 
 RUN_DEPENDS-gtk= # empty
 LIB_DEPENDS-gtk= ${LIB_DEPENDS} \
-		devel/gconf2
+		devel/gconf2 \
+		x11/gtk+3
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV= 	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -84,19 +84,6 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 
 USE_GROFF=	Yes
 
-FLAVORS=	gtk2
-FLAVOR?=
-
-.if ${FLAVOR:L:Mgtk2}
-WANTLIB-gtk += gdk-x11-2.0 gtk-x11-2.0
-LIB_DEPENDS-gtk += x11/gtk+2
-CONFIGURE_ARGS+=--with-gtk=2.0
-.else
-WANTLIB-gtk += cairo-gobject gdk-3 gtk-3
-LIB_DEPENDS-gtk += x11/gtk+3
-CONFIGURE_ARGS+=--with-gtk=3.0
-.endif
-
 FAKE_FLAGS=	sysgconfdir=${PREFIX}/share/examples/gconf2 \
 		sysconfdir=${PREFIX}/share/examples/gconf2
 

devel/gconf2/pkg/PLIST-gtk

@@ -1,3 +1,4 @@
-@comment $OpenBSD: PLIST-gtk,v 1.1 2011/05/14 21:34:30 ajacoutot Exp $
+@comment $OpenBSD: PLIST-gtk,v 1.2 2011/09/12 08:21:08 ajacoutot Exp $
+@pkgpath devel/gconf2,-gtk,gtk2
 @conflict gconf2-<2.32.3p0
 @bin libexec/gconf-sanity-check-2

x11/gnome/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.154 2011/09/12 07:56:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.155 2011/09/12 08:24:06 ajacoutot Exp $
 
      SUBDIR =
      SUBDIR += alacarte
@@ -61,7 +61,6 @@
      SUBDIR += media
      SUBDIR += menus
      SUBDIR += metacity
-     SUBDIR += metacity,gtk2
      SUBDIR += mime-data
      SUBDIR += mono-gnome
      SUBDIR += mono-keyring

x11/gnome/metacity/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2011/07/19 09:20:47 jasper Exp $
+# $OpenBSD: Makefile,v 1.65 2011/09/12 08:24:06 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -39,7 +39,9 @@ LIB_DEPENDS=	devel/startup-notification \
 		devel/libgtop2
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		x11/gnome/doc-utils
-RUN_DEPENDS=	x11/gnome/zenity
+RUN_DEPENDS=	x11/gnome/zenity \
+		x11/gnome/themes-standard \
+		fonts/cantarell-fonts
 
 SEPARATE_BUILD=	concurrent
 DESKTOP_FILES=	Yes
@@ -50,19 +52,6 @@ CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 USE_GROFF =	Yes
 
-FLAVORS=	gtk2
-FLAVOR?=
-
-.if ${FLAVOR:L:Mgtk2}
-# defaults to the "Clearlooks" theme
-RUN_DEPENDS +=	x11/gnome/themes
-PATCH_LIST +=	patch-* gtk2-patch-src_metacity_schemas_in_in
-.else
-# defaults to the "Adwaita" theme and "Cantarell" font
-RUN_DEPENDS +=	x11/gnome/themes-standard \
-		fonts/cantarell-fonts
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/metacity
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/metacity/

x11/gnome/metacity/patches/gtk2-patch-src_metacity_schemas_in_in

@@ -1,28 +0,0 @@
-$OpenBSD: gtk2-patch-src_metacity_schemas_in_in,v 1.1 2011/05/27 12:47:42 ajacoutot Exp $
-
-* Revert the following until we move to GNOME3:
-From 72dfc33520472306d7b8f791b8f23e65dd3ff88e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 09 Feb 2011 23:41:19 +0000
-Subject: Use GNOME 3 theme defaults
-
---- src/metacity.schemas.in.in.orig	Wed Mar 23 14:10:44 2011
-+++ src/metacity.schemas.in.in	Sun Apr 10 10:27:58 2011
-@@ -247,7 +247,7 @@
-       <applyto>/apps/metacity/general/theme</applyto>
-       <owner>metacity</owner>
-       <type>string</type>
--      <default>Adwaita</default>
-+      <default>Clearlooks</default>
-       <locale name="C">
-          <short>Current theme</short>
-          <long>
-@@ -278,7 +278,7 @@
-       <applyto>/apps/metacity/general/titlebar_font</applyto>   
-       <owner>metacity</owner>
-       <type>string</type>
--      <default>Cantarell Bold 11</default>
-+      <default>Sans Bold 10</default>
-       <locale name="C">
-         <short>Window title font</short>
-         <long>

x11/gnome/metacity/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.28 2011/06/21 17:54:25 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.29 2011/09/12 08:24:06 ajacoutot Exp $
+@pkgpath x11/gnome/metacity,gtk2
 @bin bin/metacity
 @bin bin/metacity-message
 @bin bin/metacity-theme-viewer