git: f55d9674821e - main - net/openldap24-server: Fix CONFLICTS

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