Sat Apr 24 06:10:40 2021 UTC ()
Fix build with GHC 9


(pho)
diff -r1.2 -r1.3 pkgsrc/textproc/hs-cassava/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/hs-cassava/PLIST
diff -r1.1 -r1.2 pkgsrc/textproc/hs-cassava/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/textproc/hs-cassava/distinfo
diff -r0 -r1.1 pkgsrc/textproc/hs-cassava/patches/patch-cassava.cabal
cvs diff -r1.2 -r1.3 pkgsrc/textproc/hs-cassava/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/hs-cassava/Makefile 2020/04/03 07:40:44 1.2
+++ pkgsrc/textproc/hs-cassava/Makefile 2021/04/24 06:10:39 1.3
@@ -1,22 +1,18 @@ @@ -1,22 +1,18 @@
1# $NetBSD: Makefile,v 1.2 2020/04/03 07:40:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2021/04/24 06:10:39 pho Exp $
2 2
3DISTNAME= cassava-0.5.2.0 3DISTNAME= cassava-0.5.2.0
4CATEGORIES= textproc 4CATEGORIES= textproc
5MASTER_SITES= ${MASTER_SITE_HASKELL_HACKAGE:=cassava-${PKGVERSION_NOREV}/} 
6 5
7MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://github.com/hvr/cassava 
9COMMENT= CSV parsing and encoding library 7COMMENT= CSV parsing and encoding library
10LICENSE= modified-bsd 8LICENSE= modified-bsd
11 9
12DEPENDS+= hs-attoparsec-[0-9]*:../../textproc/hs-attoparsec 10.include "../../textproc/hs-attoparsec/buildlink3.mk"
13DEPENDS+= hs-unordered-containers-[0-9]*:../../devel/hs-unordered-containers 11.include "../../devel/hs-hashable/buildlink3.mk"
14DEPENDS+= hs-vector-[0-9]*:../../devel/hs-vector 
15 
16USE_LANGUAGES= # none 
17 
18.include "../../devel/hs-Only/buildlink3.mk" 12.include "../../devel/hs-Only/buildlink3.mk"
19.include "../../devel/hs-bytestring-builder/buildlink3.mk" 13.include "../../math/hs-scientific/buildlink3.mk"
20.include "../../mk/haskell.mk" 14.include "../../devel/hs-unordered-containers/buildlink3.mk"
 15.include "../../devel/hs-vector/buildlink3.mk"
21.include "../../textproc/hs-text-short/buildlink3.mk" 16.include "../../textproc/hs-text-short/buildlink3.mk"
 17.include "../../mk/haskell.mk"
