pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/textproc/hs-cassava
Module Name: pkgsrc
Committed By: pho
Date: Sat Apr 24 06:10:40 UTC 2021
Modified Files:
pkgsrc/textproc/hs-cassava: Makefile PLIST buildlink3.mk distinfo
Added Files:
pkgsrc/textproc/hs-cassava/patches: patch-cassava.cabal
Log Message:
Fix build with GHC 9
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/hs-cassava/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/hs-cassava/PLIST \
pkgsrc/textproc/hs-cassava/buildlink3.mk \
pkgsrc/textproc/hs-cassava/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/hs-cassava/patches/patch-cassava.cabal
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/textproc/hs-cassava/Makefile
diff -u pkgsrc/textproc/hs-cassava/Makefile:1.2 pkgsrc/textproc/hs-cassava/Makefile:1.3
--- pkgsrc/textproc/hs-cassava/Makefile:1.2 Fri Apr 3 07:40:44 2020
+++ pkgsrc/textproc/hs-cassava/Makefile Sat Apr 24 06:10:39 2021
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2020/04/03 07:40:44 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/24 06:10:39 pho Exp $
DISTNAME= cassava-0.5.2.0
CATEGORIES= textproc
-MASTER_SITES= ${MASTER_SITE_HASKELL_HACKAGE:=cassava-${PKGVERSION_NOREV}/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/hvr/cassava
COMMENT= CSV parsing and encoding library
LICENSE= modified-bsd
-DEPENDS+= hs-attoparsec-[0-9]*:../../textproc/hs-attoparsec
-DEPENDS+= hs-unordered-containers-[0-9]*:../../devel/hs-unordered-containers
-DEPENDS+= hs-vector-[0-9]*:../../devel/hs-vector
-
-USE_LANGUAGES= # none
-
+.include "../../textproc/hs-attoparsec/buildlink3.mk"
+.include "../../devel/hs-hashable/buildlink3.mk"
.include "../../devel/hs-Only/buildlink3.mk"
-.include "../../devel/hs-bytestring-builder/buildlink3.mk"
-.include "../../mk/haskell.mk"
+.include "../../math/hs-scientific/buildlink3.mk"
+.include "../../devel/hs-unordered-containers/buildlink3.mk"
+.include "../../devel/hs-vector/buildlink3.mk"
.include "../../textproc/hs-text-short/buildlink3.mk"
+.include "../../mk/haskell.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/hs-cassava/PLIST
diff -u pkgsrc/textproc/hs-cassava/PLIST:1.1 pkgsrc/textproc/hs-cassava/PLIST:1.2
--- pkgsrc/textproc/hs-cassava/PLIST:1.1 Mon May 11 17:52:14 2020
+++ pkgsrc/textproc/hs-cassava/PLIST Sat Apr 24 06:10:39 2021
@@ -1,50 +1,50 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:14 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Data/Csv.dyn_hi
-${HS_IMPL}/Data/Csv.hi
-${HS_IMPL}/Data/Csv.p_hi
-${HS_IMPL}/Data/Csv/Builder.dyn_hi
-${HS_IMPL}/Data/Csv/Builder.hi
-${HS_IMPL}/Data/Csv/Builder.p_hi
-${HS_IMPL}/Data/Csv/Conversion.dyn_hi
-${HS_IMPL}/Data/Csv/Conversion.hi
-${HS_IMPL}/Data/Csv/Conversion.p_hi
-${HS_IMPL}/Data/Csv/Conversion/Internal.dyn_hi
-${HS_IMPL}/Data/Csv/Conversion/Internal.hi
-${HS_IMPL}/Data/Csv/Conversion/Internal.p_hi
-${HS_IMPL}/Data/Csv/Encoding.dyn_hi
-${HS_IMPL}/Data/Csv/Encoding.hi
-${HS_IMPL}/Data/Csv/Encoding.p_hi
-${HS_IMPL}/Data/Csv/Incremental.dyn_hi
-${HS_IMPL}/Data/Csv/Incremental.hi
-${HS_IMPL}/Data/Csv/Incremental.p_hi
-${HS_IMPL}/Data/Csv/Parser.dyn_hi
-${HS_IMPL}/Data/Csv/Parser.hi
-${HS_IMPL}/Data/Csv/Parser.p_hi
-${HS_IMPL}/Data/Csv/Streaming.dyn_hi
-${HS_IMPL}/Data/Csv/Streaming.hi
-${HS_IMPL}/Data/Csv/Streaming.p_hi
-${HS_IMPL}/Data/Csv/Types.dyn_hi
-${HS_IMPL}/Data/Csv/Types.hi
-${HS_IMPL}/Data/Csv/Types.p_hi
-${HS_IMPL}/Data/Csv/Util.dyn_hi
-${HS_IMPL}/Data/Csv/Util.hi
-${HS_IMPL}/Data/Csv/Util.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 06:10:39 pho Exp $
+lib/cassava-${PKGVERSION}/${HS_VERSION}/package-description
+lib/cassava-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Builder.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Builder.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Builder.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion/Internal.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion/Internal.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Conversion/Internal.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Encoding.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Encoding.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Encoding.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Incremental.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Incremental.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Incremental.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Streaming.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Streaming.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Streaming.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Types.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Types.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Types.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Util.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Util.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Util.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Data-Csv-Builder.html
-${HS_DOCS}/html/Data-Csv-Incremental.html
-${HS_DOCS}/html/Data-Csv-Parser.html
-${HS_DOCS}/html/Data-Csv-Streaming.html
-${HS_DOCS}/html/Data-Csv.html
-${HS_DOCS}/html/cassava.haddock
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Builder.html
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Incremental.html
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Parser.html
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv-Streaming.html
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/Data-Csv.html
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/cassava.haddock
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/cassava-${PKGVERSION}/html/synopsis.png
Index: pkgsrc/textproc/hs-cassava/buildlink3.mk
diff -u pkgsrc/textproc/hs-cassava/buildlink3.mk:1.1 pkgsrc/textproc/hs-cassava/buildlink3.mk:1.2
--- pkgsrc/textproc/hs-cassava/buildlink3.mk:1.1 Mon Mar 30 16:49:19 2020
+++ pkgsrc/textproc/hs-cassava/buildlink3.mk Sat Apr 24 06:10:39 2021
@@ -1,13 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/03/30 16:49:19 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/04/24 06:10:39 pho Exp $
BUILDLINK_TREE+= hs-cassava
.if !defined(HS_CASSAVA_BUILDLINK3_MK)
HS_CASSAVA_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.hs-cassava+= hs-cassava>=0.5.2.0
+BUILDLINK_API_DEPENDS.hs-cassava+= hs-cassava>=0.5.2
BUILDLINK_ABI_DEPENDS.hs-cassava+= hs-cassava>=0.5.2.0
BUILDLINK_PKGSRCDIR.hs-cassava?= ../../textproc/hs-cassava
+
+.include "../../textproc/hs-attoparsec/buildlink3.mk"
+.include "../../devel/hs-hashable/buildlink3.mk"
+.include "../../devel/hs-Only/buildlink3.mk"
+.include "../../math/hs-scientific/buildlink3.mk"
+.include "../../devel/hs-unordered-containers/buildlink3.mk"
+.include "../../devel/hs-vector/buildlink3.mk"
+.include "../../textproc/hs-text-short/buildlink3.mk"
.endif # HS_CASSAVA_BUILDLINK3_MK
BUILDLINK_TREE+= -hs-cassava
Index: pkgsrc/textproc/hs-cassava/distinfo
diff -u pkgsrc/textproc/hs-cassava/distinfo:1.1 pkgsrc/textproc/hs-cassava/distinfo:1.2
--- pkgsrc/textproc/hs-cassava/distinfo:1.1 Mon Mar 30 16:49:19 2020
+++ pkgsrc/textproc/hs-cassava/distinfo Sat Apr 24 06:10:39 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/03/30 16:49:19 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2021/04/24 06:10:39 pho Exp $
SHA1 (cassava-0.5.2.0.tar.gz) = 8288560c1b1328dc930da8e850439824c2842277
RMD160 (cassava-0.5.2.0.tar.gz) = 1913809650916b73dd6cab17d4374666bb6f83c4
SHA512 (cassava-0.5.2.0.tar.gz) = f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
Size (cassava-0.5.2.0.tar.gz) = 37411 bytes
+SHA1 (patch-cassava.cabal) = 76379c44b67a7342c3a65b0974aa023ff47ab3c0
Added files:
Index: pkgsrc/textproc/hs-cassava/patches/patch-cassava.cabal
diff -u /dev/null pkgsrc/textproc/hs-cassava/patches/patch-cassava.cabal:1.1
--- /dev/null Sat Apr 24 06:10:40 2021
+++ pkgsrc/textproc/hs-cassava/patches/patch-cassava.cabal Sat Apr 24 06:10:39 2021
@@ -0,0 +1,18 @@
+$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,
Home |
Main Index |
Thread Index |
Old Index