[pkgsrc/trunk]: pkgsrc/archivers Fix build with GHC 9.2

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7548bb45f58c
branches:  trunk
changeset: 373437:7548bb45f58c
user:      pho <pho%pkgsrc.org@localhost>
date:      Fri Feb 11 13:03:40 2022 +0000

description:
Fix build with GHC 9.2

diffstat:

 archivers/hs-tar/distinfo                  |   4 ++--
 archivers/hs-tar/patches/patch-tar.cabal   |  17 ++++++++++++++++-
 archivers/hs-zlib/Makefile                 |   5 ++++-
 archivers/hs-zlib/distinfo                 |   3 ++-
 archivers/hs-zlib/patches/patch-zlib.cabal |  15 +++++++++++++++
 5 files changed, 39 insertions(+), 5 deletions(-)

diffs (89 lines):

diff -r 19626b27758b -r 7548bb45f58c archivers/hs-tar/distinfo
--- a/archivers/hs-tar/distinfo Fri Feb 11 13:03:16 2022 +0000
+++ b/archivers/hs-tar/distinfo Fri Feb 11 13:03:40 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 09:57:07 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/11 13:03:51 pho Exp $
 
 BLAKE2s (tar-0.5.1.1.tar.gz) = 48de9f5ef6affeb1cd05abc038947443e39e6671d345b920c789343bd54acc96
 SHA512 (tar-0.5.1.1.tar.gz) = 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
 Size (tar-0.5.1.1.tar.gz) = 39155 bytes
-SHA1 (patch-tar.cabal) = f69fe9fda4e4f833213355f1565cfb723800a000
+SHA1 (patch-tar.cabal) = e15673875115bbb22eeb9ebc38d8b02653787010
diff -r 19626b27758b -r 7548bb45f58c archivers/hs-tar/patches/patch-tar.cabal
--- a/archivers/hs-tar/patches/patch-tar.cabal  Fri Feb 11 13:03:16 2022 +0000
+++ b/archivers/hs-tar/patches/patch-tar.cabal  Fri Feb 11 13:03:40 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-tar.cabal,v 1.1 2021/04/23 00:21:47 pho Exp $
+$NetBSD: patch-tar.cabal,v 1.2 2022/02/11 13:03:51 pho Exp $
 
 Relax the dependency constraint. The package is known to be compatible
 with GHC 9.
@@ -14,3 +14,18 @@
                   filepath             < 1.5,
                   array                < 0.6,
                   containers >= 0.2 && < 0.7,
+@@ -49,12 +49,12 @@ library
+   if flag(old-time)
+     build-depends: directory < 1.2, old-time < 1.2
+   else
+-    build-depends: directory >= 1.2 && < 1.4, time < 1.10
++    build-depends: directory >= 1.2 && < 1.4, time < 1.13
+ 
+   if flag(old-bytestring)
+     build-depends: bytestring-builder >= 0.10.4.0.2 && < 0.11, bytestring == 0.9.*
+   else
+-    build-depends: bytestring == 0.10.*
++    build-depends: bytestring >= 0.10 && < 0.12
+ 
+   if !impl(ghc >= 8.0)
+     build-depends: semigroups == 0.18.*
diff -r 19626b27758b -r 7548bb45f58c archivers/hs-zlib/Makefile
--- a/archivers/hs-zlib/Makefile        Fri Feb 11 13:03:16 2022 +0000
+++ b/archivers/hs-zlib/Makefile        Fri Feb 11 13:03:40 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/18 02:48:01 pho Exp $
+# $NetBSD: Makefile,v 1.8 2022/02/11 13:03:40 pho Exp $
 
 DISTNAME=      zlib-0.6.2.3
 PKGREVISION=   2
@@ -8,6 +8,9 @@
 COMMENT=       Compression and decompression in the gzip and zlib formats
 LICENSE=       modified-bsd
 
+USE_TOOLS+=            pkg-config
+CONFIGURE_ARGS+=       -fpkg-config
+
 .include "../../mk/haskell.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 19626b27758b -r 7548bb45f58c archivers/hs-zlib/distinfo
--- a/archivers/hs-zlib/distinfo        Fri Feb 11 13:03:16 2022 +0000
+++ b/archivers/hs-zlib/distinfo        Fri Feb 11 13:03:40 2022 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 09:57:07 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/02/11 13:03:40 pho Exp $
 
 BLAKE2s (zlib-0.6.2.3.tar.gz) = 3b4b71371c3dd469f741104870809b76bad688a370b45a4d4d43d5f0c5fa9f60
 SHA512 (zlib-0.6.2.3.tar.gz) = 535fc711af639967c032791c6a0c09680ac186c706e02a28cfabd9b2dcddc84a6ee5f6007e2ed67c1dc19dd6d561cb821d8840dba7386b63cc002418c4d5040a
 Size (zlib-0.6.2.3.tar.gz) = 149186 bytes
+SHA1 (patch-zlib.cabal) = f7795814dac916afe2fa3e0c2d25b12ce63fd43a
diff -r 19626b27758b -r 7548bb45f58c archivers/hs-zlib/patches/patch-zlib.cabal
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/hs-zlib/patches/patch-zlib.cabal        Fri Feb 11 13:03:40 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-zlib.cabal,v 1.1 2022/02/11 13:03:40 pho Exp $
+
+Fix build with GHC 9.2
+
+--- zlib.cabal.orig    2001-09-09 01:46:40.000000000 +0000
++++ zlib.cabal
+@@ -91,7 +91,7 @@ library
+   if impl(ghc >= 7.6)
+     other-extensions: CApiFFI
+ 
+-  build-depends:   base >= 4 && < 4.16,
++  build-depends:   base >= 4 && < 5,
+                    bytestring >= 0.9 && < 0.12
+   if impl(ghc >= 7.0 && < 8.0.3)
+     build-depends: ghc-prim