svn commit: r543451 - in head/net: haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21

[Dmitry Sivachenko]

Author: demon
Date: Sun Jul 26 08:32:41 2020
New Revision: 543451
URL: https://svnweb.freebsd.org/changeset/ports/543451

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
  head/net/haproxy20/Makefile
  head/net/haproxy21/Makefile

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Sun Jul 26 08:14:25 2020	(r543450)
+++ head/net/haproxy-devel/Makefile	Sun Jul 26 08:32:41 2020	(r543451)
@@ -14,7 +14,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]* haproxy21-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[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	Sun Jul 26 08:14:25 2020	(r543450)
+++ head/net/haproxy/Makefile	Sun Jul 26 08:32:41 2020	(r543451)
@@ -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]* haproxy21-[0-9]*
+CONFLICTS_INSTALL=	haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[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	Sun Jul 26 08:14:25 2020	(r543450)
+++ head/net/haproxy17/Makefile	Sun Jul 26 08:32:41 2020	(r543451)
@@ -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]* haproxy21-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy18/Makefile
==============================================================================
--- head/net/haproxy18/Makefile	Sun Jul 26 08:14:25 2020	(r543450)
+++ head/net/haproxy18/Makefile	Sun Jul 26 08:32:41 2020	(r543451)
@@ -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]* haproxy21-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy19/Makefile
==============================================================================
--- head/net/haproxy19/Makefile	Sun Jul 26 08:14:25 2020	(r543450)
+++ head/net/haproxy19/Makefile	Sun Jul 26 08:32:41 2020	(r543451)
@@ -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]* haproxy21-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy20/Makefile
==============================================================================
--- head/net/haproxy20/Makefile	Sun Jul 26 08:14:25 2020	(r543450)
+++ head/net/haproxy20/Makefile	Sun Jul 26 08:32:41 2020	(r543451)
@@ -13,7 +13,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]* haproxy21-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* 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/haproxy21/Makefile
==============================================================================
--- head/net/haproxy21/Makefile	Sun Jul 26 08:14:25 2020	(r543450)
+++ head/net/haproxy21/Makefile	Sun Jul 26 08:32:41 2020	(r543451)
@@ -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]* haproxy19-[0-9]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]*
 
 USES=		compiler:c++11-lang cpe gmake
 USE_RC_SUBR=	haproxy