8 files changed, 10 insertions, 30 deletions

diff --git a/MOVED b/MOVED
index c61cc042c91b..4b66b1ffef5b 100644
--- a/MOVED
+++ b/MOVED
@@ -1551,3 +1551,4 @@ devel/py-ctypes||2011-02-25|Removed, part of python since python25
 security/py-hashlib||2011-02-25|Removed, part of python since python25
 www/py-hashlib||2011-02-25|Removed, part of python since python25
 x11/gstreamer-plugins-vdpau|multimedia/gstreamer-plugins-vdpau|2011-02-25|Move to the multimedia category
+x11/gir-repository-babl|x11/babl|2011-02-25|Merged into babl
diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
index b23f894c638f..a120ed649b5f 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Introspection information for various libraries
 NO_BUILD=	yes
 
 RUN_DEPENDS=	${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
-		${GIRDIR}/${babl_GIR}.gir:${PORTSDIR}/${babl_CATEGORY}/gir-repository-babl \
 		${GIRDIR}/${libnotify_GIR}.gir:${PORTSDIR}/${libnotify_CATEGORY}/gir-repository-libnotify \
 		${GIRDIR}/${vte_GIR}.gir:${PORTSDIR}/${vte_CATEGORY}/gir-repository-vte \
 		${GIRDIR}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index cb9b4f1d1b9f..666baf28b468 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -9,9 +9,6 @@ GIRDIR=		${LOCALBASE}/share/gir-1.0
 poppler_CATEGORY=	graphics
 poppler_GIR=	Poppler-0.8
 
-babl_CATEGORY=	x11
-babl_GIR=	Babl-0.1
-
 libnotify_CATEGORY=	devel
 libnotify_GIR=	Notify-0.4
 
@@ -58,11 +55,6 @@ GIR_FILES=	Poppler-0.8
 CLEAR_DEPS+=	Gdk-2.0
 .endif
 
-.if ${GIR_NAME} == "babl"
-LIB_DEPENDS+=	babl-0.1.0:${PORTSDIR}/x11/babl
-GIR_FILES=	Babl-0.1
-.endif
-
 .if ${GIR_NAME} == "libnotify"
 LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
 USE_GNOME+=	gtk20
diff --git a/x11/Makefile b/x11/Makefile
index 4525a4d9f57d..41c2a733320a 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -78,7 +78,6 @@
     SUBDIR += gdkxft
     SUBDIR += gdm
     SUBDIR += ggiterm
-    SUBDIR += gir-repository-babl
     SUBDIR += glproto
     SUBDIR += gmessage
     SUBDIR += gmrun
diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index 5d93eaf672cb..7b66e1989f2d 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	babl
-PORTVERSION=	0.1.2
+PORTVERSION=	0.1.4
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
@@ -20,6 +20,8 @@ MASTER_SITE_SUBDIR=	babl/${PORTVERSION:R}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Dynamic pixel format conversion library
 
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/x11/babl/distinfo b/x11/babl/distinfo
index de14f1ebacaa..18d556367ecf 100644
--- a/x11/babl/distinfo
+++ b/x11/babl/distinfo
@@ -1,3 +1,2 @@
-MD5 (babl-0.1.2.tar.bz2) = 8eebd8d78d3173db7af5e3e60b1e03ea
-SHA256 (babl-0.1.2.tar.bz2) = 1de1394f3d49313bd99f2eab5ae7a4ddfd66d27cdaa89aede67b0dd96f43b722
-SIZE (babl-0.1.2.tar.bz2) = 428971
+SHA256 (babl-0.1.4.tar.bz2) = 5b36312528de84815f054345cd478743a9493981a44060013b682d0304ffe733
+SIZE (babl-0.1.4.tar.bz2) = 423645
diff --git a/x11/babl/pkg-plist b/x11/babl/pkg-plist
index 5ad3ac806c6a..ed21ce877a90 100644
--- a/x11/babl/pkg-plist
+++ b/x11/babl/pkg-plist
@@ -27,7 +27,11 @@ lib/babl-0.1/gggl.a
 lib/babl-0.1/gimp-8bit.a
 lib/babl-0.1/naive-CMYK.a
 lib/babl-0.1/sse-fixups.a
+lib/girepository-1.0/Babl-0.1.typelib
+share/gir-1.0/Babl-0.1.gir
 libdata/pkgconfig/babl.pc
 @dirrm lib/babl-0.1
 @dirrm include/babl-0.1/babl
 @dirrm include/babl-0.1
+@dirrmtry lib/girepository-1.0
+@dirrmtry share/gir-1.0
diff --git a/x11/gir-repository-babl/Makefile b/x11/gir-repository-babl/Makefile
deleted file mode 100644
index 5ccfda87c952..000000000000
--- a/x11/gir-repository-babl/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	gir-repository-babl
-# Date created:				12 September 2009
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/x11/gir-repository-babl/Makefile,v 1.1 2009/09/16 02:05:12 avl Exp $
-#
-
-CATEGORIES=	x11
-PORTREVISION=	4
-
-MASTERDIR=	${.CURDIR}/../../devel/gir-repository
-
-PKGNAMESUFFIX=	-babl
-
-.include "${MASTERDIR}/bsd.gir.mk"