From nobody Wed Apr 24 05:53:21 2024 X-Original-To: dev-commits-ports-main@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 4VPSpB17s9z5JsG1; Wed, 24 Apr 2024 05:53:22 +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 4VPSpB0WRxz4ZBd; Wed, 24 Apr 2024 05:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2S4gVqWeMSf1yQz4n1vY/OJwhpPOhS4iv+d8AGrwxck=; b=VAmO3ph0naUlYLInJUTviXav9b/B8ltoAn6OUG3SE9jx2/k8mxU7//9mIZ0hC/HwAjsE9I KeqsnFWjUshaZdDhjhtk0ik8lrGc07VsGqb50eg9XbpCayYq3C6rXOwelnbNzqciC6603v 6U+9GJqCafxKnaZGd9ZyLGbDB/D+gcRikgIWbIYYp82XVEzQ3CJ1J1aLuTV2maaEtuRHHD /uSX5dl69Hdda3hXyDIP1z1VM1Ufvm+jhfDCtAb6Q0tJmh0iFWaswCbVH5jK4ehU+5GP+e 5wyIWBb5rF/SuYzbDyBQQ9Rx+D/TIAwHocU2iGmopWz3RsLNlnDPNApQoXWpDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713938002; a=rsa-sha256; cv=none; b=Prk8R0poytRC6h4UyD0ekJqusxhogz3nWvNPVUbARA02jQQdi6LBfMu3hOxGvujvH1Njla Se3onWR+cNaDe51xIFL3X24/O0QgKiYbSrrzkaTB5pyNA9BqL7Hd7HtQYzroqZE4ixeaRf IMhU/ujCnEu1TOeEmhblSj+YeXeyzIzFhogIdfOjk2hRUnOpYhf8KzFsMiqIgJkC2mJnm7 6HXPvv2oZUwh3AWJrrw52YvL/AG2uzbF+1ozkEVDcr75nlOYdVw99QJ8muW2NZmHUAUzQ1 4G4BMar8ypte63RGy3OFPbZaUm8vMVHW/S/la1XCQY57wzW1OYz5DIoW7o2Bhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713938002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2S4gVqWeMSf1yQz4n1vY/OJwhpPOhS4iv+d8AGrwxck=; b=itdVndPGWJa+bXKEVH80EsfU+Bp897rg7TzMo2OQMeRYQDKdiK8HDTSmrGQz0BrldSL84F qITMbU70hHvHwdCKOS83zFgaIBSgUimJpnPtsOfIP4KCVcXGPEb8sDpwXzOX7K93KiPTby Og1/dzGr/pqT90qLbsXRekKRaWK0o08FSi/3vXnwSVK6qFloHsGXGzAjXg9K1XDDoITjCl LidA84n88oMNtOQE1LA+viqIvAjiPr2i+J52B0t/sbXEyEeEADN7WJAbyjtNpOmKAvx731 SOnEaJd1QWCOPwft9g54nR4Yb17EZApU0GuuKvcw4cVW4oNZH1ELoxPGdnpUHQ== 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 4VPSpB07V7z13Qn; Wed, 24 Apr 2024 05:53:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43O5rLSF008152; Wed, 24 Apr 2024 05:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O5rLk1008149; Wed, 24 Apr 2024 05:53:21 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:53:21 GMT Message-Id: <202404240553.43O5rLk1008149@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: e19776056444 - main - security/gnupg: Use gpgrt-config for configure List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e19776056444fcea54fe13be7ca84eca2b6a95c6 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=e19776056444fcea54fe13be7ca84eca2b6a95c6 commit e19776056444fcea54fe13be7ca84eca2b6a95c6 Author: Jason E. Hale AuthorDate: 2024-04-24 02:26:52 +0000 Commit: Jason E. Hale CommitDate: 2024-04-24 05:52:55 +0000 security/gnupg: Use gpgrt-config for configure Use gpgrt-config in the configure stage over the old individual *-config scripts from the various gnupg-related libraries (e.g: gpg-error-config, libassuan-config, ksba-config). Upstream has prefered this method since version 2.3.0 released 2021-04-07 and the old scripts are now starting to be phased-out. This prepares for devel/npth >= 1.7 which no longer installs npth-config by default, so gpgrt-config must be used to get its configuration details. Approved by: portmgr (blanket) --- security/gnupg/files/patch-configure | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/security/gnupg/files/patch-configure b/security/gnupg/files/patch-configure new file mode 100644 index 000000000000..20e250e38430 --- /dev/null +++ b/security/gnupg/files/patch-configure @@ -0,0 +1,13 @@ +Fix path of pkgconfig files passed to gpgrt-config. + +--- configure.orig 2024-01-25 10:09:44 UTC ++++ configure +@@ -8428,7 +8428,7 @@ fi + # Get the prefix of gpgrt-config assuming it's something like: + # /bin/gpgrt-config + gpgrt_prefix=${GPGRT_CONFIG%/*/*} +- possible_libdir1=${gpgrt_prefix}/lib ++ possible_libdir1=${gpgrt_prefix}/libdata + # Determine by using system libdir-format with CC, it's like: + # Normal style: /usr/lib + # GNU cross style: /usr//lib