From 411c624da8e8856a9d9e346424ed565a6ac07143 Mon Sep 17 00:00:00 2001 From: Dmitry Sivachenko Date: Sun, 26 Jul 2020 08:32:41 +0000 Subject: [PATCH] Update CONFLICTS. --- net/haproxy-devel/Makefile | 2 +- net/haproxy/Makefile | 2 +- net/haproxy17/Makefile | 2 +- net/haproxy18/Makefile | 2 +- net/haproxy19/Makefile | 2 +- net/haproxy20/Makefile | 2 +- net/haproxy21/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index b5abda18787f..16364d740a38 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -14,7 +14,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer 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 diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index dc256b32bd50..d8ef71dfeac3 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer 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 diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile index 984c4f53f59c..c9ac58779f78 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]* 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 diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile index 078f371b2c6a..b2293d36d06f 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-[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 diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile index 373845fc6445..702744d7046e 100644 --- a/net/haproxy19/Makefile +++ b/net/haproxy19/Makefile @@ -13,7 +13,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer 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 diff --git a/net/haproxy20/Makefile b/net/haproxy20/Makefile index 066b2ea4f00f..ec22fd9f83b4 100644 --- a/net/haproxy20/Makefile +++ b/net/haproxy20/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]* 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 diff --git a/net/haproxy21/Makefile b/net/haproxy21/Makefile index b38278983983..c7ad34819519 100644 --- a/net/haproxy21/Makefile +++ b/net/haproxy21/Makefile @@ -13,7 +13,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer 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