CVS commit: pkgsrc/archivers/hs-zlib

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Feb 11 13:03:40 UTC 2022

Modified Files:
        pkgsrc/archivers/hs-zlib: Makefile distinfo
Added Files:
        pkgsrc/archivers/hs-zlib/patches: patch-zlib.cabal

Log Message:
Fix build with GHC 9.2


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/archivers/hs-zlib/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/archivers/hs-zlib/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/hs-zlib/patches/patch-zlib.cabal

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

Modified files:

Index: pkgsrc/archivers/hs-zlib/Makefile
diff -u pkgsrc/archivers/hs-zlib/Makefile:1.7 pkgsrc/archivers/hs-zlib/Makefile:1.8
--- pkgsrc/archivers/hs-zlib/Makefile:1.7       Tue Jan 18 02:48:01 2022
+++ pkgsrc/archivers/hs-zlib/Makefile   Fri Feb 11 13:03:40 2022
@@ -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 @@ MAINTAINER=     pho%cielonegro.org@localhost
 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"

Index: pkgsrc/archivers/hs-zlib/distinfo
diff -u pkgsrc/archivers/hs-zlib/distinfo:1.6 pkgsrc/archivers/hs-zlib/distinfo:1.7
--- pkgsrc/archivers/hs-zlib/distinfo:1.6       Tue Oct 26 09:57:07 2021
+++ pkgsrc/archivers/hs-zlib/distinfo   Fri Feb 11 13:03:40 2022
@@ -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

Added files:

Index: pkgsrc/archivers/hs-zlib/patches/patch-zlib.cabal
diff -u /dev/null pkgsrc/archivers/hs-zlib/patches/patch-zlib.cabal:1.1
--- /dev/null   Fri Feb 11 13:03:40 2022
+++ pkgsrc/archivers/hs-zlib/patches/patch-zlib.cabal   Fri Feb 11 13:03:40 2022
@@ -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