CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 18 Mar 2021 15:04:57 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Mar 18 15:04:56 UTC 2021

Modified Files:
        pkgsrc/databases/postgresql10: Makefile.common distinfo
        pkgsrc/databases/postgresql10-client: buildlink3.mk
        pkgsrc/databases/postgresql10-contrib: Makefile
        pkgsrc/databases/postgresql11: Makefile.common distinfo
        pkgsrc/databases/postgresql11-client: buildlink3.mk
        pkgsrc/databases/postgresql11-contrib: Makefile PLIST
        pkgsrc/databases/postgresql12: Makefile.common distinfo
        pkgsrc/databases/postgresql12-client: buildlink3.mk
        pkgsrc/databases/postgresql12-contrib: Makefile PLIST
        pkgsrc/databases/postgresql13: Makefile.common distinfo
        pkgsrc/databases/postgresql13-client: buildlink3.mk
        pkgsrc/databases/postgresql13-contrib: Makefile PLIST
        pkgsrc/databases/postgresql13-server: PLIST
        pkgsrc/databases/postgresql13/patches: patch-configure
        pkgsrc/databases/postgresql95: Makefile.common distinfo
        pkgsrc/databases/postgresql95-client: buildlink3.mk
        pkgsrc/databases/postgresql95-contrib: Makefile
        pkgsrc/databases/postgresql96: Makefile.common distinfo
        pkgsrc/databases/postgresql96-client: buildlink3.mk
        pkgsrc/databases/postgresql96-contrib: Makefile
Added Files:
        pkgsrc/databases/postgresql10/patches: patch-contrib_uuid-ossp_Makefile
        pkgsrc/databases/postgresql11/patches: patch-contrib_uuid-ossp_Makefile
        pkgsrc/databases/postgresql12/patches: patch-contrib_uuid-ossp_Makefile
        pkgsrc/databases/postgresql13/patches: patch-contrib_uuid-ossp_Makefile
        pkgsrc/databases/postgresql95/patches: patch-contrib_uuid-ossp_Makefile
        pkgsrc/databases/postgresql96/patches: patch-contrib_uuid-ossp_Makefile

Log Message:
postgresql: fix buildling contrib/uuid-ossp; fixes for LLVM enabled; should fix #55803


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/databases/postgresql10/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/postgresql10/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql10-client/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/postgresql10-contrib/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql10/patches/patch-contrib_uuid-ossp_Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/databases/postgresql11/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/postgresql11/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql11-client/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/postgresql11-contrib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql11-contrib/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql11/patches/patch-contrib_uuid-ossp_Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/postgresql12/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql12/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql12-client/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/postgresql12-contrib/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql12-contrib/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql12/patches/patch-contrib_uuid-ossp_Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql13/Makefile.common \
    pkgsrc/databases/postgresql13/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql13-client/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/postgresql13-contrib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql13-contrib/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql13-server/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/postgresql13/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql13/patches/patch-contrib_uuid-ossp_Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/postgresql95/Makefile.common
cvs rdiff -u -r1.27 -r1.28 pkgsrc/databases/postgresql95/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql95-client/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/postgresql95-contrib/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/postgresql96/Makefile.common
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/postgresql96/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql96-client/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/postgresql96-contrib/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql96/patches/patch-contrib_uuid-ossp_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.24 pkgsrc/databases/postgresql10/Makefile.common:1.25
--- pkgsrc/databases/postgresql10/Makefile.common:1.24  Mon Feb 15 18:58:36 2021
+++ pkgsrc/databases/postgresql10/Makefile.common       Thu Mar 18 15:04:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2021/02/15 18:58:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2021/03/18 15:04:53 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -96,6 +96,17 @@ BUILD_DEFS+=         PGSQL_BLCKSZ
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif
 
+# UUID support for contrib/uuid-ossp
+# It has to be defined here, because it affects Makefile.global
+.if ${OPSYS:M*BSD}
+CONFIGURE_ARGS+=       --with-uuid=bsd
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-uuid=e2fs
+.elif ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-uuid=ossp
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=  rm:-ffast-math
 

Index: pkgsrc/databases/postgresql10/distinfo
diff -u pkgsrc/databases/postgresql10/distinfo:1.18 pkgsrc/databases/postgresql10/distinfo:1.19
--- pkgsrc/databases/postgresql10/distinfo:1.18 Mon Feb 15 18:58:36 2021
+++ pkgsrc/databases/postgresql10/distinfo      Thu Mar 18 15:04:53 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2021/02/15 18:58:36 adam Exp $
+$NetBSD: distinfo,v 1.19 2021/03/18 15:04:53 adam Exp $
 
 SHA1 (postgresql-10.16.tar.bz2) = 594d7f1c604a9666499510d69b6dece97632a61d
 RMD160 (postgresql-10.16.tar.bz2) = d112a187f96bb75e39131e48ca7973286e2da89d
@@ -8,6 +8,7 @@ SHA1 (patch-config_missing) = c2d7d74292
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
 SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
 SHA1 (patch-src_Makefile.shlib) = 74ab026a457a4789a1aa1d6423d88ce4a2db7a2e
 SHA1 (patch-src_backend_Makefile) = 91aa620b3a26f3da66c22aef78611a352a8793b6

Index: pkgsrc/databases/postgresql10-client/buildlink3.mk
diff -u pkgsrc/databases/postgresql10-client/buildlink3.mk:1.3 pkgsrc/databases/postgresql10-client/buildlink3.mk:1.4
--- pkgsrc/databases/postgresql10-client/buildlink3.mk:1.3      Fri Dec  4 04:55:42 2020
+++ pkgsrc/databases/postgresql10-client/buildlink3.mk  Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/12/04 04:55:42 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/18 15:04:54 adam Exp $
 
 BUILDLINK_TREE+=       postgresql10-client
 
