From owner-dev-commits-ports-all@freebsd.org Mon Aug 2 15:26:55 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 EEDC06760FE; Mon, 2 Aug 2021 15:26:55 +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 4Gdhgg6DvHz4bq1; Mon, 2 Aug 2021 15:26:55 +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 BBC9721E40; Mon, 2 Aug 2021 15:26:55 +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 172FQtdE097685; Mon, 2 Aug 2021 15:26:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 172FQtFN097684; Mon, 2 Aug 2021 15:26:55 GMT (envelope-from git) Date: Mon, 2 Aug 2021 15:26:55 GMT Message-Id: <202108021526.172FQtFN097684@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: 068a856800e6 - main - net/openldap24-server: Fix build with port OpenSSL 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: 068a856800e69ed12db47f9c8cb93be8e85cb141 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 15:26:56 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=068a856800e69ed12db47f9c8cb93be8e85cb141 commit 068a856800e69ed12db47f9c8cb93be8e85cb141 Author: Robert Backhaus AuthorDate: 2021-08-02 15:24:15 +0000 Commit: Xin LI CommitDate: 2021-08-02 15:26:39 +0000 net/openldap24-server: Fix build with port OpenSSL PR: ports/257559 Reported by: many --- net/openldap24-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index afbf8a4a3d2d..211a6a82933b 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -511,7 +511,7 @@ PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR} .include -.if ${PORT_OPTIONS:MFETCH} && defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base +.if ${PORT_OPTIONS:MFETCH} && (defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base) BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported . endif