From db8bf96e5a2b1af73383e01e8d5a29c8ef19f4ac Mon Sep 17 00:00:00 2001
From: kwm <kwm@FreeBSD.org>
Date: Mon, 3 May 2010 21:47:50 +0000
Subject: Add conflict with ekiga3.

Approved by:	maintainer (via private mail)
---
 net/ekiga/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'net/ekiga')

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index bb3971743732..cfabd3b24e0a 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.11
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -19,6 +19,8 @@ OPTIONS=	AVAHI	"Support Avahi for service discovery on LAN" on \
 
 LIB_DEPENDS=	opal_r:${PORTSDIR}/net/opal
 
+CONFLICTS=	ekiga-3.*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl
-- 
cgit