CVS commit: pkgsrc/databases

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Oct 16 14:42:50 UTC 2022

Modified Files:
        pkgsrc/databases/postgresql10: Makefile.common
        pkgsrc/databases/postgresql10-client: Makefile
        pkgsrc/databases/postgresql11: Makefile.common
        pkgsrc/databases/postgresql11-client: Makefile
        pkgsrc/databases/postgresql13: Makefile.common
        pkgsrc/databases/postgresql13-client: Makefile
        pkgsrc/databases/postgresql14: Makefile.common
        pkgsrc/databases/postgresql14-client: Makefile

Log Message:
databases/postgresql*: Work around autoconf mkdir bug

autoconf does not accept NetBSD mkdir (this bug has already been fixed
in upstream autoconf).  This leads to install.sh, and thus
postgresql's workaround for a relative path in pgxs, and then that
being used in postgis.  Somewhere in that chain there is a bug leading
to postgis failing to make a directory at install time.

This passes in an autoconf cache variable so that for mkdir it uses
mkdir (which it does on GNU/Linux, and thus that situation is
well-tested).


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/postgresql10/Makefile.common
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/postgresql10-client/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/postgresql11/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/postgresql11-client/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/postgresql13/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/postgresql13-client/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql14/Makefile.common
cvs rdiff -u -r1.10 -r1.11 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/Makefile.common
diff -u pkgsrc/databases/postgresql10/Makefile.common:1.35 pkgsrc/databases/postgresql10/Makefile.common:1.36
--- pkgsrc/databases/postgresql10/Makefile.common:1.35  Mon Aug 15 20:59:35 2022
+++ pkgsrc/databases/postgresql10/Makefile.common       Sun Oct 16 14:42:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2022/08/15 20:59:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.36 2022/10/16 14:42:49 gdt Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -68,6 +68,12 @@ CONFIGURE_ARGS+=     --without-perl
 CONFIGURE_ARGS+=       --without-python
 CONFIGURE_ARGS+=       --without-tcl
 
+# Work around a bug in autoconf, that thinks almost all mkdir
+# implementations are deficient, and a bug someplace between postgis
+# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh
+# but without a path.
+CONFIGURE_ENV+=                ac_cv_path_mkdir="mkdir"
+
 # avoid pointing to a wrapper
 CONFIGURE_ENV+=                MSGFMT=${TOOLS_PATH.msgfmt}
 

Index: pkgsrc/databases/postgresql10-client/Makefile
diff -u pkgsrc/databases/postgresql10-client/Makefile:1.28 pkgsrc/databases/postgresql10-client/Makefile:1.29
--- pkgsrc/databases/postgresql10-client/Makefile:1.28  Mon Aug 15 20:59:35 2022
+++ pkgsrc/databases/postgresql10-client/Makefile       Sun Oct 16 14:42:49 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2022/08/15 20:59:35 adam Exp $
+# $NetBSD: Makefile,v 1.29 2022/10/16 14:42:49 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/-/10-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql10/Makefile.common"

Index: pkgsrc/databases/postgresql11/Makefile.common
diff -u pkgsrc/databases/postgresql11/Makefile.common:1.29 pkgsrc/databases/postgresql11/Makefile.common:1.30
--- pkgsrc/databases/postgresql11/Makefile.common:1.29  Mon Oct  3 07:50:27 2022
+++ pkgsrc/databases/postgresql11/Makefile.common       Sun Oct 16 14:42:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2022/10/03 07:50:27 nia Exp $
+# $NetBSD: Makefile.common,v 1.30 2022/10/16 14:42:50 gdt Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -68,6 +68,12 @@ CONFIGURE_ARGS+=     --without-perl
 CONFIGURE_ARGS+=       --without-python
 CONFIGURE_ARGS+=       --without-tcl
 
+# Work around a bug in autoconf, that thinks almost all mkdir
+# implementations are deficient, and a bug someplace between postgis
+# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh
+# but without a path.
+CONFIGURE_ENV+=                ac_cv_path_mkdir="mkdir"
+
 # avoid pointing to a wrapper
 CONFIGURE_ENV+=                MSGFMT=${TOOLS_PATH.msgfmt}
 

