4 files changed, 39 insertions, 37 deletions
diff --git a/textproc/hs-cassava-megaparsec/Makefile b/textproc/hs-cassava-megaparsec/Makefile
index 755478d94b5..2d22d26b17e 100644
--- a/textproc/hs-cassava-megaparsec/Makefile
+++ b/textproc/hs-cassava-megaparsec/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2020/04/03 07:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/24 06:18:24 pho Exp $
 
-DISTNAME=	cassava-megaparsec-2.0.1
+DISTNAME=	cassava-megaparsec-2.0.2
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_HASKELL_HACKAGE:=cassava-megaparsec-${PKGVERSION_NOREV}/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/stackbuilders/cassava-megaparsec
 COMMENT=	Megaparsec parser of CSV files that plays nicely with Cassava
 LICENSE=	mit
 
-DEPENDS+=	hs-megaparsec-[0-9]*:../../textproc/hs-megaparsec
-
-USE_LANGUAGES=	# none
-
-.include "../../mk/haskell.mk"
 .include "../../textproc/hs-cassava/buildlink3.mk"
+.include "../../textproc/hs-megaparsec/buildlink3.mk"
+.include "../../devel/hs-unordered-containers/buildlink3.mk"
+.include "../../devel/hs-vector/buildlink3.mk"
+.include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hs-cassava-megaparsec/PLIST b/textproc/hs-cassava-megaparsec/PLIST
index 7a04308562a..c7d0f7faee4 100644
--- a/textproc/hs-cassava-megaparsec/PLIST
+++ b/textproc/hs-cassava-megaparsec/PLIST
@@ -1,21 +1,21 @@
-@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/Parser/Megaparsec.dyn_hi
-${HS_IMPL}/Data/Csv/Parser/Megaparsec.hi
-${HS_IMPL}/Data/Csv/Parser/Megaparsec.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:18:24 pho Exp $
+lib/cassava-megaparsec-${PKGVERSION}/${HS_VERSION}/package-description
+lib/cassava-megaparsec-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser/Megaparsec.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser/Megaparsec.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Data/Csv/Parser/Megaparsec.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.md
-${HS_DOCS}/html/CHANGELOG.md
-${HS_DOCS}/html/Data-Csv-Parser-Megaparsec.html
-${HS_DOCS}/html/README.md
-${HS_DOCS}/html/cassava-megaparsec.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-megaparsec-${PKGVERSION}/LICENSE.md
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/CHANGELOG.md
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/Data-Csv-Parser-Megaparsec.html
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/README.md
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/cassava-megaparsec.haddock
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/cassava-megaparsec-${PKGVERSION}/html/synopsis.png
diff --git a/textproc/hs-cassava-megaparsec/buildlink3.mk b/textproc/hs-cassava-megaparsec/buildlink3.mk
index 8cd76b68d81..50142285e43 100644
--- a/textproc/hs-cassava-megaparsec/buildlink3.mk
+++ b/textproc/hs-cassava-megaparsec/buildlink3.mk
@@ -1,13 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/03/30 16:49:55 riastradh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/04/24 06:18:24 pho Exp $
 
 BUILDLINK_TREE+=	hs-cassava-megaparsec
 
 .if !defined(HS_CASSAVA_MEGAPARSEC_BUILDLINK3_MK)
 HS_CASSAVA_MEGAPARSEC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-cassava-megaparsec+=	hs-cassava-megaparsec>=2.0.1
-BUILDLINK_ABI_DEPENDS.hs-cassava-megaparsec+=	hs-cassava-megaparsec>=2.0.1
+BUILDLINK_API_DEPENDS.hs-cassava-megaparsec+=	hs-cassava-megaparsec>=2.0.2
+BUILDLINK_ABI_DEPENDS.hs-cassava-megaparsec+=	hs-cassava-megaparsec>=2.0.2
 BUILDLINK_PKGSRCDIR.hs-cassava-megaparsec?=	../../textproc/hs-cassava-megaparsec
+
+.include "../../textproc/hs-cassava/buildlink3.mk"
+.include "../../textproc/hs-megaparsec/buildlink3.mk"
+.include "../../devel/hs-unordered-containers/buildlink3.mk"
+.include "../../devel/hs-vector/buildlink3.mk"
 .endif	# HS_CASSAVA_MEGAPARSEC_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-hs-cassava-megaparsec
diff --git a/textproc/hs-cassava-megaparsec/distinfo b/textproc/hs-cassava-megaparsec/distinfo
index d0b770d7e09..c23aea250c8 100644
--- a/textproc/hs-cassava-megaparsec/distinfo
+++ b/textproc/hs-cassava-megaparsec/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2020/03/30 16:49:55 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2021/04/24 06:18:24 pho Exp $
 
-SHA1 (cassava-megaparsec-2.0.1.tar.gz) = 447bb239ae9708b506b6431364808e8a079b7319
-RMD160 (cassava-megaparsec-2.0.1.tar.gz) = f56e249712a437552ee9dd09e0ff5607359bfb0c
-SHA512 (cassava-megaparsec-2.0.1.tar.gz) = f4be4741871b14c3ded67fbb7c7c084c649b3a3f848650ab61a5a2d5462d86b66941794e201a10cd803c06876fc2a8bf40d2efdf49379ed08e8f11436dd89282
-Size (cassava-megaparsec-2.0.1.tar.gz) = 6131 bytes
+SHA1 (cassava-megaparsec-2.0.2.tar.gz) = 1c23e9ae726ab63a45c1261b636c519a8cb94201
+RMD160 (cassava-megaparsec-2.0.2.tar.gz) = 81c7c48af5767fc1f3b9236da915355f132cce24
+SHA512 (cassava-megaparsec-2.0.2.tar.gz) = b32057fe6dd2a70eb96e9453e3f765f0b67099342411df050bf30dc0bf1c360b3804b1e958c6e2937f66b98433e0459ab3833f060065b45af051415cdfc0bf7b
+Size (cassava-megaparsec-2.0.2.tar.gz) = 6146 bytes