22.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/textproc/hs-cassava/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/hs-cassava/PLIST 2020/05/11 17:52:14 1.1
+++ pkgsrc/textproc/hs-cassava/PLIST 2021/04/24 06:10:39 1.2
@@ -1,50 +1,50 @@ @@ -1,50 +1,50 @@
1@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:14 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.2 2021/04/24 06:10:39 pho Exp $
2${HS_INTF}/package-description 2lib/cassava-${PKGVERSION}/${HS_VERSION}/package-description
3${HS_INTF}/package-id 3lib/cassava-${PKGVERSION}/${HS_VERSION}/package-id
4${HS_IMPL}/Data/Csv.dyn_hi 4lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv.dyn_hi
5${HS_IMPL}/Data/Csv.hi 5lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv.hi
6${HS_IMPL}/Data/Csv.p_hi 6lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv.p_hi
7${HS_IMPL}/Data/Csv/Builder.dyn_hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Builder.dyn_hi
8${HS_IMPL}/Data/Csv/Builder.hi 8lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Builder.hi
9${HS_IMPL}/Data/Csv/Builder.p_hi 9lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Builder.p_hi
10${HS_IMPL}/Data/Csv/Conversion.dyn_hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion.dyn_hi
11${HS_IMPL}/Data/Csv/Conversion.hi 11lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion.hi
12${HS_IMPL}/Data/Csv/Conversion.p_hi 12lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion.p_hi
13${HS_IMPL}/Data/Csv/Conversion/Internal.dyn_hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion/Internal.dyn_hi
14${HS_IMPL}/Data/Csv/Conversion/Internal.hi 14lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion/Internal.hi
15${HS_IMPL}/Data/Csv/Conversion/Internal.p_hi 15lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion/Internal.p_hi
16${HS_IMPL}/Data/Csv/Encoding.dyn_hi 16lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Encoding.dyn_hi
17${HS_IMPL}/Data/Csv/Encoding.hi 17lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Encoding.hi
18${HS_IMPL}/Data/Csv/Encoding.p_hi 18lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Encoding.p_hi
19${HS_IMPL}/Data/Csv/Incremental.dyn_hi 19lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Incremental.dyn_hi
20${HS_IMPL}/Data/Csv/Incremental.hi 20lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Incremental.hi
21${HS_IMPL}/Data/Csv/Incremental.p_hi 21lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Incremental.p_hi
22${HS_IMPL}/Data/Csv/Parser.dyn_hi 22lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser.dyn_hi
23${HS_IMPL}/Data/Csv/Parser.hi 23lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser.hi
24${HS_IMPL}/Data/Csv/Parser.p_hi 24lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser.p_hi
25${HS_IMPL}/Data/Csv/Streaming.dyn_hi 25lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Streaming.dyn_hi
26${HS_IMPL}/Data/Csv/Streaming.hi 26lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Streaming.hi
27${HS_IMPL}/Data/Csv/Streaming.p_hi 27lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Streaming.p_hi
28${HS_IMPL}/Data/Csv/Types.dyn_hi 28lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Types.dyn_hi
29${HS_IMPL}/Data/Csv/Types.hi 29lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Types.hi
30${HS_IMPL}/Data/Csv/Types.p_hi 30lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Types.p_hi
31${HS_IMPL}/Data/Csv/Util.dyn_hi 31lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Util.dyn_hi
32${HS_IMPL}/Data/Csv/Util.hi 32lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Util.hi
33${HS_IMPL}/Data/Csv/Util.p_hi 33lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Util.p_hi
34${HS_IMPL}/libHS${HS_PKGID}.a 34lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
35${HS_IMPL}/libHS${HS_PKGID}_p.a 35lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
36lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 36lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
37${HS_DOCS}/LICENSE 37share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/LICENSE
38${HS_DOCS}/html/Data-Csv-Builder.html 38share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Builder.html
39${HS_DOCS}/html/Data-Csv-Incremental.html 39share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Incremental.html
40${HS_DOCS}/html/Data-Csv-Parser.html 40share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Parser.html
41${HS_DOCS}/html/Data-Csv-Streaming.html 41share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Streaming.html
42${HS_DOCS}/html/Data-Csv.html 42share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv.html
43${HS_DOCS}/html/cassava.haddock 43share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/cassava.haddock
44${HS_DOCS}/html/doc-index.html 44share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/doc-index.html
45${HS_DOCS}/html/haddock-bundle.min.js 45share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/haddock-bundle.min.js
46${HS_DOCS}/html/index.html 46share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/index.html
47${HS_DOCS}/html/linuwial.css 47share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/linuwial.css
48${HS_DOCS}/html/meta.json 48share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/meta.json
49${HS_DOCS}/html/quick-jump.css 49share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/quick-jump.css
50${HS_DOCS}/html/synopsis.png 50share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/synopsis.png
cvs diff -r1.1 -r1.2 pkgsrc/textproc/hs-cassava/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/hs-cassava/buildlink3.mk 2020/03/30 16:49:19 1.1
+++ pkgsrc/textproc/hs-cassava/buildlink3.mk 2021/04/24 06:10:39 1.2
@@ -1,13 +1,21 @@ @@ -1,13 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.1 2020/03/30 16:49:19 riastradh Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2021/04/24 06:10:39 pho Exp $
2 2
3BUILDLINK_TREE+= hs-cassava 3BUILDLINK_TREE+= hs-cassava
4 4
5.if !defined(HS_CASSAVA_BUILDLINK3_MK) 5.if !defined(HS_CASSAVA_BUILDLINK3_MK)
6HS_CASSAVA_BUILDLINK3_MK:= 6HS_CASSAVA_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.hs-cassava+= hs-cassava>=0.5.2.0 8BUILDLINK_API_DEPENDS.hs-cassava+= hs-cassava>=0.5.2
9BUILDLINK_ABI_DEPENDS.hs-cassava+= hs-cassava>=0.5.2.0 9BUILDLINK_ABI_DEPENDS.hs-cassava+= hs-cassava>=0.5.2.0
10BUILDLINK_PKGSRCDIR.hs-cassava?= ../../textproc/hs-cassava 10BUILDLINK_PKGSRCDIR.hs-cassava?= ../../textproc/hs-cassava
 11
 12.include "../../textproc/hs-attoparsec/buildlink3.mk"
 13.include "../../devel/hs-hashable/buildlink3.mk"
 14.include "../../devel/hs-Only/buildlink3.mk"
 15.include "../../math/hs-scientific/buildlink3.mk"
 16.include "../../devel/hs-unordered-containers/buildlink3.mk"
 17.include "../../devel/hs-vector/buildlink3.mk"
 18.include "../../textproc/hs-text-short/buildlink3.mk"
