[pkgsrc/trunk]: pkgsrc/textproc Fix build with GHC 9

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/textproc Fix build with GHC 9
From: pho <pho%pkgsrc.org@localhost>
Date: Sat, 24 Apr 2021 08:00:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/576f6bbb265a
branches:  trunk
changeset: 451035:576f6bbb265a
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Apr 24 06:05:49 2021 +0000

description:
Fix build with GHC 9

diffstat:

 textproc/hs-cassava/Makefile                          |  18 +--
 textproc/hs-cassava/PLIST                             |  98 +++++++++---------
 textproc/hs-cassava/buildlink3.mk                     |  12 +-
 textproc/hs-cassava/distinfo                          |   3 +-
 textproc/hs-cassava/patches/patch-cassava.cabal       |  18 +++
 textproc/hs-text-short/Makefile                       |   7 +-
 textproc/hs-text-short/PLIST                          |  64 ++++++------
 textproc/hs-text-short/buildlink3.mk                  |   4 +-
 textproc/hs-text-short/distinfo                       |   4 +-
 textproc/hs-text-short/patches/patch-text-short.cabal |  10 +-
 10 files changed, 129 insertions(+), 109 deletions(-)

diffs (truncated from 349 to 300 lines):

diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-cassava/Makefile
--- a/textproc/hs-cassava/Makefile      Sat Apr 24 05:59:54 2021 +0000
+++ b/textproc/hs-cassava/Makefile      Sat Apr 24 06:05:49 2021 +0000
@@ -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 "../../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 "../../textproc/hs-text-short/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-cassava/PLIST
--- a/textproc/hs-cassava/PLIST Sat Apr 24 05:59:54 2021 +0000
+++ b/textproc/hs-cassava/PLIST Sat Apr 24 06:05:49 2021 +0000
@@ -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
diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-cassava/buildlink3.mk
--- a/textproc/hs-cassava/buildlink3.mk Sat Apr 24 05:59:54 2021 +0000
+++ b/textproc/hs-cassava/buildlink3.mk Sat Apr 24 06:05:49 2021 +0000
@@ -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
diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-cassava/distinfo
--- a/textproc/hs-cassava/distinfo      Sat Apr 24 05:59:54 2021 +0000
+++ b/textproc/hs-cassava/distinfo      Sat Apr 24 06:05:49 2021 +0000
@@ -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
diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-cassava/patches/patch-cassava.cabal
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/hs-cassava/patches/patch-cassava.cabal   Sat Apr 24 06:05:49 2021 +0000
@@ -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,
diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-text-short/Makefile
--- a/textproc/hs-text-short/Makefile   Sat Apr 24 05:59:54 2021 +0000
+++ b/textproc/hs-text-short/Makefile   Sat Apr 24 06:05:49 2021 +0000
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2020/04/03 07:32:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/24 06:05:49 pho Exp $
 
 DISTNAME=      text-short-0.1.3
 CATEGORIES=    textproc
-MASTER_SITES=  ${MASTER_SITE_HASKELL_HACKAGE:=text-short-${PKGVERSION_NOREV}/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://hackage.haskell.org/package/text-short
 COMMENT=       Memory-efficient representation of Unicode text strings
 LICENSE=       modified-bsd
 
-DEPENDS+=      hs-hashable-[0-9]*:../../devel/hs-hashable
-
+.include "../../devel/hs-hashable/buildlink3.mk"
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-text-short/PLIST
--- a/textproc/hs-text-short/PLIST      Sat Apr 24 05:59:54 2021 +0000
+++ b/textproc/hs-text-short/PLIST      Sat Apr 24 06:05:49 2021 +0000
@@ -1,33 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:18 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.2 2021/04/24 06:05:49 pho Exp $
+lib/text-short-${PKGVERSION}/${HS_VERSION}/package-description
+lib/text-short-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/Data/Text/Short.dyn_hi
-${HS_IMPL}/Data/Text/Short.hi
-${HS_IMPL}/Data/Text/Short.p_hi
-${HS_IMPL}/Data/Text/Short/Internal.dyn_hi
-${HS_IMPL}/Data/Text/Short/Internal.hi
-${HS_IMPL}/Data/Text/Short/Internal.p_hi
-${HS_IMPL}/Data/Text/Short/Partial.dyn_hi
-${HS_IMPL}/Data/Text/Short/Partial.hi
-${HS_IMPL}/Data/Text/Short/Partial.p_hi
-${HS_IMPL}/Data/Text/Short/Unsafe.dyn_hi
-${HS_IMPL}/Data/Text/Short/Unsafe.hi
-${HS_IMPL}/Data/Text/Short/Unsafe.p_hi
-${HS_IMPL}/PrimOps.dyn_hi
-${HS_IMPL}/PrimOps.hi
-${HS_IMPL}/PrimOps.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/Data-Text-Short-Partial.html
-${HS_DOCS}/html/Data-Text-Short-Unsafe.html
-${HS_DOCS}/html/Data-Text-Short.html
-${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
-${HS_DOCS}/html/text-short.haddock
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Internal.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Internal.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Internal.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Partial.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Partial.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Partial.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Unsafe.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Unsafe.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Text/Short/Unsafe.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/PrimOps.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/PrimOps.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/PrimOps.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/Data-Text-Short-Partial.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/Data-Text-Short-Unsafe.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/Data-Text-Short.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/synopsis.png
+share/doc/${HS_PLATFORM}/text-short-${PKGVERSION}/html/text-short.haddock
diff -r a9c344d2fd9b -r 576f6bbb265a textproc/hs-text-short/buildlink3.mk
--- a/textproc/hs-text-short/buildlink3.mk      Sat Apr 24 05:59:54 2021 +0000
+++ b/textproc/hs-text-short/buildlink3.mk      Sat Apr 24 06:05:49 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/03/30 16:48:43 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/04/24 06:05:49 pho Exp $
 
 BUILDLINK_TREE+=       hs-text-short
 
@@ -8,6 +8,8 @@
 BUILDLINK_API_DEPENDS.hs-text-short+=  hs-text-short>=0.1.3
 BUILDLINK_ABI_DEPENDS.hs-text-short+=  hs-text-short>=0.1.3
 BUILDLINK_PKGSRCDIR.hs-text-short?=    ../../textproc/hs-text-short
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/hs-case-insensitive Update PLIST
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/hs-cassava-megaparsec Update to cassava-megap...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/hs-case-insensitive Update PLIST
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/hs-cassava-megaparsec Update to cassava-megap...
Indexes:
Home | Main Index | Thread Index | Old Index