From f8c29188d2119d89bdd27177e5b8a75baf1757f1 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 26 Mar 2013 14:16:18 +0000
Subject: [PATCH] Move to the x11/gnome MODULE.

---
 x11/gtk+2/Makefile | 66 ++++++++++++++++++----------------------------
 1 file changed, 25 insertions(+), 41 deletions(-)

diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile
index 5fbfad84efe..bb31e7c0984 100644
--- a/x11/gtk+2/Makefile
+++ b/x11/gtk+2/Makefile
@@ -1,15 +1,18 @@
-# $OpenBSD: Makefile,v 1.160 2013/03/21 08:48:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.161 2013/03/26 14:16:18 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT-main=	multi-platform graphical toolkit
 COMMENT-guic=	gtk+ icon theme caching utility
 
-V=		2.24.17
-DISTNAME=	gtk+-${V}
+GNOME_VERSION=	2.24.17
+GNOME_PROJECT=	gtk+
 
-PKGNAME-main=	gtk+2-${V}
-PKGNAME-guic=	gtk-update-icon-cache-${V}
+PKGNAME-main=	gtk+2-${GNOME_VERSION}
+PKGNAME-guic=	gtk-update-icon-cache-${GNOME_VERSION}
+
+REVISION-main=	0
+REVISION-guic=	0
 
 CATEGORIES=	x11 devel
 
@@ -24,21 +27,20 @@ MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m pcre png z
-
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk+/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
-EXTRACT_SUFX=	.tar.xz
+WANTLIB += ffi gdk_pixbuf-2.0 gthread-2.0 m pcre z
 
 MULTI_PACKAGES=	-main -guic
 
 MODULES=	devel/gettext \
-		lang/python
+		lang/python \
+		x11/gnome
+
+MODPY_BUILDDEP=	No
 
-BUILD_DEPENDS=	devel/gobject-introspection
 LIB_DEPENDS=	graphics/gdk-pixbuf2
 
-RUN_DEPENDS-main= ${RUN_DEPENDS} \
+RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
+		${MODPY_RUN_DEPENDS} \
 		${BASE_PKGPATH},-guic \
 		x11/hicolor-icon-theme
 
@@ -50,47 +52,29 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
 
 WANTLIB-main += ${WANTLIB} c pthread glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB-main += gio-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 atk-1.0
-WANTLIB-main += X11 Xcomposite Xcursor Xdamage Xext Xfixes
+WANTLIB-main += X11 Xcomposite Xcursor Xdamage Xext Xfixes graphite2
 WANTLIB-main += Xi Xinerama Xrandr Xrender cairo expat dbus-1 icuuc
 WANTLIB-main += fontconfig freetype pixman-1 pthread-stubs xcb icule
 WANTLIB-main += xcb-render xcb-shm png asn1 crypto cups gssapi krb5 ssl
 WANTLIB-main += harfbuzz icudata avahi-client avahi-common
 
-# python is only used by gtk-builder-convert, so let's not enforce the
-# dependency
-MODPY_BUILDDEP=	No
-MODPY_RUNDEP=	No
-
-RUN_DEPENDS-guic= ${RUN_DEPENDS} \
+RUN_DEPENDS-guic= ${MODGETTEXT_RUN_DEPENDS} \
 		x11/hicolor-icon-theme
 
 WANTLIB-guic += ${WANTLIB}
-WANTLIB-guic += c pthread
+WANTLIB-guic += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 png pthread
+
+MODPY_BUILDDEP=	No
+MODPY_ADJ_FILES=gtk/gtk-builder-convert
+
+MODGNOME_TOOLS=	goi
+MODGNOME_CPPFLAGS=-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include/libpng
 
-USE_GMAKE=	Yes
 TEST_IS_INTERACTIVE= x11
 
 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/freetype2/ \
-			-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-gtk-doc \
-		--enable-introspection \
-		--with-xinput \
-		--disable-papi
-
-# If one of these tools is found at configure stage, it might be used,
-# no matter whether we use --disable-gtk-doc or not.
-CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
-		ac_cv_path_GTKDOC_REBASE="" \
-		ac_cv_path_GTKDOC_MKPDF=""
+CONFIGURE_ARGS=	--with-xinput=xfree
 
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/gtk+2
 
-pre-configure:
-	perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},' \
-		${WRKSRC}/gtk/gtk-builder-convert
-
 .include <bsd.port.mk>