Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171454677929840"
MIME-Version: 1.0
Date: Wed, 1 May 2024 06:59:39 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/devel/hs-heapsize
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240501065939.391C4FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171454677929840
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Wed May  1 06:59:39 UTC 2024

Modified Files:
	pkgsrc/devel/hs-heapsize: PLIST distinfo
Added Files:
	pkgsrc/devel/hs-heapsize/patches: patch-heapsize.cabal

Log Message:
devel/hs-heapsize: Fix build with GHC 9.8

This breaks build with the currently default GHC 9.6. Please bear with me
until I switch the default compiler.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hs-heapsize/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hs-heapsize/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/hs-heapsize/patches/patch-heapsize.cabal

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171454677929840
Content-Disposition: inline
Content-Length: 3721
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/hs-heapsize/PLIST
diff -u pkgsrc/devel/hs-heapsize/PLIST:1.2 pkgsrc/devel/hs-heapsize/PLIST:1.3
--- pkgsrc/devel/hs-heapsize/PLIST:1.2	Mon Oct 30 06:33:35 2023
+++ pkgsrc/devel/hs-heapsize/PLIST	Wed May  1 06:59:38 2024
@@ -1,21 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2023/10/30 06:33:35 pho Exp $
-lib/heapsize-${PKGVERSION}/${HS_VERSION}/package-description
-lib/heapsize-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.3 2024/05/01 06:59:38 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/HeapSize.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/HeapSize.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/HeapSize.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+lib/heapsize-${PKGVERSION}/${HS_VERSION}/package-description
+lib/heapsize-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/HeapSize.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/heapsize.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/heapsize-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/devel/hs-heapsize/distinfo
diff -u pkgsrc/devel/hs-heapsize/distinfo:1.1 pkgsrc/devel/hs-heapsize/distinfo:1.2
--- pkgsrc/devel/hs-heapsize/distinfo:1.1	Wed Feb 16 10:12:07 2022
+++ pkgsrc/devel/hs-heapsize/distinfo	Wed May  1 06:59:38 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/02/16 10:12:07 pho Exp $
+$NetBSD: distinfo,v 1.2 2024/05/01 06:59:38 pho Exp $
 
 BLAKE2s (heapsize-0.3.0.1.tar.gz) = e8d74b7c664015983301b89eaf359c9724ec50a3c2029c1d5424b22b747086d9
 SHA512 (heapsize-0.3.0.1.tar.gz) = 83ab498d41380429643aaf8f06e652e8c6d6062627b417fbd62e3844800010c88e0390c26839b7d766673570ce6a2073a030fd96b12ccbd66de780884957130f
 Size (heapsize-0.3.0.1.tar.gz) = 4570 bytes
+SHA1 (patch-heapsize.cabal) = 523e29f9b354c379e9546a6003c0fabec33c8f72

Added files:

Index: pkgsrc/devel/hs-heapsize/patches/patch-heapsize.cabal
diff -u /dev/null pkgsrc/devel/hs-heapsize/patches/patch-heapsize.cabal:1.1
--- /dev/null	Wed May  1 06:59:39 2024
+++ pkgsrc/devel/hs-heapsize/patches/patch-heapsize.cabal	Wed May  1 06:59:38 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-heapsize.cabal,v 1.1 2024/05/01 06:59:38 pho Exp $
+
+Fix build on GHC 9.8:
+https://github.com/pepeiborra/Heapsize/pull/1
+
+--- heapsize.cabal.orig	2001-09-09 01:46:40.000000000 +0000
++++ heapsize.cabal
+@@ -1,7 +1,7 @@
+-cabal-version:      2.0
++cabal-version:      3.0
+ name:               heapsize
+ version:            0.3.0.1
+-license:            BSD3
++license:            BSD-3-Clause
+ license-file:       LICENSE
+ category:           GHC, Debug, Development
+ build-type:         Simple
+@@ -16,7 +16,7 @@ description:        heapsize is a tool t
+ Library
+   Exposed-modules:
+     HeapSize
+-  c-sources:
++  cmm-sources:
+     cbits/heapsize_prim.cmm
+   Default-Language: Haskell2010
+   Build-depends:


--_----------=_171454677929840--