From ece4d747ce247b1adede8fe8827b978ab62e5f6d Mon Sep 17 00:00:00 2001 From: kwm Date: Thu, 15 Sep 2011 20:14:16 +0000 Subject: Update Conflicts git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16187 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/libgdata06/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'devel') diff --git a/devel/libgdata06/Makefile b/devel/libgdata06/Makefile index e4a922bb3..905b3e1ae 100644 --- a/devel/libgdata06/Makefile +++ b/devel/libgdata06/Makefile @@ -3,7 +3,7 @@ # Whom: Koop Mast # # $FreeBSD$ -# $MCom: ports/devel/libgdata/Makefile,v 1.19 2011/04/30 20:43:16 mezz Exp $ +# $MCom: ports/devel/libgdata06/Makefile,v 1.1 2011/08/24 13:49:29 kwm Exp $ # PORTNAME= libgdata @@ -18,7 +18,7 @@ COMMENT= GLib based implimentation of the GData protocol BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome -CONFLICTS= libgdata-0.8.* +CONFLICTS= libgdata-0.10.* USE_BZIP2= yes USE_LDCONFIG= yes -- cgit v1.2.3