svn commit: r518459 - in head/net: haproxy haproxy-devel haproxy17 haproxy18 haproxy19

[Dmitry Sivachenko]

Author: demon
Date: Tue Nov 26 10:37:06 2019
New Revision: 518459
URL: https://svnweb.freebsd.org/changeset/ports/518459

Log:
  Update CONFLICTS.

Modified:
  head/net/haproxy-devel/Makefile
  head/net/haproxy/Makefile
  head/net/haproxy17/Makefile
  head/net/haproxy18/Makefile
  head/net/haproxy19/Makefile

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Tue Nov 26 10:28:34 2019	(r518458)
+++ head/net/haproxy-devel/Makefile	Tue Nov 26 10:37:06 2019	(r518459)
@@ -15,7 +15,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Tue Nov 26 10:28:34 2019	(r518458)
+++ head/net/haproxy/Makefile	Tue Nov 26 10:37:06 2019	(r518459)
@@ -12,7 +12,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]*
+CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy17/Makefile
==============================================================================
--- head/net/haproxy17/Makefile	Tue Nov 26 10:28:34 2019	(r518458)
+++ head/net/haproxy17/Makefile	Tue Nov 26 10:37:06 2019	(r518459)
@@ -16,7 +16,7 @@ LICENSE_COMB=	multi
 BROKEN_mips=		fails to build: undefined reference to '__sync_sub_and_fetch_4'
 BROKEN_mips64=		fails to build: undefined reference to '__sync_sub_and_fetch_4'
 
-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy18/Makefile
==============================================================================
--- head/net/haproxy18/Makefile	Tue Nov 26 10:28:34 2019	(r518458)
+++ head/net/haproxy18/Makefile	Tue Nov 26 10:37:06 2019	(r518459)
@@ -13,7 +13,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy19/Makefile
==============================================================================
--- head/net/haproxy19/Makefile	Tue Nov 26 10:28:34 2019	(r518458)
+++ head/net/haproxy19/Makefile	Tue Nov 26 10:37:06 2019	(r518459)
@@ -13,7 +13,7 @@ COMMENT=	Reliable, high performance TCP/HTTP load bala
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy21-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy