summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2004-01-20 00:02:34 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2004-01-20 00:02:34 +0000
commit4fae7f633deb38672bd3e59b893de588ac3091f7 (patch)
treecd011089eade74ffddeacbe4c74dc70d7383c61e
parentAdd p5-Text-WikiFormat 0.71, module for translating Wiki formatted text (diff)
- Add CONFLICTS between net/arpwatch and net/arpwatch-devel
-rw-r--r--net-mgmt/arpwatch-devel/Makefile2
-rw-r--r--net-mgmt/arpwatch/Makefile2
-rw-r--r--net/arpwatch-devel/Makefile2
-rw-r--r--net/arpwatch/Makefile2
4 files changed, 8 insertions, 0 deletions
diff --git a/net-mgmt/arpwatch-devel/Makefile b/net-mgmt/arpwatch-devel/Makefile
index af4c46637fc2..8cefdfeca18f 100644
--- a/net-mgmt/arpwatch-devel/Makefile
+++ b/net-mgmt/arpwatch-devel/Makefile
@@ -16,6 +16,8 @@ DISTNAME= arpwatch-2.1a11
MAINTAINER= mdg@secureworks.net
COMMENT= Monitor arp & rarp requests
+CONFLICTS= arpwatch-2.*
+
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --quiet
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index d98e7431bfd1..a38aa57976a9 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -16,6 +16,8 @@ DISTNAME= arpwatch-2.1a11
MAINTAINER= krion@FreeBSD.org
COMMENT= Monitor arp & rarp requests
+CONFLICTS= arpwatch-devel-2.*
+
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --quiet
diff --git a/net/arpwatch-devel/Makefile b/net/arpwatch-devel/Makefile
index af4c46637fc2..8cefdfeca18f 100644
--- a/net/arpwatch-devel/Makefile
+++ b/net/arpwatch-devel/Makefile
@@ -16,6 +16,8 @@ DISTNAME= arpwatch-2.1a11
MAINTAINER= mdg@secureworks.net
COMMENT= Monitor arp & rarp requests
+CONFLICTS= arpwatch-2.*
+
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --quiet
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index d98e7431bfd1..a38aa57976a9 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -16,6 +16,8 @@ DISTNAME= arpwatch-2.1a11
MAINTAINER= krion@FreeBSD.org
COMMENT= Monitor arp & rarp requests
+CONFLICTS= arpwatch-devel-2.*
+
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --quiet