From 190fc8a29c3513cbd806740d5dd7d48a4e007ba7 Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Tue, 26 Mar 2019 10:59:32 +0000 Subject: Update CONFLICTS. --- net/haproxy17/Makefile | 2 +- net/haproxy18/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'net') diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile index 5d824aac9cb5..7d29e79f4f05 100644 --- a/net/haproxy17/Makefile +++ b/net/haproxy17/Makefile @@ -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 diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile index 0fd00cffbfd5..90cdef724659 100644 --- a/net/haproxy18/Makefile +++ b/net/haproxy18/Makefile @@ -13,7 +13,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer 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 -- cgit v1.2.3