CVS commit: pkgsrc/databases

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu May  5 08:22:38 UTC 2022

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

Log Message:
postgresql*-client: Use OPSYS_VERSION to numerically compare NetBSD versions

XXX do we still want to keep hacks for NetBSD 3?


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/postgresql10-client/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/databases/postgresql11-client/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/postgresql12-client/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/postgresql13-client/Makefile
cvs rdiff -u -r1.4 -r1.5 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-client/Makefile
diff -u pkgsrc/databases/postgresql10-client/Makefile:1.23 pkgsrc/databases/postgresql10-client/Makefile:1.24
--- pkgsrc/databases/postgresql10-client/Makefile:1.23  Mon Apr 18 19:10:39 2022
+++ pkgsrc/databases/postgresql10-client/Makefile       Thu May  5 08:22:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/04/18 19:10:39 adam Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/05 08:22:37 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/10-client-/}
 PKGREVISION=   1
@@ -24,7 +24,7 @@ INSTALLATION_DIRS+=   bin
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earlier than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
+.if (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 040000) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 PGSQL_THREAD_SAFETY?=  no
 .endif

Index: pkgsrc/databases/postgresql11-client/Makefile
diff -u pkgsrc/databases/postgresql11-client/Makefile:1.19 pkgsrc/databases/postgresql11-client/Makefile:1.20
--- pkgsrc/databases/postgresql11-client/Makefile:1.19  Mon Apr 18 19:10:40 2022
+++ pkgsrc/databases/postgresql11-client/Makefile       Thu May  5 08:22:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/04/18 19:10:40 adam Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/05 08:22:37 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/11-client-/}
 PKGREVISION=   1
@@ -24,7 +24,7 @@ INSTALLATION_DIRS+=   bin
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earlier than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
+.if (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 040000) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 PGSQL_THREAD_SAFETY?=  no
 .endif

Index: pkgsrc/databases/postgresql12-client/Makefile
diff -u pkgsrc/databases/postgresql12-client/Makefile:1.21 pkgsrc/databases/postgresql12-client/Makefile:1.22
--- pkgsrc/databases/postgresql12-client/Makefile:1.21  Mon Apr 18 19:10:41 2022
+++ pkgsrc/databases/postgresql12-client/Makefile       Thu May  5 08:22:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2022/04/18 19:10:41 adam Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/05 08:22:38 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/12-client-/}
 PKGREVISION=   1
@@ -24,7 +24,7 @@ INSTALLATION_DIRS+=   bin
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earlier than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
+.if (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 040000) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 PGSQL_THREAD_SAFETY?=  no
 .endif

Index: pkgsrc/databases/postgresql13-client/Makefile
diff -u pkgsrc/databases/postgresql13-client/Makefile:1.13 pkgsrc/databases/postgresql13-client/Makefile:1.14
--- pkgsrc/databases/postgresql13-client/Makefile:1.13  Mon Apr 18 19:10:42 2022
+++ pkgsrc/databases/postgresql13-client/Makefile       Thu May  5 08:22:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/04/18 19:10:42 adam Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/05 08:22:38 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/13-client-/}
 PKGREVISION=   1
@@ -24,7 +24,7 @@ INSTALLATION_DIRS+=   bin
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earlier than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
+.if (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 040000) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 PGSQL_THREAD_SAFETY?=  no
 .endif

Index: pkgsrc/databases/postgresql14-client/Makefile
diff -u pkgsrc/databases/postgresql14-client/Makefile:1.4 pkgsrc/databases/postgresql14-client/Makefile:1.5
--- pkgsrc/databases/postgresql14-client/Makefile:1.4   Mon Apr 18 19:10:42 2022
+++ pkgsrc/databases/postgresql14-client/Makefile       Thu May  5 08:22:38 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/04/18 19:10:42 adam Exp $
+# $NetBSD: Makefile,v 1.5 2022/05/05 08:22:38 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/14-client-/}
 PKGREVISION=   1
@@ -24,7 +24,7 @@ INSTALLATION_DIRS+=   bin
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earlier than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
+.if (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 040000) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
 PGSQL_THREAD_SAFETY?=  no
 .endif