Sat Apr 24 14:38:12 2021 UTC ()
Fix build with GHC 9


(pho)
diff -r1.3 -r1.4 pkgsrc/textproc/hs-HsYAML/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/hs-HsYAML/PLIST
diff -r1.1 -r1.2 pkgsrc/textproc/hs-HsYAML/distinfo
diff -r0 -r1.1 pkgsrc/textproc/hs-HsYAML/patches/patch-HsYAML.cabal
cvs diff -r1.3 -r1.4 pkgsrc/textproc/hs-HsYAML/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/hs-HsYAML/Makefile 2021/02/18 15:07:27 1.3
+++ pkgsrc/textproc/hs-HsYAML/Makefile 2021/04/24 14:38:12 1.4
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1# $NetBSD: Makefile,v 1.3 2021/02/18 15:07:27 mef Exp $ 1# $NetBSD: Makefile,v 1.4 2021/04/24 14:38:12 pho Exp $
2 2
3DISTNAME= HsYAML-0.2.1.0 3DISTNAME= HsYAML-0.2.1.0
4CATEGORIES= textproc 4CATEGORIES= textproc
5 5
6MAINTAINER= pho@cielonegro.org 6MAINTAINER= pho@cielonegro.org
7COMMENT= Pure Haskell YAML 1.2 processor 7COMMENT= Pure Haskell YAML 1.2 processor
8LICENSE= gnu-gpl-v2 8LICENSE= gnu-gpl-v2
9 9
10BUILDLINK_API_DEPENDS.ghc+= ghc<8.10 
11.include "../../mk/haskell.mk" 10.include "../../mk/haskell.mk"
12.include "../../mk/bsd.pkg.mk" 11.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/textproc/hs-HsYAML/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/hs-HsYAML/PLIST 2020/05/11 17:52:14 1.1
+++ pkgsrc/textproc/hs-HsYAML/PLIST 2021/04/24 14:38:12 1.2
@@ -1,82 +1,82 @@ @@ -1,82 +1,82 @@
1@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:14 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.2 2021/04/24 14:38:12 pho Exp $
2${HS_INTF}/package-description 2lib/HsYAML-${PKGVERSION}/${HS_VERSION}/package-description
3${HS_INTF}/package-id 3lib/HsYAML-${PKGVERSION}/${HS_VERSION}/package-id
4${HS_IMPL}/Data/DList.dyn_hi 4lib/${HS_PLATFORM}/${HS_PKGID}/Data/DList.dyn_hi
5${HS_IMPL}/Data/DList.hi 5lib/${HS_PLATFORM}/${HS_PKGID}/Data/DList.hi
6${HS_IMPL}/Data/DList.p_hi 6lib/${HS_PLATFORM}/${HS_PKGID}/Data/DList.p_hi
7${HS_IMPL}/Data/YAML.dyn_hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML.dyn_hi
8${HS_IMPL}/Data/YAML.hi 8lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML.hi
9${HS_IMPL}/Data/YAML.p_hi 9lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML.p_hi
10${HS_IMPL}/Data/YAML/Dumper.dyn_hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Dumper.dyn_hi
11${HS_IMPL}/Data/YAML/Dumper.hi 11lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Dumper.hi
12${HS_IMPL}/Data/YAML/Dumper.p_hi 12lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Dumper.p_hi
13${HS_IMPL}/Data/YAML/Event.dyn_hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event.dyn_hi
14${HS_IMPL}/Data/YAML/Event.hi 14lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event.hi
15${HS_IMPL}/Data/YAML/Event.p_hi 15lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event.p_hi
16${HS_IMPL}/Data/YAML/Event/Internal.dyn_hi 16lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Internal.dyn_hi
17${HS_IMPL}/Data/YAML/Event/Internal.hi 17lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Internal.hi
18${HS_IMPL}/Data/YAML/Event/Internal.p_hi 18lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Internal.p_hi
19${HS_IMPL}/Data/YAML/Event/Writer.dyn_hi 19lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Writer.dyn_hi
20${HS_IMPL}/Data/YAML/Event/Writer.hi 20lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Writer.hi
21${HS_IMPL}/Data/YAML/Event/Writer.p_hi 21lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Writer.p_hi
22${HS_IMPL}/Data/YAML/Internal.dyn_hi 22lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Internal.dyn_hi
23${HS_IMPL}/Data/YAML/Internal.hi 23lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Internal.hi
24${HS_IMPL}/Data/YAML/Internal.p_hi 24lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Internal.p_hi
25${HS_IMPL}/Data/YAML/Loader.dyn_hi 25lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Loader.dyn_hi
26${HS_IMPL}/Data/YAML/Loader.hi 26lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Loader.hi
27${HS_IMPL}/Data/YAML/Loader.p_hi 27lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Loader.p_hi
28${HS_IMPL}/Data/YAML/Pos.dyn_hi 28lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Pos.dyn_hi
29${HS_IMPL}/Data/YAML/Pos.hi 29lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Pos.hi
30${HS_IMPL}/Data/YAML/Pos.p_hi 30lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Pos.p_hi
31${HS_IMPL}/Data/YAML/Schema.dyn_hi 31lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema.dyn_hi
32${HS_IMPL}/Data/YAML/Schema.hi 32lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema.hi
33${HS_IMPL}/Data/YAML/Schema.p_hi 33lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema.p_hi
34${HS_IMPL}/Data/YAML/Schema/Internal.dyn_hi 34lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema/Internal.dyn_hi
35${HS_IMPL}/Data/YAML/Schema/Internal.hi 35lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema/Internal.hi
36${HS_IMPL}/Data/YAML/Schema/Internal.p_hi 36lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema/Internal.p_hi
37${HS_IMPL}/Data/YAML/Token.dyn_hi 37lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token.dyn_hi
38${HS_IMPL}/Data/YAML/Token.hi 38lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token.hi
39${HS_IMPL}/Data/YAML/Token.p_hi 39lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token.p_hi
40${HS_IMPL}/Data/YAML/Token/Encoding.dyn_hi 40lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token/Encoding.dyn_hi
41${HS_IMPL}/Data/YAML/Token/Encoding.hi 41lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token/Encoding.hi
42${HS_IMPL}/Data/YAML/Token/Encoding.p_hi 42lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token/Encoding.p_hi
43${HS_IMPL}/Util.dyn_hi 43lib/${HS_PLATFORM}/${HS_PKGID}/Util.dyn_hi
44${HS_IMPL}/Util.hi 44lib/${HS_PLATFORM}/${HS_PKGID}/Util.hi
45${HS_IMPL}/Util.p_hi 45lib/${HS_PLATFORM}/${HS_PKGID}/Util.p_hi
46${HS_IMPL}/libHS${HS_PKGID}.a 46lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
47${HS_IMPL}/libHS${HS_PKGID}_p.a 47lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
48lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 48lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
49${HS_DOCS}/LICENSE.GPLv2 49share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/LICENSE.GPLv2
50${HS_DOCS}/LICENSE.GPLv3 50share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/LICENSE.GPLv3
51${HS_DOCS}/html/Data-YAML-Event.html 51share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML-Event.html
52${HS_DOCS}/html/Data-YAML-Schema.html 52share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML-Schema.html
53${HS_DOCS}/html/Data-YAML-Token.html 53share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML-Token.html
54${HS_DOCS}/html/Data-YAML.html 54share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML.html
55${HS_DOCS}/html/HsYAML.haddock 55share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/HsYAML.haddock
56${HS_DOCS}/html/doc-index-46.html 56share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-46.html
57${HS_DOCS}/html/doc-index-A.html 57share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-A.html
58${HS_DOCS}/html/doc-index-All.html 58share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-All.html
59${HS_DOCS}/html/doc-index-B.html 59share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-B.html
60${HS_DOCS}/html/doc-index-C.html 60share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-C.html
61${HS_DOCS}/html/doc-index-D.html 61share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-D.html
62${HS_DOCS}/html/doc-index-E.html 62share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-E.html
63${HS_DOCS}/html/doc-index-F.html 63share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-F.html
64${HS_DOCS}/html/doc-index-I.html 64share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-I.html
65${HS_DOCS}/html/doc-index-J.html 65share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-J.html
66${HS_DOCS}/html/doc-index-K.html 66share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-K.html
67${HS_DOCS}/html/doc-index-L.html 67share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-L.html
68${HS_DOCS}/html/doc-index-M.html 68share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-M.html
69${HS_DOCS}/html/doc-index-N.html 69share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-N.html
70${HS_DOCS}/html/doc-index-P.html 70share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-P.html
71${HS_DOCS}/html/doc-index-S.html 71share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-S.html
72${HS_DOCS}/html/doc-index-T.html 72share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-T.html
73${HS_DOCS}/html/doc-index-U.html 73share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-U.html
74${HS_DOCS}/html/doc-index-W.html 74share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-W.html
75${HS_DOCS}/html/doc-index-Y.html 75share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-Y.html
76${HS_DOCS}/html/doc-index.html 76share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index.html
77${HS_DOCS}/html/haddock-bundle.min.js 77share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/haddock-bundle.min.js
78${HS_DOCS}/html/index.html 78share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/index.html
79${HS_DOCS}/html/linuwial.css 79share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/linuwial.css
80${HS_DOCS}/html/meta.json 80share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/meta.json
81${HS_DOCS}/html/quick-jump.css 81share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/quick-jump.css
82${HS_DOCS}/html/synopsis.png 82share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/synopsis.png
cvs diff -r1.1 -r1.2 pkgsrc/textproc/hs-HsYAML/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/hs-HsYAML/distinfo 2020/01/15 07:03:50 1.1
+++ pkgsrc/textproc/hs-HsYAML/distinfo 2021/04/24 14:38:12 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2020/01/15 07:03:50 pho Exp $ 1$NetBSD: distinfo,v 1.2 2021/04/24 14:38:12 pho Exp $
2 2
3SHA1 (HsYAML-0.2.1.0.tar.gz) = 4a6799043e7f0b21c953f33f71d1f4639326a2ad 3SHA1 (HsYAML-0.2.1.0.tar.gz) = 4a6799043e7f0b21c953f33f71d1f4639326a2ad
4RMD160 (HsYAML-0.2.1.0.tar.gz) = 5ae75485a1f2d5ce46774d8eb2c7d3fb327a6c9b 4RMD160 (HsYAML-0.2.1.0.tar.gz) = 5ae75485a1f2d5ce46774d8eb2c7d3fb327a6c9b
5SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304 5SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
6Size (HsYAML-0.2.1.0.tar.gz) = 83976 bytes 6Size (HsYAML-0.2.1.0.tar.gz) = 83976 bytes
 7SHA1 (patch-HsYAML.cabal) = 1d8ea96161e4447f6b239ee253ad63258bf95003
File Added: pkgsrc/textproc/hs-HsYAML/patches/Attic/patch-HsYAML.cabal
$NetBSD: patch-HsYAML.cabal,v 1.1 2021/04/24 14:38:12 pho Exp $

Fix build with GHC 9.

--- HsYAML.cabal.orig	2001-09-09 01:46:40.000000000 +0000
+++ HsYAML.cabal
@@ -77,7 +77,7 @@ library
                        Trustworthy
                        TypeSynonymInstances
 
-  build-depends:       base         >=4.5   && <4.14
+  build-depends:       base         >=4.5   && <5
                      , bytestring   >=0.9   && <0.11
                      , containers   >=0.4.2 && <0.7
                      , deepseq      >=1.3.0 && <1.5