From nobody Mon Oct 25 06:45:43 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B1EFD1808EB4; Mon, 25 Oct 2021 06:45:43 +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 4Hd57W4d8cz3Qdq; Mon, 25 Oct 2021 06:45:43 +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 7F12E242AE; Mon, 25 Oct 2021 06:45:43 +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 19P6jhRT025198; Mon, 25 Oct 2021 06:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19P6jhKH025197; Mon, 25 Oct 2021 06:45:43 GMT (envelope-from git) Date: Mon, 25 Oct 2021 06:45:43 GMT Message-Id: <202110250645.19P6jhKH025197@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: 018803104cba - main - net/openldap24-client: Install libldap as symlinks to libldap_r. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 018803104cbab00fd901d80ca2829191d7287a28 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=018803104cbab00fd901d80ca2829191d7287a28 commit 018803104cbab00fd901d80ca2829191d7287a28 Author: Xin LI AuthorDate: 2021-10-25 06:09:48 +0000 Commit: Xin LI CommitDate: 2021-10-25 06:45:37 +0000 net/openldap24-client: Install libldap as symlinks to libldap_r. As of FreeBSD 12.0, OpenSSL is depending on the threading library and it is no longer possible to build a true non-threaded version of libldap. The libldap_r is ABI compatible with libldap and is shipped as the libldap on Solaris and many Linux distributions, so follow the same approach. --- net/openldap24-server/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 55186932c24c..08572e8bc96f 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -49,7 +49,7 @@ WANT_OPENLDAP_VER?= 24 BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif -PORTREVISION_CLIENT= 3 +PORTREVISION_CLIENT= 4 PORTREVISION_SERVER= 6 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 11.7 @@ -622,9 +622,12 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \ done - for library in lber ldap ldap_r; do \ + for library in lber ldap_r; do \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \ done + for suffix in -${OPENLDAP_MAJOR}.so.2 -${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}.${OPENLDAP_SHLIB_MINOR} .a .la .so; do \ + ${LN} -sf libldap_r$${suffix} ${STAGEDIR}${PREFIX}/lib/libldap$${suffix}; \ + done .else ${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR} .for module in ${CONTRIB_MODULES}