[pkgsrc/trunk]: pkgsrc/devel/hs-memory Update to memory-0.16.0

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fe58c55ef7e
branches:  trunk
changeset: 373349:3fe58c55ef7e
user:      pho <pho%pkgsrc.org@localhost>
date:      Fri Feb 11 09:35:09 2022 +0000

description:
Update to memory-0.16.0

No changelogs are provided by the upstream.

diffstat:

 devel/hs-memory/Makefile                                      |  13 ++++++--
 devel/hs-memory/PLIST                                         |   8 ++--
 devel/hs-memory/buildlink3.mk                                 |   6 ++--
 devel/hs-memory/distinfo                                      |  15 +++++-----
 devel/hs-memory/patches/patch-Data_ByteArray_Bytes.hs         |  14 ----------
 devel/hs-memory/patches/patch-Data_ByteArray_ScrubbedBytes.hs |  14 ----------
 devel/hs-memory/patches/patch-Data_Memory_MemMap_Posix.hsc    |   7 ++--
 7 files changed, 27 insertions(+), 50 deletions(-)

diffs (141 lines):

diff -r 15383768fcbe -r 3fe58c55ef7e devel/hs-memory/Makefile
--- a/devel/hs-memory/Makefile  Fri Feb 11 09:31:46 2022 +0000
+++ b/devel/hs-memory/Makefile  Fri Feb 11 09:35:09 2022 +0000
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2022/01/18 02:48:10 pho Exp $
+# $NetBSD: Makefile,v 1.4 2022/02/11 09:35:09 pho Exp $
+
+DISTNAME=      memory-0.16.0
+CATEGORIES=    devel
 
-DISTNAME=      memory-0.15.0
-PKGREVISION=   2
-CATEGORIES=    devel
+# Compatibility with GHC 9.2:
+# https://github.com/vincenthz/hs-memory/issues/86
+PATCH_SITES=           https://gitlab.haskell.org/ghc/head.hackage/-/raw/c50d7587a23ef1260721e84f8bcc1450d73177db/patches/
+PATCHFILES=            memory-0.16.0.patch
+PATCH_DIST_STRIP=      -p1
 
 MAINTAINER=    pho%cielonegro.org@localhost
 COMMENT=       Memory and related abstraction stuff
diff -r 15383768fcbe -r 3fe58c55ef7e devel/hs-memory/PLIST
--- a/devel/hs-memory/PLIST     Fri Feb 11 09:31:46 2022 +0000
+++ b/devel/hs-memory/PLIST     Fri Feb 11 09:35:09 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/04/23 09:35:56 pho Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/02/11 09:35:09 pho Exp $
 lib/memory-${PKGVERSION}/${HS_VERSION}/package-description
 lib/memory-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
@@ -65,6 +65,9 @@
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Hash/SipHash.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Hash/SipHash.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Hash/SipHash.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/HeadHackageUtils.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/HeadHackageUtils.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/HeadHackageUtils.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Compat.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Compat.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Compat.p_hi
@@ -80,9 +83,6 @@
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Imports.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Imports.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Imports.p_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Scrubber.dyn_hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Scrubber.hi
-lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/Internal/Scrubber.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/MemMap/Posix.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/MemMap/Posix.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Memory/MemMap/Posix.p_hi
diff -r 15383768fcbe -r 3fe58c55ef7e devel/hs-memory/buildlink3.mk
--- a/devel/hs-memory/buildlink3.mk     Fri Feb 11 09:31:46 2022 +0000
+++ b/devel/hs-memory/buildlink3.mk     Fri Feb 11 09:35:09 2022 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2022/01/18 02:48:10 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2022/02/11 09:35:09 pho Exp $
 
 BUILDLINK_TREE+=       hs-memory
 
 .if !defined(HS_MEMORY_BUILDLINK3_MK)
 HS_MEMORY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-memory+=      hs-memory>=0.15.0
-BUILDLINK_ABI_DEPENDS.hs-memory+=      hs-memory>=0.15.0nb2
+BUILDLINK_API_DEPENDS.hs-memory+=      hs-memory>=0.16.0
+BUILDLINK_ABI_DEPENDS.hs-memory+=      hs-memory>=0.16.0
 BUILDLINK_PKGSRCDIR.hs-memory?=                ../../devel/hs-memory
 
 .include "../../devel/hs-basement/buildlink3.mk"
diff -r 15383768fcbe -r 3fe58c55ef7e devel/hs-memory/distinfo
--- a/devel/hs-memory/distinfo  Fri Feb 11 09:31:46 2022 +0000
+++ b/devel/hs-memory/distinfo  Fri Feb 11 09:35:09 2022 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:14:58 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/11 09:35:09 pho Exp $
 
