From a36bf337898cc741fce4f00fceca732735a1f98b Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Mon, 9 Oct 2017 18:58:36 +0000 Subject: [PATCH] net/quagga{-esr}: add conflicts - detected by rodrigo's conflict scanner --- net/quagga-esr/Makefile | 2 +- net/quagga/Makefile | 2 +- 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