@@ -13,6 +13,11 @@ BUILDLINK_PKGSRCDIR.postgresql10-client?
 BUILDLINK_LDADD.postgresql10-client=   -lpq ${BUILDLINK_LDADD.gettext}
 BUILDLINK_FILES.postgresql10-client+=  bin/pg_config
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/databases/postgresql10-contrib/Makefile
diff -u pkgsrc/databases/postgresql10-contrib/Makefile:1.15 pkgsrc/databases/postgresql10-contrib/Makefile:1.16
--- pkgsrc/databases/postgresql10-contrib/Makefile:1.15 Mon Feb 15 18:58:36 2021
+++ pkgsrc/databases/postgresql10-contrib/Makefile      Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/02/15 18:58:36 adam Exp $
+# $NetBSD: Makefile,v 1.16 2021/03/18 15:04:54 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/10-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
@@ -57,21 +57,9 @@ TOOLS_BROKEN+=               perl
 CONFIGURE_ARGS+=       --with-openssl
 
 PLIST_VARS+=           uuid
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.uuid=            yes
 BUILD_DIRS+=           contrib/uuid-ossp
-.  if ${OPSYS:M*BSD}
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20"
-CONFIGURE_ARGS+=       --with-uuid=bsd
-.  elif ${OPSYS} == "Linux"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS -I${WRKSRC}/contrib/pgcrypto"
-CONFIGURE_ARGS+=       --with-uuid=e2fs
-.  elif ${OPSYS} == "SunOS"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP"
-CONFIGURE_ARGS+=       --with-uuid=ossp
-BUILD_MAKE_FLAGS+=     UUID_LIBS=-lossp-uuid
-.  include "../../devel/ossp-uuid/buildlink3.mk"
-.  endif
 .endif
 
 PRINT_PLIST_AWK+=      {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}

Index: pkgsrc/databases/postgresql11/Makefile.common
diff -u pkgsrc/databases/postgresql11/Makefile.common:1.17 pkgsrc/databases/postgresql11/Makefile.common:1.18
--- pkgsrc/databases/postgresql11/Makefile.common:1.17  Mon Feb 15 18:58:37 2021
+++ pkgsrc/databases/postgresql11/Makefile.common       Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2021/02/15 18:58:37 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2021/03/18 15:04:54 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -96,6 +96,17 @@ BUILD_DEFS+=         PGSQL_BLCKSZ
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif
 
+# UUID support for contrib/uuid-ossp
+# It has to be defined here, because it affects Makefile.global
+.if ${OPSYS:M*BSD}
+CONFIGURE_ARGS+=       --with-uuid=bsd
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-uuid=e2fs
+.elif ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-uuid=ossp
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=  rm:-ffast-math
 

Index: pkgsrc/databases/postgresql11/distinfo
diff -u pkgsrc/databases/postgresql11/distinfo:1.13 pkgsrc/databases/postgresql11/distinfo:1.14
--- pkgsrc/databases/postgresql11/distinfo:1.13 Mon Feb 15 18:58:37 2021
+++ pkgsrc/databases/postgresql11/distinfo      Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2021/02/15 18:58:37 adam Exp $
+$NetBSD: distinfo,v 1.14 2021/03/18 15:04:54 adam Exp $
 
 SHA1 (postgresql-11.11.tar.bz2) = ebd71258718f08bf20f79a0e0709bee0955df01b
 RMD160 (postgresql-11.11.tar.bz2) = 44d9bcd81fc6a89d8e2bcbcbc7353e37e951cfbc
@@ -8,10 +8,10 @@ SHA1 (patch-config_missing) = c2d7d74292
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
 SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
 SHA1 (patch-src_Makefile.shlib) = 4e093c79345add008a56c10d1c1bc8574f7a38e1
 SHA1 (patch-src_backend_Makefile) = 209f4cfb1670381838e7f25ead7ab9f0f671f89c
-SHA1 (patch-src_backend_commands_collationcmds.c) = d7d5400ce40ab8da646331473b5a70fb3ef4552f
 SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0

Index: pkgsrc/databases/postgresql11-client/buildlink3.mk
diff -u pkgsrc/databases/postgresql11-client/buildlink3.mk:1.3 pkgsrc/databases/postgresql11-client/buildlink3.mk:1.4
--- pkgsrc/databases/postgresql11-client/buildlink3.mk:1.3      Fri Dec  4 04:55:43 2020
+++ pkgsrc/databases/postgresql11-client/buildlink3.mk  Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/12/04 04:55:43 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/18 15:04:54 adam Exp $
 
 BUILDLINK_TREE+=       postgresql11-client
 
@@ -13,6 +13,11 @@ BUILDLINK_PKGSRCDIR.postgresql11-client?
 BUILDLINK_LDADD.postgresql11-client=   -lpq ${BUILDLINK_LDADD.gettext}
 BUILDLINK_FILES.postgresql11-client+=  bin/pg_config
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/databases/postgresql11-contrib/Makefile
diff -u pkgsrc/databases/postgresql11-contrib/Makefile:1.12 pkgsrc/databases/postgresql11-contrib/Makefile:1.13
--- pkgsrc/databases/postgresql11-contrib/Makefile:1.12 Mon Feb 15 18:58:38 2021
+++ pkgsrc/databases/postgresql11-contrib/Makefile      Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/15 18:58:38 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/18 15:04:54 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/11-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
@@ -56,21 +56,9 @@ TOOLS_BROKEN+=               perl
 CONFIGURE_ARGS+=       --with-openssl
 
 PLIST_VARS+=           uuid
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.uuid=            yes
 BUILD_DIRS+=           contrib/uuid-ossp
-.  if ${OPSYS:M*BSD}
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20"
-CONFIGURE_ARGS+=       --with-uuid=bsd
-.  elif ${OPSYS} == "Linux"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS"
-CONFIGURE_ARGS+=       --with-uuid=e2fs
-.  elif ${OPSYS} == "SunOS"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP"
-CONFIGURE_ARGS+=       --with-uuid=ossp
-BUILD_MAKE_FLAGS+=     UUID_LIBS=-lossp-uuid
-.  include "../../devel/ossp-uuid/buildlink3.mk"
-.  endif
 .endif
 
 PRINT_PLIST_AWK+=      {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}

