Updated textproc/ocaml-csv to version 2.4.

This introduces compatilibity with later OCaml verions (post-4.08), and
several other minor bugfixes and changes.

5 files changed, 13 insertions, 15 deletions

diff --git a/textproc/ocaml-csv/Makefile b/textproc/ocaml-csv/Makefile
index 103152dfe5d..23b8f47f128 100644
--- a/textproc/ocaml-csv/Makefile
+++ b/textproc/ocaml-csv/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.24 2021/03/08 08:13:07 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2022/05/05 12:00:47 jaapb Exp $
 
-VERSION=	2.2
+VERSION=	2.4
 GITHUB_PROJECT=	ocaml-csv
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Chris00/}
 
 MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	http://csv.forge.ocamlcore.org/
+HOMEPAGE=	https://github.com/Chris00/ocaml-csv/
 COMMENT=	CSV library for OCaml
 LICENSE=	gnu-lgpl-v2.1
 
@@ -16,8 +15,8 @@ LICENSE=	gnu-lgpl-v2.1
 USE_LANGUAGES=	c
 
 OCAML_USE_DUNE=		yes
-DUNE_BUILD_PACKAGES=	csv
 OPAM_INSTALL_FILES=	csv
+OCAML_FINDLIB_DIRS=	csv
 
 .include "options.mk"
 .include "../../mk/ocaml.mk"
diff --git a/textproc/ocaml-csv/PLIST b/textproc/ocaml-csv/PLIST
index 1312fc061f2..f101f10ae82 100644
--- a/textproc/ocaml-csv/PLIST
+++ b/textproc/ocaml-csv/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2019/03/05 19:40:33 jaapb Exp $
-bin/csvtool
+@comment $NetBSD: PLIST,v 1.9 2022/05/05 12:00:47 jaapb Exp $
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/META
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/csv-lwt/csv_lwt.a
 ${PLIST.lwt}${OCAML_SITELIB}/csv-lwt/csv_lwt.cma
diff --git a/textproc/ocaml-csv/buildlink3.mk b/textproc/ocaml-csv/buildlink3.mk
index ffc2ce90b41..763ce90df44 100644
--- a/textproc/ocaml-csv/buildlink3.mk
+++ b/textproc/ocaml-csv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2019/11/04 21:43:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2022/05/05 12:00:47 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-csv
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-csv
 OCAML_CSV_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-csv+=	ocaml-csv>=2.0
-BUILDLINK_ABI_DEPENDS.ocaml-csv+=	ocaml-csv>=2.2nb1
+BUILDLINK_ABI_DEPENDS.ocaml-csv+=	ocaml-csv>=2.4
 BUILDLINK_PKGSRCDIR.ocaml-csv?=		../../textproc/ocaml-csv
 
 .endif	# OCAML_CSV_BUILDLINK3_MK
diff --git a/textproc/ocaml-csv/distinfo b/textproc/ocaml-csv/distinfo
index c614ed51734..48a62cb9d9a 100644
--- a/textproc/ocaml-csv/distinfo
+++ b/textproc/ocaml-csv/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:22:23 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/05/05 12:00:47 jaapb Exp $
 
-BLAKE2s (ocaml-csv-2.2.tar.gz) = b4a1ad900c881b2095f118ce218722248d423813e1ad2d1e51bfefb146e14967
-SHA512 (ocaml-csv-2.2.tar.gz) = 733f33482d4b26f3046a205808dbbb66e0414ebc0c32fa9529b647828f9ed15cfdee00634d61959ae33ad99a41ac9193c25e6ecf154edf99a8344a5ddde75ccf
-Size (ocaml-csv-2.2.tar.gz) = 45069 bytes
+BLAKE2s (ocaml-csv-2.4.tar.gz) = cdb2baf04a549690ee4fd753cf262813424809d21e8905809dab2e2dfb19fbc2
+SHA512 (ocaml-csv-2.4.tar.gz) = 618c900d8fc3c9d09e45178e2794e1d5907c6a2d8344a3af066496cbc344e6203e5c1de4119ebef8fd58ff1537f8b832882294bdbffb220dcb5b78efb8d526b3
+Size (ocaml-csv-2.4.tar.gz) = 45975 bytes
diff --git a/textproc/ocaml-csv/options.mk b/textproc/ocaml-csv/options.mk
index c209d380021..8bab33b523f 100644
--- a/textproc/ocaml-csv/options.mk
+++ b/textproc/ocaml-csv/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/04 21:43:39 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2022/05/05 12:00:47 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml-csv
 PKG_SUPPORTED_OPTIONS=	lwt
@@ -15,7 +15,7 @@ PLIST_VARS+=		lwt
 .if !empty(PKG_OPTIONS:Mlwt)
 .include "../../devel/ocaml-lwt/buildlink3.mk"
 PLIST.lwt=	yes
-DUNE_BUILD_PACKAGES+=	csv-lwt
 OPAM_INSTALL_FILES+=	csv-lwt
+OCAML_FINDLIB_DIRS+=	csv-lwt
 .else
 .endif