From 72e9452f1d9a7c248fee46fe20b11f3695b3e389 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 10 Jan 2008 07:26:50 +0000 Subject: Fix glib dependency, and remove gtk20 dependency. This might make some ports unhappy, but it definitely cleans up GConf's dependencies. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10043 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gconf2/Makefile | 7 +++---- devel/gconf2/files/patch-gconf-2.0.pc.in | 11 +++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 devel/gconf2/files/patch-gconf-2.0.pc.in (limited to 'devel/gconf2') diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 00fd6c250..dd28cb2b1 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/devel/gconf2/Makefile,v 1.87 2007/10/15 14:17:14 ahze Exp $ +# $MCom: ports/devel/gconf2/Makefile,v 1.89 2008/01/09 23:33:12 marcus Exp $ # PORTNAME= gconf2 PORTVERSION= 2.21.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -24,8 +24,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_XLIB= yes -USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack \ +USE_GNOME= gnomehier gnomehack orbit2 glib20 libxml2 linc ltverhack \ referencehack USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/devel/gconf2/files/patch-gconf-2.0.pc.in b/devel/gconf2/files/patch-gconf-2.0.pc.in new file mode 100644 index 000000000..dcee8207d --- /dev/null +++ b/devel/gconf2/files/patch-gconf-2.0.pc.in @@ -0,0 +1,11 @@ +--- gconf-2.0.pc.in.orig 2008-01-10 02:17:24.000000000 -0500 ++++ gconf-2.0.pc.in 2008-01-10 02:17:31.000000000 -0500 +@@ -8,7 +8,7 @@ gconf_serverdir=@libexecdir@ + Name: gconf + Description: GNOME Config System. + Version: @VERSION@ +-Requires: glib ++Requires: glib-2.0 + Requires.private: ORBit-2.0 + Libs: -L${libdir} -lgconf-@MAJOR_VERSION@ + Cflags: -I${includedir}/gconf/@MAJOR_VERSION@ -- cgit v1.2.3