From owner-dev-commits-ports-main@freebsd.org Mon Sep 6 19:16:17 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 485F9679D29; Mon, 6 Sep 2021 19:16:17 +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 4H3J691ZJxz3Q1Z; Mon, 6 Sep 2021 19:16:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 10D8224686; Mon, 6 Sep 2021 19:16:17 +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 186JGG7o034226; Mon, 6 Sep 2021 19:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 186JGGM1034225; Mon, 6 Sep 2021 19:16:16 GMT (envelope-from git) Date: Mon, 6 Sep 2021 19:16:16 GMT Message-Id: <202109061916.186JGGM1034225@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xin LI Subject: git: c9693f729190 - main - net/openldap2[45]-server: Make CONFLICT_INSTALL more preciese. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9693f729190b7328d60b398788688d40ccc6ab6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 19:16:17 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=c9693f729190b7328d60b398788688d40ccc6ab6 commit c9693f729190b7328d60b398788688d40ccc6ab6 Author: Xin LI AuthorDate: 2021-09-06 19:15:32 +0000 Commit: Xin LI 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