From owner-svn-ports-all@freebsd.org Sun Jul 26 08:32:43 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 489583A14C6; Sun, 26 Jul 2020 08:32:43 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BDx5R196Sz4Gh8; Sun, 26 Jul 2020 08:32:43 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B158A0BE; Sun, 26 Jul 2020 08:32:43 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06Q8Wghr068655; Sun, 26 Jul 2020 08:32:42 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06Q8WfNY068648; Sun, 26 Jul 2020 08:32:41 GMT (envelope-from demon@FreeBSD.org) Message-Id: <202007260832.06Q8WfNY068648@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Sun, 26 Jul 2020 08:32:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543451 - in head/net: haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 X-SVN-Group: ports-head X-SVN-Commit-Author: demon X-SVN-Commit-Paths: in head/net: haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21 X-SVN-Commit-Revision: 543451 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jul 2020 08:32:43 -0000 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