From 174ee5687d11e7de94dee2fbe48dafaa5b6ee40d Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 10 Apr 2011 19:28:35 +0000 Subject: -Add CONFLICTS with the each others. -Add GNOME_DESKTOP_VERSION. The libwnck probably will be changed, but I need to do more research to see if I can resolve the conflicts between 2.x and 3.x. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15786 df743ca5-7f9a-e211-a948-0013205c9059 --- databases/evolution-data-server/Makefile | 5 +++-- databases/evolution-data-server3/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'databases') diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index c4344f467..3c1cb0f00 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD: ports/databases/evolution-data-server/Makefile,v 1.81 2011/02/25 01:31:35 delphij Exp $ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.205 2011/03/06 20:31:31 kwm Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.206 2011/03/07 16:54:34 kwm Exp $ # PORTNAME= evolution-data-server @@ -25,13 +25,14 @@ LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring +CONFLICTS= evolution-data-server-3.[0-9]* + USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack ltverhack ltasneededhack gconf2 \ libxml2 -GNOME_DESKTOP_VERSION=2 USE_OPENLDAP= yes USE_AUTOTOOLS= libtool USE_BDB= 41+ diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile index a9b5b4858..f3cf04d49 100644 --- a/databases/evolution-data-server3/Makefile +++ b/databases/evolution-data-server3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.10 2011/03/21 19:55:33 kwm Exp $ +# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.11 2011/04/04 10:36:53 kwm Exp $ # PORTNAME= evolution-data-server @@ -23,7 +23,7 @@ LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring -CONFLICTS= evolution-data-server-2.30.* +CONFLICTS= evolution-data-server-2.[0-9]* LATEST_LINK= evolution-data-server3 LICENSE= LGPL20 -- cgit v1.2.3