CVS commit: pkgsrc/lang/ghc96

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Nov  2 15:29:31 UTC 2023

Modified Files:
        pkgsrc/lang/ghc96: distinfo
        pkgsrc/lang/ghc96/patches: patch-hadrian_bootstrap_src_Main.hs
            patch-hadrian_src_Settings_Packages.hs
            patch-libraries_terminfo_configure.ac

Log Message:
lang/ghc96: Add pull-request URLs to patches


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc96/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/ghc96/patches/patch-hadrian_bootstrap_src_Main.hs \
    pkgsrc/lang/ghc96/patches/patch-hadrian_src_Settings_Packages.hs \
    pkgsrc/lang/ghc96/patches/patch-libraries_terminfo_configure.ac

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

Modified files:

Index: pkgsrc/lang/ghc96/distinfo
diff -u pkgsrc/lang/ghc96/distinfo:1.5 pkgsrc/lang/ghc96/distinfo:1.6
--- pkgsrc/lang/ghc96/distinfo:1.5      Thu Nov  2 14:32:04 2023
+++ pkgsrc/lang/ghc96/distinfo  Thu Nov  2 15:29:31 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2023/11/02 14:32:04 pho Exp $
+$NetBSD: distinfo,v 1.6 2023/11/02 15:29:31 pho Exp $
 
 BLAKE2s (ghc-9.2.1-boot-hadrian.tar.gz) = 363fea08f46524eab654b3225650be4938bd0404e8c44145381f97a0c4489dca
 SHA512 (ghc-9.2.1-boot-hadrian.tar.gz) = a006ab38df77bc22e51ee75808065ad75781f85eb52cae54ed8995942ba16e70f4d68d4097f2597bca09e8b7890858d0a28a0f66216e6a4b21a3c68bb8082c59
