From a844b886a157b03ff2a66677c9699b135deea1aa Mon Sep 17 00:00:00 2001 From: pho Date: Wed, 25 Jan 2023 09:57:38 +0000 Subject: [PATCH] archivers/hs-tar: Fix build with GHC 9.4 --- archivers/hs-tar/Makefile | 8 ++- archivers/hs-tar/PLIST | 76 ++++++++++++------------ archivers/hs-tar/distinfo | 3 +- archivers/hs-tar/patches/patch-tar.cabal | 31 ---------- 4 files changed, 46 insertions(+), 72 deletions(-) delete mode 100644 archivers/hs-tar/patches/patch-tar.cabal diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile index 3ee429f07c21..93f6413e1b63 100644 --- a/archivers/hs-tar/Makefile +++ b/archivers/hs-tar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2022/02/26 03:57:43 pho Exp $ +# $NetBSD: Makefile,v 1.9 2023/01/25 09:57:38 pho Exp $ DISTNAME= tar-0.5.1.1 PKGREVISION= 4 @@ -8,5 +8,11 @@ MAINTAINER= pho@cielonegro.org COMMENT= Reading, writing, and manipulating ".tar" archive files LICENSE= modified-bsd +HASKELL_UNRESTRICT_DEPENDENCIES+= \ + base \ + bytestring \ + directory \ + time + .include "../../mk/haskell.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/hs-tar/PLIST b/archivers/hs-tar/PLIST index 5783bc1940fc..924db1404820 100644 --- a/archivers/hs-tar/PLIST +++ b/archivers/hs-tar/PLIST @@ -1,52 +1,52 @@ -@comment $NetBSD: PLIST,v 1.2 2021/04/23 03:59:26 pho Exp $ +@comment $NetBSD: PLIST,v 1.3 2023/01/25 09:57:38 pho Exp $ lib/tar-${PKGVERSION}/${HS_VERSION}/package-description lib/tar-${PKGVERSION}/${HS_VERSION}/package-id -lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar.dyn_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Check.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Check.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Check.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Check.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Entry.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Check.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Entry.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Entry.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Entry.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Entry.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/IntTrie.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/IntTrie.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/IntTrie.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/IntTrie.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/StringTable.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/IntTrie.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/StringTable.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/StringTable.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/StringTable.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Pack.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Index/StringTable.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Pack.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Pack.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Pack.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Read.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Pack.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Read.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Read.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Read.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Types.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Read.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Types.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Types.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Types.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Unpack.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Types.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Unpack.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Unpack.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Unpack.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Write.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Unpack.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Write.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Write.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Write.p_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Codec/Archive/Tar/Write.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}/tar-${PKGVERSION}/LICENSE -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar-Check.html -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar-Entry.html -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar-Index.html -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar.html -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/doc-index.html -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/haddock-bundle.min.js -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/index.html -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/linuwial.css -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/meta.json -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/quick-jump.css -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/synopsis.png -share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/tar.haddock +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/LICENSE +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar-Check.html +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar-Entry.html +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar-Index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/Codec-Archive-Tar.html +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/haddock-bundle.min.js +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/linuwial.css +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/meta.json +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/synopsis.png +${PLIST.doc}share/doc/${HS_PLATFORM}/tar-${PKGVERSION}/html/tar.haddock diff --git a/archivers/hs-tar/distinfo b/archivers/hs-tar/distinfo index 363c1dcb4b1c..02832e3f052e 100644 --- a/archivers/hs-tar/distinfo +++ b/archivers/hs-tar/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2022/02/11 13:03:51 pho Exp $ +$NetBSD: distinfo,v 1.6 2023/01/25 09:57:38 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) = e15673875115bbb22eeb9ebc38d8b02653787010 diff --git a/archivers/hs-tar/patches/patch-tar.cabal b/archivers/hs-tar/patches/patch-tar.cabal deleted file mode 100644 index b15078edc669..000000000000 --- a/archivers/hs-tar/patches/patch-tar.cabal +++ /dev/null @@ -1,31 +0,0 @@ -$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. - ---- tar.cabal.orig 2001-09-09 01:46:40.000000000 +0000 -+++ tar.cabal -@@ -40,7 +40,7 @@ flag old-bytestring - - library - -- build-depends: base >= 4 && < 4.14, -+ build-depends: base >= 4 && < 5, - 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.*