From nobody Wed Jan 12 15:24:35 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F1AAB1955535; Wed, 12 Jan 2022 15:24:37 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYrvm19kYz3M5b; Wed, 12 Jan 2022 15:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68EED7794; Wed, 12 Jan 2022 15:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20CFOZZX024896; Wed, 12 Jan 2022 15:24:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CFOZgu024895; Wed, 12 Jan 2022 15:24:35 GMT (envelope-from git) Date: Wed, 12 Jan 2022 15:24:35 GMT Message-Id: <202201121524.20CFOZgu024895@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Antoine Brodin Subject: git: 7b14535092ab - main - net/haproxy24: fix PKGBASE collision List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: antoine X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b14535092aba7a0201a90da2be4da8cfcacf61a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642001077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1B+QVNvEyaSgpE7YWylIJjh6TSk+DpGj/UsyoF8jihg=; b=NnGfdKyXeTo7qtquvTGKygaWIapl+SippHS2Y8LRw7zh8HADhtlG1Xl4lS+PYTQmI3dJWM YV5wIcwnBzWceM5xYpASSCkKnLqs9j57fTUFT5B5oPKLK3k7neWs51bTDtwHFvmzSdEQ5S bW+GzacvdNaMtrTwcI8Oku6/oYSDYOxgmUv3T+bjzfeDZY0DzYRx8p5ovZkg9yEXtHef8v XahGNXFaMZlvro/nIxBcXCT/+mEKun04r0C92Z5sOzLwYm8R6N27l6m4snoFTrDeImCsWx 8Fw4N4454399U5Xo7Wnylua4T4AhNLGoRbVZU57q3Y/+leel7v0tpZVtd+cY8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642001077; a=rsa-sha256; cv=none; b=GuDqzWX+dtJ8p3nZM+sKZf433cmOPWwpoYC/hsCsjsGWgAgg2cK0AYp/99TwE63fIiAKxu gqZ6lMemg6UmrWI/DKhXr4KMy7/cybkhm1HJIodvOb85MlnN/BqIzdzTSrd3P3K3Mnl2P6 JSaz9eqgO29wFNIb66nYyxZDhXqt3O3n2hgyinpDUl6LPEbRsfM02ZKBM8sLYmnmrhaw3a 9uQIb4IC1yUfDtgkOGdUxga7t3yug8q0ZrX98PWSKtSp6P4c2HiMbis5d12oXTdA2w7dxP K20FuRgfkudEHdc5CN3cHqL4rIEefIo4QP4PpnLP77CDKov5Oma/BILn9SJIRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by antoine: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b14535092aba7a0201a90da2be4da8cfcacf61a commit 7b14535092aba7a0201a90da2be4da8cfcacf61a Author: Antoine Brodin AuthorDate: 2022-01-12 15:23:37 +0000 Commit: Antoine Brodin CommitDate: 2022-01-12 15:23:37 +0000 net/haproxy24: fix PKGBASE collision --- net/haproxy24/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/haproxy24/Makefile b/net/haproxy24/Makefile index 5126018dea37..55de142a40ba 100644 --- a/net/haproxy24/Makefile +++ b/net/haproxy24/Makefile @@ -17,7 +17,7 @@ FLAVOR?= ${FLAVORS:[1]} default_CONFLICTS_INSTALL= haproxy-lua lua_CONFLICTS_INSTALL= haproxy -lua_PKGNAMESUFFIX= -lua +lua_PKGNAMESUFFIX= 24-lua CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21