Date: Thu, 4 Aug 2022 11:39:35 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 2d2596cfd772 - 2022Q3 - net/openldap24-server: Fix CONFLICTS Message-ID: <202208041139.274BdZwc066589@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208041139.274BdZwc066589>