CVS commit: pkgsrc/textproc/hs-regex-posix

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Apr 24 16:41:17 UTC 2021

Modified Files:
        pkgsrc/textproc/hs-regex-posix: PLIST distinfo
Added Files:
        pkgsrc/textproc/hs-regex-posix/patches: patch-regex-posix.cabal

Log Message:
Fix build with GHC 9


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/hs-regex-posix/PLIST \
    pkgsrc/textproc/hs-regex-posix/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/hs-regex-posix/patches/patch-regex-posix.cabal

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/hs-regex-posix/PLIST
diff -u pkgsrc/textproc/hs-regex-posix/PLIST:1.3 pkgsrc/textproc/hs-regex-posix/PLIST:1.4
--- pkgsrc/textproc/hs-regex-posix/PLIST:1.3    Mon May 11 17:52:17 2020
+++ pkgsrc/textproc/hs-regex-posix/PLIST        Sat Apr 24 16:41:17 2021
@@ -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
Index: pkgsrc/textproc/hs-regex-posix/distinfo
diff -u pkgsrc/textproc/hs-regex-posix/distinfo:1.3 pkgsrc/textproc/hs-regex-posix/distinfo:1.4
--- pkgsrc/textproc/hs-regex-posix/distinfo:1.3 Thu Jan  2 15:03:19 2020
+++ pkgsrc/textproc/hs-regex-posix/distinfo     Sat Apr 24 16:41:17 2021
@@ -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

Added files:

Index: pkgsrc/textproc/hs-regex-posix/patches/patch-regex-posix.cabal
diff -u /dev/null pkgsrc/textproc/hs-regex-posix/patches/patch-regex-posix.cabal:1.1
--- /dev/null   Sat Apr 24 16:41:17 2021
+++ pkgsrc/textproc/hs-regex-posix/patches/patch-regex-posix.cabal      Sat Apr 24 16:41:17 2021
@@ -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