pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang ghc*: Use OPSYS_VERSION to numerically compare Ne...
details: https://anonhg.NetBSD.org/pkgsrc/rev/43abc2783e17
branches: trunk
changeset: 378695:43abc2783e17
user: nia <nia%pkgsrc.org@localhost>
date: Thu May 05 08:18:59 2022 +0000
description:
ghc*: Use OPSYS_VERSION to numerically compare NetBSD versions
diffstat:
lang/ghc7/Makefile | 4 ++--
lang/ghc80/Makefile | 4 ++--
lang/ghc810/Makefile | 4 ++--
lang/ghc84/Makefile | 4 ++--
lang/ghc88/Makefile | 4 ++--
lang/ghc90/Makefile | 4 ++--
lang/ghc92/Makefile | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diffs (126 lines):
diff -r 2994f7859721 -r 43abc2783e17 lang/ghc7/Makefile
--- a/lang/ghc7/Makefile Thu May 05 08:06:49 2022 +0000
+++ b/lang/ghc7/Makefile Thu May 05 08:18:59 2022 +0000
@@ -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
diff -r 2994f7859721 -r 43abc2783e17 lang/ghc80/Makefile
--- a/lang/ghc80/Makefile Thu May 05 08:06:49 2022 +0000
+++ b/lang/ghc80/Makefile Thu May 05 08:18:59 2022 +0000
@@ -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
diff -r 2994f7859721 -r 43abc2783e17 lang/ghc810/Makefile
--- a/lang/ghc810/Makefile Thu May 05 08:06:49 2022 +0000
+++ b/lang/ghc810/Makefile Thu May 05 08:18:59 2022 +0000
@@ -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
diff -r 2994f7859721 -r 43abc2783e17 lang/ghc84/Makefile
--- a/lang/ghc84/Makefile Thu May 05 08:06:49 2022 +0000
+++ b/lang/ghc84/Makefile Thu May 05 08:18:59 2022 +0000
@@ -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
diff -r 2994f7859721 -r 43abc2783e17 lang/ghc88/Makefile
--- a/lang/ghc88/Makefile Thu May 05 08:06:49 2022 +0000
+++ b/lang/ghc88/Makefile Thu May 05 08:18:59 2022 +0000
@@ -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
diff -r 2994f7859721 -r 43abc2783e17 lang/ghc90/Makefile
--- a/lang/ghc90/Makefile Thu May 05 08:06:49 2022 +0000
+++ b/lang/ghc90/Makefile Thu May 05 08:18:59 2022 +0000
@@ -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
diff -r 2994f7859721 -r 43abc2783e17 lang/ghc92/Makefile
--- a/lang/ghc92/Makefile Thu May 05 08:06:49 2022 +0000
+++ b/lang/ghc92/Makefile Thu May 05 08:18:59 2022 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index