switch on introspection support, bump PKGREV

6 files changed, 33 insertions, 13 deletions

diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 9ca5dba390c..845dcb9b707 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.159 2012/02/06 12:39:56 wiz Exp $
+# $NetBSD: Makefile,v 1.160 2012/02/10 15:50:45 drochner Exp $
 
 DISTNAME=		pango-1.29.4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel fonts
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pango/1.29/}
 EXTRACT_SUFX=		.tar.xz
@@ -49,6 +49,8 @@ PLIST_VARS+=		coretext
 PLIST.coretext=	yes
 .endif
 
+BUILDLINK_DEPMETHOD.gobject-introspection:= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.24.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index de78d6066b1..439b027e235 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.54 2012/02/03 22:03:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.55 2012/02/10 15:50:45 drochner Exp $
 bin/pango-querymodules
 bin/pango-view
 include/pango-1.0/pango/pango-attributes.h
@@ -36,6 +36,10 @@ include/pango-1.0/pango/pangoft2.h
 ${PLIST.x11}include/pango-1.0/pango/pangox.h
 ${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h
 ${PLIST.x11}include/pango-1.0/pango/pangoxft.h
+lib/girepository-1.0/Pango-1.0.typelib
+lib/girepository-1.0/PangoCairo-1.0.typelib
+lib/girepository-1.0/PangoFT2-1.0.typelib
+${PLIST.x11}lib/girepository-1.0/PangoXft-1.0.typelib
 lib/libpango-1.0.la
 lib/libpangocairo-1.0.la
 lib/libpangoft2-1.0.la
@@ -63,6 +67,10 @@ ${PLIST.x11}lib/pkgconfig/pangoxft.pc
 ${PLIST.x11}libdata/pango/pangox.aliases
 man/man1/pango-querymodules.1
 man/man1/pango-view.1
+share/gir-1.0/Pango-1.0.gir
+share/gir-1.0/PangoCairo-1.0.gir
+share/gir-1.0/PangoFT2-1.0.gir
+${PLIST.x11}share/gir-1.0/PangoXft-1.0.gir
 share/gtk-doc/html/pango/PangoEngineLang.html
 share/gtk-doc/html/pango/PangoEngineShape.html
 share/gtk-doc/html/pango/PangoFcDecoder.html
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index b861312dc3a..0fd7b1f5309 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2012/02/06 12:40:22 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/02/10 15:41:40 drochner Exp $
 #
 
 DISTNAME=	gdk-pixbuf-2.24.1
 PKGNAME=	gdk-pixbuf2-2.24.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/2.24/}
 EXTRACT_SUFX=	.tar.xz
@@ -18,7 +18,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config gmake
 USE_PKGLOCALEDIR=	yes
 
 PKGCONFIG_OVERRIDE+=	contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
@@ -35,6 +35,8 @@ post-install:
 
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection:= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/gdk-pixbuf2/PLIST b/graphics/gdk-pixbuf2/PLIST
index bc024472360..a696f83019b 100644
--- a/graphics/gdk-pixbuf2/PLIST
+++ b/graphics/gdk-pixbuf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/08/30 22:34:13 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/02/10 15:41:40 drochner Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -28,10 +28,12 @@ lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.la
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.la
+lib/girepository-1.0/GdkPixbuf-2.0.typelib
 lib/libgdk_pixbuf-2.0.la
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 man/man1/gdk-pixbuf-csource.1
 man/man1/gdk-pixbuf-query-loaders.1
+share/gir-1.0/GdkPixbuf-2.0.gir
 share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
 share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html
 share/gtk-doc/html/gdk-pixbuf/api-index-2-10.html
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile
index 537c748af12..3e841403a75 100644
--- a/x11/gtk3/Makefile
+++ b/x11/gtk3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/02/09 19:32:33 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2012/02/10 15:51:26 drochner Exp $
 
 DISTNAME=	gtk+-3.2.3
 PKGNAME=	${DISTNAME:S/gtk/gtk3/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/3.2/ \
 		${MASTER_SITE_GNOME:=sources/gtk+/3.2/}
@@ -69,12 +69,12 @@ _BUILDING_GTK3=	yes
 .include "modules.mk"
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
-BUILDLINK_API_DEPENDS.atk+=	atk>=2.1.5
+BUILDLINK_API_DEPENDS.atk+=	atk>=2.2.0nb2
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.29.14
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.23.5
+BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.24.1nb2
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.10.1
 .include "../../devel/gobject-introspection/buildlink3.mk"
@@ -83,7 +83,7 @@ BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.10.1
 
 .include "../../devel/glib2/schemas.mk"
 
-BUILDLINK_API_DEPENDS.pango+=	pango>=1.29.0
+BUILDLINK_API_DEPENDS.pango+=	pango>=1.29.4nb2
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10.0
diff --git a/x11/gtk3/PLIST b/x11/gtk3/PLIST
index 24ed36ded6e..bea569915fb 100644
--- a/x11/gtk3/PLIST
+++ b/x11/gtk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/02/03 14:48:44 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/02/10 15:51:26 drochner Exp $
 bin/gtk-query-immodules-3.0
 bin/gtk3-demo
 include/gail-3.0/libgail-util/gail-util.h
@@ -286,6 +286,9 @@ include/gtk-3.0/unix-print/gtk/gtkprinter.h
 include/gtk-3.0/unix-print/gtk/gtkprintjob.h
 include/gtk-3.0/unix-print/gtk/gtkprintunixdialog.h
 include/gtk-3.0/unix-print/gtk/gtkunixprint.h
+lib/girepository-1.0/Gdk-3.0.typelib
+${PLIST.x11}lib/girepository-1.0/GdkX11-3.0.typelib
+lib/girepository-1.0/Gtk-3.0.typelib
 lib/gtk-3.0/3.0.0/immodules/im-am-et.la
 lib/gtk-3.0/3.0.0/immodules/im-cedilla.la
 lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.la
@@ -315,6 +318,9 @@ libdata/gtk-3.0/im-multipress.conf
 man/man1/gtk-query-immodules-3.0.1
 man/man1/gtk-update-icon-cache.1
 share/aclocal/gtk-3.0.m4
+share/gir-1.0/Gdk-3.0.gir
+${PLIST.x11}share/gir-1.0/GdkX11-3.0.gir
+share/gir-1.0/Gtk-3.0.gir
 share/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 share/gtk-3.0/demo/alphatest.png
 share/gtk-3.0/demo/apple-red.png