git: c9693f729190 - main - net/openldap2[45]-server: Make CONFLICT_INSTALL more preciese.

[Xin LI]

The branch main has been updated by delphij:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c9693f729190b7328d60b398788688d40ccc6ab6

commit c9693f729190b7328d60b398788688d40ccc6ab6
Author:     Xin LI <delphij at FreeBSD.org>
AuthorDate: 2021-09-06 19:15:32 +0000
Commit:     Xin LI <delphij at FreeBSD.org>
CommitDate: 2021-09-06 19:15:32 +0000

    net/openldap2[45]-server: Make CONFLICT_INSTALL more preciese.
---
 net/openldap24-server/Makefile | 7 +++++--
 net/openldap25-server/Makefile | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index a36363a23d6d..cfe181e3923e 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -34,8 +34,11 @@ LICENSE_NAME=		OpenLDAP Public License
 LICENSE_FILE=		${WRKSRC}/LICENSE
 LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-CONFLICTS_INSTALL=	${PORTNAME}2[0-3][5-9]-client-* ${PORTNAME}-client-* \
-			${PORTNAME}2[0-3][5-9]-server-* ${PORTNAME}-server-*
+.if defined(CLIENT_ONLY)
+CONFLICTS_INSTALL=	${PORTNAME}2[0-3][5-9]-client-* ${PORTNAME}-client-*
+.else
+CONFLICTS_INSTALL=	${PORTNAME}2[0-3][5-9]-server-* ${PORTNAME}-server-*
+.endif
 
 GNU_CONFIGURE=		yes
 # :keepla because port uses lt_dlopen
diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index 56cf6d239df2..dc02e97c583b 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -37,8 +37,11 @@ LICENSE_PERMS=		dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 # :keepla because port uses lt_dlopen
 USES=			cpe gmake libtool:keepla localbase ssl tar:tgz
 
-CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-client-* ${PORTNAME}-client-* \
-			${PORTNAME}2[0-46-9]-server-* ${PORTNAME}-server-*
+.if defined(CLIENT_ONLY)
+CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-client-* ${PORTNAME}-client-*
+.else
+CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-server-* ${PORTNAME}-server-*
+.endif
 
 GNU_CONFIGURE=		yes