CVS commit: pkgsrc/lang/ghc92

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 28 10:28:17 UTC 2022

Modified Files:
        pkgsrc/lang/ghc92: Makefile bootstrap.mk

Log Message:
ghc92: fix compat dependencies for NetBSD 10


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/ghc92/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ghc92/bootstrap.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc92/Makefile
diff -u pkgsrc/lang/ghc92/Makefile:1.10 pkgsrc/lang/ghc92/Makefile:1.11
--- pkgsrc/lang/ghc92/Makefile:1.10     Tue Nov 22 14:35:32 2022
+++ pkgsrc/lang/ghc92/Makefile  Wed Dec 28 10:28:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/11/22 14:35:32 nia Exp $
+# $NetBSD: Makefile,v 1.11 2022/12/28 10:28:17 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -243,6 +243,10 @@ BUILD_DEPENDS+=    ${PYPKGPREFIX}-sphinx-[0
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && ${OPSYS_VERSION} >= 099000
 BUILD_DEPENDS+=        compat90-[0-9]*:../../emulators/compat90
 ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib
+.elif !empty(MACHINE_PLATFORM:MNetBSD-*-*) && ${OPSYS_VERSION} >= 099000
+BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
+BUILD_DEPENDS+=        compat90-[0-9]*:../../emulators/compat90
+ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib
 .elif !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=        compat80-[0-9]*:../../emulators/compat80
 ALL_ENV+=      LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib

Index: pkgsrc/lang/ghc92/bootstrap.mk
diff -u pkgsrc/lang/ghc92/bootstrap.mk:1.2 pkgsrc/lang/ghc92/bootstrap.mk:1.3
--- pkgsrc/lang/ghc92/bootstrap.mk:1.2  Thu Jul  7 16:26:37 2022
+++ pkgsrc/lang/ghc92/bootstrap.mk      Wed Dec 28 10:28:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.2 2022/07/07 16:26:37 jperkin Exp $
+# $NetBSD: bootstrap.mk,v 1.3 2022/12/28 10:28:17 wiz Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis.
 #
@@ -271,7 +271,7 @@ post-bootstrap:
        @${ECHO} "Your bootstrap kit has the following run-time dependencies:"
 .for pkg in ${BOOT_GHC_DEPS}
        @${PRINTF} "  * %-8s" "${pkg}:"
-.  if !empty(USE_BUILTIN.${pkg}:M[nN][oO])
+.  if ${USE_BUILTIN.${pkg}:tl} == no
        @${ECHO_N} " pkgsrc ${BUILDLINK_PKGNAME.${pkg}}"
 .  else
        @${ECHO_N} " native"