Updated net/ocaml-conduit to version 2.1.0.

This introduces a fairly extensive list of changes, some of which break
compatibility. See CHANGES.md for more details.

4 files changed, 17 insertions, 14 deletions

diff --git a/net/ocaml-conduit/Makefile b/net/ocaml-conduit/Makefile
index 13a908f01df..1355cefcdd3 100644
--- a/net/ocaml-conduit/Makefile
+++ b/net/ocaml-conduit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2019/11/03 11:45:45 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2020/04/08 12:46:24 jaapb Exp $
 
 GITHUB_PROJECT=	ocaml-conduit
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	${GITHUB_PROJECT}-1.4.0
+DISTNAME=	${GITHUB_PROJECT}-2.1.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
 
diff --git a/net/ocaml-conduit/PLIST b/net/ocaml-conduit/PLIST
index f095631daa1..eade1ba6c00 100644
--- a/net/ocaml-conduit/PLIST
+++ b/net/ocaml-conduit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/07/01 16:01:36 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/08 12:46:24 jaapb Exp $
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/META
 ${PLIST.async}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-async/conduit_async.a
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async.cma
@@ -26,6 +26,10 @@ ${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async__V2.cmi
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async__V2.cmt
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async__V2.cmti
 ${PLIST.async}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-async/conduit_async__V2.cmx
+${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async__V3.cmi
+${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async__V3.cmt
+${PLIST.async}${OCAML_SITELIB}/conduit-async/conduit_async__V3.cmti
+${PLIST.async}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-async/conduit_async__V3.cmx
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/dune-package
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/opam
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/private_ssl.ml
@@ -34,6 +38,8 @@ ${PLIST.async}${OCAML_SITELIB}/conduit-async/v1.ml
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/v1.mli
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/v2.ml
 ${PLIST.async}${OCAML_SITELIB}/conduit-async/v2.mli
+${PLIST.async}${OCAML_SITELIB}/conduit-async/v3.ml
+${PLIST.async}${OCAML_SITELIB}/conduit-async/v3.mli
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/META
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_launchd.cmi
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_launchd.cmt
@@ -47,10 +53,8 @@ ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_server.ml
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_server.mli
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmi
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmt
-${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmti
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.cmx
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.ml
-${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_tls.mli
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.a
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.cma
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.cmi
@@ -63,10 +67,8 @@ ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.ml
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix.mli
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmi
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmt
-${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmti
 ${PLIST.lwt}${PLIST.ocaml-opt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.cmx
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.ml
-${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/conduit_lwt_unix_ssl.mli
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/dune-package
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/opam
 ${PLIST.lwt}${OCAML_SITELIB}/conduit-lwt-unix/resolver_lwt_unix.cmi
diff --git a/net/ocaml-conduit/buildlink3.mk b/net/ocaml-conduit/buildlink3.mk
index ccac1d366b8..57ee5e92190 100644
--- a/net/ocaml-conduit/buildlink3.mk
+++ b/net/ocaml-conduit/buildlink3.mk
@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/07/01 16:01:36 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/04/08 12:46:24 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-conduit
 
 .if !defined(OCAML_CONDUIT_BUILDLINK3_MK)
 OCAML_CONDUIT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-conduit+=	ocaml-conduit>=1.4.0
+BUILDLINK_API_DEPENDS.ocaml-conduit+=	ocaml-conduit>=2.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-conduit+=	ocaml-conduit>=2.1.0
 BUILDLINK_PKGSRCDIR.ocaml-conduit?=	../../net/ocaml-conduit
 
 .endif	# OCAML_CONDUIT_BUILDLINK3_MK
diff --git a/net/ocaml-conduit/distinfo b/net/ocaml-conduit/distinfo
index 21530666c27..0a7dd1c211d 100644
--- a/net/ocaml-conduit/distinfo
+++ b/net/ocaml-conduit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2019/07/01 16:01:36 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2020/04/08 12:46:24 jaapb Exp $
 
-SHA1 (ocaml-conduit-1.4.0.tar.gz) = 0002d85cd9194012d7054b0b615fd07830f6ff79
-RMD160 (ocaml-conduit-1.4.0.tar.gz) = cc3ae9b0ed74957fa127ec70d6b5bb23a72f5e02
-SHA512 (ocaml-conduit-1.4.0.tar.gz) = 030946f88bc037c8c1e78818b9250acdd374c5c067d3a718f50818647da7e8b12dbc494c62dd3bd35bf07a85dd4aa1c19a561f5bb95ce065a222ce3fd36d5aa3
-Size (ocaml-conduit-1.4.0.tar.gz) = 39066 bytes
+SHA1 (ocaml-conduit-2.1.0.tar.gz) = 42455080b260edd835d2f66d25a4f7a2d7c1aa7a
+RMD160 (ocaml-conduit-2.1.0.tar.gz) = 438e11bff637c78285abc0fafa265a2690bca4d3
+SHA512 (ocaml-conduit-2.1.0.tar.gz) = c65f55933d00f17f281474d756064e89424226defa10a1e82716ed8f50ceb5f2c8c005b42f25ef32702ccb2ce827f605da4d88425e24198962c264689f48ac82
+Size (ocaml-conduit-2.1.0.tar.gz) = 41641 bytes