Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714337541258020"
MIME-Version: 1.0
Date: Sun, 28 Apr 2024 20:52:21 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/devel/hs-githash
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240428205221.70FAFFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	pho
Date:		Sun Apr 28 20:52:21 UTC 2024

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

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

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


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

Modified files:

Index: pkgsrc/devel/hs-githash/Makefile
diff -u pkgsrc/devel/hs-githash/Makefile:1.8 pkgsrc/devel/hs-githash/Makefile:1.9
--- pkgsrc/devel/hs-githash/Makefile:1.8	Thu Nov  2 06:36:32 2023
+++ pkgsrc/devel/hs-githash/Makefile	Sun Apr 28 20:52:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/11/02 06:36:32 pho Exp $
+# $NetBSD: Makefile,v 1.9 2024/04/28 20:52:21 pho Exp $
 
 DISTNAME=	githash-0.1.7.0
 PKGREVISION=	1
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Compile git revision info into Haskell projects
 LICENSE=	modified-bsd
 
+DEPENDS+=	git-[0-9]*:../../devel/git-base
+
 .include "../../devel/hs-th-compat/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/hs-githash/PLIST
diff -u pkgsrc/devel/hs-githash/PLIST:1.3 pkgsrc/devel/hs-githash/PLIST:1.4
--- pkgsrc/devel/hs-githash/PLIST:1.3	Thu Oct 26 05:15:19 2023
+++ pkgsrc/devel/hs-githash/PLIST	Sun Apr 28 20:52:21 2024
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/10/26 05:15:19 pho Exp $
-lib/githash-${PKGVERSION}/${HS_VERSION}/package-description
-lib/githash-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.4 2024/04/28 20:52:21 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/GitHash.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/GitHash.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/GitHash.p_hi
@@ -10,15 +8,15 @@ ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKG
 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/githash-${PKGVERSION}/${HS_VERSION}/package-description
+lib/githash-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/GitHash.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/githash.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/githash-${PKGVERSION}/html/synopsis.png


--_----------=_1714337541258020--