Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714632464110300"
MIME-Version: 1.0
Date: Thu, 2 May 2024 06:47:44 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/www/hs-servant
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240502064744.22F6FFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	pho
Date:		Thu May  2 06:47:44 UTC 2024

Modified Files:
	pkgsrc/www/hs-servant: Makefile PLIST

Log Message:
www/hs-servant: 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.5 -r1.6 pkgsrc/www/hs-servant/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/hs-servant/PLIST

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


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

Modified files:

Index: pkgsrc/www/hs-servant/Makefile
diff -u pkgsrc/www/hs-servant/Makefile:1.5 pkgsrc/www/hs-servant/Makefile:1.6
--- pkgsrc/www/hs-servant/Makefile:1.5	Thu Nov  2 06:37:47 2023
+++ pkgsrc/www/hs-servant/Makefile	Thu May  2 06:47:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/11/02 06:37:47 pho Exp $
+# $NetBSD: Makefile,v 1.6 2024/05/02 06:47:43 pho Exp $
 
 DISTNAME=	servant-0.20.1
 PKGREVISION=	1
@@ -8,6 +8,13 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Family of combinators for defining webservices APIs
 LICENSE=	modified-bsd
 
+HASKELL_UNRESTRICT_DEPENDENCIES+=	\
+	QuickCheck	\
+	base		\
+	bytestring	\
+	deepseq		\
+	text
+
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../textproc/hs-attoparsec/buildlink3.mk"
 .include "../../devel/hs-base-compat/buildlink3.mk"

Index: pkgsrc/www/hs-servant/PLIST
diff -u pkgsrc/www/hs-servant/PLIST:1.2 pkgsrc/www/hs-servant/PLIST:1.3
--- pkgsrc/www/hs-servant/PLIST:1.2	Mon Oct 30 13:35:06 2023
+++ pkgsrc/www/hs-servant/PLIST	Thu May  2 06:47:43 2024
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/10/30 13:35:06 pho Exp $
-lib/servant-${PKGVERSION}/${HS_VERSION}/package-description
-lib/servant-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.3 2024/05/02 06:47:43 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.hi
@@ -106,6 +104,8 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Servant/T
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Types/SourceT.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+lib/servant-${PKGVERSION}/${HS_VERSION}/package-description
+lib/servant-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Alternative.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-BasicAuth.html
@@ -168,12 +168,10 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ser
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-W.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-Y.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/servant.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/synopsis.png


--_----------=_1714632464110300--