Thu May 2 06:47:44 2024 UTC (25d)
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.


(pho)
diff -r1.5 -r1.6 pkgsrc/www/hs-servant/Makefile
diff -r1.2 -r1.3 pkgsrc/www/hs-servant/PLIST
cvs diff -r1.5 -r1.6 pkgsrc/www/hs-servant/Makefile (expand / switch to unified diff)

--- pkgsrc/www/hs-servant/Makefile 2023/11/02 06:37:47 1.5
+++ pkgsrc/www/hs-servant/Makefile 2024/05/02 06:47:43 1.6
@@ -1,23 +1,30 @@ @@ -1,23 +1,30 @@
1# $NetBSD: Makefile,v 1.5 2023/11/02 06:37:47 pho Exp $ 1# $NetBSD: Makefile,v 1.6 2024/05/02 06:47:43 pho Exp $
2 2
3DISTNAME= servant-0.20.1 3DISTNAME= servant-0.20.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= www 5CATEGORIES= www
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Family of combinators for defining webservices APIs 8COMMENT= Family of combinators for defining webservices APIs
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
 11HASKELL_UNRESTRICT_DEPENDENCIES+= \
 12 QuickCheck \
 13 base \
 14 bytestring \
 15 deepseq \
 16 text
 17
11.include "../../converters/hs-aeson/buildlink3.mk" 18.include "../../converters/hs-aeson/buildlink3.mk"
12.include "../../textproc/hs-attoparsec/buildlink3.mk" 19.include "../../textproc/hs-attoparsec/buildlink3.mk"
13.include "../../devel/hs-base-compat/buildlink3.mk" 20.include "../../devel/hs-base-compat/buildlink3.mk"
14.include "../../math/hs-bifunctors/buildlink3.mk" 21.include "../../math/hs-bifunctors/buildlink3.mk"
15.include "../../textproc/hs-case-insensitive/buildlink3.mk" 22.include "../../textproc/hs-case-insensitive/buildlink3.mk"
16.include "../../devel/hs-constraints/buildlink3.mk" 23.include "../../devel/hs-constraints/buildlink3.mk"
17.include "../../www/hs-http-api-data/buildlink3.mk" 24.include "../../www/hs-http-api-data/buildlink3.mk"
18.include "../../www/hs-http-media/buildlink3.mk" 25.include "../../www/hs-http-media/buildlink3.mk"
19.include "../../www/hs-http-types/buildlink3.mk" 26.include "../../www/hs-http-types/buildlink3.mk"
20.include "../../devel/hs-mmorph/buildlink3.mk" 27.include "../../devel/hs-mmorph/buildlink3.mk"
21.include "../../net/hs-network-uri/buildlink3.mk" 28.include "../../net/hs-network-uri/buildlink3.mk"
22.include "../../devel/hs-QuickCheck/buildlink3.mk" 29.include "../../devel/hs-QuickCheck/buildlink3.mk"
23.include "../../devel/hs-singleton-bool/buildlink3.mk" 30.include "../../devel/hs-singleton-bool/buildlink3.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/hs-servant/PLIST (expand / switch to unified diff)

--- pkgsrc/www/hs-servant/PLIST 2023/10/30 13:35:06 1.2
+++ pkgsrc/www/hs-servant/PLIST 2024/05/02 06:47:43 1.3
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2023/10/30 13:35:06 pho Exp $ 1@comment $NetBSD: PLIST,v 1.3 2024/05/02 06:47:43 pho Exp $
2lib/servant-${PKGVERSION}/${HS_VERSION}/package-description 
3lib/servant-${PKGVERSION}/${HS_VERSION}/package-id 
4${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 2${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
5${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.dyn_hi 3${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.dyn_hi
6lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.hi 4lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.hi
7${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.p_hi 5${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API.p_hi
8${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Alternative.dyn_hi 6${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Alternative.dyn_hi
9lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Alternative.hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Alternative.hi
10${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Alternative.p_hi 8${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Alternative.p_hi
11${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/BasicAuth.dyn_hi 9${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/BasicAuth.dyn_hi
12lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/BasicAuth.hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/BasicAuth.hi
13${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/BasicAuth.p_hi 11${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/BasicAuth.p_hi
14${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Capture.dyn_hi 12${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Capture.dyn_hi
15lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Capture.hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Capture.hi
16${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Capture.p_hi 14${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/Capture.p_hi
@@ -96,26 +94,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P @@ -96,26 +94,28 @@ ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_P
96lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/WithResource.hi 94lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/WithResource.hi
97${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/WithResource.p_hi 95${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/API/WithResource.p_hi
98${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Links.dyn_hi 96${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Links.dyn_hi
99lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Links.hi 97lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Links.hi
100${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Links.p_hi 98${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Links.p_hi
101${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Test/ComprehensiveAPI.dyn_hi 99${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Test/ComprehensiveAPI.dyn_hi
102lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Test/ComprehensiveAPI.hi 100lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Test/ComprehensiveAPI.hi
103${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Test/ComprehensiveAPI.p_hi 101${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Test/ComprehensiveAPI.p_hi
104${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Types/SourceT.dyn_hi 102${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Types/SourceT.dyn_hi
105lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Types/SourceT.hi 103lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Types/SourceT.hi
106${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Types/SourceT.p_hi 104${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Servant/Types/SourceT.p_hi
107lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 105lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
108${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 106${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 107lib/servant-${PKGVERSION}/${HS_VERSION}/package-description
 108lib/servant-${PKGVERSION}/${HS_VERSION}/package-id
109share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/LICENSE 109share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/LICENSE
110${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Alternative.html 110${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Alternative.html
111${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-BasicAuth.html 111${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-BasicAuth.html
112${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Capture.html 112${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Capture.html
113${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-ContentTypes.html 113${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-ContentTypes.html
114${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Description.html 114${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Description.html
115${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Empty.html 115${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Empty.html
116${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Experimental-Auth.html 116${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Experimental-Auth.html
117${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Fragment.html 117${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Fragment.html
118${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Generic.html 118${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Generic.html
119${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Header.html 119${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-Header.html
120${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-HttpVersion.html 120${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-HttpVersion.html
121${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-IsSecure.html 121${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/Servant-API-IsSecure.html
@@ -158,22 +158,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ser @@ -158,22 +158,20 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/ser
158${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-M.html 158${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-M.html
159${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-N.html 159${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-N.html
160${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-O.html 160${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-O.html
161${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-P.html 161${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-P.html
162${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-Q.html 162${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-Q.html
163${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-R.html 163${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-R.html
164${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-S.html 164${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-S.html
165${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-T.html 165${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-T.html
166${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-U.html 166${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-U.html
167${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-V.html 167${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-V.html
168${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-W.html 168${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-W.html
169${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-Y.html 169${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index-Y.html
170${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index.html 170${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index.html
171${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/doc-index.json 
172${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/haddock-bundle.min.js 171${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/haddock-bundle.min.js
173${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/index.html 172${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/index.html
174${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/linuwial.css 173${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/linuwial.css
175${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/meta.json 174${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/meta.json
176${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/quick-jump.css 175${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/quick-jump.css
177${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/quick-jump.min.js 
178${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/servant.haddock 176${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/servant.haddock
179${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/synopsis.png 177${PLIST.doc}share/doc/${HS_PLATFORM}/servant-${PKGVERSION}/html/synopsis.png