From nobody Thu Aug 4 11:37:44 2022 X-Original-To: dev-commits-ports-all@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 4Lz6Cs0skFz4Yp8h; Thu, 4 Aug 2022 11:37:45 +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 4Lz6Cs0CP3z42J4; Thu, 4 Aug 2022 11:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659613065; 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=p684/REkj7gDZapE6H/QHB4v9ZQm0cHhg0Hi76zikYQ=; b=EbIdD+6Cily2MgA7H2+/3Hqba2HqFSq3pDJl9xLdxfHmUCBHqLUSVeFF9UG2qNbGuGFGb3 5dfyMWq8fyq98CsNpByNDheLDOYRgvsjhY2hb2fU4q9cOpFrFdOVJPDoEBJybpbdMkju10 i6E757cfXIyaS/Muk0xyIJWNnzoLGtBaNBOZxQsRUX0P9VWVApKqOinh/2kMqT3J0Y6yf3 ntXqVBXez8LIbOCqriDuu07BGERT3JofJUSp7RpeXIy4QuQbedtpWQDmD4a2DByBhvivZi J0W8e3zyhED2e0N4G22PBP/m4pTBHdZU992BHrfGfXDcDwv3a8+A37GFa+gnJA== 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 4Lz6Cr65d0z1S9L; Thu, 4 Aug 2022 11:37:44 +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 274Bbiwa066314; Thu, 4 Aug 2022 11:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 274BbiwW066313; Thu, 4 Aug 2022 11:37:44 GMT (envelope-from git) Date: Thu, 4 Aug 2022 11:37:44 GMT Message-Id: <202208041137.274BbiwW066313@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: f55d9674821e - main - net/openldap24-server: Fix CONFLICTS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: f55d9674821ec3f06a1f1286e3ddabb6278363b2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659613065; 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=p684/REkj7gDZapE6H/QHB4v9ZQm0cHhg0Hi76zikYQ=; b=vAI8S70619zxWp40dCI9htoSRVSPN+HF9AbAChZt4N6otuRMv4tJ6YW3U80qO5w2pghs1K iot8tcAOnsE6XYKsBjVM220klKndlyYqjx0tz60cYGgeFM4Sxthphcxa/b7wjLdx2SLJ4h 6Rf1ZtD2YSc1CL6vpGUlgW5oUoLNGTFY3a3AskunDH/2n35YpSyzXoPeojzMfxh8atueWw QdV1e3XVpy45PwH9Cf5YirM/sBEQEkwQOHxCb189C9tDyPDy68hkkhoCGWJ/KbCHSLcWR6 tvDVmWszCBXI7S9rrr9gy8t6F/szHBi3e20qy7oExu+oVATPScZHWnsZ4RLoWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659613065; a=rsa-sha256; cv=none; b=TnWEhtWgciSF9jOqSeEcWXPXeGKQWrMK38BHVvzeOsteSOE+0hr097SoTMJKXGGRrk7qhO I1xNQx60q4XUhwmlBK7BK02Sgot5atgN7hA32EeP+Pj+IEXh0SCWUWzrLAEO3nP9RED8Yv 84iM56+lT3eHFwzQ9diqehVno8qp+0VDa4O5bJV8edklRQ+q3wMM+6hWzTnvTfFpQ4cxur 8KrW9JdWONF+6MxGSN9WHDthvbOU5Z6HGgIsTy45iNrs7usK45SAYRQfrNzt5BPZdxopUr r7zAzRkClIhhCvua/vsqqFZe44BXIGR5+ed5gq6d54bkHaW6I1CqOtUxq96itA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=f55d9674821ec3f06a1f1286e3ddabb6278363b2 commit f55d9674821ec3f06a1f1286e3ddabb6278363b2 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:36:44 +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 --- 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 3d14afaf8b44..df8c81b20e91 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -33,9 +33,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