From cd60438acab2eeb550a39c704100fd4e91b69993 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Mon, 24 Mar 2008 04:25:19 +0000
Subject: [PATCH] Libgda2 no longer conflicts with libgda3.

Submitted by:	kwm
---
 databases/libgda2/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 1c7df563d32c..bdaf2c6f1c92 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda2/Makefile,v 1.41 2007/10/21 03:13:52 mezz Exp $
+#   $MCom: ports/databases/libgda2/Makefile,v 1.44 2008/03/11 04:21:46 mezz Exp $
 #
 
 PORTNAME=	libgda2
@@ -44,8 +44,6 @@ MAN5=		gda-config.5
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
-CONFLICTS=	libgda3-[0-9]*
-
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/testing//" \
 		${WRKSRC}/Makefile.in