CVS commit: pkgsrc/textproc/hs-cheapskate

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Oct 30 02:56:46 UTC 2023

Modified Files:
        pkgsrc/textproc/hs-cheapskate: Makefile distinfo
Added Files:
        pkgsrc/textproc/hs-cheapskate/patches: patch-Cheapskate_Parse.hs

Log Message:
textproc/hs-cheapskate: Fix build with GHC 9.6


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/hs-cheapskate/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/hs-cheapskate/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/hs-cheapskate/patches/patch-Cheapskate_Parse.hs

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

Modified files:

Index: pkgsrc/textproc/hs-cheapskate/Makefile
diff -u pkgsrc/textproc/hs-cheapskate/Makefile:1.9 pkgsrc/textproc/hs-cheapskate/Makefile:1.10
--- pkgsrc/textproc/hs-cheapskate/Makefile:1.9  Mon Oct  9 04:54:49 2023
+++ pkgsrc/textproc/hs-cheapskate/Makefile      Mon Oct 30 02:56:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/10/09 04:54:49 pho Exp $
+# $NetBSD: Makefile,v 1.10 2023/10/30 02:56:46 pho Exp $
 
 DISTNAME=      cheapskate-0.1.1.2
 PKGREVISION=   6
@@ -12,6 +12,7 @@ LICENSE=      modified-bsd
 CONFIGURE_ARGS+=       -f-dingus
 
 HASKELL_UNRESTRICT_DEPENDENCIES+=      \
+       mtl     \
        text
 
 .include "../../textproc/hs-blaze-html/buildlink3.mk"

Index: pkgsrc/textproc/hs-cheapskate/distinfo
diff -u pkgsrc/textproc/hs-cheapskate/distinfo:1.4 pkgsrc/textproc/hs-cheapskate/distinfo:1.5
--- pkgsrc/textproc/hs-cheapskate/distinfo:1.4  Tue Oct 26 11:21:59 2021
+++ pkgsrc/textproc/hs-cheapskate/distinfo      Mon Oct 30 02:56:46 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:21:59 nia Exp $
+$NetBSD: distinfo,v 1.5 2023/10/30 02:56:46 pho Exp $
 
 BLAKE2s (cheapskate-0.1.1.2.tar.gz) = 2e67974e0a0de8c409a4508b5ea12e2d5e80fcf65cea3f23a262e5c36ea97126
 SHA512 (cheapskate-0.1.1.2.tar.gz) = b671ada413b8bd90f28b008c7bada4b744dedac2c7711090f1148dfa1643f7843f44e56c9a5a99fd0f71ded8393a0095b04fbdf73f70a707698dc9fb76ed1b45
 Size (cheapskate-0.1.1.2.tar.gz) = 27114 bytes
+SHA1 (patch-Cheapskate_Parse.hs) = 84f0b1aceecb6f67eea825de7627761d466ce0cb

Added files:

Index: pkgsrc/textproc/hs-cheapskate/patches/patch-Cheapskate_Parse.hs
diff -u /dev/null pkgsrc/textproc/hs-cheapskate/patches/patch-Cheapskate_Parse.hs:1.1
--- /dev/null   Mon Oct 30 02:56:46 2023
+++ pkgsrc/textproc/hs-cheapskate/patches/patch-Cheapskate_Parse.hs     Mon Oct 30 02:56:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Cheapskate_Parse.hs,v 1.1 2023/10/30 02:56:46 pho Exp $
+
+Fix build with GHC 9.6. Functions from Control.Monad are no longer
+re-exported by Prelude.
+
+--- Cheapskate/Parse.hs.orig   2023-10-30 02:54:30.013924303 +0000
++++ Cheapskate/Parse.hs
+@@ -6,6 +6,7 @@ import Cheapskate.ParserCombinators
+ import Cheapskate.Util
+ import Cheapskate.Inlines
+ import Cheapskate.Types
++import Control.Monad
+ import Data.Char hiding (Space)
+ import qualified Data.Set as Set
+ import Prelude hiding (takeWhile)