CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Mon, 18 Jul 2022 22:13:21 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Jul 18 22:13:21 UTC 2022

Modified Files:
        pkgsrc/databases/postgresql10: options.mk
        pkgsrc/databases/postgresql10-client: Makefile
        pkgsrc/databases/postgresql11: options.mk
        pkgsrc/databases/postgresql11-client: Makefile
        pkgsrc/databases/postgresql12: options.mk
        pkgsrc/databases/postgresql12-client: Makefile
        pkgsrc/databases/postgresql13: options.mk
        pkgsrc/databases/postgresql13-client: Makefile
        pkgsrc/databases/postgresql14: options.mk
        pkgsrc/databases/postgresql14-client: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql10/options.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/postgresql10-client/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/postgresql11/options.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/postgresql11-client/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql12/options.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/postgresql12-client/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql13/options.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/postgresql13-client/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql14/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/postgresql14-client/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql10/options.mk
diff -u pkgsrc/databases/postgresql10/options.mk:1.3 pkgsrc/databases/postgresql10/options.mk:1.4
--- pkgsrc/databases/postgresql10/options.mk:1.3        Fri Oct 25 12:01:19 2019
+++ pkgsrc/databases/postgresql10/options.mk    Mon Jul 18 22:13:20 2022
@@ -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 @@ PLIST.nls=            yes
 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

Index: pkgsrc/databases/postgresql10-client/Makefile
diff -u pkgsrc/databases/postgresql10-client/Makefile:1.26 pkgsrc/databases/postgresql10-client/Makefile:1.27
--- pkgsrc/databases/postgresql10-client/Makefile:1.26  Tue Jun 28 11:31:32 2022
+++ pkgsrc/databases/postgresql10-client/Makefile       Mon Jul 18 22:13:20 2022
@@ -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"

Index: pkgsrc/databases/postgresql11/options.mk
diff -u pkgsrc/databases/postgresql11/options.mk:1.6 pkgsrc/databases/postgresql11/options.mk:1.7
--- pkgsrc/databases/postgresql11/options.mk:1.6        Fri Oct 25 12:16:06 2019
+++ pkgsrc/databases/postgresql11/options.mk    Mon Jul 18 22:13:20 2022
@@ -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 @@ PLIST.nls=        yes
 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

Index: pkgsrc/databases/postgresql11-client/Makefile
diff -u pkgsrc/databases/postgresql11-client/Makefile:1.22 pkgsrc/databases/postgresql11-client/Makefile:1.23
--- pkgsrc/databases/postgresql11-client/Makefile:1.22  Tue Jun 28 11:31:33 2022
+++ pkgsrc/databases/postgresql11-client/Makefile       Mon Jul 18 22:13:20 2022
@@ -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"

Index: pkgsrc/databases/postgresql12/options.mk
diff -u pkgsrc/databases/postgresql12/options.mk:1.5 pkgsrc/databases/postgresql12/options.mk:1.6
--- pkgsrc/databases/postgresql12/options.mk:1.5        Fri Oct 25 12:42:55 2019
+++ pkgsrc/databases/postgresql12/options.mk    Mon Jul 18 22:13:20 2022
@@ -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 @@ PLIST.nls=            yes
 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

Index: pkgsrc/databases/postgresql12-client/Makefile
diff -u pkgsrc/databases/postgresql12-client/Makefile:1.24 pkgsrc/databases/postgresql12-client/Makefile:1.25
--- pkgsrc/databases/postgresql12-client/Makefile:1.24  Tue Jun 28 11:31:34 2022
+++ pkgsrc/databases/postgresql12-client/Makefile       Mon Jul 18 22:13:20 2022
@@ -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"

Index: pkgsrc/databases/postgresql13/options.mk
diff -u pkgsrc/databases/postgresql13/options.mk:1.2 pkgsrc/databases/postgresql13/options.mk:1.3
--- pkgsrc/databases/postgresql13/options.mk:1.2        Thu Apr  1 10:22:23 2021
+++ pkgsrc/databases/postgresql13/options.mk    Mon Jul 18 22:13:21 2022
@@ -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 @@ PLIST.nls=            yes
 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

Index: pkgsrc/databases/postgresql13-client/Makefile
diff -u pkgsrc/databases/postgresql13-client/Makefile:1.18 pkgsrc/databases/postgresql13-client/Makefile:1.19
--- pkgsrc/databases/postgresql13-client/Makefile:1.18  Tue Jun 28 11:31:35 2022
+++ pkgsrc/databases/postgresql13-client/Makefile       Mon Jul 18 22:13:21 2022
@@ -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"

Index: pkgsrc/databases/postgresql14/options.mk
diff -u pkgsrc/databases/postgresql14/options.mk:1.2 pkgsrc/databases/postgresql14/options.mk:1.3
--- pkgsrc/databases/postgresql14/options.mk:1.2        Thu May 12 13:03:57 2022
+++ pkgsrc/databases/postgresql14/options.mk    Mon Jul 18 22:13:21 2022
@@ -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 @@ PLIST.nls=            yes
 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

Index: pkgsrc/databases/postgresql14-client/Makefile
diff -u pkgsrc/databases/postgresql14-client/Makefile:1.8 pkgsrc/databases/postgresql14-client/Makefile:1.9
--- pkgsrc/databases/postgresql14-client/Makefile:1.8   Tue Jun 28 11:31:36 2022
+++ pkgsrc/databases/postgresql14-client/Makefile       Mon Jul 18 22:13:21 2022
@@ -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"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/databases/postgresql-promscale_extension
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/databases/postgresql-promscale_extension
Indexes:

Home | Main Index | Thread Index | Old Index