CVS commit: pkgsrc/lang/ghc98

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 28 16:23:44 UTC 2024

Modified Files:
        pkgsrc/lang/ghc98: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/lang/ghc98/patches:
            patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs

Log Message:
lang/ghc98: Fix a long-standing Cabal bug


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ghc98/Makefile \
    pkgsrc/lang/ghc98/buildlink3.mk pkgsrc/lang/ghc98/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc98/patches/patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.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.1 pkgsrc/lang/ghc98/Makefile:1.2
--- pkgsrc/lang/ghc98/Makefile:1.1      Sun Apr 28 05:58:57 2024
+++ pkgsrc/lang/ghc98/Makefile  Sun Apr 28 16:23:44 2024
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2024/04/28 05:58:57 pho Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/28 16:23:44 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
 DISTNAME=      ghc-9.8.2-src
 PKGNAME=       ${DISTNAME:S/-src$//}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
Index: pkgsrc/lang/ghc98/buildlink3.mk
diff -u pkgsrc/lang/ghc98/buildlink3.mk:1.1 pkgsrc/lang/ghc98/buildlink3.mk:1.2
--- pkgsrc/lang/ghc98/buildlink3.mk:1.1 Sun Apr 28 05:58:57 2024
+++ pkgsrc/lang/ghc98/buildlink3.mk     Sun Apr 28 16:23:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2024/04/28 05:58:57 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2024/04/28 16:23:44 pho Exp $
 
 BUILDLINK_TREE+=       ghc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ghc
 GHC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ghc+=    ghc>=9.8.2
-BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.8.2
+BUILDLINK_ABI_DEPENDS.ghc+=    ghc>=9.8.2nb1
 BUILDLINK_PKGSRCDIR.ghc?=      ../../lang/ghc98
 
 .include "../../converters/libiconv/buildlink3.mk"
Index: pkgsrc/lang/ghc98/distinfo
diff -u pkgsrc/lang/ghc98/distinfo:1.1 pkgsrc/lang/ghc98/distinfo:1.2
--- pkgsrc/lang/ghc98/distinfo:1.1      Sun Apr 28 05:58:57 2024
+++ pkgsrc/lang/ghc98/distinfo  Sun Apr 28 16:23:44 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2024/04/28 05:58:57 pho Exp $
+$NetBSD: distinfo,v 1.2 2024/04/28 16:23:44 pho Exp $
 
 BLAKE2s (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = a691117b405b9f7954b954acc382b3357a9ff8c98151514c82d18d83da397940
 SHA512 (ghc-9.4.7-boot-aarch64-unknown-netbsd.tar.xz) = 1c917a52a020be3a1878f9d7e8e4c47d31180e54248c127a60706c1053a95b2d8a487f79e7fb5daa725178f271a7cc17e4e7b47ce2119f8546e259c63b9864d8
@@ -36,6 +36,7 @@ SHA1 (patch-hadrian_src_Settings_Builder
 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
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215

Added files:

Index: pkgsrc/lang/ghc98/patches/patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs
diff -u /dev/null pkgsrc/lang/ghc98/patches/patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs:1.1
--- /dev/null   Sun Apr 28 16:23:44 2024
+++ pkgsrc/lang/ghc98/patches/patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs   Sun Apr 28 16:23:44 2024
@@ -0,0 +1,28 @@
+$NetBSD: patch-libraries_Cabal_Cabal_src_Distribution_Simple_Register.hs,v 1.1 2024/04/28 16:23:44 pho Exp $
+
+Fix a long-standing Cabal bug: when a package to be built contains a
+library that has no Haskell modules, "./Setup register" tries to register
+the library with fields "haddock-interfaces:" and "haddock-html:" pointing
+at non-existent files or directories, and "ghc-pkg register" warns about
+them.
+
+wiz@ asked me three times about these suspicious yet harmless warnings and
+I kept telling him to just ignore them. I was lazy (as always) and
+repeatedly said something like "oh yeah I'll fix it some time in the
+future" but now the future has finally come! (pho@)
+
+TODO: Upstream this
+
+--- libraries/Cabal/Cabal/src/Distribution/Simple/Register.hs.orig     2024-04-28 14:54:00.713517045 +0000
++++ libraries/Cabal/Cabal/src/Distribution/Simple/Register.hs
+@@ -445,8 +445,8 @@ generalInstalledPackageInfo adjustRelInc
+     IPI.ldOptions          = ldOptions bi,
+     IPI.frameworks         = frameworks bi,
+     IPI.frameworkDirs      = extraFrameworkDirs bi,
+-    IPI.haddockInterfaces  = [haddockdir installDirs </> haddockName pkg],
+-    IPI.haddockHTMLs       = [htmldir installDirs],
++    IPI.haddockInterfaces  = [ haddockdir installDirs </> haddockName pkg | hasModules ],
++    IPI.haddockHTMLs       = [ htmldir installDirs | hasModules ],
+     IPI.pkgRoot            = Nothing,
+     IPI.libVisibility      = libVisibility lib
+   }