Fix build with GHC 9

3 files changed, 58 insertions, 42 deletions

diff --git a/textproc/hs-regex-pcre/PLIST b/textproc/hs-regex-pcre/PLIST
index e54d1d8ed98..e3b503b1872 100644
--- a/textproc/hs-regex-pcre/PLIST
+++ b/textproc/hs-regex-pcre/PLIST
@@ -1,42 +1,42 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:17 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 16:38:04 pho Exp $
+lib/regex-pcre-${PKGVERSION}/${HS_VERSION}/package-description
+lib/regex-pcre-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Paths_regex_pcre.dyn_hi
-${HS_IMPL}/Paths_regex_pcre.hi
-${HS_IMPL}/Paths_regex_pcre.p_hi
-${HS_IMPL}/Text/Regex/PCRE.dyn_hi
-${HS_IMPL}/Text/Regex/PCRE.hi
-${HS_IMPL}/Text/Regex/PCRE.p_hi
-${HS_IMPL}/Text/Regex/PCRE/ByteString.dyn_hi
-${HS_IMPL}/Text/Regex/PCRE/ByteString.hi
-${HS_IMPL}/Text/Regex/PCRE/ByteString.p_hi
-${HS_IMPL}/Text/Regex/PCRE/ByteString/Lazy.dyn_hi
-${HS_IMPL}/Text/Regex/PCRE/ByteString/Lazy.hi
-${HS_IMPL}/Text/Regex/PCRE/ByteString/Lazy.p_hi
-${HS_IMPL}/Text/Regex/PCRE/Sequence.dyn_hi
-${HS_IMPL}/Text/Regex/PCRE/Sequence.hi
-${HS_IMPL}/Text/Regex/PCRE/Sequence.p_hi
-${HS_IMPL}/Text/Regex/PCRE/String.dyn_hi
-${HS_IMPL}/Text/Regex/PCRE/String.hi
-${HS_IMPL}/Text/Regex/PCRE/String.p_hi
-${HS_IMPL}/Text/Regex/PCRE/Wrap.dyn_hi
-${HS_IMPL}/Text/Regex/PCRE/Wrap.hi
-${HS_IMPL}/Text/Regex/PCRE/Wrap.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Text-Regex-PCRE-ByteString-Lazy.html
-${HS_DOCS}/html/Text-Regex-PCRE-ByteString.html
-${HS_DOCS}/html/Text-Regex-PCRE-Sequence.html
-${HS_DOCS}/html/Text-Regex-PCRE-String.html
-${HS_DOCS}/html/Text-Regex-PCRE-Wrap.html
-${HS_DOCS}/html/Text-Regex-PCRE.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/regex-pcre.haddock
-${HS_DOCS}/html/synopsis.png
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_pcre.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_pcre.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_pcre.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/ByteString.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/ByteString.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/ByteString.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/ByteString/Lazy.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/ByteString/Lazy.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/ByteString/Lazy.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/Sequence.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/Sequence.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/Sequence.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/String.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/String.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/String.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/Wrap.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/Wrap.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/PCRE/Wrap.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}/regex-pcre-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/Text-Regex-PCRE-ByteString-Lazy.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/Text-Regex-PCRE-ByteString.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/Text-Regex-PCRE-Sequence.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/Text-Regex-PCRE-String.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/Text-Regex-PCRE-Wrap.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/Text-Regex-PCRE.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/regex-pcre.haddock
+share/doc/${HS_PLATFORM}/regex-pcre-${PKGVERSION}/html/synopsis.png
diff --git a/textproc/hs-regex-pcre/distinfo b/textproc/hs-regex-pcre/distinfo
index 267f19ad9c4..945e11e8191 100644
--- a/textproc/hs-regex-pcre/distinfo
+++ b/textproc/hs-regex-pcre/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/01/03 06:18:21 pho Exp $
+$NetBSD: distinfo,v 1.2 2021/04/24 16:38:04 pho Exp $
 
 SHA1 (regex-pcre-0.95.0.0.tar.gz) = 97e11329e4cc7e742dbf82c89e39fa5353c84ac2
 RMD160 (regex-pcre-0.95.0.0.tar.gz) = 0fa157c65fecf5676b73e12f65853db4dec4d9ca
 SHA512 (regex-pcre-0.95.0.0.tar.gz) = 7c9ed0edd0c44d7118313c298c2658858117dd89eb7956566f5bb2fb75f2aaed70d201fda4102c46206b9951013bafee654ff39ed3c4bf9c5086f6c0cc217bdb
 Size (regex-pcre-0.95.0.0.tar.gz) = 9766 bytes
+SHA1 (patch-regex-pcre.cabal) = 9ecfc72485412437abeb56b1db40da05024f86eb
diff --git a/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal b/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal
new file mode 100644
index 00000000000..a1ff3055754
--- /dev/null
+++ b/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal
@@ -0,0 +1,15 @@
+$NetBSD: patch-regex-pcre.cabal,v 1.1 2021/04/24 16:38:04 pho Exp $
+
+Fix build with GHC 9.
+
+--- regex-pcre.cabal.orig	2001-09-09 01:46:40.000000000 +0000
++++ regex-pcre.cabal
+@@ -54,7 +54,7 @@ library
+       FlexibleInstances
+ 
+   build-depends: regex-base == 0.94.*
+-               , base       >= 4.3 && < 4.14
++               , base       >= 4.3 && < 5
+                , containers >= 0.4 && < 0.7
+                , bytestring >= 0.9 && < 0.11
+                , array      >= 0.3 && < 0.6