Updated devel/ocaml-encore to version 0.4.

This fixes a build failure, and has several other minor improvements and
bugfixes.

4 files changed, 21 insertions, 15 deletions

diff --git a/devel/ocaml-encore/Makefile b/devel/ocaml-encore/Makefile
index 2c12e3bed44..d956fdfc906 100644
--- a/devel/ocaml-encore/Makefile
+++ b/devel/ocaml-encore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/03/19 11:38:06 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2020/04/14 08:56:07 jaapb Exp $
 
 GITHUB_PROJECT=	encore
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	${GITHUB_PROJECT}-0.2
+DISTNAME=	${GITHUB_PROJECT}-0.4
 PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
@@ -17,6 +17,7 @@ OCAML_USE_DUNE=	yes
 
 .include "../../mk/ocaml.mk"
 .include "../../devel/ocaml-angstrom/buildlink3.mk"
+.include "../../devel/ocaml-ke/buildlink3.mk"
 .include "../../devel/ocaml-ocplib-endian/buildlink3.mk"
 .include "../../devel/ocaml-fmt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-encore/PLIST b/devel/ocaml-encore/PLIST
index 804b43c594f..0fd12d2521b 100644
--- a/devel/ocaml-encore/PLIST
+++ b/devel/ocaml-encore/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/19 11:38:06 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/04/14 08:56:07 jaapb Exp $
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/Encore.a
 ${OCAML_SITELIB}/encore/Encore.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/Encore.cmxa
@@ -6,6 +6,15 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/Encore.cmxs
 ${OCAML_SITELIB}/encore/META
 ${OCAML_SITELIB}/encore/bijection.ml
 ${OCAML_SITELIB}/encore/bijection.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/butils/butils.a
+${OCAML_SITELIB}/encore/butils/butils.cma
+${OCAML_SITELIB}/encore/butils/butils.cmi
+${OCAML_SITELIB}/encore/butils/butils.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/butils/butils.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/butils/butils.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/butils/butils.cmxs
+${OCAML_SITELIB}/encore/butils/butils.ml
+${OCAML_SITELIB}/encore/butils/libbutils_stubs.a
 ${OCAML_SITELIB}/encore/dune-package
 ${OCAML_SITELIB}/encore/either.ml
 ${OCAML_SITELIB}/encore/encoder.ml
@@ -31,10 +40,6 @@ ${OCAML_SITELIB}/encore/encore__Encoder.cmi
 ${OCAML_SITELIB}/encore/encore__Encoder.cmt
 ${OCAML_SITELIB}/encore/encore__Encoder.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/encore__Encoder.cmx
-${OCAML_SITELIB}/encore/encore__FQueue.cmi
-${OCAML_SITELIB}/encore/encore__FQueue.cmt
-${OCAML_SITELIB}/encore/encore__FQueue.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/encore__FQueue.cmx
 ${OCAML_SITELIB}/encore/encore__Lole.cmi
 ${OCAML_SITELIB}/encore/encore__Lole.cmt
 ${OCAML_SITELIB}/encore/encore__Lole.cmti
@@ -51,8 +56,6 @@ ${OCAML_SITELIB}/encore/encore__Proxy_encoder.cmi
 ${OCAML_SITELIB}/encore/encore__Proxy_encoder.cmt
 ${OCAML_SITELIB}/encore/encore__Proxy_encoder.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/encore/encore__Proxy_encoder.cmx
-${OCAML_SITELIB}/encore/fQueue.ml
-${OCAML_SITELIB}/encore/fQueue.mli
 ${OCAML_SITELIB}/encore/lole.ml
 ${OCAML_SITELIB}/encore/lole.mli
 ${OCAML_SITELIB}/encore/meta.ml
@@ -62,6 +65,7 @@ ${OCAML_SITELIB}/encore/proxy_decoder.ml
 ${OCAML_SITELIB}/encore/proxy_decoder.mli
 ${OCAML_SITELIB}/encore/proxy_encoder.ml
 ${OCAML_SITELIB}/encore/proxy_encoder.mli
+${OCAML_SITELIB}/stublibs/dllbutils_stubs.so
 share/doc/encore/CHANGES.md
 share/doc/encore/LICENSE.md
 share/doc/encore/README.md
diff --git a/devel/ocaml-encore/buildlink3.mk b/devel/ocaml-encore/buildlink3.mk
index b65c4c68c44..d497fe31e15 100644
--- a/devel/ocaml-encore/buildlink3.mk
+++ b/devel/ocaml-encore/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/03/19 11:38:06 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/04/14 08:56:07 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-encore
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-encore
 OCAML_ENCORE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-encore+=	ocaml-encore>=0.2
+BUILDLINK_ABI_DEPENDS.ocaml-encore+=	ocaml-encore>=0.4
 BUILDLINK_PKGSRCDIR.ocaml-encore?=	../../devel/ocaml-encore
 
 .endif	# OCAML_ENCORE_BUILDLINK3_MK
diff --git a/devel/ocaml-encore/distinfo b/devel/ocaml-encore/distinfo
index c30500bf303..ad551ffa16e 100644
--- a/devel/ocaml-encore/distinfo
+++ b/devel/ocaml-encore/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2019/03/19 11:38:06 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2020/04/14 08:56:07 jaapb Exp $
 
-SHA1 (encore-0.2.tar.gz) = be1fbb2ed32890e0de67f7368a610eb890f53e3d
-RMD160 (encore-0.2.tar.gz) = 2d4fa48c2d22831ac57923873e18be7696bce9a0
-SHA512 (encore-0.2.tar.gz) = 8549ca999284f73a720103f8b2f68cdb95c917f9e751e207ca6457c9d3843e44e073f609f51759b43c577a8f0d4b75de14cb42225f28fa7fdb5ccf5e73b3b586
-Size (encore-0.2.tar.gz) = 16911 bytes
+SHA1 (encore-0.4.tar.gz) = 0ec4cdacd434dafc0df428da48f327a09a3d7f1e
+RMD160 (encore-0.4.tar.gz) = 42c43b933fe3ee9378236589e4b93b553fb08ea5
+SHA512 (encore-0.4.tar.gz) = 61163efc967ebe814125afaacc6b0c4a8f58059a57feca3a50c2ea1ae4f8411755cd83707e87fbd4165fe75edd1d3f530252bfd4bcc6c02a58659edda5777c63
+Size (encore-0.4.tar.gz) = 16913 bytes