Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714432333277440"
MIME-Version: 1.0
Date: Mon, 29 Apr 2024 23:12:13 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/devel/hs-these
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240429231213.578DEFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	pho
Date:		Mon Apr 29 23:12:13 UTC 2024

Modified Files:
	pkgsrc/devel/hs-these: Makefile PLIST

Log Message:
devel/hs-these: 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.11 -r1.12 pkgsrc/devel/hs-these/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-these/PLIST

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


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

Modified files:

Index: pkgsrc/devel/hs-these/Makefile
diff -u pkgsrc/devel/hs-these/Makefile:1.11 pkgsrc/devel/hs-these/Makefile:1.12
--- pkgsrc/devel/hs-these/Makefile:1.11	Thu Nov  2 06:37:00 2023
+++ pkgsrc/devel/hs-these/Makefile	Mon Apr 29 23:12:13 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/11/02 06:37:00 pho Exp $
+# $NetBSD: Makefile,v 1.12 2024/04/29 23:12:13 pho Exp $
 
 DISTNAME=	these-1.2
 PKGREVISION=	1
@@ -8,6 +8,10 @@ MAINTAINER=	pho@cielonegro.org
 COMMENT=	Either-or-both data type
 LICENSE=	modified-bsd
 
+HASKELL_UNRESTRICT_DEPENDENCIES+=	\
+	base	\
+	deepseq
+
 .include "../../devel/hs-assoc/buildlink3.mk"
 .include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../mk/haskell.mk"

Index: pkgsrc/devel/hs-these/PLIST
diff -u pkgsrc/devel/hs-these/PLIST:1.3 pkgsrc/devel/hs-these/PLIST:1.4
--- pkgsrc/devel/hs-these/PLIST:1.3	Sat Oct 28 20:00:47 2023
+++ pkgsrc/devel/hs-these/PLIST	Mon Apr 29 23:12:13 2024
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/10/28 20:00:47 pho Exp $
-lib/these-${PKGVERSION}/${HS_VERSION}/package-description
-lib/these-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.4 2024/04/29 23:12:13 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/These.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Data/Functor/These.hi
@@ -13,17 +11,17 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Data/Thes
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Data/These/Combinators.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+lib/these-${PKGVERSION}/${HS_VERSION}/package-description
+lib/these-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/these-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/Data-Functor-These.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/Data-These-Combinators.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/Data-These.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/synopsis.png
 ${PLIST.doc}share/doc/${HS_PLATFORM}/these-${PKGVERSION}/html/these.haddock


--_----------=_1714432333277440--