From owner-svn-ports-head@freebsd.org Tue Nov 26 10:37:07 2019 Return-Path: Delivered-To: svn-ports-head@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 B79A01B1900; Tue, 26 Nov 2019 10:37:07 +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) server-signature RSA-PSS (4096 bits) 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 47MgM74PZPz4fcw; Tue, 26 Nov 2019 10:37:07 +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 7A80723CA7; Tue, 26 Nov 2019 10:37:07 +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 xAQAb74Q008635; Tue, 26 Nov 2019 10:37:07 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAQAb6oq008630; Tue, 26 Nov 2019 10:37:06 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201911261037.xAQAb6oq008630@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Tue, 26 Nov 2019 10:37:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518459 - in head/net: haproxy haproxy-devel haproxy17 haproxy18 haproxy19 X-SVN-Group: ports-head X-SVN-Commit-Author: demon X-SVN-Commit-Paths: in head/net: haproxy haproxy-devel haproxy17 haproxy18 haproxy19 X-SVN-Commit-Revision: 518459 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Nov 2019 10:37:07 -0000 Author: demon Date: Tue Nov 26 10:37:06 2019 New Revision: 518459 URL: https://svnweb.freebsd.org/changeset/ports/518459 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 Modified: head/net/haproxy-devel/Makefile ============================================================================== --- head/net/haproxy-devel/Makefile Tue Nov 26 10:28:34 2019 (r518458) +++ head/net/haproxy-devel/Makefile Tue Nov 26 10:37:06 2019 (r518459) @@ -15,7 +15,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]* +CONFLICTS_INSTALL= haproxy-[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/haproxy/Makefile ============================================================================== --- head/net/haproxy/Makefile Tue Nov 26 10:28:34 2019 (r518458) +++ head/net/haproxy/Makefile Tue Nov 26 10:37:06 2019 (r518459) @@ -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]* +CONFLICTS_INSTALL= 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/haproxy17/Makefile ============================================================================== --- head/net/haproxy17/Makefile Tue Nov 26 10:28:34 2019 (r518458) +++ head/net/haproxy17/Makefile Tue Nov 26 10:37:06 2019 (r518459) @@ -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]* +CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]* USES= cpe gmake USE_RC_SUBR= haproxy Modified: head/net/haproxy18/Makefile ============================================================================== --- head/net/haproxy18/Makefile Tue Nov 26 10:28:34 2019 (r518458) +++ head/net/haproxy18/Makefile Tue Nov 26 10:37:06 2019 (r518459) @@ -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]* +CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]* USES= cpe gmake USE_RC_SUBR= haproxy Modified: head/net/haproxy19/Makefile ============================================================================== --- head/net/haproxy19/Makefile Tue Nov 26 10:28:34 2019 (r518458) +++ head/net/haproxy19/Makefile Tue Nov 26 10:37:06 2019 (r518459) @@ -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]* +CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy21-[0-9]* USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy