Skip to content

Commit 58d4bbd

Browse files
depressed-phodepressed-pho
committed
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
1 parent f8db036 commit 58d4bbd

File tree

8 files changed

+90
-80
lines changed

8 files changed

+90
-80
lines changed

‎devel/hs-MonadRandom/Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
# $NetBSD: Makefile,v 1.10 2022/02/26 03:57:47 pho Exp $
1+
# $NetBSD: Makefile,v 1.11 2023/01/26 04:02:00 pho Exp $
22

3-
DISTNAME= MonadRandom-0.5.3
4-
PKGREVISION= 4
3+
DISTNAME= MonadRandom-0.6
54
CATEGORIES= devel
65

76
MAINTAINER= [email protected]
87
COMMENT= Random-number generation monad
98
LICENSE= 2-clause-bsd
109
# http://www.haskell.org/haskellwiki/HaskellWiki:Copyrights
1110

12-
.include "../../mk/haskell.mk"
1311
.include "../../devel/hs-primitive/buildlink3.mk"
1412
.include "../../devel/hs-random/buildlink3.mk"
1513
.include "../../devel/hs-transformers-compat/buildlink3.mk"
14+
.include "../../mk/haskell.mk"
1615
.include "../../mk/bsd.pkg.mk"

‎devel/hs-MonadRandom/PLIST

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
@comment $NetBSD: PLIST,v 1.4 2021/04/23 10:41:51 pho Exp $
1+
@comment $NetBSD: PLIST,v 1.5 2023/01/26 04:02:00 pho Exp $
22
lib/MonadRandom-${PKGVERSION}/${HS_VERSION}/package-description
33
lib/MonadRandom-${PKGVERSION}/${HS_VERSION}/package-id
4-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.dyn_hi
4+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.dyn_hi
55
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.hi
6-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.p_hi
7-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.dyn_hi
6+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random.p_hi
7+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.dyn_hi
88
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.hi
9-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.p_hi
10-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.dyn_hi
9+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Class.p_hi
10+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.dyn_hi
1111
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.hi
12-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.p_hi
13-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.dyn_hi
12+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Lazy.p_hi
13+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.dyn_hi
1414
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.hi
15-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.p_hi
16-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.dyn_hi
15+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Random/Strict.p_hi
16+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.dyn_hi
1717
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.hi
18-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.p_hi
19-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.dyn_hi
18+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random.p_hi
19+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.dyn_hi
2020
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.hi
21-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.p_hi
22-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.dyn_hi
21+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Lazy.p_hi
22+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.dyn_hi
2323
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.hi
24-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.p_hi
24+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Monad/Trans/Random/Strict.p_hi
2525
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
26-
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
27-
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
28-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/LICENSE
29-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Class.html
30-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Lazy.html
31-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Strict.html
32-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random.html
33-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Lazy.html
34-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Strict.html
35-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random.html
36-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/MonadRandom.haddock
37-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/doc-index.html
38-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/haddock-bundle.min.js
39-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/index.html
40-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/linuwial.css
41-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/meta.json
42-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/quick-jump.css
43-
share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/synopsis.png
26+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
27+
${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
28+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/LICENSE
29+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Class.html
30+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Lazy.html
31+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random-Strict.html
32+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Random.html
33+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Lazy.html
34+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random-Strict.html
35+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/Control-Monad-Trans-Random.html
36+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/MonadRandom.haddock
37+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/doc-index.html
38+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/haddock-bundle.min.js
39+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/index.html
40+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/linuwial.css
41+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/meta.json
42+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/quick-jump.css
43+
${PLIST.doc}share/doc/${HS_PLATFORM}/MonadRandom-${PKGVERSION}/html/synopsis.png

‎devel/hs-MonadRandom/buildlink3.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# $NetBSD: buildlink3.mk,v 1.10 2022/02/26 03:57:47 pho Exp $
1+
# $NetBSD: buildlink3.mk,v 1.11 2023/01/26 04:02:00 pho Exp $
22

33
BUILDLINK_TREE+= hs-MonadRandom
44

55
.if !defined(HS_MONADRANDOM_BUILDLINK3_MK)
66
HS_MONADRANDOM_BUILDLINK3_MK:=
77

8-
BUILDLINK_API_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.5.3
9-
BUILDLINK_ABI_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.5.3nb4
8+
BUILDLINK_API_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.6
9+
BUILDLINK_ABI_DEPENDS.hs-MonadRandom+= hs-MonadRandom>=0.6
1010
BUILDLINK_PKGSRCDIR.hs-MonadRandom?= ../../devel/hs-MonadRandom
1111

1212
.include "../../devel/hs-primitive/buildlink3.mk"

‎devel/hs-MonadRandom/distinfo

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
$NetBSD: distinfo,v 1.8 2022/02/11 13:28:05 pho Exp $
1+
$NetBSD: distinfo,v 1.9 2023/01/26 04:02:00 pho Exp $
22

3-
BLAKE2s (MonadRandom-0.5.3.tar.gz) = 8a1541944e3df8e023a2abfc66b071a92a6dfe85d76ae2be124231c282ecbb37
4-
SHA512 (MonadRandom-0.5.3.tar.gz) = dde2a7ad4b6f27f8f4c94653b2a7c04cff1ef7a3dfbf6d036a6ef977f5952e9c7f905f0ad110438bc2764dcc985f04c9a7f1bd25997fd6f81ee55b654a7d6768
5-
Size (MonadRandom-0.5.3.tar.gz) = 11259 bytes
6-
SHA1 (patch-MonadRandom.cabal) = 7005a7da6e53cbaa81db4691885e6f294f874eeb
3+
BLAKE2s (MonadRandom-0.6.tar.gz) = e71bf19db12f78b7a8e5b109515f404554dea72d783bfd4479fe0c09c6ffef9b
4+
SHA512 (MonadRandom-0.6.tar.gz) = a6e0944bc2448a376c036330dcc17eeb6076de4b44c64729b94dede87935c2ad06af5d69ee14953a7b38d06529daa0a46a4569bc3d959f7748ce7e77abcea713
5+
Size (MonadRandom-0.6.tar.gz) = 11402 bytes

‎devel/hs-MonadRandom/patches/patch-MonadRandom.cabal

-15
This file was deleted.

‎devel/hs-async-pool/PLIST

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
@comment $NetBSD: PLIST,v 1.1 2022/02/23 16:51:44 pho Exp $
1+
@comment $NetBSD: PLIST,v 1.2 2023/01/26 03:58:43 pho Exp $
22
lib/async-pool-${PKGVERSION}/${HS_VERSION}/package-description
33
lib/async-pool-${PKGVERSION}/${HS_VERSION}/package-id
4-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.dyn_hi
4+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.dyn_hi
55
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.hi
6-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.p_hi
7-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.dyn_hi
6+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool.p_hi
7+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.dyn_hi
88
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.hi
9-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.p_hi
10-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.dyn_hi
9+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Async.p_hi
10+
${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.dyn_hi
1111
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.hi
12-
lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.p_hi
12+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Control/Concurrent/Async/Pool/Internal.p_hi
1313
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
14-
lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
15-
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
16-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/LICENSE
17-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/Control-Concurrent-Async-Pool.html
18-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/async-pool.haddock
19-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/doc-index.html
20-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/haddock-bundle.min.js
21-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/index.html
22-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/linuwial.css
23-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/meta.json
24-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/quick-jump.css
25-
share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/synopsis.png
14+
${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
15+
${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
16+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/LICENSE
17+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/Control-Concurrent-Async-Pool.html
18+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/async-pool.haddock
19+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/doc-index.html
20+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/haddock-bundle.min.js
21+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/index.html
22+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/linuwial.css
23+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/meta.json
24+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/quick-jump.css
25+
${PLIST.doc}share/doc/${HS_PLATFORM}/async-pool-${PKGVERSION}/html/synopsis.png

‎devel/hs-async-pool/distinfo

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
$NetBSD: distinfo,v 1.1 2022/02/23 16:51:44 pho Exp $
1+
$NetBSD: distinfo,v 1.2 2023/01/26 03:58:43 pho Exp $
22

33
BLAKE2s (async-pool-0.9.1.tar.gz) = b0cde9e12cc7c5e83339d908e4ec1c8d6a1943e3b7a9d07ea6a2539eeea73ef1
44
SHA512 (async-pool-0.9.1.tar.gz) = 36f955bf85ef37b8cf5c4b25638df7cd3c88afe5cc87668d7bcaf1b244b655594220f0031e56e754470014d00d6e01b7ad6d090b8e88ef2ec6bebb4c8c8909ce
55
Size (async-pool-0.9.1.tar.gz) = 15109 bytes
6+
SHA1 (patch-Control_Concurrent_Async_Pool_Async.hs) = ac9708f460bc50dcb359ac197c06628354f141c9

‎devel/hs-async-pool/patches/patch-Control_Concurrent_Async_Pool_Async.hs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
$NetBSD: patch-Control_Concurrent_Async_Pool_Async.hs,v 1.1 2023/01/26 03:58:43 pho Exp $
2+
3+
Fix build with GHC 9.4:
4+
https://github.com/jwiegley/async-pool/commit/c5b8e82be6496fd754ce78a4303bb177d6c6a6df
5+
6+
--- Control/Concurrent/Async/Pool/Async.hs.orig 2001-09-09 01:46:40.000000000 +0000
7+
+++ Control/Concurrent/Async/Pool/Async.hs
8+
@@ -710,10 +710,18 @@ tryAll = try
9+
-- exception handler.
10+
{-# INLINE rawForkIO #-}
11+
rawForkIO :: IO () -> IO ThreadId
12+
+#if MIN_VERSION_base(4,17,0)
13+
+rawForkIO (IO action) = IO $ \ s ->
14+
+#else
15+
rawForkIO action = IO $ \ s ->
16+
+#endif
17+
case (fork# action s) of (# s1, tid #) -> (# s1, ThreadId tid #)
18+
19+
{-# INLINE rawForkOn #-}
20+
rawForkOn :: Int -> IO () -> IO ThreadId
21+
+#if MIN_VERSION_base(4,17,0)
22+
+rawForkOn (I# cpu) (IO action) = IO $ \ s ->
23+
+#else
24+
rawForkOn (I# cpu) action = IO $ \ s ->
25+
+#endif
26+
case (forkOn# cpu action s) of (# s1, tid #) -> (# s1, ThreadId tid #)

0 commit comments

Comments
 (0)