Index: pkgsrc/databases/postgresql11-contrib/PLIST
diff -u pkgsrc/databases/postgresql11-contrib/PLIST:1.2 pkgsrc/databases/postgresql11-contrib/PLIST:1.3
--- pkgsrc/databases/postgresql11-contrib/PLIST:1.2     Fri Nov  9 18:12:24 2018
+++ pkgsrc/databases/postgresql11-contrib/PLIST Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/11/09 18:12:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/03/18 15:04:54 adam Exp $
 bin/oid2name
 bin/pg_standby
 bin/vacuumlo
@@ -178,6 +178,10 @@ ${PLIST.llvm}lib/postgresql/bitcode/tsm_
 ${PLIST.llvm}lib/postgresql/bitcode/tsm_system_time/tsm_system_time.bc
 ${PLIST.llvm}lib/postgresql/bitcode/unaccent.index.bc
 ${PLIST.llvm}lib/postgresql/bitcode/unaccent/unaccent.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp.index.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/md5.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/sha1.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/uuid-ossp.bc
 lib/postgresql/btree_gin.so
 lib/postgresql/btree_gist.so
 lib/postgresql/citext.so

Index: pkgsrc/databases/postgresql12/Makefile.common
diff -u pkgsrc/databases/postgresql12/Makefile.common:1.10 pkgsrc/databases/postgresql12/Makefile.common:1.11
--- pkgsrc/databases/postgresql12/Makefile.common:1.10  Mon Feb 15 18:58:38 2021
+++ pkgsrc/databases/postgresql12/Makefile.common       Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2021/02/15 18:58:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2021/03/18 15:04:54 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -96,6 +96,17 @@ BUILD_DEFS+=         PGSQL_BLCKSZ
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif
 
+# UUID support for contrib/uuid-ossp
+# It has to be defined here, because it affects Makefile.global
+.if ${OPSYS:M*BSD}
+CONFIGURE_ARGS+=       --with-uuid=bsd
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-uuid=e2fs
+.elif ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-uuid=ossp
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=  rm:-ffast-math
 

Index: pkgsrc/databases/postgresql12/distinfo
diff -u pkgsrc/databases/postgresql12/distinfo:1.7 pkgsrc/databases/postgresql12/distinfo:1.8
--- pkgsrc/databases/postgresql12/distinfo:1.7  Mon Feb 15 18:58:38 2021
+++ pkgsrc/databases/postgresql12/distinfo      Thu Mar 18 15:04:54 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2021/02/15 18:58:38 adam Exp $
+$NetBSD: distinfo,v 1.8 2021/03/18 15:04:54 adam Exp $
 
 SHA1 (postgresql-12.6.tar.bz2) = 988d60b27a2dfefd37574cd2da2ce0b45a9ca207
 RMD160 (postgresql-12.6.tar.bz2) = 034ced8da6d4b56ea6e5450dc32156f41a3f2f98
@@ -8,6 +8,7 @@ SHA1 (patch-config_missing) = c2d7d74292
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
 SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
 SHA1 (patch-src_Makefile.global.in) = 335b57afff23a9684ab0a09257665810c1ba2d1e
 SHA1 (patch-src_Makefile.shlib) = 4e093c79345add008a56c10d1c1bc8574f7a38e1
 SHA1 (patch-src_backend_Makefile) = 209f4cfb1670381838e7f25ead7ab9f0f671f89c

Index: pkgsrc/databases/postgresql12-client/buildlink3.mk
diff -u pkgsrc/databases/postgresql12-client/buildlink3.mk:1.3 pkgsrc/databases/postgresql12-client/buildlink3.mk:1.4
--- pkgsrc/databases/postgresql12-client/buildlink3.mk:1.3      Fri Dec  4 04:55:44 2020
+++ pkgsrc/databases/postgresql12-client/buildlink3.mk  Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/12/04 04:55:44 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/18 15:04:55 adam Exp $
 
 BUILDLINK_TREE+=       postgresql12-client
 
@@ -13,6 +13,11 @@ BUILDLINK_PKGSRCDIR.postgresql12-client?
 BUILDLINK_LDADD.postgresql12-client=   -lpq ${BUILDLINK_LDADD.gettext}
 BUILDLINK_FILES.postgresql12-client+=  bin/pg_config
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/databases/postgresql12-contrib/Makefile
diff -u pkgsrc/databases/postgresql12-contrib/Makefile:1.12 pkgsrc/databases/postgresql12-contrib/Makefile:1.13
--- pkgsrc/databases/postgresql12-contrib/Makefile:1.12 Mon Feb 15 18:58:39 2021
+++ pkgsrc/databases/postgresql12-contrib/Makefile      Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/15 18:58:39 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/03/18 15:04:55 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/12-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
@@ -56,21 +56,9 @@ CONFIGURE_ARGS+=     --with-openssl
 TOOLS_BROKEN+=         perl
 
 PLIST_VARS+=           uuid
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.uuid=            yes
 BUILD_DIRS+=           contrib/uuid-ossp
-.  if ${OPSYS:M*BSD}
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20"
-CONFIGURE_ARGS+=       --with-uuid=bsd
-.  elif ${OPSYS} == "Linux"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS"
-CONFIGURE_ARGS+=       --with-uuid=e2fs
-.  elif ${OPSYS} == "SunOS"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP"
-CONFIGURE_ARGS+=       --with-uuid=ossp
-BUILD_MAKE_FLAGS+=     UUID_LIBS=-lossp-uuid
-.  include "../../devel/ossp-uuid/buildlink3.mk"
-.  endif
 .endif
 
 PRINT_PLIST_AWK+=      {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}

