CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Apr 16 06:38:21 UTC 2021

Modified Files:
        pkgsrc/databases/postgresql10: Makefile.common
        pkgsrc/databases/postgresql11: Makefile.common
        pkgsrc/databases/postgresql12: Makefile.common
        pkgsrc/databases/postgresql13: Makefile.common
        pkgsrc/databases/postgresql95: Makefile.common
        pkgsrc/databases/postgresql96: Makefile.common

Log Message:
postgresql: ensure linux libuuid is buildlinked when needed


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/postgresql10/Makefile.common
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/postgresql11/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/postgresql12/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql13/Makefile.common
cvs rdiff -u -r1.36 -r1.37 pkgsrc/databases/postgresql95/Makefile.common
cvs rdiff -u -r1.30 -r1.31 pkgsrc/databases/postgresql96/Makefile.common

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.25 pkgsrc/databases/postgresql10/Makefile.common:1.26
--- pkgsrc/databases/postgresql10/Makefile.common:1.25  Thu Mar 18 15:04:53 2021
+++ pkgsrc/databases/postgresql10/Makefile.common       Fri Apr 16 06:38:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2021/03/18 15:04:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.26 2021/04/16 06:38:20 nia Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -102,6 +102,7 @@ CONFIGURE_ARGS+=    --with-blocksize=${PGSQ
 CONFIGURE_ARGS+=       --with-uuid=bsd
 .elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=       --with-uuid=e2fs
+.include "../../devel/libuuid/buildlink3.mk"
 .elif ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-uuid=ossp
 .include "../../devel/ossp-uuid/buildlink3.mk"

Index: pkgsrc/databases/postgresql11/Makefile.common
diff -u pkgsrc/databases/postgresql11/Makefile.common:1.18 pkgsrc/databases/postgresql11/Makefile.common:1.19
--- pkgsrc/databases/postgresql11/Makefile.common:1.18  Thu Mar 18 15:04:54 2021
+++ pkgsrc/databases/postgresql11/Makefile.common       Fri Apr 16 06:38:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2021/03/18 15:04:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2021/04/16 06:38:20 nia Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -102,6 +102,7 @@ CONFIGURE_ARGS+=    --with-blocksize=${PGSQ
 CONFIGURE_ARGS+=       --with-uuid=bsd
 .elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=       --with-uuid=e2fs
+.include "../../devel/libuuid/buildlink3.mk"
 .elif ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-uuid=ossp
 .include "../../devel/ossp-uuid/buildlink3.mk"

Index: pkgsrc/databases/postgresql12/Makefile.common
diff -u pkgsrc/databases/postgresql12/Makefile.common:1.11 pkgsrc/databases/postgresql12/Makefile.common:1.12
--- pkgsrc/databases/postgresql12/Makefile.common:1.11  Thu Mar 18 15:04:54 2021
+++ pkgsrc/databases/postgresql12/Makefile.common       Fri Apr 16 06:38:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2021/03/18 15:04:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2021/04/16 06:38:20 nia Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -102,6 +102,7 @@ CONFIGURE_ARGS+=    --with-blocksize=${PGSQ
 CONFIGURE_ARGS+=       --with-uuid=bsd
 .elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=       --with-uuid=e2fs
+.include "../../devel/libuuid/buildlink3.mk"
 .elif ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-uuid=ossp
 .include "../../devel/ossp-uuid/buildlink3.mk"

Index: pkgsrc/databases/postgresql13/Makefile.common
diff -u pkgsrc/databases/postgresql13/Makefile.common:1.4 pkgsrc/databases/postgresql13/Makefile.common:1.5
--- pkgsrc/databases/postgresql13/Makefile.common:1.4   Thu Mar 18 15:04:55 2021
+++ pkgsrc/databases/postgresql13/Makefile.common       Fri Apr 16 06:38:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2021/03/18 15:04:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2021/04/16 06:38:20 nia Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -102,6 +102,7 @@ CONFIGURE_ARGS+=    --with-blocksize=${PGSQ
 CONFIGURE_ARGS+=       --with-uuid=bsd
 .elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=       --with-uuid=e2fs
+.include "../../devel/libuuid/buildlink3.mk"
 .elif ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-uuid=ossp
 .include "../../devel/ossp-uuid/buildlink3.mk"

Index: pkgsrc/databases/postgresql95/Makefile.common
diff -u pkgsrc/databases/postgresql95/Makefile.common:1.36 pkgsrc/databases/postgresql95/Makefile.common:1.37
--- pkgsrc/databases/postgresql95/Makefile.common:1.36  Thu Mar 18 15:04:55 2021
+++ pkgsrc/databases/postgresql95/Makefile.common       Fri Apr 16 06:38:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2021/03/18 15:04:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.37 2021/04/16 06:38:20 nia Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -103,6 +103,7 @@ CONFIGURE_ARGS+=    --with-blocksize=${PGSQ
 CONFIGURE_ARGS+=       --with-uuid=bsd
 .elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=       --with-uuid=e2fs
+.include "../../devel/libuuid/buildlink3.mk"
 .elif ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-uuid=ossp
 .include "../../devel/ossp-uuid/buildlink3.mk"

Index: pkgsrc/databases/postgresql96/Makefile.common
diff -u pkgsrc/databases/postgresql96/Makefile.common:1.30 pkgsrc/databases/postgresql96/Makefile.common:1.31
--- pkgsrc/databases/postgresql96/Makefile.common:1.30  Thu Mar 18 15:04:56 2021
+++ pkgsrc/databases/postgresql96/Makefile.common       Fri Apr 16 06:38:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2021/03/18 15:04:56 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2021/04/16 06:38:21 nia Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -103,6 +103,7 @@ CONFIGURE_ARGS+=    --with-blocksize=${PGSQ
 CONFIGURE_ARGS+=       --with-uuid=bsd
 .elif ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=       --with-uuid=e2fs
+.include "../../devel/libuuid/buildlink3.mk"
 .elif ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --with-uuid=ossp
 .include "../../devel/ossp-uuid/buildlink3.mk"