Thu May 5 08:19:00 2022 UTC ()
ghc*: Use OPSYS_VERSION to numerically compare NetBSD versions
(nia)
diff -r1.51 -r1.52 pkgsrc/lang/ghc7/Makefile
diff -r1.15 -r1.16 pkgsrc/lang/ghc80/Makefile
diff -r1.10 -r1.11 pkgsrc/lang/ghc810/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/ghc84/Makefile
diff -r1.23 -r1.24 pkgsrc/lang/ghc88/Makefile
diff -r1.19 -r1.20 pkgsrc/lang/ghc90/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/ghc92/Makefile
--- pkgsrc/lang/ghc7/Makefile 2021/12/08 16:02:15 1.51
+++ pkgsrc/lang/ghc7/Makefile 2022/05/05 08:18:59 1.52
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.52 2022/05/05 08:18:59 nia Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -178,7 +178,7 @@
# NetBSD 9.x have libcurses with a newer major version than the
# bootstrap kit is linked against. For now, work around this with
# compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
# In a sandboxed build environment, we have to reach over to the
# installed libraries themselves, since the symlinks compat80 adds
--- pkgsrc/lang/ghc80/Makefile 2021/12/08 16:02:15 1.15
+++ pkgsrc/lang/ghc80/Makefile 2022/05/05 08:18:59 1.16
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/05 08:18:59 nia Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -178,7 +178,7 @@
# NetBSD 9.x have libcurses with a newer major version than the
# bootstrap kit is linked against. For now, work around this with
# compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
# In a sandboxed build environment, we have to reach over to the
# installed libraries themselves, since the symlinks compat80 adds
--- pkgsrc/lang/ghc810/Makefile 2022/02/14 12:12:07 1.10
+++ pkgsrc/lang/ghc810/Makefile 2022/05/05 08:18:59 1.11
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/02/14 12:12:07 pho Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/05 08:18:59 nia Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -220,7 +220,7 @@
# NetBSD 9.x have libcurses with a newer major version than the
# bootstrap kit is linked against. For now, work around this with
# compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
# In a sandboxed build environment, we have to reach over to the
# installed libraries themselves, since the symlinks compat80 adds
--- pkgsrc/lang/ghc84/Makefile 2021/12/08 16:02:15 1.17
+++ pkgsrc/lang/ghc84/Makefile 2022/05/05 08:18:59 1.18
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/05 08:18:59 nia Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -196,7 +196,7 @@
# NetBSD 9.x have libcurses with a newer major version than the
# bootstrap kit is linked against. For now, work around this with
# compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
# In a sandboxed build environment, we have to reach over to the
# installed libraries themselves, since the symlinks compat80 adds
--- pkgsrc/lang/ghc88/Makefile 2021/12/08 16:02:15 1.23
+++ pkgsrc/lang/ghc88/Makefile 2022/05/05 08:18:59 1.24
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/05 08:18:59 nia Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -220,7 +220,7 @@
# NetBSD 9.x have libcurses with a newer major version than the
# bootstrap kit is linked against. For now, work around this with
# compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
# In a sandboxed build environment, we have to reach over to the
# installed libraries themselves, since the symlinks compat80 adds
--- pkgsrc/lang/ghc90/Makefile 2022/02/24 09:18:09 1.19
+++ pkgsrc/lang/ghc90/Makefile 2022/05/05 08:18:59 1.20
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/02/24 09:18:09 pho Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/05 08:18:59 nia Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -235,7 +235,7 @@
# NetBSD 9.x have libcurses with a newer major version than the
# bootstrap kit is linked against. For now, work around this with
# compat80.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && empty(OS_VERSION:M[0-8].*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
# In a sandboxed build environment, we have to reach over to the
# installed libraries themselves, since the symlinks compat80 adds
--- pkgsrc/lang/ghc92/Makefile 2022/02/24 09:17:59 1.6
+++ pkgsrc/lang/ghc92/Makefile 2022/05/05 08:18:59 1.7
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/02/24 09:17:59 pho Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/05 08:18:59 nia Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -236,7 +236,7 @@
# NetBSD 9.x have libcurses with a newer major version than the
# bootstrap kit is linked against. For now, work around this with
# compat80.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && empty(OS_VERSION:M[0-8].*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
BUILD_DEPENDS+= compat80-[0-9]*:../../emulators/compat80
# In a sandboxed build environment, we have to reach over to the
# installed libraries themselves, since the symlinks compat80 adds