Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714357379118850"
MIME-Version: 1.0
Date: Mon, 29 Apr 2024 02:22:59 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/hs-regex-base
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240429022259.4C3B0FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	pho
Date:		Mon Apr 29 02:22:59 UTC 2024

Modified Files:
	pkgsrc/textproc/hs-regex-base: Makefile PLIST

Log Message:
textproc/hs-regex-base: 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.16 -r1.17 pkgsrc/textproc/hs-regex-base/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/hs-regex-base/PLIST

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


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

Modified files:

Index: pkgsrc/textproc/hs-regex-base/Makefile
diff -u pkgsrc/textproc/hs-regex-base/Makefile:1.16 pkgsrc/textproc/hs-regex-base/Makefile:1.17
--- pkgsrc/textproc/hs-regex-base/Makefile:1.16	Thu Nov  2 06:37:35 2023
+++ pkgsrc/textproc/hs-regex-base/Makefile	Mon Apr 29 02:22:59 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/11/02 06:37:35 pho Exp $
+# $NetBSD: Makefile,v 1.17 2024/04/29 02:22:59 pho Exp $
 
 DISTNAME=	regex-base-0.94.0.2
 PKGREVISION=	5
@@ -9,7 +9,9 @@ COMMENT=	Replaces/Enhances Haskell Text.
 LICENSE=	modified-bsd
 
 HASKELL_UNRESTRICT_DEPENDENCIES+=	\
-	base
+	base		\
+	bytestring	\
+	text
 
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/hs-regex-base/PLIST
diff -u pkgsrc/textproc/hs-regex-base/PLIST:1.6 pkgsrc/textproc/hs-regex-base/PLIST:1.7
--- pkgsrc/textproc/hs-regex-base/PLIST:1.6	Thu Oct 26 09:18:34 2023
+++ pkgsrc/textproc/hs-regex-base/PLIST	Mon Apr 29 02:22:59 2024
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2023/10/26 09:18:34 pho Exp $
-lib/regex-base-${PKGVERSION}/${HS_VERSION}/package-description
-lib/regex-base-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.7 2024/04/29 02:22:59 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_base.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Paths_regex_base.hi
@@ -19,18 +17,18 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Text/Rege
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Regex/Base/RegexLike.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+lib/regex-base-${PKGVERSION}/${HS_VERSION}/package-description
+lib/regex-base-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/Text-Regex-Base-Context.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/Text-Regex-Base-Impl.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/Text-Regex-Base-RegexLike.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/Text-Regex-Base.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/regex-base.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/regex-base-${PKGVERSION}/html/synopsis.png


--_----------=_1714357379118850--