diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile index 2e4fa574520f..3dde87cf271c 100644 --- a/archivers/hs-zlib/Makefile +++ b/archivers/hs-zlib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2022/02/26 03:57:43 pho Exp $ +# $NetBSD: Makefile,v 1.11 2023/01/25 09:48:10 pho Exp $ -DISTNAME= zlib-0.6.2.3 -PKGREVISION= 4 +DISTNAME= zlib-0.6.3.0 CATEGORIES= archivers MAINTAINER= pho@cielonegro.org diff --git a/archivers/hs-zlib/PLIST b/archivers/hs-zlib/PLIST index ce6e7fe70118..88fa00634dfa 100644 --- a/archivers/hs-zlib/PLIST +++ b/archivers/hs-zlib/PLIST @@ -1,37 +1,37 @@ -@comment $NetBSD: PLIST,v 1.5 2021/04/23 04:05:24 pho Exp $ -lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/GZip.dyn_hi +@comment $NetBSD: PLIST,v 1.6 2023/01/25 09:48:10 pho Exp $ +${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/GZip.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/GZip.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/GZip.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/GZip.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/ByteStringCompat.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/ByteStringCompat.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/ByteStringCompat.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/ByteStringCompat.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Internal.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/ByteStringCompat.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Internal.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Internal.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Internal.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Raw.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Internal.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Raw.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Raw.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Raw.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Stream.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Raw.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Stream.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Stream.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Stream.p_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Compression/Zlib/Stream.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a -lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a lib/zlib-${PKGVERSION}/${HS_VERSION}/package-description lib/zlib-${PKGVERSION}/${HS_VERSION}/package-id -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/LICENSE -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-GZip.html -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-Zlib-Internal.html -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-Zlib-Raw.html -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-Zlib.html -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/doc-index.html -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/haddock-bundle.min.js -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/index.html -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/linuwial.css -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/meta.json -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/quick-jump.css -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/synopsis.png -share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/zlib.haddock +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/LICENSE +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-GZip.html +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-Zlib-Internal.html +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-Zlib-Raw.html +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/Codec-Compression-Zlib.html +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/haddock-bundle.min.js +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/linuwial.css +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/meta.json +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/synopsis.png +${PLIST.doc}share/doc/${HS_PLATFORM}/zlib-${PKGVERSION}/html/zlib.haddock diff --git a/archivers/hs-zlib/buildlink3.mk b/archivers/hs-zlib/buildlink3.mk index 9c340ed64d67..e036bcc2611a 100644 --- a/archivers/hs-zlib/buildlink3.mk +++ b/archivers/hs-zlib/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2022/02/26 03:57:43 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2023/01/25 09:48:10 pho Exp $ BUILDLINK_TREE+= hs-zlib .if !defined(HS_ZLIB_BUILDLINK3_MK) HS_ZLIB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-zlib+= hs-zlib>=0.6.2 -BUILDLINK_ABI_DEPENDS.hs-zlib+= hs-zlib>=0.6.2.3nb4 +BUILDLINK_API_DEPENDS.hs-zlib+= hs-zlib>=0.6.3 +BUILDLINK_ABI_DEPENDS.hs-zlib+= hs-zlib>=0.6.3.0 BUILDLINK_PKGSRCDIR.hs-zlib?= ../../archivers/hs-zlib .include "../../devel/zlib/buildlink3.mk" diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo index da81862d3e68..84f3ed54f123 100644 --- a/archivers/hs-zlib/distinfo +++ b/archivers/hs-zlib/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.7 2022/02/11 13:03:40 pho Exp $ +$NetBSD: distinfo,v 1.8 2023/01/25 09:48:10 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 +BLAKE2s (zlib-0.6.3.0.tar.gz) = 4ee77f172211ba7eeb4994ba53e9dd827b5af687e396e26f55054809110cdd84 +SHA512 (zlib-0.6.3.0.tar.gz) = 95daae13c5d5458fd7c610ce4cc686dc7af477364c4dcf3d31abede84f6e4b4e70ea255f7ded586d46d9bb6298d19c93b8856eec16c6002265ed076e52bf9a21 +Size (zlib-0.6.3.0.tar.gz) = 369595 bytes diff --git a/archivers/hs-zlib/patches/patch-zlib.cabal b/archivers/hs-zlib/patches/patch-zlib.cabal deleted file mode 100644 index 3104a6e300e3..000000000000 --- a/archivers/hs-zlib/patches/patch-zlib.cabal +++ /dev/null @@ -1,15 +0,0 @@ -$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