summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 06:16:21 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 06:16:21 +0000
commit29bc00aad3337360bfe876bf2724256fc4b5d7a0 (patch)
tree5b603f4ca91a49cfd96cf1e7739d9fdae1de6f69
parentbalsa and balsa2 conflict with each other. (diff)
net-snmp4 conflicts with net-snmp-5.x.
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes: svn path=/head/; revision=90837
-rw-r--r--net-mgmt/net-snmp4/Makefile2
-rw-r--r--net/net-snmp4/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 0fafd3cdf71a..951b1b96702f 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -62,6 +62,8 @@ SBIN= snmpd snmptrapd
STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh
+CONFLICTS= net-snmp-5.*
+
.if defined(WITHOUT_SSL)
CONFIGURE_ARGS+= --without-openssl
.else
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index 0fafd3cdf71a..951b1b96702f 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -62,6 +62,8 @@ SBIN= snmpd snmptrapd
STARTUP_FILE= ${PREFIX}/etc/rc.d/snmpd.sh
+CONFLICTS= net-snmp-5.*
+
.if defined(WITHOUT_SSL)
CONFIGURE_ARGS+= --without-openssl
.else