svn commit: r451630 - in head/net: quagga quagga-esr

[Kurt Jaeger]

Author: pi
Date: Mon Oct  9 18:58:36 2017
New Revision: 451630
URL: https://svnweb.freebsd.org/changeset/ports/451630

Log:
  net/quagga{-esr}: add conflicts
  
  - detected by rodrigo's conflict scanner

Modified:
  head/net/quagga-esr/Makefile
  head/net/quagga/Makefile

Modified: head/net/quagga-esr/Makefile
==============================================================================
--- head/net/quagga-esr/Makefile	Mon Oct  9 18:25:24 2017	(r451629)
+++ head/net/quagga-esr/Makefile	Mon Oct  9 18:58:36 2017	(r451630)
@@ -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

Modified: head/net/quagga/Makefile
==============================================================================
--- head/net/quagga/Makefile	Mon Oct  9 18:25:24 2017	(r451629)
+++ head/net/quagga/Makefile	Mon Oct  9 18:58:36 2017	(r451630)
@@ -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