summaryrefslogtreecommitdiffstats
path: root/net-im
diff options
context:
space:
mode:
Diffstat (limited to 'net-im')
-rw-r--r--net-im/empathy/Makefile5
-rw-r--r--net-im/empathy3/Makefile4
2 files changed, 7 insertions, 2 deletions
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index db7cf8816..b453a0f56 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,10 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD: ports/net-im/empathy/Makefile,v 1.27 2011/02/25 01:32:03 delphij Exp $
-# $MCom: ports/net-im/empathy/Makefile,v 1.80 2011/03/14 20:14:45 kwm Exp $
+# $MCom: ports/net-im/empathy/Makefile,v 1.81 2011/03/16 21:49:08 kwm Exp $
PORTNAME= empathy
PORTVERSION= 2.33.4
+PORTREVISION= 1
CATEGORIES= net-im gnome
MASTER_SITES= GNOME
@@ -29,6 +30,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
+CONFLICTS= empathy-3.[0-9]*
+
USE_GMAKE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/net-im/empathy3/Makefile b/net-im/empathy3/Makefile
index b55b6b25a..b60c227ce 100644
--- a/net-im/empathy3/Makefile
+++ b/net-im/empathy3/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net-im/empathy3/Makefile,v 1.11 2011/03/29 16:32:25 kwm Exp $
+# $MCom: ports/net-im/empathy3/Makefile,v 1.12 2011/04/05 10:53:44 kwm Exp $
PORTNAME= empathy
PORTVERSION= 3.0.0
@@ -30,6 +30,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control
+CONFLICTS= empathy-2.[0-9]*
+
USE_GMAKE= yes
USE_BZIP2= yes
USE_GETTEXT= yes