From nobody Sat Jun 25 11:11:04 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 EF0B286D234; Sat, 25 Jun 2022 11:11:04 +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 4LVWWX6TWkz3jSD; Sat, 25 Jun 2022 11:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656155464; 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=TnObyeBbgESETOURW5+J4Ocli67rNA4XoH2V837V95E=; b=tLuksMAhMc1l3kCX70Oc7rqGKBHrKqnLy0ujYF9A4zvmZhIJ7n8GLctPqROACKh5fcLwVo FsjTwS3YxKUeOxQMxBzc4nd2n8r9Vxa61HXFuASl+78wOVPW4DGLbHWP/Waa5B3wXsMsNH APieUnOsSUycUO+jjoPmg6iRW5xMMgWgFH6FUAvHJbTjGWl6LxlRvZPZcQQVcNyMdVB9pZ ofy3R6WYgZfgU4Ph5jnSw5BDx0IJRrGDZkgNSkHUHWI5FtbOtfocdSpUa5efCLxNW5/irC 7ekDsR1wXtw172Ibn3VCZN4wbLfA+XWDso7cNn1SGmuKsTWslrnHSQYV16MEUA== 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 BFA5F23545; Sat, 25 Jun 2022 11:11:04 +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 25PBB4LC059077; Sat, 25 Jun 2022 11:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25PBB4V0059076; Sat, 25 Jun 2022 11:11:04 GMT (envelope-from git) Date: Sat, 25 Jun 2022 11:11:04 GMT Message-Id: <202206251111.25PBB4V0059076@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: d8031f426048 - main - net/haproxy25: 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: d8031f42604876e0fb1b01b81b9fc8b35cb89e4d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656155464; 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=TnObyeBbgESETOURW5+J4Ocli67rNA4XoH2V837V95E=; b=dPylnx7eGW79yt7x99VoEVBrfoGfnS9dynmVgfIjqH1Tz8dz/ABF8ygpSPneCPP61dOyHA ZS0PmbmDe8jsrecaJawJB2U3/3HEr3rRwkLY+dWmB5bUIY6w3exJN9YarmRPCBqjFDJ66e Z2Qq0GRh90G65wE5SXyGPis4SU94aL9KX13Rd2kFSoBtng1ai75BrLSTFoWUnEOf1LkmVc vESgjhVUHZBl8z/CciyqRzIIqC7mO1uH3EmQXaBIKdmyzB3cSKlMgAymWASTRKLAfhq2gA u1ibms9+xwUjGEXcA3AicF2Qloamqkw7LTSX9/bc5OFx9BW91FODhiW/dCrHpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656155464; a=rsa-sha256; cv=none; b=MVkske9lLuKWypV3m0Pb4mRGoo1B4KqL9SNFUWosMQtktYypyh7McoSZ1cDgzPhd8Td4IT YzMCuAXogz8DiNvp2riGIY42lJ9OVdKNOuFpQ1i3OM8rV+Ju7/g56/SLHa1vxF1UNJY1u3 EXgB8YBpBC7MbOouBKuRDPEERH1UHvaARVBqTauKgI6xe1UI4izOIo2C9oF9lrnowg4FCy c50+Uz5sqwCVMDJY/LQr/FxtV1sOwloSYAMj+Fw11Qn5bm9WASZUg5sFDpPWAwszGJ8dii GQob1Y3GCnK1SKFCyoKgTDc33uGcxdV8jTfg0OK7l38rHjNOaTKKPB7qwM33hQ== 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=d8031f42604876e0fb1b01b81b9fc8b35cb89e4d commit d8031f42604876e0fb1b01b81b9fc8b35cb89e4d Author: Antoine Brodin AuthorDate: 2022-06-25 11:10:36 +0000 Commit: Antoine Brodin CommitDate: 2022-06-25 11:10:54 +0000 net/haproxy25: fix PKGBASE collision --- net/haproxy25/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/haproxy25/Makefile b/net/haproxy25/Makefile index 82015612366b..d49958f2f602 100644 --- a/net/haproxy25/Makefile +++ b/net/haproxy25/Makefile @@ -3,6 +3,7 @@ PORTNAME= haproxy DISTVERSION= 2.5.7 CATEGORIES= net www +PKGNAMESUFFIX= 25 MASTER_SITES= http://www.haproxy.org/download/2.5/src/ MAINTAINER= demon@FreeBSD.org @@ -19,7 +20,7 @@ USE_RC_SUBR= haproxy default_CONFLICTS_INSTALL= haproxy-lua lua_CONFLICTS_INSTALL= haproxy -lua_PKGNAMESUFFIX= -lua +lua_PKGNAMESUFFIX= 25-lua CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24