Index: pkgsrc/databases/postgresql12-contrib/PLIST
diff -u pkgsrc/databases/postgresql12-contrib/PLIST:1.1 pkgsrc/databases/postgresql12-contrib/PLIST:1.2
--- pkgsrc/databases/postgresql12-contrib/PLIST:1.1     Mon Oct  7 19:21:49 2019
+++ pkgsrc/databases/postgresql12-contrib/PLIST Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/07 19:21:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/03/18 15:04:55 adam Exp $
 bin/oid2name
 bin/pg_standby
 bin/vacuumlo
@@ -176,6 +176,10 @@ ${PLIST.llvm}lib/postgresql/bitcode/tsm_
 ${PLIST.llvm}lib/postgresql/bitcode/tsm_system_time/tsm_system_time.bc
 ${PLIST.llvm}lib/postgresql/bitcode/unaccent.index.bc
 ${PLIST.llvm}lib/postgresql/bitcode/unaccent/unaccent.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp.index.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/md5.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/sha1.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/uuid-ossp.bc
 lib/postgresql/btree_gin.so
 lib/postgresql/btree_gist.so
 lib/postgresql/citext.so

Index: pkgsrc/databases/postgresql13/Makefile.common
diff -u pkgsrc/databases/postgresql13/Makefile.common:1.3 pkgsrc/databases/postgresql13/Makefile.common:1.4
--- pkgsrc/databases/postgresql13/Makefile.common:1.3   Mon Feb 15 18:58:39 2021
+++ pkgsrc/databases/postgresql13/Makefile.common       Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2021/02/15 18:58:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2021/03/18 15:04:55 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -96,6 +96,17 @@ BUILD_DEFS+=         PGSQL_BLCKSZ
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif
 
+# UUID support for contrib/uuid-ossp
+# It has to be defined here, because it affects Makefile.global
+.if ${OPSYS:M*BSD}
+CONFIGURE_ARGS+=       --with-uuid=bsd
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-uuid=e2fs
+.elif ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-uuid=ossp
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=  rm:-ffast-math
 
Index: pkgsrc/databases/postgresql13/distinfo
diff -u pkgsrc/databases/postgresql13/distinfo:1.3 pkgsrc/databases/postgresql13/distinfo:1.4
--- pkgsrc/databases/postgresql13/distinfo:1.3  Mon Feb 15 18:58:39 2021
+++ pkgsrc/databases/postgresql13/distinfo      Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2021/02/15 18:58:39 adam Exp $
+$NetBSD: distinfo,v 1.4 2021/03/18 15:04:55 adam Exp $
 
 SHA1 (postgresql-13.2.tar.bz2) = fc40c06ee7f2fd5f4ee5af88c8502f06a44c8698
 RMD160 (postgresql-13.2.tar.bz2) = 834069b800e8dcad67c5472dc23bc126e8c411fc
@@ -6,8 +6,9 @@ SHA512 (postgresql-13.2.tar.bz2) = 6d93c
 Size (postgresql-13.2.tar.bz2) = 21057276 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = b3393d0f28e97f89ae20297d85553c508b3896bb
-SHA1 (patch-configure) = b0a758023b3b263ff51b154d0da32cf02520c6cd
+SHA1 (patch-configure) = 142ba9dc85a2408802e4b9e4943b775312d577c9
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 65e975c16f2604a44961ce0ef80be28f13b798c3
 SHA1 (patch-src_Makefile.global.in) = 9690bd0e4e967dbb0f83376a9c9848e34efed74c
 SHA1 (patch-src_Makefile.shlib) = 3bcdbd0d9e3c0609743e72c3cafb83b74c0e412f
 SHA1 (patch-src_backend_Makefile) = 209f4cfb1670381838e7f25ead7ab9f0f671f89c

Index: pkgsrc/databases/postgresql13-client/buildlink3.mk
diff -u pkgsrc/databases/postgresql13-client/buildlink3.mk:1.2 pkgsrc/databases/postgresql13-client/buildlink3.mk:1.3
--- pkgsrc/databases/postgresql13-client/buildlink3.mk:1.2      Fri Dec  4 04:55:45 2020
+++ pkgsrc/databases/postgresql13-client/buildlink3.mk  Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/12/04 04:55:45 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/03/18 15:04:55 adam Exp $
 
 BUILDLINK_TREE+=       postgresql13-client
 
@@ -13,6 +13,11 @@ BUILDLINK_PKGSRCDIR.postgresql13-client?
 BUILDLINK_LDADD.postgresql13-client=   -lpq ${BUILDLINK_LDADD.gettext}
 BUILDLINK_FILES.postgresql13-client+=  bin/pg_config
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/databases/postgresql13-contrib/Makefile
diff -u pkgsrc/databases/postgresql13-contrib/Makefile:1.5 pkgsrc/databases/postgresql13-contrib/Makefile:1.6
--- pkgsrc/databases/postgresql13-contrib/Makefile:1.5  Mon Feb 15 18:58:40 2021
+++ pkgsrc/databases/postgresql13-contrib/Makefile      Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/02/15 18:58:40 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/03/18 15:04:55 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/13-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
@@ -56,21 +56,9 @@ CONFIGURE_ARGS+=     --with-openssl
 TOOLS_BROKEN+=         perl
 
 PLIST_VARS+=           uuid
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.uuid=            yes
 BUILD_DIRS+=           contrib/uuid-ossp
-.  if ${OPSYS:M*BSD}
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20"
-CONFIGURE_ARGS+=       --with-uuid=bsd
-.  elif ${OPSYS} == "Linux"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS"
-CONFIGURE_ARGS+=       --with-uuid=e2fs
-.  elif ${OPSYS} == "SunOS"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP"
-CONFIGURE_ARGS+=       --with-uuid=ossp
-BUILD_MAKE_FLAGS+=     UUID_LIBS=-lossp-uuid
-.  include "../../devel/ossp-uuid/buildlink3.mk"
-.  endif
 .endif
 
 PRINT_PLIST_AWK+=      {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}

