[pkgsrc/trunk]: pkgsrc/databases postgresql*-client: fix installed PGXS Makef...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/da4b4d828f71
branches:  trunk
changeset: 382050:da4b4d828f71
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Jul 18 22:13:20 2022 +0000

description:
postgresql*-client: fix installed PGXS Makefiles when using pkgsrc gettext

If we are using the "nls" PKG_OPTION together with pkgsrc gettext, then
we must ensure CPPFLAGS contains -I${PREFIX}/include/gettext.
The installed postgresql/server/c.h expects to be able to include
<libintl.h> using the CPPFLAGS that get installed in Makefile.global.
Without this it is not possible to develop PGXS extensions
outside of pkgsrc.

diffstat:

 databases/postgresql10-client/Makefile |  4 ++--
 databases/postgresql10/options.mk      |  5 ++++-
 databases/postgresql11-client/Makefile |  4 ++--
 databases/postgresql11/options.mk      |  5 ++++-
 databases/postgresql12-client/Makefile |  4 ++--
 databases/postgresql12/options.mk      |  5 ++++-
 databases/postgresql13-client/Makefile |  4 ++--
 databases/postgresql13/options.mk      |  5 ++++-
 databases/postgresql14-client/Makefile |  4 ++--
 databases/postgresql14/options.mk      |  5 ++++-
 10 files changed, 30 insertions(+), 15 deletions(-)

diffs (160 lines):

diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql10-client/Makefile
--- a/databases/postgresql10-client/Makefile    Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql10-client/Makefile    Mon Jul 18 22:13:20 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2022/06/28 11:31:32 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2022/07/18 22:13:20 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/-/10-client-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql10/Makefile.common"
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql10/options.mk
--- a/databases/postgresql10/options.mk Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql10/options.mk Mon Jul 18 22:13:20 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/10/25 12:01:19 triaxx Exp $
+# $NetBSD: options.mk,v 1.4 2022/07/18 22:13:20 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql10
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu gssapi ldap nls pam
@@ -51,6 +51,9 @@
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
 LIBS.SunOS+=           -lintl
+.  if !empty(USE_BUILTIN.gettext:M[nN][oO])
+CPPFLAGS+=             -I${PREFIX}/include/gettext
+.  endif
 .else
 CONFIGURE_ARGS+=       --disable-nls
 .endif
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql11-client/Makefile
--- a/databases/postgresql11-client/Makefile    Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql11-client/Makefile    Mon Jul 18 22:13:20 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2022/06/28 11:31:33 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2022/07/18 22:13:20 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/-/11-client-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql11/Makefile.common"
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql11/options.mk
--- a/databases/postgresql11/options.mk Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql11/options.mk Mon Jul 18 22:13:20 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2019/10/25 12:16:06 triaxx Exp $
+# $NetBSD: options.mk,v 1.7 2022/07/18 22:13:20 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql11
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
@@ -59,6 +59,9 @@
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
 LIBS.SunOS+=           -lintl
+.  if !empty(USE_BUILTIN.gettext:M[nN][oO])
+CPPFLAGS+=             -I${PREFIX}/include/gettext
+.  endif
 .else
 CONFIGURE_ARGS+=    --disable-nls
 .endif
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql12-client/Makefile
--- a/databases/postgresql12-client/Makefile    Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql12-client/Makefile    Mon Jul 18 22:13:20 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2022/06/28 11:31:34 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2022/07/18 22:13:20 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/-/12-client-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql12/Makefile.common"
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql12/options.mk
--- a/databases/postgresql12/options.mk Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql12/options.mk Mon Jul 18 22:13:20 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2019/10/25 12:42:55 triaxx Exp $
+# $NetBSD: options.mk,v 1.6 2022/07/18 22:13:20 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql12
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
@@ -59,6 +59,9 @@
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
 LIBS.SunOS+=           -lintl
+.  if !empty(USE_BUILTIN.gettext:M[nN][oO])
+CPPFLAGS+=             -I${PREFIX}/include/gettext
+.  endif
 .else
 CONFIGURE_ARGS+=       --disable-nls
 .endif
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql13-client/Makefile
--- a/databases/postgresql13-client/Makefile    Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql13-client/Makefile    Mon Jul 18 22:13:20 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2022/06/28 11:31:35 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/07/18 22:13:21 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/-/13-client-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql13/Makefile.common"
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql13/options.mk
--- a/databases/postgresql13/options.mk Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql13/options.mk Mon Jul 18 22:13:20 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/04/01 10:22:23 adam Exp $
+# $NetBSD: options.mk,v 1.3 2022/07/18 22:13:21 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql13
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
@@ -60,6 +60,9 @@
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
 LIBS.SunOS+=           -lintl
+.  if !empty(USE_BUILTIN.gettext:M[nN][oO])
+CPPFLAGS+=             -I${PREFIX}/include/gettext
+.  endif
 .else
 CONFIGURE_ARGS+=       --disable-nls
 .endif
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql14-client/Makefile
--- a/databases/postgresql14-client/Makefile    Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql14-client/Makefile    Mon Jul 18 22:13:20 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2022/06/28 11:31:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/07/18 22:13:21 tnn Exp $
 
 PKGNAME=       ${DISTNAME:S/-/14-client-/}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql14/Makefile.common"
diff -r 8715489d6126 -r da4b4d828f71 databases/postgresql14/options.mk
--- a/databases/postgresql14/options.mk Mon Jul 18 22:11:22 2022 +0000
+++ b/databases/postgresql14/options.mk Mon Jul 18 22:13:20 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2022/05/12 13:03:57 abs Exp $
+# $NetBSD: options.mk,v 1.3 2022/07/18 22:13:21 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql14
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam lz4
@@ -67,6 +67,9 @@
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
 LIBS.SunOS+=           -lintl
+.  if !empty(USE_BUILTIN.gettext:M[nN][oO])
+CPPFLAGS+=             -I${PREFIX}/include/gettext
+.  endif
 .else
 CONFIGURE_ARGS+=       --disable-nls
 .endif