@@ -32,13 +32,13 @@ SHA1 (patch-compiler_GHC_SysTools_Proces
 SHA1 (patch-configure.ac) = 985482ae70830ddbf1334c9c82a2cec78a34bb4c
 SHA1 (patch-hadrian_bindist_Makefile) = 9a2a708d200ee03a199e8626210b13174a5b3663
 SHA1 (patch-hadrian_bootstrap_bootstrap.py) = dbad8dc9c1949e5fa7491dcb0f8648d0b70f5803
-SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 70d7095c672c5e0e39ea08ff1beb2494e15e6143
+SHA1 (patch-hadrian_bootstrap_src_Main.hs) = 2e0a7ae2ef195013ca07313c150a7e48b6985e32
 SHA1 (patch-hadrian_src_Builder.hs) = cc72d98a6ed6101ce92e95e0766f2ee60c5e3f72
 SHA1 (patch-hadrian_src_Oracles_Setting.hs) = 498d1f810fa2f57151909eb672b73f137f1a7b01
 SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8
 SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a
 SHA1 (patch-hadrian_src_Settings_Default.hs) = 0e0278308ca4decac3fabd89831195b2a20c6eab
-SHA1 (patch-hadrian_src_Settings_Packages.hs) = 1db5c293a9f5691a5009b1a6d4ae9bf0a7109c2c
+SHA1 (patch-hadrian_src_Settings_Packages.hs) = 1cd01cc0aa82913b88c160189d4def916b4eb6b8
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = 9e6028dd6ffc2d3c71493fbb7336adcec9f08f78
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
@@ -47,7 +47,7 @@ SHA1 (patch-libraries_base_System_Enviro
 SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
 SHA1 (patch-libraries_ghc-boot_GHC_BaseDir.hs) = 27336cee41ba343c452a90ed004ba1ef2261482c
 SHA1 (patch-libraries_process_cbits_posix_fork__exec.c) = 8bc8aa1a3cfe8101257f77da98e5f877c59a36b0
-SHA1 (patch-libraries_terminfo_configure.ac) = 507a96209e32017faa96557d21a140bdb8f0b5c3
+SHA1 (patch-libraries_terminfo_configure.ac) = 068c2b89fc997a433709ec171c685654598781d7
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a
 SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = 414f0310793bf184cdac7546e3f81fee4821a05f

Index: pkgsrc/lang/ghc96/patches/patch-hadrian_bootstrap_src_Main.hs
diff -u pkgsrc/lang/ghc96/patches/patch-hadrian_bootstrap_src_Main.hs:1.1 pkgsrc/lang/ghc96/patches/patch-hadrian_bootstrap_src_Main.hs:1.2
--- pkgsrc/lang/ghc96/patches/patch-hadrian_bootstrap_src_Main.hs:1.1   Mon Oct 23 08:06:48 2023
+++ pkgsrc/lang/ghc96/patches/patch-hadrian_bootstrap_src_Main.hs       Thu Nov  2 15:29:31 2023
@@ -1,9 +1,9 @@
-$NetBSD: patch-hadrian_bootstrap_src_Main.hs,v 1.1 2023/10/23 08:06:48 pho Exp $
+$NetBSD: patch-hadrian_bootstrap_src_Main.hs,v 1.2 2023/11/02 15:29:31 pho Exp $
 
 Fix build with cabal-install-parsers >= 0.6. This doesn't affect normal
 builds. It's only for creating Hadrian bootstrap source archives.
 
-TODO: Upstream this.
+https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11546
 
 --- hadrian/bootstrap/src/Main.hs.orig 2023-09-21 11:30:31.000000000 +0000
 +++ hadrian/bootstrap/src/Main.hs
Index: pkgsrc/lang/ghc96/patches/patch-hadrian_src_Settings_Packages.hs
diff -u pkgsrc/lang/ghc96/patches/patch-hadrian_src_Settings_Packages.hs:1.1 pkgsrc/lang/ghc96/patches/patch-hadrian_src_Settings_Packages.hs:1.2
--- pkgsrc/lang/ghc96/patches/patch-hadrian_src_Settings_Packages.hs:1.1        Mon Oct 23 08:06:49 2023
+++ pkgsrc/lang/ghc96/patches/patch-hadrian_src_Settings_Packages.hs    Thu Nov  2 15:29:31 2023
@@ -1,7 +1,9 @@
-$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.1 2023/10/23 08:06:49 pho Exp $
+$NetBSD: patch-hadrian_src_Settings_Packages.hs,v 1.2 2023/11/02 15:29:31 pho Exp $
 
 Hunk #0, #1:
-  Don't assume we always build the threaded RTS. TODO: Upstream this.
+  Don't assume we always build the threaded RTS. This can only be
+  upstreamed after they update its Haddock to a version containing this
+  change: https://github.com/haskell/haddock/pull/1575
 
 Hunk #2:
   Hadrian does something unholy on i386 to gain speed but it seems to be
Index: pkgsrc/lang/ghc96/patches/patch-libraries_terminfo_configure.ac
diff -u pkgsrc/lang/ghc96/patches/patch-libraries_terminfo_configure.ac:1.1 pkgsrc/lang/ghc96/patches/patch-libraries_terminfo_configure.ac:1.2
--- pkgsrc/lang/ghc96/patches/patch-libraries_terminfo_configure.ac:1.1 Mon Oct 23 08:06:49 2023
+++ pkgsrc/lang/ghc96/patches/patch-libraries_terminfo_configure.ac     Thu Nov  2 15:29:31 2023
@@ -1,6 +1,7 @@
-$NetBSD: patch-libraries_terminfo_configure.ac,v 1.1 2023/10/23 08:06:49 pho Exp $
+$NetBSD: patch-libraries_terminfo_configure.ac,v 1.2 2023/11/02 15:29:31 pho Exp $
 
-Don't use "==" as it's a Bash-ism. TODO: Upstream this.
+Don't use "==" as it's a Bash-ism:
+https://github.com/judah/terminfo/commit/09fe6ebe02d439c507c0bad6e500c9212f56e8e3
 
 --- libraries/terminfo/configure.ac.orig       2023-10-23 02:48:49.253512773 +0000
 +++ libraries/terminfo/configure.ac