CVS commit: pkgsrc/lang/ghc88

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat May  1 03:00:07 UTC 2021

Modified Files:
        pkgsrc/lang/ghc88: distinfo
        pkgsrc/lang/ghc88/patches: patch-ghc.mk

Log Message:
Fix a bug in the previous commit which would produce a non-installable bootkit


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/ghc88/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc88/patches/patch-ghc.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/ghc88/distinfo
diff -u pkgsrc/lang/ghc88/distinfo:1.17 pkgsrc/lang/ghc88/distinfo:1.18
--- pkgsrc/lang/ghc88/distinfo:1.17     Thu Apr 29 05:09:08 2021
+++ pkgsrc/lang/ghc88/distinfo  Sat May  1 03:00:06 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2021/04/29 05:09:08 pho Exp $
+$NetBSD: distinfo,v 1.18 2021/05/01 03:00:06 pho Exp $
 
 SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a
 RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2
@@ -31,7 +31,7 @@ Size (netbsd-9.0-amd64-libterminfo.tar.g
 SHA1 (patch-aclocal.m4) = 16ac8899a7d87cf93a6139edba9e5222eb4c5c66
 SHA1 (patch-compiler_main_DynFlags.hs) = 07bb2a5afdd087f4d2da5c035feecc13273aec70
 SHA1 (patch-configure.ac) = 6e5cec26e440ccd71343a1981b415459813f88be
-SHA1 (patch-ghc.mk) = 9bfa82ee29c2786e7bae800279823bee72e4fab1
+SHA1 (patch-ghc.mk) = 1a4de0f175b0b73dc6d09a26b8c55bb6e0be0e18
 SHA1 (patch-ghc_ghc.mk) = 9c639cc95cb79e4ffbd9b5fce311edba54939b5e
 SHA1 (patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs) = a4c82b1282c0580a7945be8c3b9d38bc760db99f
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00

Index: pkgsrc/lang/ghc88/patches/patch-ghc.mk
diff -u pkgsrc/lang/ghc88/patches/patch-ghc.mk:1.1 pkgsrc/lang/ghc88/patches/patch-ghc.mk:1.2
--- pkgsrc/lang/ghc88/patches/patch-ghc.mk:1.1  Wed Apr 28 15:39:23 2021
+++ pkgsrc/lang/ghc88/patches/patch-ghc.mk      Sat May  1 03:00:07 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-ghc.mk,v 1.1 2021/04/28 15:39:23 pho Exp $
+$NetBSD: patch-ghc.mk,v 1.2 2021/05/01 03:00:07 pho Exp $
 
 Use the wrapper scripts for ghc as we can't use the ones from the DESTDIR
 as the libraries are not in the right place yet.
@@ -10,7 +10,7 @@ as the libraries are not in the right pl
  INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
  
 -ifeq "$(BINDIST) $(CrossCompiling)" "NO YES"
-+ifeq "UseWrappers" "UseWrappers"
++ifeq "$(BINDIST)" "NO"
  # when installing ghc-stage2 we can't run target's
  # 'ghc-pkg' and 'ghc-stage2' but those are needed for registration.
  INSTALLED_GHC_REAL=$(TOP)/inplace/bin/ghc-stage1