[pkgsrc/trunk]: pkgsrc/databases postgresql*-client: Use OPSYS_VERSION to num...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/acf01ee69734
branches:  trunk
changeset: 378699:acf01ee69734
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu May 05 08:22:37 2022 +0000

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

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

diffstat:

 databases/postgresql10-client/Makefile |  4 ++--
 databases/postgresql11-client/Makefile |  4 ++--
 databases/postgresql12-client/Makefile |  4 ++--
 databases/postgresql13-client/Makefile |  4 ++--
 databases/postgresql14-client/Makefile |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 7822ac9c8c48 -r acf01ee69734 databases/postgresql10-client/Makefile
--- a/databases/postgresql10-client/Makefile    Thu May 05 08:21:33 2022 +0000
+++ b/databases/postgresql10-client/Makefile    Thu May 05 08:22:37 2022 +0000
@@ -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 @@
 # 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
diff -r 7822ac9c8c48 -r acf01ee69734 databases/postgresql11-client/Makefile
--- a/databases/postgresql11-client/Makefile    Thu May 05 08:21:33 2022 +0000
+++ b/databases/postgresql11-client/Makefile    Thu May 05 08:22:37 2022 +0000
@@ -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 @@
 # 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
diff -r 7822ac9c8c48 -r acf01ee69734 databases/postgresql12-client/Makefile
--- a/databases/postgresql12-client/Makefile    Thu May 05 08:21:33 2022 +0000
+++ b/databases/postgresql12-client/Makefile    Thu May 05 08:22:37 2022 +0000
@@ -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 @@
 # 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
diff -r 7822ac9c8c48 -r acf01ee69734 databases/postgresql13-client/Makefile
--- a/databases/postgresql13-client/Makefile    Thu May 05 08:21:33 2022 +0000
+++ b/databases/postgresql13-client/Makefile    Thu May 05 08:22:37 2022 +0000
@@ -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 @@
 # 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
diff -r 7822ac9c8c48 -r acf01ee69734 databases/postgresql14-client/Makefile
--- a/databases/postgresql14-client/Makefile    Thu May 05 08:21:33 2022 +0000
+++ b/databases/postgresql14-client/Makefile    Thu May 05 08:22:37 2022 +0000
@@ -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 @@
 # 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