Index: pkgsrc/databases/postgresql13-contrib/PLIST
diff -u pkgsrc/databases/postgresql13-contrib/PLIST:1.2 pkgsrc/databases/postgresql13-contrib/PLIST:1.3
--- pkgsrc/databases/postgresql13-contrib/PLIST:1.2     Thu Nov 12 16:59:55 2020
+++ pkgsrc/databases/postgresql13-contrib/PLIST Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/11/12 16:59:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/03/18 15:04:55 adam Exp $
 bin/oid2name
 bin/pg_standby
 bin/vacuumlo
@@ -176,6 +176,10 @@ ${PLIST.llvm}lib/postgresql/bitcode/tsm_
 ${PLIST.llvm}lib/postgresql/bitcode/tsm_system_time/tsm_system_time.bc
 ${PLIST.llvm}lib/postgresql/bitcode/unaccent.index.bc
 ${PLIST.llvm}lib/postgresql/bitcode/unaccent/unaccent.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp.index.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/md5.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/sha1.bc
+${PLIST.llvm}${PLIST.uuid}lib/postgresql/bitcode/uuid-ossp/uuid-ossp.bc
 lib/postgresql/btree_gin.so
 lib/postgresql/btree_gist.so
 lib/postgresql/citext.so

Index: pkgsrc/databases/postgresql13-server/PLIST
diff -u pkgsrc/databases/postgresql13-server/PLIST:1.1 pkgsrc/databases/postgresql13-server/PLIST:1.2
--- pkgsrc/databases/postgresql13-server/PLIST:1.1      Sun Oct 18 09:24:03 2020
+++ pkgsrc/databases/postgresql13-server/PLIST  Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/10/18 09:24:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/03/18 15:04:55 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -11,7 +11,9 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/brin/brin_tuple.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/brin/brin_validate.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/brin/brin_xlog.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/attmap.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/bufmask.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/detoast.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/heaptuple.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/indextuple.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/printsimple.bc
@@ -20,6 +22,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/reloptions.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/scankey.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/session.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/toast_internals.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/tupconvert.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/common/tupdesc.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/gin/ginarrayproc.bc
@@ -61,11 +64,11 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/heapam.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/heapam_handler.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/heapam_visibility.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/heaptoast.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/hio.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/pruneheap.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/rewriteheap.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/syncscan.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/tuptoaster.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/vacuumlazy.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/heap/visibilitymap.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/index/amapi.bc
@@ -73,6 +76,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/index/genam.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/index/indexam.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/nbtree/nbtcompare.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/access/nbtree/nbtdedup.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/nbtree/nbtinsert.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/nbtree/nbtpage.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/nbtree/nbtree.bc
@@ -117,6 +121,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/table/table.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/table/tableam.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/table/tableamapi.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/access/table/toast_helper.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/tablesample/bernoulli.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/tablesample/system.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/access/tablesample/tablesample.bc
@@ -153,6 +158,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/catalog/objectaddress.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/catalog/partition.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/catalog/pg_aggregate.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/catalog/pg_cast.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/catalog/pg_collation.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/catalog/pg_constraint.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/catalog/pg_conversion.bc
@@ -249,6 +255,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/executor/nodeGroup.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/executor/nodeHash.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/executor/nodeHashjoin.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/executor/nodeIncrementalSort.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/executor/nodeIndexonlyscan.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/executor/nodeIndexscan.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/executor/nodeLimit.bc
@@ -289,7 +296,6 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/lib/knapsack.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/lib/pairingheap.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/lib/rbtree.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/lib/stringinfo.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/auth-scram.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/auth.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc
@@ -402,6 +408,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/postmaster/bgwriter.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/postmaster/checkpointer.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/postmaster/fork_process.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/postmaster/interrupt.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/postmaster/pgarch.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/postmaster/pgstat.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/postmaster/postmaster.bc
@@ -414,6 +421,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/regex/regexport.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/regex/regfree.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/regex/regprefix.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/replication/backup_manifest.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/replication/basebackup.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/replication/logical/decode.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/replication/logical/launcher.bc
@@ -492,6 +500,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/storage/smgr/md.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/storage/smgr/smgr.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/storage/sync/sync.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/tcop/cmdtag.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/tcop/dest.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/tcop/fastpath.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/tcop/postgres.bc
@@ -603,7 +612,6 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/tsvector.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/tsvector_op.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/tsvector_parser.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/txid.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/uuid.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/varbit.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/varchar.bc
@@ -611,6 +619,7 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/version.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/windowfuncs.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/xid.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/xid8funcs.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/adt/xml.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/cache/attoptcache.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/cache/catcache.bc
@@ -633,15 +642,13 @@ ${PLIST.llvm}lib/postgresql/bitcode/post
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/fmgr/funcapi.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/fmgrtab.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/hash/dynahash.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/hash/hashfn.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/hash/pg_crc.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/init/globals.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/init/miscinit.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/init/postinit.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mb/conv.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mb/encnames.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mb/mbutils.bc
-${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mb/wchar.bc
+${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mb/stringinfo_mb.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mb/wstrcmp.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/mb/wstrncmp.bc
 ${PLIST.llvm}lib/postgresql/bitcode/postgres/utils/misc/guc.bc

Index: pkgsrc/databases/postgresql13/patches/patch-configure
diff -u pkgsrc/databases/postgresql13/patches/patch-configure:1.1 pkgsrc/databases/postgresql13/patches/patch-configure:1.2
--- pkgsrc/databases/postgresql13/patches/patch-configure:1.1   Sun Oct 18 09:24:02 2020
+++ pkgsrc/databases/postgresql13/patches/patch-configure       Thu Mar 18 15:04:55 2021
@@ -1,10 +1,20 @@
-$NetBSD: patch-configure,v 1.1 2020/10/18 09:24:02 adam Exp $
+$NetBSD: patch-configure,v 1.2 2021/03/18 15:04:55 adam Exp $
 
+Do not store CONFIGURE_ARGS, as these may contain working directory references.
 Finally, native solaris uses -lgss for gssapi on mit-krb5.
 
---- configure.orig     2018-02-05 21:01:02.000000000 +0000
+--- configure.orig     2021-02-08 21:54:11.000000000 +0000
 +++ configure
-@@ -2879,6 +2879,7 @@ case $host_os in
+@@ -2805,7 +2805,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define CONFIGURE_ARGS "$ac_configure_args"
++#define CONFIGURE_ARGS ""
+ _ACEOF
+ 
+ 
+@@ -2971,6 +2971,7 @@ case $host_os in
    darwin*) template=darwin ;;
  dragonfly*) template=netbsd ;;
   freebsd*) template=freebsd ;;
