From nobody Thu Aug 4 11:39:35 2022 X-Original-To: dev-commits-ports-branches@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 4Lz6Fz6nJ5z4YpH7; Thu, 4 Aug 2022 11:39:35 +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 4Lz6Fz6FD2z42VX; Thu, 4 Aug 2022 11:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659613175; 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=+PCQDa62wKDR5SYJD6DifZ12q1bBqZCZ7IroraM+FpM=; b=K6r7BoqpRapmVWqlmsvqbRnKDtQ5/v70pI7cPSVHKszi55tSAq7tuvMaYId3ZJr8r+K+JY WRav+Ii1bY0FLP4AlH1zQreyC78xmve1cGywh3J6PsXsWemyZCCfdUZ+u3yIrhDI6Ol+pf gqSw6BrynD/in86aJ0bvvildR15t4e/IAHYyI5NenOQtRuHXTA88qav5rt97bk6ZXqQOsP Q5nAzEl5GDW4r0LPI5mK6xfH8djPvNwE647pN5g0+GKpUzW0Ke+FNBvqrGirqc8sBvTbpL 99hLIUmHDsUEg9p225Nw86R6DklWsRiv3Kh/94WWDF7mHglBwk4RgkMxacLWvA== 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 4Lz6Fz53bVz1SYn; Thu, 4 Aug 2022 11:39: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 274BdZXR066590; Thu, 4 Aug 2022 11:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 274BdZwc066589; Thu, 4 Aug 2022 11:39:35 GMT (envelope-from git) Date: Thu, 4 Aug 2022 11:39:35 GMT Message-Id: <202208041139.274BdZwc066589@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 2d2596cfd772 - 2022Q3 - net/openldap24-server: Fix CONFLICTS List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 2d2596cfd77264496d3b865285b2cf757db6233d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659613175; 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=+PCQDa62wKDR5SYJD6DifZ12q1bBqZCZ7IroraM+FpM=; b=chnJ7OS23oCiiCUSs0VqBViqkkLiUgb1x8UuZCRpTzVC6gTNowHs9KuRXFMw9HlEx1dsLU g4NGHRZIpu2+jIJnUkGD/RfHm23QmGcK64RxSBEXmaVoWkC0ztydV6FrBTtq4YMcxEGWqE woqMwp39xSFXJJiaIYb8CPtOYR8y1iX/hCSM2h9Y0YSYhrR62mxK51ClpxoeF+wWvbWv0Z CAmtANJHIfu3WQGU8+uLvVT3dzXRTDDo76XsBh9OSFHtOOapA8S/HF6f+7hEyICHbk27sO ZQz9qeT9PL4xqPJqTXp7ktBRiw9ilVcBdOhJJ4O/DHAUsxwIW5MQ1raJ6nZW3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659613175; a=rsa-sha256; cv=none; b=eOb6WDvJuqFHxxh16dD+cbCLMPgbXep9fskahwIihDvWlG2u1Fn/c974xZg2Ff/KcBmXHK HwsEfWb78h9e09buF8/k4yGrOVptLnydsReCWGa1jN/SmzFaiEb9vnJBB63DR6JXs2pd1+ Q1n5Z6V/9JHL103cCOJNW9RtJxnDi+gugRv7HBo/Y9Q/RTyGAOEOFVr5T5coNg06OL9Jhs h6kvZ7TROQfWCkZK9yCJsAJwoHNUTzWI+FTm9hnzhU6E0Liv4hDLgaY+LpYIfTH7+amdNj AwXyOtGStD+dzN6eZFgP+BrXkejahBOVyH1JbagFLBQ+4v1m7NZrdSY/6kkikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d2596cfd77264496d3b865285b2cf757db6233d commit 2d2596cfd77264496d3b865285b2cf757db6233d Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-08-04 11:33:26 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-08-04 11:39:15 +0000 net/openldap24-server: Fix CONFLICTS Error message: pkg: openldap26-client-2.6.3 conflicts with openldap24-client-2.4.59_4 (installs files into the same place). Problematic file: /usr/local/bin/ldapadd Approved by: portmgr blanket (cherry picked from commit f55d9674821ec3f06a1f1286e3ddabb6278363b2) --- net/openldap24-server/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 819cbfeb716c..6b15124a62f5 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -35,9 +35,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept .if defined(CLIENT_ONLY) -CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client ${PORTNAME}-client +CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client ${PORTNAME}2[0-35-9]-client ${PORTNAME}-client .else -CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server ${PORTNAME}-server +CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server ${PORTNAME}2[0-35-9]-server ${PORTNAME}-server .endif GNU_CONFIGURE= yes