aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpi <pi@FreeBSD.org>2017-10-10 02:58:36 +0800
committerpi <pi@FreeBSD.org>2017-10-10 02:58:36 +0800
commitdce31ca1e6d1e480aece69963a12ffd62a120af9 (patch)
treed10ba4ff9291b1acea6a4831e3e35cc8a0006c4b /net
parent966f05fee9d75d03cdf18590c795548903c5fce4 (diff)
downloadfreebsd-ports-gnome-dce31ca1e6d1e480aece69963a12ffd62a120af9.tar.gz
freebsd-ports-gnome-dce31ca1e6d1e480aece69963a12ffd62a120af9.tar.zst
freebsd-ports-gnome-dce31ca1e6d1e480aece69963a12ffd62a120af9.zip
net/quagga{-esr}: add conflicts
- detected by rodrigo's conflict scanner
Diffstat (limited to 'net')
-rw-r--r--net/quagga-esr/Makefile2
-rw-r--r--net/quagga/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/quagga-esr/Makefile b/net/quagga-esr/Makefile
index 9343b56792d7..ef54005b773b 100644
--- a/net/quagga-esr/Makefile
+++ b/net/quagga-esr/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= gawk:lang/gawk
-CONFLICTS= openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]*
+CONFLICTS= openbgpd openospfd zebra quagga frr pimd
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 283c560961f7..6da9e3f2cf9b 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -13,7 +13,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= gawk:lang/gawk
-CONFLICTS= openbgpd openospfd zebra quagga-re frr
+CONFLICTS= openbgpd openospfd zebra quagga-esr frr pimd
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-exampledir=${PREFIX}/share/examples/quagga