git: d146ee382529 - main - security/libgpg-error: Fix gpgrt-config

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Wed, 24 Apr 2024 05:53:24 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d146ee382529d68faa184e4f218088114c4b0fc8

commit d146ee382529d68faa184e4f218088114c4b0fc8
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-04-24 04:14:11 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-04-24 05:52:55 +0000

    security/libgpg-error: Fix gpgrt-config
    
    Fix the default search path for pkgconfig files in gpgrt-config.
    Previously, it was necessary to supply the path manually with the
    --libdir argument, but this can now be omitted.
    
    Approved by:    portmgr (blanket)
---
 security/libgpg-error/Makefile                        |  1 +
 security/libgpg-error/files/patch-src_gpgrt-config.in | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 1d621fadff50..b7f59851a248 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libgpg-error
 DISTVERSION=	1.48
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	GNUPG
 
diff --git a/security/libgpg-error/files/patch-src_gpgrt-config.in b/security/libgpg-error/files/patch-src_gpgrt-config.in
new file mode 100644
index 000000000000..a916e552739a
--- /dev/null
+++ b/security/libgpg-error/files/patch-src_gpgrt-config.in
@@ -0,0 +1,13 @@
+Fix default path to pkgconfig files.
+
+--- src/gpgrt-config.in.orig	2024-04-24 04:08:07 UTC
++++ src/gpgrt-config.in
+@@ -460,7 +460,7 @@ determine_gpgrt_libdir () {
+     # Get the prefix of gpgrt-config assuming it's something like:
+     #   <PREFIX>/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/<triplet>/lib