git: 7b9f38bc8eca - main - net/kea-devel: Fix PGSQL build

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Thu, 14 Aug 2025 00:58:36 UTC
The branch main has been updated by cy:

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

commit 7b9f38bc8eca71ce78fbcb9db36e84667a21d916
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-08-13 23:37:16 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-08-14 00:58:06 +0000

    net/kea-devel:  Fix PGSQL build
    
    PR:             288209
    Submitted by:   Raivo Hool <raivo@lehma.com>
---
 net/kea-devel/Makefile                             |  4 ++--
 .../patch-subprojects__postgresql__meson.build     | 23 ++++++++++++++++++++++
 net/kea-devel/pkg-plist                            |  4 ++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/net/kea-devel/Makefile b/net/kea-devel/Makefile
index 2daa0567c7c7..4866cba2e510 100644
--- a/net/kea-devel/Makefile
+++ b/net/kea-devel/Makefile
@@ -46,10 +46,10 @@ MYSQL_SUB_LIST=		REQ_MYSQL=mysql
 MYSQL_SUB_LIST_OFF=	REQ_MYSQL=""
 
 PGSQL_USES=		pgsql
-PGSQ_MESON_ENABLED=	postgresql
+PGSQL_MESON_ENABLED=	postgresql
 PGSQL_SUB_LIST=		REQ_PGSQL=postgresql
 PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
-PGSQL_VARS=		WANT_PGSQL=client
+PGSQL_VARS=		WANT_PGSQL=lib
 
 post-build:
 	cd ${WRKSRC}/doc/sphinx/man; \
diff --git a/net/kea-devel/files/patch-subprojects__postgresql__meson.build b/net/kea-devel/files/patch-subprojects__postgresql__meson.build
new file mode 100644
index 000000000000..7d4fd8334553
--- /dev/null
+++ b/net/kea-devel/files/patch-subprojects__postgresql__meson.build
@@ -0,0 +1,23 @@
+--- subprojects/postgresql/meson.build.orig	2025-07-14 21:38:51.533442000 +0000
++++ subprojects/postgresql/meson.build	2025-07-14 21:55:25.061747000 +0000
+@@ -10,17 +10,16 @@
+     includedir = run_command([pg_config, '--includedir'], check: false)
+     ldflags = run_command([pg_config, '--ldflags'], check: false)
+     libdir = run_command([pg_config, '--libdir'], check: false)
+-    libs = run_command([pg_config, '--libs'], check: false)
+     version = run_command([pg_config, '--version'], check: false)
+-    if cppflags.returncode() == 0 and includedir.returncode() == 0 and libdir.returncode() == 0 and ldflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
++
++    if cppflags.returncode() == 0 and includedir.returncode() == 0 and ldflags.returncode() == 0 and libdir.returncode() == 0 and version.returncode() == 0
+         pgsql_compile_args = cppflags.stdout().split()
+         pgsql_includedir_args = includedir.stdout().split()
+         pgsql_ldflags = ldflags.stdout().split()
+         pgsql_libdir = libdir.stdout().strip()
+-        pgsql_link_args = libs.stdout().split()
+         pgsql_version = version.stdout().strip()
+ 
+-        link_args = [f'-L@pgsql_libdir@'] + pgsql_ldflags + pgsql_link_args
++        link_args = ['-L' + pgsql_libdir] + pgsql_ldflags
+         if libpq.found()
+             link_args += ['-lpq']
+         endif
diff --git a/net/kea-devel/pkg-plist b/net/kea-devel/pkg-plist
index dbe5a05bf069..f26639a779d2 100644
--- a/net/kea-devel/pkg-plist
+++ b/net/kea-devel/pkg-plist
@@ -526,8 +526,8 @@ lib/libkea-log.so.75.0.0
 %%MYSQL%%lib/libkea-mysql.so.86
 %%MYSQL%%lib/libkea-mysql.so.86.0.0
 %%PGSQL%%lib/libkea-pgsql.so
-%%PGSQL%%lib/libkea-pgsql.so.87
-%%PGSQL%%lib/libkea-pgsql.so.87.0.0
+%%PGSQL%%lib/libkea-pgsql.so.88
+%%PGSQL%%lib/libkea-pgsql.so.88.0.0
 lib/libkea-process.so
 lib/libkea-process.so.90
 lib/libkea-process.so.90.0.0