diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-08-04 17:42:52 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-08-04 17:42:52 +0800 |
| commit | b2220a80919b01d8262f12967f799c013c179e93 (patch) | |
| tree | 7e54b0e7b80f3c67ea16ad5f3237b95d31310e28 | |
| parent | 3190b8311e19961ef282e4b0792730387489e7c0 (diff) | |
| download | marcuscom-ports-b2220a80919b01d8262f12967f799c013c179e93.tar marcuscom-ports-b2220a80919b01d8262f12967f799c013c179e93.tar.gz marcuscom-ports-b2220a80919b01d8262f12967f799c013c179e93.tar.bz2 marcuscom-ports-b2220a80919b01d8262f12967f799c013c179e93.tar.lz marcuscom-ports-b2220a80919b01d8262f12967f799c013c179e93.tar.xz marcuscom-ports-b2220a80919b01d8262f12967f799c013c179e93.tar.zst marcuscom-ports-b2220a80919b01d8262f12967f799c013c179e93.zip | |
Register conflict with security/gcr.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17012 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | security/gnome-keyring/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 17702095d..bfeb270c0 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.101 2011/04/09 16:41:20 mezz Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.102 2011/04/09 17:20:19 mezz Exp $ # PORTNAME= gnome-keyring @@ -20,7 +20,7 @@ LIB_DEPENDS= tasn1.4:${PORTSDIR}/security/libtasn1 \ 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]* +CONFLICTS= gnome-keyring-3.[0-9]* gcr-3.[0-9]* USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack |