Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714358511173000"
MIME-Version: 1.0
Date: Mon, 29 Apr 2024 02:41:51 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/hs-jira-wiki-markup
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240429024151.199E1FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714358511173000
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:41:51 UTC 2024

Modified Files:
	pkgsrc/textproc/hs-jira-wiki-markup: Makefile PLIST

Log Message:
textproc/hs-jira-wiki-markup: 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.14 -r1.15 pkgsrc/textproc/hs-jira-wiki-markup/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/hs-jira-wiki-markup/PLIST

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


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

Modified files:

Index: pkgsrc/textproc/hs-jira-wiki-markup/Makefile
diff -u pkgsrc/textproc/hs-jira-wiki-markup/Makefile:1.14 pkgsrc/textproc/hs-jira-wiki-markup/Makefile:1.15
--- pkgsrc/textproc/hs-jira-wiki-markup/Makefile:1.14	Thu Nov  2 06:37:33 2023
+++ pkgsrc/textproc/hs-jira-wiki-markup/Makefile	Mon Apr 29 02:41:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/11/02 06:37:33 pho Exp $
+# $NetBSD: Makefile,v 1.15 2024/04/29 02:41:50 pho Exp $
 
 DISTNAME=	jira-wiki-markup-1.5.1
 PKGREVISION=	1
@@ -8,5 +8,8 @@ MAINTAINER=	pho@cielonegro.org
 COMMENT=	Handle Jira wiki markup
 LICENSE=	mit
 
+HASKELL_UNRESTRICT_DEPENDENCIES+=	\
+	text
+
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/hs-jira-wiki-markup/PLIST
diff -u pkgsrc/textproc/hs-jira-wiki-markup/PLIST:1.4 pkgsrc/textproc/hs-jira-wiki-markup/PLIST:1.5
--- pkgsrc/textproc/hs-jira-wiki-markup/PLIST:1.4	Thu Oct 26 16:34:49 2023
+++ pkgsrc/textproc/hs-jira-wiki-markup/PLIST	Mon Apr 29 02:41:50 2024
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2023/10/26 16:34:49 pho Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/04/29 02:41:50 pho Exp $
 bin/jira-wiki-markup
-lib/jira-wiki-markup-${PKGVERSION}/${HS_VERSION}/package-description
-lib/jira-wiki-markup-${PKGVERSION}/${HS_VERSION}/package-id
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Jira/Markup.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Text/Jira/Markup.hi
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Text/Jira/Markup.p_hi
@@ -29,6 +27,8 @@ ${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/jira-wiki-markup-${PKGVERSION}/${HS_VERSION}/package-description
+lib/jira-wiki-markup-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/CHANGELOG.md
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/README.md
@@ -60,12 +60,10 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/jir
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/doc-index-U.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/doc-index-W.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/jira-wiki-markup.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/jira-wiki-markup-${PKGVERSION}/html/synopsis.png


--_----------=_1714358511173000--