CVS commit: pkgsrc/lang/ghc98

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat May 11 18:37:40 UTC 2024

Modified Files:
        pkgsrc/lang/ghc98: Makefile bootstrap.mk distinfo
Removed Files:
        pkgsrc/lang/ghc98/patches: patch-hadrian_src_Settings_Default.hs

Log Message:
lang/ghc98: Remove a patch that we no longer need


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ghc98/Makefile \
    pkgsrc/lang/ghc98/bootstrap.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ghc98/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/ghc98/patches/patch-hadrian_src_Settings_Default.hs

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

Modified files:

Index: pkgsrc/lang/ghc98/Makefile
diff -u pkgsrc/lang/ghc98/Makefile:1.3 pkgsrc/lang/ghc98/Makefile:1.4
--- pkgsrc/lang/ghc98/Makefile:1.3      Mon May  6 02:26:39 2024
+++ pkgsrc/lang/ghc98/Makefile  Sat May 11 18:37:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2024/05/06 02:26:39 pho Exp $
+# $NetBSD: Makefile,v 1.4 2024/05/11 18:37:40 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -55,6 +55,7 @@ USE_LIBTOOL=                  yes
 PYTHON_FOR_BUILD_ONLY=         tool
 .include "../../lang/python/tool.mk"
 
+
 # -----------------------------------------------------------------------------
 # Configuration
 #
Index: pkgsrc/lang/ghc98/bootstrap.mk
diff -u pkgsrc/lang/ghc98/bootstrap.mk:1.3 pkgsrc/lang/ghc98/bootstrap.mk:1.4
--- pkgsrc/lang/ghc98/bootstrap.mk:1.3  Mon May  6 02:26:39 2024
+++ pkgsrc/lang/ghc98/bootstrap.mk      Sat May 11 18:37:40 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.3 2024/05/06 02:26:39 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.4 2024/05/11 18:37:40 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler on a per-platform basis. See
 # ./files/BOOTSTRAP.md for details.
@@ -109,15 +109,7 @@ TOOLS_PLATFORM.cpp=        /usr/lib/cpp
 #
 USE_TOOLS+=    xzcat xz gtar cpp patch # patch is for bootstrap.py
 
-# Bootkits from the pre-Hadrian era has a different name for the top
-# directory in their archives. We can eliminate this conditional once all
-# of our bootkits are updated to 9.4 or later.
-.if ${BOOT_ARCHIVE:M9.2.*}
-BOOT_ARCHIVE_TOP_DIR=  ghc-${BOOT_VERSION}-boot
-.else
 BOOT_ARCHIVE_TOP_DIR=  ${BOOT_ARCHIVE:C/\.tar\..z$//}
-.endif
-
 pre-configure:
        ${RUN}${TEST} -f ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE} || \
        ${FAIL_MSG}  "Place your trusted bootkit archive at ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE}"
@@ -172,6 +164,7 @@ pre-build:
 # such.
 HADRIAN_CMD=   ${PKGSRC_SET_ENV} ${ALL_ENV} ${WRKSRC}/hadrian/bootstrap/_build/bin/hadrian
 
+
 # -----------------------------------------------------------------------------
 # An unusual target "bootstrap"
 #

Index: pkgsrc/lang/ghc98/distinfo
diff -u pkgsrc/lang/ghc98/distinfo:1.6 pkgsrc/lang/ghc98/distinfo:1.7
--- pkgsrc/lang/ghc98/distinfo:1.6      Sat May 11 14:55:51 2024
+++ pkgsrc/lang/ghc98/distinfo  Sat May 11 18:37:40 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2024/05/11 14:55:51 pho Exp $
+$NetBSD: distinfo,v 1.7 2024/05/11 18:37:40 pho Exp $
 
 BLAKE2s (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = c771cfa45f5635bdf8175775cf7a67c9541bd5b4d4927ed9b5189e3dcefcd2ba
 SHA512 (ghc-9.4.7-boot-aarch64-apple-darwin.tar.xz) = 3d50e4c6605ebfa7eef018d3e9e11e8115cf2f97e24a5adfc05fd1bab152c726e240f9a213d73e220dc7fc5b9358df74eee0d4cb1b77bd5491f28899c831b1a4
@@ -36,7 +36,6 @@ SHA1 (patch-hadrian_bootstrap_src_Main.h
 SHA1 (patch-hadrian_src_Builder.hs) = bbfb1ddc30af900c89ca3cf649a32da2a1c83174
 SHA1 (patch-hadrian_src_Rules_BinaryDist.hs) = fb908f74b8b619bccd673fbdb40b1c53ab7a51d8
 SHA1 (patch-hadrian_src_Settings_Builders_Ghc.hs) = e2913e9f83bb36bb0b432a24518c9b6ca2990c6a
-SHA1 (patch-hadrian_src_Settings_Default.hs) = b8b1564fa7941f3c7c737f4115b5f4d7d0e0125a
 SHA1 (patch-hadrian_src_Settings_Packages.hs) = d7dce5ff44a3dc05efc6c31aed7234c235594231
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_GHC.hs) = 9e6028dd6ffc2d3c71493fbb7336adcec9f08f78
 SHA1 (patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs) = 2bfadb25ae6fdc701c3de988d8886eab48999de6