ghc*: Use OPSYS_VERSION to numerically compare NetBSD versions

7 files changed, 14 insertions, 14 deletions

diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile
index 4ed5d40ddfb..a3913ef3d7e 100644
--- a/lang/ghc7/Makefile
+++ b/lang/ghc7/Makefile
@@ -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 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 # 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
diff --git a/lang/ghc80/Makefile b/lang/ghc80/Makefile
index 2cc4638e813..4c77368d7d9 100644
--- a/lang/ghc80/Makefile
+++ b/lang/ghc80/Makefile
@@ -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 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # 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
diff --git a/lang/ghc810/Makefile b/lang/ghc810/Makefile
index 06e148609af..f3ddc756436 100644
--- a/lang/ghc810/Makefile
+++ b/lang/ghc810/Makefile
@@ -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 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # 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
diff --git a/lang/ghc84/Makefile b/lang/ghc84/Makefile
index 3b26d59b142..f67059b5983 100644
--- a/lang/ghc84/Makefile
+++ b/lang/ghc84/Makefile
@@ -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 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # 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
diff --git a/lang/ghc88/Makefile b/lang/ghc88/Makefile
index 98bf8d6eb93..37cfabc365f 100644
--- a/lang/ghc88/Makefile
+++ b/lang/ghc88/Makefile
@@ -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 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # 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
diff --git a/lang/ghc90/Makefile b/lang/ghc90/Makefile
index 39698b58c90..87ee0340095 100644
--- a/lang/ghc90/Makefile
+++ b/lang/ghc90/Makefile
@@ -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 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # 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
diff --git a/lang/ghc92/Makefile b/lang/ghc92/Makefile
index 901681dbb72..d6bd165f07e 100644
--- a/lang/ghc92/Makefile
+++ b/lang/ghc92/Makefile
@@ -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 @@ BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # 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