svn commit: r496889 - in head/net: haproxy17 haproxy18

[Dmitry Sivachenko]

Author: demon
Date: Tue Mar 26 10:59:32 2019
New Revision: 496889
URL: https://svnweb.freebsd.org/changeset/ports/496889

Log:
  Update CONFLICTS.

Modified:
  head/net/haproxy17/Makefile
  head/net/haproxy18/Makefile

Modified: head/net/haproxy17/Makefile
==============================================================================
--- head/net/haproxy17/Makefile	Tue Mar 26 10:58:32 2019	(r496888)
+++ head/net/haproxy17/Makefile	Tue Mar 26 10:59:32 2019	(r496889)
@@ -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]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy

Modified: head/net/haproxy18/Makefile
==============================================================================
--- head/net/haproxy18/Makefile	Tue Mar 26 10:58:32 2019	(r496888)
+++ head/net/haproxy18/Makefile	Tue Mar 26 10:59:32 2019	(r496889)
@@ -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]*
+CONFLICTS_INSTALL=	haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]*
 
 USES=		cpe gmake
 USE_RC_SUBR=	haproxy