-BLAKE2s (memory-0.15.0.tar.gz) = e666167f32f83b9b7a7f9a57986a231bad111739d9f42271872b66472b80186c
-SHA512 (memory-0.15.0.tar.gz) = 49aabf5fdaddae597df6d8f30a3e07c4d6d70fcc7b9146452a4ad4e81858786041676bc780e2b048fd683cc7c0d799d4579596c14fae940ea57954e9a7ee9129
-Size (memory-0.15.0.tar.gz) = 42299 bytes
-SHA1 (patch-Data_ByteArray_Bytes.hs) = 771298aac733f10d5ffeaa5243f3c6bfa49bcbfd
-SHA1 (patch-Data_ByteArray_ScrubbedBytes.hs) = 332856ebea1d7bf556a890945def7ef9dbe5d17b
-SHA1 (patch-Data_Memory_MemMap_Posix.hsc) = 97273516ad9731285d18315ab60884ad1c27642e
+BLAKE2s (memory-0.16.0.patch) = c308854ec184822be8e0cea205799693e598cdaae602c9e2163379208397ba5d
+SHA512 (memory-0.16.0.patch) = 5f22dead868c2770adad734ecd6877a1dca486ed5f41a915cd75aaa0134cc9fe98a552d5174933af44ca37f2732e02501d86203b4f2f2b282591643e646bf749
+Size (memory-0.16.0.patch) = 20996 bytes
+BLAKE2s (memory-0.16.0.tar.gz) = 9264e72e061e38dc809c5ca4832c7c859c00545dfe9a6c1aa9680d155a3df1d2
+SHA512 (memory-0.16.0.tar.gz) = 1f911b988ce2c8431cd0a2dee1caa39fd3b8d6c9b738fe2ad9e159669188d131cf22940d8798e1ad4807874381f25e115bf9432a979b2f035cbd7cab2661d890
+Size (memory-0.16.0.tar.gz) = 41936 bytes
+SHA1 (patch-Data_Memory_MemMap_Posix.hsc) = 214976ef75f69dd23cb360fe52893233f79ec73f
diff -r 15383768fcbe -r 3fe58c55ef7e devel/hs-memory/patches/patch-Data_ByteArray_Bytes.hs
--- a/devel/hs-memory/patches/patch-Data_ByteArray_Bytes.hs     Fri Feb 11 09:31:46 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-Data_ByteArray_Bytes.hs,v 1.1 2021/04/23 09:35:57 pho Exp $
-
-Fix build with GHC 9.
-
---- Data/ByteArray/Bytes.hs.orig       2021-04-23 09:28:23.358632857 +0000
-+++ Data/ByteArray/Bytes.hs
-@@ -16,6 +16,7 @@ module Data.ByteArray.Bytes
-     ( Bytes
-     ) where
- 
-+import           GHC.Exts (unsafeCoerce#)
- import           GHC.Types
- import           GHC.Prim
- import           GHC.Ptr
diff -r 15383768fcbe -r 3fe58c55ef7e devel/hs-memory/patches/patch-Data_ByteArray_ScrubbedBytes.hs
--- a/devel/hs-memory/patches/patch-Data_ByteArray_ScrubbedBytes.hs     Fri Feb 11 09:31:46 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-Data_ByteArray_ScrubbedBytes.hs,v 1.1 2021/04/23 09:35:57 pho Exp $
-
-Fix build with GHC 9.
-
---- Data/ByteArray/ScrubbedBytes.hs.orig       2021-04-23 09:28:51.592342938 +0000
-+++ Data/ByteArray/ScrubbedBytes.hs
-@@ -14,6 +14,7 @@ module Data.ByteArray.ScrubbedBytes
-     ( ScrubbedBytes
-     ) where
- 
-+import           GHC.Exts (unsafeCoerce#)
- import           GHC.Types
- import           GHC.Prim
- import           GHC.Ptr
diff -r 15383768fcbe -r 3fe58c55ef7e devel/hs-memory/patches/patch-Data_Memory_MemMap_Posix.hsc
--- a/devel/hs-memory/patches/patch-Data_Memory_MemMap_Posix.hsc        Fri Feb 11 09:31:46 2022 +0000
+++ b/devel/hs-memory/patches/patch-Data_Memory_MemMap_Posix.hsc        Fri Feb 11 09:35:09 2022 +0000
@@ -1,9 +1,8 @@
-$NetBSD: patch-Data_Memory_MemMap_Posix.hsc,v 1.1 2021/04/23 09:35:57 pho Exp $
+$NetBSD: patch-Data_Memory_MemMap_Posix.hsc,v 1.2 2022/02/11 09:35:09 pho Exp $
 
-Suppress a linker warning about compatibility symbol by using "capi"
-instead of "ccall".
+Use the correct symbol for msync(2) on NetBSD.
 
---- Data/Memory/MemMap/Posix.hsc.orig  2019-09-02 02:59:04.000000000 +0000
+--- Data/Memory/MemMap/Posix.hsc.orig  2022-02-06 19:45:13.938394169 +0000
 +++ Data/Memory/MemMap/Posix.hsc
 @@ -20,6 +20,7 @@
  #include <sys/mman.h>