Fix build with GHC 9

4 files changed, 99 insertions, 84 deletions

diff --git a/textproc/hs-HsYAML/Makefile b/textproc/hs-HsYAML/Makefile
index 0b3a053e6da..f3828e25db5 100644
--- a/textproc/hs-HsYAML/Makefile
+++ b/textproc/hs-HsYAML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/02/18 15:07:27 mef Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/24 14:38:12 pho Exp $
 
 DISTNAME=	HsYAML-0.2.1.0
 CATEGORIES=	textproc
@@ -7,6 +7,5 @@ MAINTAINER=	pho@cielonegro.org
 COMMENT=	Pure Haskell YAML 1.2 processor
 LICENSE=	gnu-gpl-v2
 
-BUILDLINK_API_DEPENDS.ghc+=	ghc<8.10
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hs-HsYAML/PLIST b/textproc/hs-HsYAML/PLIST
index 3c5776cacdc..eafc1dfa1cd 100644
--- a/textproc/hs-HsYAML/PLIST
+++ b/textproc/hs-HsYAML/PLIST
@@ -1,82 +1,82 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:14 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Data/DList.dyn_hi
-${HS_IMPL}/Data/DList.hi
-${HS_IMPL}/Data/DList.p_hi
-${HS_IMPL}/Data/YAML.dyn_hi
-${HS_IMPL}/Data/YAML.hi
-${HS_IMPL}/Data/YAML.p_hi
-${HS_IMPL}/Data/YAML/Dumper.dyn_hi
-${HS_IMPL}/Data/YAML/Dumper.hi
-${HS_IMPL}/Data/YAML/Dumper.p_hi
-${HS_IMPL}/Data/YAML/Event.dyn_hi
-${HS_IMPL}/Data/YAML/Event.hi
-${HS_IMPL}/Data/YAML/Event.p_hi
-${HS_IMPL}/Data/YAML/Event/Internal.dyn_hi
-${HS_IMPL}/Data/YAML/Event/Internal.hi
-${HS_IMPL}/Data/YAML/Event/Internal.p_hi
-${HS_IMPL}/Data/YAML/Event/Writer.dyn_hi
-${HS_IMPL}/Data/YAML/Event/Writer.hi
-${HS_IMPL}/Data/YAML/Event/Writer.p_hi
-${HS_IMPL}/Data/YAML/Internal.dyn_hi
-${HS_IMPL}/Data/YAML/Internal.hi
-${HS_IMPL}/Data/YAML/Internal.p_hi
-${HS_IMPL}/Data/YAML/Loader.dyn_hi
-${HS_IMPL}/Data/YAML/Loader.hi
-${HS_IMPL}/Data/YAML/Loader.p_hi
-${HS_IMPL}/Data/YAML/Pos.dyn_hi
-${HS_IMPL}/Data/YAML/Pos.hi
-${HS_IMPL}/Data/YAML/Pos.p_hi
-${HS_IMPL}/Data/YAML/Schema.dyn_hi
-${HS_IMPL}/Data/YAML/Schema.hi
-${HS_IMPL}/Data/YAML/Schema.p_hi
-${HS_IMPL}/Data/YAML/Schema/Internal.dyn_hi
-${HS_IMPL}/Data/YAML/Schema/Internal.hi
-${HS_IMPL}/Data/YAML/Schema/Internal.p_hi
-${HS_IMPL}/Data/YAML/Token.dyn_hi
-${HS_IMPL}/Data/YAML/Token.hi
-${HS_IMPL}/Data/YAML/Token.p_hi
-${HS_IMPL}/Data/YAML/Token/Encoding.dyn_hi
-${HS_IMPL}/Data/YAML/Token/Encoding.hi
-${HS_IMPL}/Data/YAML/Token/Encoding.p_hi
-${HS_IMPL}/Util.dyn_hi
-${HS_IMPL}/Util.hi
-${HS_IMPL}/Util.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 14:38:12 pho Exp $
+lib/HsYAML-${PKGVERSION}/${HS_VERSION}/package-description
+lib/HsYAML-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/DList.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/DList.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/DList.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Dumper.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Dumper.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Dumper.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Internal.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Internal.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Internal.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Writer.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Writer.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Event/Writer.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Internal.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Internal.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Internal.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Loader.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Loader.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Loader.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Pos.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Pos.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Pos.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema/Internal.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema/Internal.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Schema/Internal.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token/Encoding.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token/Encoding.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/YAML/Token/Encoding.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Util.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Util.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Util.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_DOCS}/LICENSE.GPLv2
-${HS_DOCS}/LICENSE.GPLv3
-${HS_DOCS}/html/Data-YAML-Event.html
-${HS_DOCS}/html/Data-YAML-Schema.html
-${HS_DOCS}/html/Data-YAML-Token.html
-${HS_DOCS}/html/Data-YAML.html
-${HS_DOCS}/html/HsYAML.haddock
-${HS_DOCS}/html/doc-index-46.html
-${HS_DOCS}/html/doc-index-A.html
-${HS_DOCS}/html/doc-index-All.html
-${HS_DOCS}/html/doc-index-B.html
-${HS_DOCS}/html/doc-index-C.html
-${HS_DOCS}/html/doc-index-D.html
-${HS_DOCS}/html/doc-index-E.html
-${HS_DOCS}/html/doc-index-F.html
-${HS_DOCS}/html/doc-index-I.html
-${HS_DOCS}/html/doc-index-J.html
-${HS_DOCS}/html/doc-index-K.html
-${HS_DOCS}/html/doc-index-L.html
-${HS_DOCS}/html/doc-index-M.html
-${HS_DOCS}/html/doc-index-N.html
-${HS_DOCS}/html/doc-index-P.html
-${HS_DOCS}/html/doc-index-S.html
-${HS_DOCS}/html/doc-index-T.html
-${HS_DOCS}/html/doc-index-U.html
-${HS_DOCS}/html/doc-index-W.html
-${HS_DOCS}/html/doc-index-Y.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/LICENSE.GPLv2
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/LICENSE.GPLv3
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML-Event.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML-Schema.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML-Token.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/Data-YAML.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/HsYAML.haddock
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-46.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-A.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-All.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-B.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-C.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-D.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-E.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-F.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-I.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-J.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-K.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-L.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-M.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-N.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-P.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-S.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-T.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-U.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-W.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index-Y.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/HsYAML-${PKGVERSION}/html/synopsis.png
diff --git a/textproc/hs-HsYAML/distinfo b/textproc/hs-HsYAML/distinfo
index fa22f30f5ba..5e736cd384f 100644
--- a/textproc/hs-HsYAML/distinfo
+++ b/textproc/hs-HsYAML/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/01/15 07:03:50 pho Exp $
+$NetBSD: distinfo,v 1.2 2021/04/24 14:38:12 pho Exp $
 
 SHA1 (HsYAML-0.2.1.0.tar.gz) = 4a6799043e7f0b21c953f33f71d1f4639326a2ad
 RMD160 (HsYAML-0.2.1.0.tar.gz) = 5ae75485a1f2d5ce46774d8eb2c7d3fb327a6c9b
 SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
 Size (HsYAML-0.2.1.0.tar.gz) = 83976 bytes
+SHA1 (patch-HsYAML.cabal) = 1d8ea96161e4447f6b239ee253ad63258bf95003
diff --git a/textproc/hs-HsYAML/patches/patch-HsYAML.cabal b/textproc/hs-HsYAML/patches/patch-HsYAML.cabal
new file mode 100644
index 00000000000..1538ede13cf
--- /dev/null
+++ b/textproc/hs-HsYAML/patches/patch-HsYAML.cabal
@@ -0,0 +1,15 @@
+$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