@@ -12,7 +22,7 @@ Finally, native solaris uses -lgss for g
      hpux*) template=hpux ;;
   linux*|gnu*|k*bsd*-gnu)
             template=linux ;;
-@@ -7884,9 +7885,7 @@ if test "$PORTNAME" = "win32" ; then
+@@ -9731,9 +9732,7 @@ if test "$PORTNAME" = "win32" ; then
                fi
        fi
  else
@@ -23,7 +33,7 @@ Finally, native solaris uses -lgss for g
  fi
  if test -z "$perl_embed_ldflags" ; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -9928,7 +9927,7 @@ return gss_init_sec_context ();
+@@ -12043,7 +12042,7 @@ return gss_init_sec_context ();
    return 0;
  }
  _ACEOF

Index: pkgsrc/databases/postgresql95/Makefile.common
diff -u pkgsrc/databases/postgresql95/Makefile.common:1.35 pkgsrc/databases/postgresql95/Makefile.common:1.36
--- pkgsrc/databases/postgresql95/Makefile.common:1.35  Mon Feb 15 18:58:40 2021
+++ pkgsrc/databases/postgresql95/Makefile.common       Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2021/02/15 18:58:40 adam Exp $
+# $NetBSD: Makefile.common,v 1.36 2021/03/18 15:04:55 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -97,6 +97,17 @@ BUILD_DEFS+=         PGSQL_BLCKSZ
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif
 
+# UUID support for contrib/uuid-ossp
+# It has to be defined here, because it affects Makefile.global
+.if ${OPSYS:M*BSD}
+CONFIGURE_ARGS+=       --with-uuid=bsd
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-uuid=e2fs
+.elif ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-uuid=ossp
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=  rm:-ffast-math
 

Index: pkgsrc/databases/postgresql95/distinfo
diff -u pkgsrc/databases/postgresql95/distinfo:1.27 pkgsrc/databases/postgresql95/distinfo:1.28
--- pkgsrc/databases/postgresql95/distinfo:1.27 Mon Feb 15 18:58:40 2021
+++ pkgsrc/databases/postgresql95/distinfo      Thu Mar 18 15:04:55 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2021/02/15 18:58:40 adam Exp $
+$NetBSD: distinfo,v 1.28 2021/03/18 15:04:55 adam Exp $
 
 SHA1 (postgresql-9.5.25.tar.bz2) = 06775dad91cff791d54f07aef4499eb844843932
 RMD160 (postgresql-9.5.25.tar.bz2) = 29bc5f749edd9b3f45d133f970a593dd610b72fb
@@ -8,6 +8,7 @@ SHA1 (patch-config_missing) = c2d7d74292
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = 18dd4af7f043b090beda157dfd52531b551eafd0
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
 SHA1 (patch-src_Makefile.shlib) = a809ef756e9314723476fe7408a97d23f83a0311
 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca

Index: pkgsrc/databases/postgresql95-client/buildlink3.mk
diff -u pkgsrc/databases/postgresql95-client/buildlink3.mk:1.4 pkgsrc/databases/postgresql95-client/buildlink3.mk:1.5
--- pkgsrc/databases/postgresql95-client/buildlink3.mk:1.4      Fri Dec  4 04:55:45 2020
+++ pkgsrc/databases/postgresql95-client/buildlink3.mk  Thu Mar 18 15:04:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/12/04 04:55:45 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2021/03/18 15:04:56 adam Exp $
 
 BUILDLINK_TREE+=       postgresql95-client
 
@@ -13,6 +13,11 @@ BUILDLINK_PKGSRCDIR.postgresql95-client?
 BUILDLINK_LDADD.postgresql95-client=   -lpq ${BUILDLINK_LDADD.gettext}
 BUILDLINK_FILES.postgresql95-client+=  bin/pg_config
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/databases/postgresql95-contrib/Makefile
diff -u pkgsrc/databases/postgresql95-contrib/Makefile:1.16 pkgsrc/databases/postgresql95-contrib/Makefile:1.17
--- pkgsrc/databases/postgresql95-contrib/Makefile:1.16 Mon Feb 15 18:58:40 2021
+++ pkgsrc/databases/postgresql95-contrib/Makefile      Thu Mar 18 15:04:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/02/15 18:58:40 adam Exp $
+# $NetBSD: Makefile,v 1.17 2021/03/18 15:04:56 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/95-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
@@ -58,21 +58,9 @@ TOOLS_BROKEN+=               perl
 CONFIGURE_ARGS+=       --with-openssl
 
 PLIST_VARS+=           uuid
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.uuid=            yes
 BUILD_DIRS+=           contrib/uuid-ossp
-.  if ${OPSYS:M*BSD}
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20"
-CONFIGURE_ARGS+=       --with-uuid=bsd
-.  elif ${OPSYS} == "Linux"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS"
-CONFIGURE_ARGS+=       --with-uuid=e2fs
-.  elif ${OPSYS} == "SunOS"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP"
-CONFIGURE_ARGS+=       --with-uuid=ossp
-BUILD_MAKE_FLAGS+=     UUID_LIBS=-lossp-uuid
-.  include "../../devel/ossp-uuid/buildlink3.mk"
-.  endif
 .endif
 
 PRINT_PLIST_AWK+=      {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}