Index: pkgsrc/databases/postgresql11-client/Makefile
diff -u pkgsrc/databases/postgresql11-client/Makefile:1.24 pkgsrc/databases/postgresql11-client/Makefile:1.25
--- pkgsrc/databases/postgresql11-client/Makefile:1.24  Mon Aug 15 20:59:36 2022
+++ pkgsrc/databases/postgresql11-client/Makefile       Sun Oct 16 14:42:50 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2022/08/15 20:59:36 adam Exp $
+# $NetBSD: Makefile,v 1.25 2022/10/16 14:42:50 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/-/11-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql11/Makefile.common"

Index: pkgsrc/databases/postgresql13/Makefile.common
diff -u pkgsrc/databases/postgresql13/Makefile.common:1.15 pkgsrc/databases/postgresql13/Makefile.common:1.16
--- pkgsrc/databases/postgresql13/Makefile.common:1.15  Mon Oct  3 07:50:27 2022
+++ pkgsrc/databases/postgresql13/Makefile.common       Sun Oct 16 14:42:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2022/10/03 07:50:27 nia Exp $
+# $NetBSD: Makefile.common,v 1.16 2022/10/16 14:42:50 gdt Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -68,6 +68,12 @@ CONFIGURE_ARGS+=     --without-perl
 CONFIGURE_ARGS+=       --without-python
 CONFIGURE_ARGS+=       --without-tcl
 
+# Work around a bug in autoconf, that thinks almost all mkdir
+# implementations are deficient, and a bug someplace between postgis
+# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh
+# but without a path.
+CONFIGURE_ENV+=                ac_cv_path_mkdir="mkdir"
+
 # avoid pointing to a wrapper
 CONFIGURE_ENV+=                MSGFMT=${TOOLS_PATH.msgfmt}
 

Index: pkgsrc/databases/postgresql13-client/Makefile
diff -u pkgsrc/databases/postgresql13-client/Makefile:1.20 pkgsrc/databases/postgresql13-client/Makefile:1.21
--- pkgsrc/databases/postgresql13-client/Makefile:1.20  Mon Aug 15 20:59:38 2022
+++ pkgsrc/databases/postgresql13-client/Makefile       Sun Oct 16 14:42:50 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2022/08/15 20:59:38 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/10/16 14:42:50 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/-/13-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql13/Makefile.common"

Index: pkgsrc/databases/postgresql14/Makefile.common
diff -u pkgsrc/databases/postgresql14/Makefile.common:1.7 pkgsrc/databases/postgresql14/Makefile.common:1.8
--- pkgsrc/databases/postgresql14/Makefile.common:1.7   Mon Aug 15 20:59:39 2022
+++ pkgsrc/databases/postgresql14/Makefile.common       Sun Oct 16 14:42:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2022/08/15 20:59:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2022/10/16 14:42:50 gdt Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -68,6 +68,12 @@ CONFIGURE_ARGS+=     --without-perl
 CONFIGURE_ARGS+=       --without-python
 CONFIGURE_ARGS+=       --without-tcl
 
+# Work around a bug in autoconf, that thinks almost all mkdir
+# implementations are deficient, and a bug someplace between postgis
+# and pgxs, that causes topology/Makefile.in to run pgxs's install-sh
+# but without a path.
+CONFIGURE_ENV+=                ac_cv_path_mkdir="mkdir"
+
 # avoid pointing to a wrapper
 CONFIGURE_ENV+=                MSGFMT=${TOOLS_PATH.msgfmt}
 

Index: pkgsrc/databases/postgresql14-client/Makefile
diff -u pkgsrc/databases/postgresql14-client/Makefile:1.10 pkgsrc/databases/postgresql14-client/Makefile:1.11
--- pkgsrc/databases/postgresql14-client/Makefile:1.10  Mon Aug 15 20:59:39 2022
+++ pkgsrc/databases/postgresql14-client/Makefile       Sun Oct 16 14:42:50 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2022/08/15 20:59:39 adam Exp $
+# $NetBSD: Makefile,v 1.11 2022/10/16 14:42:50 gdt Exp $
 
 PKGNAME=       ${DISTNAME:S/-/14-client-/}
+PKGREVISION=   1
 COMMENT=       PostgreSQL database client programs
 
 .include "../../databases/postgresql14/Makefile.common"