Pango gir files are now installed by pango.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13723 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 6 insertions, 19 deletions

diff --git a/RMPORTS b/RMPORTS
index afec5de0e..a99009978 100644
--- a/RMPORTS
+++ b/RMPORTS
@@ -1,3 +1,4 @@
 x11-toolkits/gir-repository-gtk20|x11-toolkits/gtk20|%%DATE%%|Now installed by x11-toolkits/gtk20
 www/gir-repository-webkit|www/webkit-gtk2|%%DATE%%|Now installed by www/webkit-gtk2
 sysutils/devicekit-power|sysutils/upower|%%DATE%%|Project name has changed
+x11-toolkits/gir-repository-pango|x11-toolkits/pango|%%DATE%%|Now installed by x11-toolkits/pango
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index 9c741199c..c087f7bea 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
 atk_CATEGORY=	accessibility
 atk_GIR=	Atk-1.0
 
-pango_CATEGORY=	x11-toolkits
-pango_GIR=	Pango-1.0
-
 poppler_CATEGORY=	graphics
 poppler_GIR=	Poppler-0.8
 
@@ -90,16 +87,9 @@ USE_GNOME+=	atk
 GIR_FILES=	Atk-1.0
 .endif
 
-.if ${GIR_NAME} == "pango"
-USE_GNOME+=	pango
-GIR_FILES=	Pango-1.0 PangoFT2-1.0 PangoCairo-1.0 PangoX-1.0 PangoXft-1.0
-DEP_NAMES+=	pangoxft
-.endif
-
 .if ${GIR_NAME} == "poppler"
 LIB_DEPENDS+=	poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
 USE_GNOME+=	gtk20
-USE_GIR=	pango
 GIR_FILES=	Poppler-0.8
 CLEAR_DEPS+=	Gdk-2.0
 .endif
diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index a8e1684a6..57097d832 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clutter
 PORTVERSION=	1.1.12
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME \
 		http://www.clutter-project.org/sources/${PORTNAME}/1.0/
@@ -14,9 +15,6 @@ MASTER_SITES=	GNOME \
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OpenGL based interactive canvas library
 
-BUILD_DEPENDS=	${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
-RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
-
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:22
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 78154690e..3b26e69bd 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.183 2010/02/10 16:57:26 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.184 2010/02/23 21:56:12 ahze Exp $
 #
 
 PORTNAME=	gtk
 PORTVERSION=	2.19.6
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -30,16 +30,14 @@ LATEST_LINK=	gtk20
 .if !defined(REFERENCE_PORT)
 
 BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		${LOCALBASE}/share/gir-1.0/Atk-1.0.gir:${PORTSDIR}/accessibility/gir-repository-atk \
-		${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
+		${LOCALBASE}/share/gir-1.0/Atk-1.0.gir:${PORTSDIR}/accessibility/gir-repository-atk
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		jasper.4:${PORTSDIR}/graphics/jasper
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		${LOCALBASE}/share/gir-1.0/Atk-1.0.gir:${PORTSDIR}/accessibility/gir-repository-atk \
-		${LOCALBASE}/share/gir-1.0/Pango-1.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-pango
+		${LOCALBASE}/share/gir-1.0/Atk-1.0.gir:${PORTSDIR}/accessibility/gir-repository-atk
 
 USE_GMAKE=	yes
 USE_PERL5=	yes