Thu May 2 08:15:17 2024 UTC (46d)
devel/hs-turtle: Fix build with GHC 9.8

This breaks build with the currently default GHC 9.6. Please bear with me
until I switch the default compiler.


(pho)
diff -r1.9 -r1.10 pkgsrc/devel/hs-turtle/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/hs-turtle/PLIST
cvs diff -r1.9 -r1.10 pkgsrc/devel/hs-turtle/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/hs-turtle/Makefile 2023/11/02 06:37:01 1.9
+++ pkgsrc/devel/hs-turtle/Makefile 2024/05/02 08:15:17 1.10
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1# $NetBSD: Makefile,v 1.9 2023/11/02 06:37:01 pho Exp $ 1# $NetBSD: Makefile,v 1.10 2024/05/02 08:15:17 pho Exp $
2 2
3DISTNAME= turtle-1.6.2 3DISTNAME= turtle-1.6.2
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= devel 5CATEGORIES= devel
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Shell programming, Haskell-style 8COMMENT= Shell programming, Haskell-style
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
 11HASKELL_UNRESTRICT_DEPENDENCIES+= \
 12 bytestring \
 13 text
 14
11.include "../../textproc/hs-ansi-wl-pprint/buildlink3.mk" 15.include "../../textproc/hs-ansi-wl-pprint/buildlink3.mk"
12.include "../../devel/hs-async/buildlink3.mk" 16.include "../../devel/hs-async/buildlink3.mk"
13.include "../../time/hs-clock/buildlink3.mk" 17.include "../../time/hs-clock/buildlink3.mk"
14.include "../../devel/hs-foldl/buildlink3.mk" 18.include "../../devel/hs-foldl/buildlink3.mk"
15.include "../../sysutils/hs-hostname/buildlink3.mk" 19.include "../../sysutils/hs-hostname/buildlink3.mk"
16.include "../../devel/hs-managed/buildlink3.mk" 20.include "../../devel/hs-managed/buildlink3.mk"
17.include "../../devel/hs-optional-args/buildlink3.mk" 21.include "../../devel/hs-optional-args/buildlink3.mk"
18.include "../../devel/hs-optparse-applicative/buildlink3.mk" 22.include "../../devel/hs-optparse-applicative/buildlink3.mk"
19.include "../../devel/hs-streaming-commons/buildlink3.mk" 23.include "../../devel/hs-streaming-commons/buildlink3.mk"
20.include "../../sysutils/hs-temporary/buildlink3.mk" 24.include "../../sysutils/hs-temporary/buildlink3.mk"
21.include "../../devel/hs-unix-compat/buildlink3.mk" 25.include "../../devel/hs-unix-compat/buildlink3.mk"
22.include "../../mk/haskell.mk" 26.include "../../mk/haskell.mk"
23.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/hs-turtle/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/hs-turtle/PLIST 2023/10/30 10:21:18 1.3
+++ pkgsrc/devel/hs-turtle/PLIST 2024/05/02 08:15:17 1.4
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2023/10/30 10:21:18 pho Exp $ 1@comment $NetBSD: PLIST,v 1.4 2024/05/02 08:15:17 pho Exp $
2lib/turtle-${PKGVERSION}/${HS_VERSION}/package-description 
3lib/turtle-${PKGVERSION}/${HS_VERSION}/package-id 
4${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 2${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
5${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle.dyn_hi 3${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle.dyn_hi
6lib/${HS_PLATFORM}/${HS_PKGID}/Turtle.hi 4lib/${HS_PLATFORM}/${HS_PKGID}/Turtle.hi
7${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle.p_hi 5${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle.p_hi
8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Bytes.dyn_hi 6${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Bytes.dyn_hi
9lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Bytes.hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Bytes.hi
10${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Bytes.p_hi 8${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Bytes.p_hi
11${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Format.dyn_hi 9${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Format.dyn_hi
12lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Format.hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Format.hi
13${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Format.p_hi 11${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Format.p_hi
14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Internal.dyn_hi 12${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Internal.dyn_hi
15lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Internal.hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Internal.hi
16${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Internal.p_hi 14${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Internal.p_hi
@@ -24,26 +22,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P @@ -24,26 +22,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P
24lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Pattern.hi 22lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Pattern.hi
25${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Pattern.p_hi 23${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Pattern.p_hi
26${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Prelude.dyn_hi 24${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Prelude.dyn_hi
27lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Prelude.hi 25lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Prelude.hi
28${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Prelude.p_hi 26${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Prelude.p_hi
29${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Shell.dyn_hi 27${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Shell.dyn_hi
30lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Shell.hi 28lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Shell.hi
31${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Shell.p_hi 29${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Shell.p_hi
32${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Tutorial.dyn_hi 30${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Tutorial.dyn_hi
33lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Tutorial.hi 31lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Tutorial.hi
34${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Tutorial.p_hi 32${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Turtle/Tutorial.p_hi
35lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 33lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
36${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 34${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 35lib/turtle-${PKGVERSION}/${HS_VERSION}/package-description
 36lib/turtle-${PKGVERSION}/${HS_VERSION}/package-id
37share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/LICENSE 37share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/LICENSE
38${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Bytes.html 38${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Bytes.html
39${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Format.html 39${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Format.html
40${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Line.html 40${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Line.html
41${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Options.html 41${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Options.html
42${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Pattern.html 42${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Pattern.html
43${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Prelude.html 43${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Prelude.html
44${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Shell.html 44${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Shell.html
45${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Tutorial.html 45${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle-Tutorial.html
46${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle.html 46${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/Turtle.html
47${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-37.html 47${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-37.html
48${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-38.html 48${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-38.html
49${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-42.html 49${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-42.html
@@ -67,22 +67,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/tur @@ -67,22 +67,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/tur
67${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-M.html 67${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-M.html
68${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-N.html 68${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-N.html
69${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-O.html 69${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-O.html
70${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-P.html 70${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-P.html
71${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-R.html 71${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-R.html
72${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-S.html 72${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-S.html
73${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-T.html 73${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-T.html
74${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-U.html 74${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-U.html
75${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-V.html 75${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-V.html
76${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-W.html 76${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-W.html
77${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-X.html 77${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-X.html
78${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-Y.html 78${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index-Y.html
79${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index.html 79${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index.html
80${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/doc-index.json 
81${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/haddock-bundle.min.js 80${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/haddock-bundle.min.js
82${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/index.html 81${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/index.html
83${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/linuwial.css 82${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/linuwial.css
84${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/meta.json 83${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/meta.json
85${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/quick-jump.css 84${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/quick-jump.css
86${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/quick-jump.min.js 
87${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/synopsis.png 85${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/synopsis.png
88${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/turtle.haddock 86${PLIST.doc}share/doc/${HS_PLATFORM}/turtle-${PKGVERSION}/html/turtle.haddock