From 58d4bbdd2c122f07d19dff6da59fee9ff5318f0d Mon Sep 17 00:00:00 2001 From: pho Date: Thu, 26 Jan 2023 03:58:43 +0000 Subject: [PATCH] devel/hs-pretty-simple: Update to 4.1.2.0 4.1.2.0 * Fix a problem with the pHPrint function incorrectly outputting a trailing newline to stdout, instead of the handle you pass it. #118 * Add a web app where you can play around with pretty-simple in your browser. #116. This took a lot of hard work by @georgefst! 4.1.1.0 * Make the pretty-printed output with outputOptionsCompact enabled a little more compact. #110. Thanks @juhp! * Add a --compact / -C flag to the pretty-simple executable that enables outputOptionsCompact. #111. Thanks again @juhp! * Add pTraceWith and pTraceShowWith to Debug.Pretty.Simple. #104. Thanks @LeviButcher! 4.1.0.0 * Fix a regression which arose in 4.0, whereby excess spaces would be inserted for unusual strings like dates and IP addresses. #105 * Attach warnings to debugging functions, so that they're easy to find and remove. #103 * Some minor improvements to the CLI tool: - Add a --version/-v flag. #83 - Add a trailing newline. #87 - Install by default, without requiring a flag. #94 --- devel/hs-MonadRandom/Makefile | 7 +- devel/hs-MonadRandom/PLIST | 66 +++++++++---------- devel/hs-MonadRandom/buildlink3.mk | 6 +- devel/hs-MonadRandom/distinfo | 9 ++- .../patches/patch-MonadRandom.cabal | 15 ----- devel/hs-async-pool/PLIST | 38 +++++------ devel/hs-async-pool/distinfo | 3 +- ...tch-Control_Concurrent_Async_Pool_Async.hs | 26 ++++++++ 8 files changed, 90 insertions(+), 80 deletions(-) delete mode 100644 devel/hs-MonadRandom/patches/patch-MonadRandom.cabal create mode 100644 devel/hs-async-pool/patches/patch-Control_Concurrent_Async_Pool_Async.hs diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile index 1e7155133258..0f9f0a0945f9 100644 --- a/devel/hs-MonadRandom/Makefile +++ b/devel/hs-MonadRandom/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2022/02/26 03:57:47 pho Exp $ +# $NetBSD: Makefile,v 1.11 2023/01/26 04:02:00 pho Exp $ -DISTNAME= MonadRandom-0.5.3 -PKGREVISION= 4 +DISTNAME= MonadRandom-0.6 CATEGORIES= devel MAINTAINER= szptvlfn@NetBSD.org @@ -9,8 +8,8 @@ COMMENT= Random-number generation monad LICENSE= 2-clause-bsd # http://www.haskell.org/haskellwiki/HaskellWiki:Copyrights -.include "../../mk/haskell.mk" .include "../../devel/hs-primitive/buildlink3.mk" .include "../../devel/hs-random/buildlink3.mk" .include "../../devel/hs-transformers-compat/buildlink3.mk" +.include "../../mk/haskell.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/hs-MonadRandom/PLIST b/devel/hs-MonadRandom/PLIST index 8ecce89ef857..eab54885e3d4 100644 --- a/devel/hs-MonadRandom/PLIST +++ b/devel/hs-MonadRandom/PLIST @@ -1,43 +1,43 @@ -@comment $NetBSD: PLIST,v 1.4 2021/04/23 10:41:51 pho Exp $ +@comment $NetBSD: PLIST,v 1.5 2023/01/26 04:02:00 pho Exp $ lib/MonadRandom-${PKGVERSION}/${HS_VERSION}/package-description lib/MonadRandom-${PKGVERSION}/${HS_VERSION}/package-id -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.dyn_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.p_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a -lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a -lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/LICENSE -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Class.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Lazy.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Strict.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Lazy.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Strict.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/MonadRandom.haddock -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/doc-index.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/haddock-bundle.min.js -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/index.html -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/linuwial.css -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/meta.json -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/quick-jump.css -share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/synopsis.png +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a +${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/LICENSE +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Class.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Lazy.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Strict.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Lazy.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Strict.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/MonadRandom.haddock +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/haddock-bundle.min.js +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/linuwial.css +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/meta.json +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/synopsis.png diff --git a/devel/hs-MonadRandom/buildlink3.mk b/devel/hs-MonadRandom/buildlink3.mk index 7925b57431b2..685cdd9940a4 100644 --- a/devel/hs-MonadRandom/buildlink3.mk +++ b/devel/hs-MonadRandom/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.10 2022/02/26 03:57:47 pho Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2023/01/26 04:02:00 pho Exp $ BUILDLINK_TREE+= hs-MonadRandom .if !defined(HS_MONADRANDOM_BUILDLINK3_MK) HS_MONADRANDOM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.5.3 -BUILDLINK_ABI_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.5.3nb4 +BUILDLINK_API_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.6 +BUILDLINK_ABI_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.6 BUILDLINK_PKGSRCDIR.hs-MonadRandom?= ../../devel/hs-MonadRandom .include "../../devel/hs-primitive/buildlink3.mk" diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo index 8c5a28ba26d4..f51a26473beb 100644 --- a/devel/hs-MonadRandom/distinfo +++ b/devel/hs-MonadRandom/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.8 2022/02/11 13:28:05 pho Exp $ +$NetBSD: distinfo,v 1.9 2023/01/26 04:02:00 pho Exp $ -BLAKE2s (MonadRandom-0.5.3.tar.gz) = 8a1541944e3df8e023a2abfc66b071a92a6dfe85d76ae2be124231c282ecbb37 -SHA512 (MonadRandom-0.5.3.tar.gz) = dde2a7ad4b6f27f8f4c94653b2a7c04cff1ef7a3dfbf6d036a6ef977f5952e9c7f905f0ad110438bc2764dcc985f04c9a7f1bd25997fd6f81ee55b654a7d6768 -Size (MonadRandom-0.5.3.tar.gz) = 11259 bytes -SHA1 (patch-MonadRandom.cabal) = 7005a7da6e53cbaa81db4691885e6f294f874eeb +BLAKE2s (MonadRandom-0.6.tar.gz) = e71bf19db12f78b7a8e5b109515f404554dea72d783bfd4479fe0c09c6ffef9b +SHA512 (MonadRandom-0.6.tar.gz) = a6e0944bc2448a376c036330dcc17eeb6076de4b44c64729b94dede87935c2ad06af5d69ee14953a7b38d06529daa0a46a4569bc3d959f7748ce7e77abcea713 +Size (MonadRandom-0.6.tar.gz) = 11402 bytes diff --git a/devel/hs-MonadRandom/patches/patch-MonadRandom.cabal b/devel/hs-MonadRandom/patches/patch-MonadRandom.cabal deleted file mode 100644 index 8289ee9e9792..000000000000 --- a/devel/hs-MonadRandom/patches/patch-MonadRandom.cabal +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-MonadRandom.cabal,v 1.3 2022/02/11 13:28:05 pho Exp $ - -Fix build with transformers-compat-0.8 - ---- MonadRandom.cabal.orig 2001-09-09 01:46:40.000000000 +0000 -+++ MonadRandom.cabal -@@ -29,7 +29,7 @@ library - build-depends: - base >=2 && <5, - transformers >=0.3 && <0.6, -- transformers-compat >=0.4 && <0.7, -+ transformers-compat >=0.4 && <0.8, - mtl >=2.1 && <2.3, - primitive >=0.6 && <0.8, - random >=1.0 && <1.3 diff --git a/devel/hs-async-pool/PLIST b/devel/hs-async-pool/PLIST index 6db945bafa37..51759fd5bae0 100644 --- a/devel/hs-async-pool/PLIST +++ b/devel/hs-async-pool/PLIST @@ -1,25 +1,25 @@ -@comment $NetBSD: PLIST,v 1.1 2022/02/23 16:51:44 pho Exp $ +@comment $NetBSD: PLIST,v 1.2 2023/01/26 03:58:43 pho Exp $ lib/async-pool-${PKGVERSION}/${HS_VERSION}/package-description lib/async-pool-${PKGVERSION}/${HS_VERSION}/package-id -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.dyn_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.p_hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.dyn_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.p_hi +${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.hi -lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.p_hi +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a -lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a -lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/LICENSE -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/Control-Concurrent-Async-Pool.html -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/async-pool.haddock -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/doc-index.html -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/haddock-bundle.min.js -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/index.html -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/linuwial.css -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/meta.json -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/quick-jump.css -share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/synopsis.png +${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a +${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/LICENSE +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/Control-Concurrent-Async-Pool.html +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/async-pool.haddock +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/doc-index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/haddock-bundle.min.js +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/index.html +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/linuwial.css +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/meta.json +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/quick-jump.css +${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/synopsis.png diff --git a/devel/hs-async-pool/distinfo b/devel/hs-async-pool/distinfo index 79af3b514ded..840cee093992 100644 --- a/devel/hs-async-pool/distinfo +++ b/devel/hs-async-pool/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2022/02/23 16:51:44 pho Exp $ +$NetBSD: distinfo,v 1.2 2023/01/26 03:58:43 pho Exp $ BLAKE2s (async-pool-0.9.1.tar.gz) = b0cde9e12cc7c5e83339d908e4ec1c8d6a1943e3b7a9d07ea6a2539eeea73ef1 SHA512 (async-pool-0.9.1.tar.gz) = 36f955bf85ef37b8cf5c4b25638df7cd3c88afe5cc87668d7bcaf1b244b655594220f0031e56e754470014d00d6e01b7ad6d090b8e88ef2ec6bebb4c8c8909ce Size (async-pool-0.9.1.tar.gz) = 15109 bytes +SHA1 (patch-Control_Concurrent_Async_Pool_Async.hs) = ac9708f460bc50dcb359ac197c06628354f141c9 diff --git a/devel/hs-async-pool/patches/patch-Control_Concurrent_Async_Pool_Async.hs b/devel/hs-async-pool/patches/patch-Control_Concurrent_Async_Pool_Async.hs new file mode 100644 index 000000000000..799d05435d14 --- /dev/null +++ b/devel/hs-async-pool/patches/patch-Control_Concurrent_Async_Pool_Async.hs @@ -0,0 +1,26 @@ +$NetBSD: patch-Control_Concurrent_Async_Pool_Async.hs,v 1.1 2023/01/26 03:58:43 pho Exp $ + +Fix build with GHC 9.4: +https://github.com/jwiegley/async-pool/commit/c5b8e82be6496fd754ce78a4303bb177d6c6a6df + +--- Control/Concurrent/Async/Pool/Async.hs.orig 2001-09-09 01:46:40.000000000 +0000 ++++ Control/Concurrent/Async/Pool/Async.hs +@@ -710,10 +710,18 @@ tryAll = try + -- exception handler. + {-# INLINE rawForkIO #-} + rawForkIO :: IO () -> IO ThreadId ++#if MIN_VERSION_base(4,17,0) ++rawForkIO (IO action) = IO $ \ s -> ++#else + rawForkIO action = IO $ \ s -> ++#endif + case (fork# action s) of (# s1, tid #) -> (# s1, ThreadId tid #) + + {-# INLINE rawForkOn #-} + rawForkOn :: Int -> IO () -> IO ThreadId ++#if MIN_VERSION_base(4,17,0) ++rawForkOn (I# cpu) (IO action) = IO $ \ s -> ++#else + rawForkOn (I# cpu) action = IO $ \ s -> ++#endif + case (forkOn# cpu action s) of (# s1, tid #) -> (# s1, ThreadId tid #)