Index: pkgsrc/databases/postgresql96/Makefile.common
diff -u pkgsrc/databases/postgresql96/Makefile.common:1.29 pkgsrc/databases/postgresql96/Makefile.common:1.30
--- pkgsrc/databases/postgresql96/Makefile.common:1.29  Mon Feb 15 18:58:41 2021
+++ pkgsrc/databases/postgresql96/Makefile.common       Thu Mar 18 15:04:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2021/02/15 18:58:41 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2021/03/18 15:04:56 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -97,6 +97,17 @@ BUILD_DEFS+=         PGSQL_BLCKSZ
 CONFIGURE_ARGS+=       --with-blocksize=${PGSQL_BLCKSZ}
 .endif
 
+# UUID support for contrib/uuid-ossp
+# It has to be defined here, because it affects Makefile.global
+.if ${OPSYS:M*BSD}
+CONFIGURE_ARGS+=       --with-uuid=bsd
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       --with-uuid=e2fs
+.elif ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --with-uuid=ossp
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=  rm:-ffast-math
 

Index: pkgsrc/databases/postgresql96/distinfo
diff -u pkgsrc/databases/postgresql96/distinfo:1.23 pkgsrc/databases/postgresql96/distinfo:1.24
--- pkgsrc/databases/postgresql96/distinfo:1.23 Mon Feb 15 18:58:41 2021
+++ pkgsrc/databases/postgresql96/distinfo      Thu Mar 18 15:04:56 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/02/15 18:58:41 adam Exp $
+$NetBSD: distinfo,v 1.24 2021/03/18 15:04:56 adam Exp $
 
 SHA1 (postgresql-9.6.21.tar.bz2) = e24333824d361968958613f546ae06011d9d1dfc
 RMD160 (postgresql-9.6.21.tar.bz2) = a8352cb850f0168ae3c42a33dc0191b71d74a966
@@ -8,6 +8,7 @@ SHA1 (patch-config_missing) = c2d7d74292
 SHA1 (patch-config_perl.m4) = 14c9564577d0df6f82ae0027aeada2f3a6a8f07c
 SHA1 (patch-configure) = db34614cef013a91dc229be319e5f09c657c3f24
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_uuid-ossp_Makefile) = 2eff5d539a4501dda45d23bc094a5099a456e0af
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
 SHA1 (patch-src_Makefile.shlib) = c2b7008ebcee1b7bfec46b9b35e91be2eef287ae
 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca

Index: pkgsrc/databases/postgresql96-client/buildlink3.mk
diff -u pkgsrc/databases/postgresql96-client/buildlink3.mk:1.3 pkgsrc/databases/postgresql96-client/buildlink3.mk:1.4
--- pkgsrc/databases/postgresql96-client/buildlink3.mk:1.3      Fri Dec  4 04:55:46 2020
+++ pkgsrc/databases/postgresql96-client/buildlink3.mk  Thu Mar 18 15:04:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/12/04 04:55:46 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/18 15:04:56 adam Exp $
 
 BUILDLINK_TREE+=       postgresql96-client
 
@@ -13,6 +13,11 @@ BUILDLINK_PKGSRCDIR.postgresql96-client?
 BUILDLINK_LDADD.postgresql96-client=   -lpq ${BUILDLINK_LDADD.gettext}
 BUILDLINK_FILES.postgresql96-client+=  bin/pg_config
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} == "SunOS"
+.include "../../devel/ossp-uuid/buildlink3.mk"
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/databases/postgresql96-contrib/Makefile
diff -u pkgsrc/databases/postgresql96-contrib/Makefile:1.16 pkgsrc/databases/postgresql96-contrib/Makefile:1.17
--- pkgsrc/databases/postgresql96-contrib/Makefile:1.16 Mon Feb 15 18:58:41 2021
+++ pkgsrc/databases/postgresql96-contrib/Makefile      Thu Mar 18 15:04:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/02/15 18:58:41 adam Exp $
+# $NetBSD: Makefile,v 1.17 2021/03/18 15:04:56 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/96-contrib-/}
 COMMENT=       Contrib subtree of tools and plug-ins
@@ -58,21 +58,9 @@ TOOLS_BROKEN+=               perl
 CONFIGURE_ARGS+=       --with-openssl
 
 PLIST_VARS+=           uuid
-.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
+.if ${OPSYS:M*BSD} || ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.uuid=            yes
 BUILD_DIRS+=           contrib/uuid-ossp
-.  if ${OPSYS:M*BSD}
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20"
-CONFIGURE_ARGS+=       --with-uuid=bsd
-.  elif ${OPSYS} == "Linux"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS"
-CONFIGURE_ARGS+=       --with-uuid=e2fs
-.  elif ${OPSYS} == "SunOS"
-BUILD_MAKE_FLAGS+=     PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP"
-CONFIGURE_ARGS+=       --with-uuid=ossp
-BUILD_MAKE_FLAGS+=     UUID_LIBS=-lossp-uuid
-.  include "../../devel/ossp-uuid/buildlink3.mk"
-.  endif
 .endif
 
 PRINT_PLIST_AWK+=      {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}

Added files:

Index: pkgsrc/databases/postgresql10/patches/patch-contrib_uuid-ossp_Makefile
diff -u /dev/null pkgsrc/databases/postgresql10/patches/patch-contrib_uuid-ossp_Makefile:1.1
--- /dev/null   Thu Mar 18 15:04:57 2021
+++ pkgsrc/databases/postgresql10/patches/patch-contrib_uuid-ossp_Makefile      Thu Mar 18 15:04:53 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:53 adam Exp $
+
+Use relative path, as top_srcdir points to PREFIX.
+
+--- contrib/uuid-ossp/Makefile.orig    2021-02-08 21:56:03.000000000 +0000
++++ contrib/uuid-ossp/Makefile
+@@ -12,7 +12,7 @@ REGRESS = uuid_ossp
+ SHLIB_LINK += $(UUID_LIBS)
+ 
+ # We copy some needed files verbatim from pgcrypto
+-pgcrypto_src = $(top_srcdir)/contrib/pgcrypto
++pgcrypto_src = ../pgcrypto
+ 
+ PG_CPPFLAGS = -I$(pgcrypto_src)
+ 

