Fix build with GHC 9

4 files changed, 106 insertions, 91 deletions

diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index c16c11588f4..70325d98617 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/18 15:07:26 mef Exp $
+# $NetBSD: Makefile,v 1.13 2021/04/24 17:07:42 pho Exp $
 
 DISTNAME=	polyparse-1.13
 CATEGORIES=	textproc
@@ -7,6 +7,5 @@ MAINTAINER=	szptvlfn@NetBSD.org
 COMMENT=	Variety of alternative parser combinator libraries
 LICENSE=	gnu-lgpl-v2.1
 
-BUILDLINK_API_DEPENDS.ghc+=	ghc<8.10
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hs-polyparse/PLIST b/textproc/hs-polyparse/PLIST
index a3195926b3d..0c1c652c68e 100644
--- a/textproc/hs-polyparse/PLIST
+++ b/textproc/hs-polyparse/PLIST
@@ -1,89 +1,89 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/11 17:52:17 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.4 2021/04/24 17:07:42 pho Exp $
+lib/polyparse-${PKGVERSION}/${HS_VERSION}/package-description
+lib/polyparse-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Text/Parse.dyn_hi
-${HS_IMPL}/Text/Parse.hi
-${HS_IMPL}/Text/Parse.p_hi
-${HS_IMPL}/Text/Parse/ByteString.dyn_hi
-${HS_IMPL}/Text/Parse/ByteString.hi
-${HS_IMPL}/Text/Parse/ByteString.p_hi
-${HS_IMPL}/Text/ParserCombinators/HuttonMeijer.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/HuttonMeijer.hi
-${HS_IMPL}/Text/ParserCombinators/HuttonMeijer.p_hi
-${HS_IMPL}/Text/ParserCombinators/HuttonMeijerWallace.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/HuttonMeijerWallace.hi
-${HS_IMPL}/Text/ParserCombinators/HuttonMeijerWallace.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly.hi
-${HS_IMPL}/Text/ParserCombinators/Poly.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Base.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Base.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Base.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/ByteString.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/ByteString.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/ByteString.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/ByteStringChar.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/ByteStringChar.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/ByteStringChar.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Lazy.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Lazy.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Lazy.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Lex.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Lex.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Lex.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Parser.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Parser.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Parser.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Plain.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Plain.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Plain.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Result.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Result.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Result.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/State.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/State.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/State.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateLazy.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateLazy.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateLazy.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateParser.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateParser.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateParser.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateText.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateText.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/StateText.p_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Text.dyn_hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Text.hi
-${HS_IMPL}/Text/ParserCombinators/Poly/Text.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/COPYRIGHT
-${HS_DOCS}/LICENCE-LGPL
-${HS_DOCS}/LICENCE-commercial
-${HS_DOCS}/html/Text-Parse-ByteString.html
-${HS_DOCS}/html/Text-Parse.html
-${HS_DOCS}/html/Text-ParserCombinators-HuttonMeijer.html
-${HS_DOCS}/html/Text-ParserCombinators-HuttonMeijerWallace.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-Base.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-ByteString.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-ByteStringChar.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-Lazy.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-Lex.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-Parser.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-Plain.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-Result.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-State.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-StateLazy.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-StateParser.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-StateText.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly-Text.html
-${HS_DOCS}/html/Text-ParserCombinators-Poly.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/polyparse.haddock
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Parse.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Parse.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Parse.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Parse/ByteString.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Parse/ByteString.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Parse/ByteString.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/HuttonMeijer.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/HuttonMeijer.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/HuttonMeijer.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/HuttonMeijerWallace.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/HuttonMeijerWallace.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/HuttonMeijerWallace.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Base.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Base.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Base.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/ByteString.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/ByteString.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/ByteString.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/ByteStringChar.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/ByteStringChar.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/ByteStringChar.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Lazy.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Lazy.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Lazy.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Lex.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Lex.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Lex.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Parser.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Parser.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Parser.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Plain.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Plain.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Plain.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Result.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Result.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Result.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/State.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/State.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/State.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateLazy.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateLazy.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateLazy.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateParser.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateParser.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateParser.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateText.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateText.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/StateText.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Text.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Text.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/ParserCombinators/Poly/Text.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/COPYRIGHT
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/LICENCE-LGPL
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/LICENCE-commercial
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-Parse-ByteString.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-Parse.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-HuttonMeijer.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-HuttonMeijerWallace.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-Base.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-ByteString.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-ByteStringChar.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-Lazy.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-Lex.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-Parser.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-Plain.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-Result.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-State.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-StateLazy.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-StateParser.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-StateText.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly-Text.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/Text-ParserCombinators-Poly.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/polyparse.haddock
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/polyparse-${PKGVERSION}/html/synopsis.png
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index ee34c59e0ce..77d426857ad 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2020/01/02 03:21:09 pho Exp $
+$NetBSD: distinfo,v 1.5 2021/04/24 17:07:42 pho Exp $
 
 SHA1 (polyparse-1.13.tar.gz) = 14fdc1d9b7e30605ab0ec25559ccad29118744fa
 RMD160 (polyparse-1.13.tar.gz) = 2d69cf98cfc034414b0feeb9f92061aeb47ffc9f
 SHA512 (polyparse-1.13.tar.gz) = 3b66a73f97d6b5b6628193f87cae1ae1a68d63df0058532b2ac9a62af82dabe28e15fe1464075a2f436e70a7d20b57e72fdd7831f8b11035ff8117becb08d18e
 Size (polyparse-1.13.tar.gz) = 33144 bytes
+SHA1 (patch-polyparse.cabal) = c3a50519f7a01d584cead71dd8f3f30fe4330fd6
diff --git a/textproc/hs-polyparse/patches/patch-polyparse.cabal b/textproc/hs-polyparse/patches/patch-polyparse.cabal
new file mode 100644
index 00000000000..5746194a571
--- /dev/null
+++ b/textproc/hs-polyparse/patches/patch-polyparse.cabal
@@ -0,0 +1,15 @@
+$NetBSD: patch-polyparse.cabal,v 1.1 2021/04/24 17:07:42 pho Exp $
+
+Fix build with GHC 9.
+
+--- polyparse.cabal.orig	2001-09-09 01:46:40.000000000 +0000
++++ polyparse.cabal
+@@ -47,7 +47,7 @@ source-repository this
+ 
+ library
+   hs-source-dirs:       src
+-  build-depends:        base >= 4.3.1.0 && < 4.14
++  build-depends:        base >= 4.3.1.0 && < 5
+ 
+   if !impl(ghc >= 8.0)
+      build-depends: fail == 4.9.*