11.endif # HS_CASSAVA_BUILDLINK3_MK 19.endif # HS_CASSAVA_BUILDLINK3_MK
12 20
13BUILDLINK_TREE+= -hs-cassava 21BUILDLINK_TREE+= -hs-cassava
cvs diff -r1.1 -r1.2 pkgsrc/textproc/hs-cassava/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/hs-cassava/distinfo 2020/03/30 16:49:19 1.1
+++ pkgsrc/textproc/hs-cassava/distinfo 2021/04/24 06:10:39 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2020/03/30 16:49:19 riastradh Exp $ 1$NetBSD: distinfo,v 1.2 2021/04/24 06:10:39 pho Exp $
2 2
3SHA1 (cassava-0.5.2.0.tar.gz) = 8288560c1b1328dc930da8e850439824c2842277 3SHA1 (cassava-0.5.2.0.tar.gz) = 8288560c1b1328dc930da8e850439824c2842277
4RMD160 (cassava-0.5.2.0.tar.gz) = 1913809650916b73dd6cab17d4374666bb6f83c4 4RMD160 (cassava-0.5.2.0.tar.gz) = 1913809650916b73dd6cab17d4374666bb6f83c4
5SHA512 (cassava-0.5.2.0.tar.gz) = f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383 5SHA512 (cassava-0.5.2.0.tar.gz) = f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
6Size (cassava-0.5.2.0.tar.gz) = 37411 bytes 6Size (cassava-0.5.2.0.tar.gz) = 37411 bytes
 7SHA1 (patch-cassava.cabal) = 76379c44b67a7342c3a65b0974aa023ff47ab3c0
File Added: pkgsrc/textproc/hs-cassava/patches/Attic/patch-cassava.cabal
$NetBSD: patch-cassava.cabal,v 1.1 2021/04/24 06:10:39 pho Exp $

Fix build with attoparsec-0.14.*.
Fix build with GHC 9.

--- cassava.cabal.orig	2001-09-09 01:46:40.000000000 +0000
+++ cassava.cabal
@@ -95,8 +95,8 @@ Library
 
   Build-depends:
     array >= 0.4 && < 0.6,
-    attoparsec >= 0.11.3.0 && < 0.14,
-    base >= 4.5 && < 4.14,
+    attoparsec >= 0.11.3.0 && < 0.15,
+    base >= 4.5 && < 5,
     bytestring >= 0.9.2 && < 0.11,
     containers >= 0.4.2 && < 0.7,
     deepseq >= 1.1 && < 1.5,