Index: pkgsrc/databases/postgresql11/patches/patch-contrib_uuid-ossp_Makefile
diff -u /dev/null pkgsrc/databases/postgresql11/patches/patch-contrib_uuid-ossp_Makefile:1.1
--- /dev/null   Thu Mar 18 15:04:57 2021
+++ pkgsrc/databases/postgresql11/patches/patch-contrib_uuid-ossp_Makefile      Thu Mar 18 15:04:54 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:54 adam Exp $
+
+Use relative path, as top_srcdir points to PREFIX.
+
+--- contrib/uuid-ossp/Makefile.orig    2021-02-08 21:56:03.000000000 +0000
++++ contrib/uuid-ossp/Makefile
+@@ -12,7 +12,7 @@ REGRESS = uuid_ossp
+ SHLIB_LINK += $(UUID_LIBS)
+ 
+ # We copy some needed files verbatim from pgcrypto
+-pgcrypto_src = $(top_srcdir)/contrib/pgcrypto
++pgcrypto_src = ../pgcrypto
+ 
+ PG_CPPFLAGS = -I$(pgcrypto_src)
+ 

Index: pkgsrc/databases/postgresql12/patches/patch-contrib_uuid-ossp_Makefile
diff -u /dev/null pkgsrc/databases/postgresql12/patches/patch-contrib_uuid-ossp_Makefile:1.1
--- /dev/null   Thu Mar 18 15:04:57 2021
+++ pkgsrc/databases/postgresql12/patches/patch-contrib_uuid-ossp_Makefile      Thu Mar 18 15:04:54 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:54 adam Exp $
+
+Use relative path, as top_srcdir points to PREFIX.
+
+--- contrib/uuid-ossp/Makefile.orig    2021-02-08 21:56:03.000000000 +0000
++++ contrib/uuid-ossp/Makefile
+@@ -12,7 +12,7 @@ REGRESS = uuid_ossp
+ SHLIB_LINK += $(UUID_LIBS)
+ 
+ # We copy some needed files verbatim from pgcrypto
+-pgcrypto_src = $(top_srcdir)/contrib/pgcrypto
++pgcrypto_src = ../pgcrypto
+ 
+ PG_CPPFLAGS = -I$(pgcrypto_src)
+ 

Index: pkgsrc/databases/postgresql13/patches/patch-contrib_uuid-ossp_Makefile
diff -u /dev/null pkgsrc/databases/postgresql13/patches/patch-contrib_uuid-ossp_Makefile:1.1
--- /dev/null   Thu Mar 18 15:04:57 2021
+++ pkgsrc/databases/postgresql13/patches/patch-contrib_uuid-ossp_Makefile      Thu Mar 18 15:04:55 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:55 adam Exp $
+
+Use relative path, as top_srcdir points to PREFIX.
+
+--- contrib/uuid-ossp/Makefile.orig    2021-03-18 11:50:26.000000000 +0000
++++ contrib/uuid-ossp/Makefile
+@@ -15,7 +15,7 @@ REGRESS = uuid_ossp
+ SHLIB_LINK += $(UUID_LIBS)
+ 
+ # We copy some needed files verbatim from pgcrypto
+-pgcrypto_src = $(top_srcdir)/contrib/pgcrypto
++pgcrypto_src = ../pgcrypto
+ 
+ PG_CPPFLAGS = -I$(pgcrypto_src)
+ 

Index: pkgsrc/databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile
diff -u /dev/null pkgsrc/databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile:1.1
--- /dev/null   Thu Mar 18 15:04:57 2021
+++ pkgsrc/databases/postgresql95/patches/patch-contrib_uuid-ossp_Makefile      Thu Mar 18 15:04:56 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:56 adam Exp $
+
+Use relative path, as top_srcdir points to PREFIX.
+
+--- contrib/uuid-ossp/Makefile.orig    2021-02-08 21:56:03.000000000 +0000
++++ contrib/uuid-ossp/Makefile
+@@ -12,7 +12,7 @@ REGRESS = uuid_ossp
+ SHLIB_LINK += $(UUID_LIBS)
+ 
+ # We copy some needed files verbatim from pgcrypto
+-pgcrypto_src = $(top_srcdir)/contrib/pgcrypto
++pgcrypto_src = ../pgcrypto
+ 
+ PG_CPPFLAGS = -I$(pgcrypto_src)
+ 

Index: pkgsrc/databases/postgresql96/patches/patch-contrib_uuid-ossp_Makefile
diff -u /dev/null pkgsrc/databases/postgresql96/patches/patch-contrib_uuid-ossp_Makefile:1.1
--- /dev/null   Thu Mar 18 15:04:57 2021
+++ pkgsrc/databases/postgresql96/patches/patch-contrib_uuid-ossp_Makefile      Thu Mar 18 15:04:56 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-contrib_uuid-ossp_Makefile,v 1.1 2021/03/18 15:04:56 adam Exp $
+
+Use relative path, as top_srcdir points to PREFIX.
+
+--- contrib/uuid-ossp/Makefile.orig    2021-02-08 21:56:03.000000000 +0000
++++ contrib/uuid-ossp/Makefile
+@@ -12,7 +12,7 @@ REGRESS = uuid_ossp
+ SHLIB_LINK += $(UUID_LIBS)
+ 
+ # We copy some needed files verbatim from pgcrypto
+-pgcrypto_src = $(top_srcdir)/contrib/pgcrypto
++pgcrypto_src = ../pgcrypto
+ 
+ PG_CPPFLAGS = -I$(pgcrypto_src)
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/emulators/qemu
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/emulators/qemu
Indexes:

Home | Main Index | Thread Index | Old Index