diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 00:46:23 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-10 00:46:23 +0800 |
| commit | 9008904f85cc5a7858e27dbb481960b877a43761 (patch) | |
| tree | 04018380d802a883ae5a07f1685c35fe77917294 | |
| parent | 8faf16c24d6274c761fc8a3a6158a60134d9a7e6 (diff) | |
| download | marcuscom-ports-9008904f85cc5a7858e27dbb481960b877a43761.tar marcuscom-ports-9008904f85cc5a7858e27dbb481960b877a43761.tar.gz marcuscom-ports-9008904f85cc5a7858e27dbb481960b877a43761.tar.bz2 marcuscom-ports-9008904f85cc5a7858e27dbb481960b877a43761.tar.lz marcuscom-ports-9008904f85cc5a7858e27dbb481960b877a43761.tar.xz marcuscom-ports-9008904f85cc5a7858e27dbb481960b877a43761.tar.zst marcuscom-ports-9008904f85cc5a7858e27dbb481960b877a43761.zip | |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15776 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | security/seahorse/Makefile | 4 | ||||
| -rw-r--r-- | security/seahorse3/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index 76d332b0b..0ec7949c6 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -3,7 +3,7 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse/Makefile,v 1.101 2011/03/06 20:09:35 kwm Exp $ +# $MCom: ports/security/seahorse/Makefile,v 1.102 2011/04/09 15:57:12 mezz Exp $ # PORTNAME= seahorse @@ -24,6 +24,8 @@ LIB_DEPENDS= gpgme.18:${PORTSDIR}/security/gpgme \ gcrypt.17:${PORTSDIR}/security/libgcrypt \ soup-2.4.1:${PORTSDIR}/devel/libsoup +CONFLICTS= seahorse-3.[0-9]* + USE_XORG= sm USE_LDCONFIG= yes USE_BZIP2= yes diff --git a/security/seahorse3/Makefile b/security/seahorse3/Makefile index b5ec6f549..941871703 100644 --- a/security/seahorse3/Makefile +++ b/security/seahorse3/Makefile @@ -3,7 +3,7 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse3/Makefile,v 1.3 2011/03/29 20:44:10 kwm Exp $ +# $MCom: ports/security/seahorse3/Makefile,v 1.4 2011/04/07 08:36:00 kwm Exp $ # PORTNAME= seahorse @@ -24,6 +24,8 @@ LIB_DEPENDS= gpgme.18:${PORTSDIR}/security/gpgme \ gcrypt.17:${PORTSDIR}/security/libgcrypt \ soup-2.4.1:${PORTSDIR}/devel/libsoup +CONFLICTS= seahorse-2.[0-9]* + USE_XORG= sm USE_LDCONFIG= yes USE_BZIP2= yes |