From owner-svn-ports-all@freebsd.org Tue Mar 26 10:59:33 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6613154CA7E; Tue, 26 Mar 2019 10:59:33 +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 631168B4F1; Tue, 26 Mar 2019 10:59:33 +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 3C7CB1EB4D; Tue, 26 Mar 2019 10:59:33 +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 x2QAxXo9046309; Tue, 26 Mar 2019 10:59:33 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2QAxWB5046308; Tue, 26 Mar 2019 10:59:32 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201903261059.x2QAxWB5046308@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Tue, 26 Mar 2019 10:59:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496889 - in head/net: haproxy17 haproxy18 X-SVN-Group: ports-head X-SVN-Commit-Author: demon X-SVN-Commit-Paths: in head/net: haproxy17 haproxy18 X-SVN-Commit-Revision: 496889 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 631168B4F1 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 26 Mar 2019 10:59:34 -0000 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