From 03728c5ad54a288e0a00261a21916e6070df06cd Mon Sep 17 00:00:00 2001 From: fluffy Date: Tue, 30 Mar 2010 13:36:43 +0000 Subject: - Set CONFLICTS with net-mgmt/argus3[-clients] --- net-mgmt/argus-clients/Makefile | 2 ++ net-mgmt/argus/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/net-mgmt/argus-clients/Makefile b/net-mgmt/argus-clients/Makefile index 5139d78..913c75c 100644 --- a/net-mgmt/argus-clients/Makefile +++ b/net-mgmt/argus-clients/Makefile @@ -15,6 +15,8 @@ MASTER_SITES= http://qosient.com/argus/src/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Client programs for the argus IP network transaction auditing tool +CONFLICTS= argus-clients-3* argus-clients-sasl-3* + .if defined(WITH_SASL) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 .endif diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile index 2cc4ecb..03bbe21 100644 --- a/net-mgmt/argus/Makefile +++ b/net-mgmt/argus/Makefile @@ -15,6 +15,8 @@ MASTER_SITES= http://qosient.com/argus/src/ \ MAINTAINER= ports@freebsd.org COMMENT= A generic IP network transaction auditing tool +CONFLICTS= argus-3* argus-sasl-3* + .if defined(WITH_SASL) LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 .endif -- cgit v1.1