summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/evolution-exchange/Makefile4
-rw-r--r--mail/evolution-exchange3/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 071d74b65..7f2a7c4f2 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD: ports/mail/evolution-exchange/Makefile,v 1.67 2011/02/25 01:31:48 delphij Exp $
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.166 2010/11/16 09:52:36 kwm Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.168 2011/03/07 13:35:38 kwm Exp $
#
PORTNAME= evolution-exchange
@@ -20,6 +20,8 @@ EVO_PC_FILE= ${LOCALBASE}/libdata/pkgconfig/evolution-mail.pc
BUILD_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
RUN_DEPENDS= ${EVO_PC_FILE}:${PORTSDIR}/mail/evolution
+CONFLICTS= evolution-exchange-3.[0-9]*
+
USE_BZIP2= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool
diff --git a/mail/evolution-exchange3/Makefile b/mail/evolution-exchange3/Makefile
index 31aea209c..e7040478b 100644
--- a/mail/evolution-exchange3/Makefile
+++ b/mail/evolution-exchange3/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange3/Makefile,v 1.6 2011/03/22 09:43:13 kwm Exp $
+# $MCom: ports/mail/evolution-exchange3/Makefile,v 1.7 2011/04/05 09:02:40 kwm Exp $
#
PORTNAME= evolution-exchange
@@ -18,6 +18,8 @@ COMMENT= Evolution plugin to connect to Microsoft Exchange servers
BUILD_DEPENDS= evolution>=2.91.0:${PORTSDIR}/mail/evolution3
RUN_DEPENDS= evolution>=2.91.0:${PORTSDIR}/mail/evolution3
+CONFLICTS= evolution-exchange-2.[0-9]*
+
USE_BZIP2= yes
USE_GETTEXT= yes
USE_AUTOTOOLS= libtool