Date: Mon, 6 Sep 2021 19:16:16 GMT From: Xin LI <delphij@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c9693f729190 - main - net/openldap2[45]-server: Make CONFLICT_INSTALL more preciese. Message-ID: <202109061916.186JGGM1034225@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=c9693f729190b7328d60b398788688d40ccc6ab6 commit c9693f729190b7328d60b398788688d40ccc6ab6 Author: Xin LI <delphij@FreeBSD.org> AuthorDate: 2021-09-06 19:15:32 +0000 Commit: Xin LI <delphij@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109061916.186JGGM1034225>