[pkgsrc/trunk]: pkgsrc/textproc Fix build with GHC 9

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/textproc Fix build with GHC 9
From: pho <pho%pkgsrc.org@localhost>
Date: Sat, 24 Apr 2021 18:58:14 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/329ac8c5ed6d
branches:  trunk
changeset: 451143:329ac8c5ed6d
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Apr 24 16:38:04 2021 +0000

description:
Fix build with GHC 9

diffstat:

 textproc/hs-regex-pcre/PLIST                            |  82 ++++++++--------
 textproc/hs-regex-pcre/distinfo                         |   3 +-
 textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal   |  15 +++
 textproc/hs-regex-posix/PLIST                           |  82 ++++++++--------
 textproc/hs-regex-posix/distinfo                        |   3 +-
 textproc/hs-regex-posix/patches/patch-regex-posix.cabal |  15 +++
 6 files changed, 116 insertions(+), 84 deletions(-)

diffs (236 lines):

diff -r b2726dc586a6 -r 329ac8c5ed6d textproc/hs-regex-pcre/PLIST
--- a/textproc/hs-regex-pcre/PLIST      Sat Apr 24 16:34:54 2021 +0000
+++ b/textproc/hs-regex-pcre/PLIST      Sat Apr 24 16:38:04 2021 +0000
@@ -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 -r b2726dc586a6 -r 329ac8c5ed6d textproc/hs-regex-pcre/distinfo
--- a/textproc/hs-regex-pcre/distinfo   Sat Apr 24 16:34:54 2021 +0000
+++ b/textproc/hs-regex-pcre/distinfo   Sat Apr 24 16:38:04 2021 +0000
@@ -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 -r b2726dc586a6 -r 329ac8c5ed6d textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/hs-regex-pcre/patches/patch-regex-pcre.cabal     Sat Apr 24 16:38:04 2021 +0000
@@ -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
diff -r b2726dc586a6 -r 329ac8c5ed6d textproc/hs-regex-posix/PLIST
--- a/textproc/hs-regex-posix/PLIST     Sat Apr 24 16:34:54 2021 +0000
+++ b/textproc/hs-regex-posix/PLIST     Sat Apr 24 16:38:04 2021 +0000
@@ -1,42 +1,42 @@
-@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 16:41:17 pho Exp $
+lib/regex-posix-${PKGVERSION}/${HS_VERSION}/package-description
+lib/regex-posix-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Paths_regex_posix.dyn_hi
-${HS_IMPL}/Paths_regex_posix.hi
-${HS_IMPL}/Paths_regex_posix.p_hi
-${HS_IMPL}/Text/Regex/Posix.dyn_hi
-${HS_IMPL}/Text/Regex/Posix.hi
-${HS_IMPL}/Text/Regex/Posix.p_hi
-${HS_IMPL}/Text/Regex/Posix/ByteString.dyn_hi
-${HS_IMPL}/Text/Regex/Posix/ByteString.hi
-${HS_IMPL}/Text/Regex/Posix/ByteString.p_hi
-${HS_IMPL}/Text/Regex/Posix/ByteString/Lazy.dyn_hi
-${HS_IMPL}/Text/Regex/Posix/ByteString/Lazy.hi
-${HS_IMPL}/Text/Regex/Posix/ByteString/Lazy.p_hi
-${HS_IMPL}/Text/Regex/Posix/Sequence.dyn_hi
-${HS_IMPL}/Text/Regex/Posix/Sequence.hi
-${HS_IMPL}/Text/Regex/Posix/Sequence.p_hi
-${HS_IMPL}/Text/Regex/Posix/String.dyn_hi
-${HS_IMPL}/Text/Regex/Posix/String.hi
-${HS_IMPL}/Text/Regex/Posix/String.p_hi
-${HS_IMPL}/Text/Regex/Posix/Wrap.dyn_hi
-${HS_IMPL}/Text/Regex/Posix/Wrap.hi
-${HS_IMPL}/Text/Regex/Posix/Wrap.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Text-Regex-Posix-ByteString-Lazy.html
-${HS_DOCS}/html/Text-Regex-Posix-ByteString.html
-${HS_DOCS}/html/Text-Regex-Posix-Sequence.html
-${HS_DOCS}/html/Text-Regex-Posix-String.html
-${HS_DOCS}/html/Text-Regex-Posix-Wrap.html
-${HS_DOCS}/html/Text-Regex-Posix.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-posix.haddock
-${HS_DOCS}/html/synopsis.png
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_posix.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_posix.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_posix.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/ByteString.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/ByteString.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/ByteString.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/ByteString/Lazy.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/ByteString/Lazy.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/ByteString/Lazy.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/Sequence.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/Sequence.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/Sequence.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/String.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/String.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/String.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/Wrap.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/Wrap.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Posix/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-posix-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/Text-Regex-Posix-ByteString-Lazy.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/Text-Regex-Posix-ByteString.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/Text-Regex-Posix-Sequence.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/Text-Regex-Posix-String.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/Text-Regex-Posix-Wrap.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/Text-Regex-Posix.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/regex-posix.haddock
+share/doc/${HS_PLATFORM}/regex-posix-${PKGVERSION}/html/synopsis.png
diff -r b2726dc586a6 -r 329ac8c5ed6d textproc/hs-regex-posix/distinfo
--- a/textproc/hs-regex-posix/distinfo  Sat Apr 24 16:34:54 2021 +0000
+++ b/textproc/hs-regex-posix/distinfo  Sat Apr 24 16:38:04 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2020/01/02 15:03:19 pho Exp $
+$NetBSD: distinfo,v 1.4 2021/04/24 16:41:17 pho Exp $
 
 SHA1 (regex-posix-0.96.0.0.tar.gz) = 33425ada76edbf02d1de6607a937b57ce141865a
 RMD160 (regex-posix-0.96.0.0.tar.gz) = d0e569bf459edc2d5a23f01e9f9377e16779ad61
 SHA512 (regex-posix-0.96.0.0.tar.gz) = 91bdc672a535cd1a6a65b1ae2adef43605b792ec9f99150fa239ab4353cddad47988ac7baa65673c53be36e83c8fad1511ba85fb5f7b43c51b4ae526d9af248a
 Size (regex-posix-0.96.0.0.tar.gz) = 12529 bytes
+SHA1 (patch-regex-posix.cabal) = eadf81480fe5704f4153aa57f1438259d6c97ebd
diff -r b2726dc586a6 -r 329ac8c5ed6d textproc/hs-regex-posix/patches/patch-regex-posix.cabal
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/hs-regex-posix/patches/patch-regex-posix.cabal   Sat Apr 24 16:38:04 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-regex-posix.cabal,v 1.1 2021/04/24 16:41:17 pho Exp $
+
+Fix build with GHC 9.
+
+--- regex-posix.cabal.orig     2001-09-09 01:46:40.000000000 +0000
++++ regex-posix.cabal
+@@ -66,7 +66,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
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc Update PLIST
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/hs-cgrep Update to cgrep-6.6.32
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc Update PLIST
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/hs-cgrep Update to cgrep-6.6.32
Indexes:
Home | Main Index | Thread Index | Old Index