diff options
-rw-r--r-- | net-im/empathy/Makefile | 5 | ||||
-rw-r--r-- | net-im/empathy3/Makefile | 4 | ||||
-rw-r--r-- | security/gnome-keyring/Makefile | 4 | ||||
-rw-r--r-- | security/gnome-keyring3/Makefile | 4 |
4 files changed, 13 insertions, 4 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 diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 442853090..e16b37c0c 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring/Makefile,v 1.98 2010/10/26 08:18:44 kwm Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.100 2011/01/18 10:23:19 kwm Exp $ # PORTNAME= gnome-keyring @@ -19,6 +19,8 @@ COMMENT= A program that keeps passwords and other secrets LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +CONFLICTS= gnome-keyring-3.[0-9]* + USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack USE_GMAKE= yes diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile index 7d0ddfaad..0e5c9caee 100644 --- a/security/gnome-keyring3/Makefile +++ b/security/gnome-keyring3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring3/Makefile,v 1.7 2011/03/22 11:16:19 kwm Exp $ +# $MCom: ports/security/gnome-keyring3/Makefile,v 1.8 2011/04/04 12:04:24 kwm Exp $ # PORTNAME= gnome-keyring @@ -21,6 +21,8 @@ LIB_DEPENDS= gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ gcrypt.17:${PORTSDIR}/security/libgcrypt RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +CONFLICTS= gnome-keyring-2.[0-9]* + USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gtk30 ltverhack intlhack USE_GMAKE= yes |