Updated textproc/ocaml-tyxml for dune compatibility.

Package is now compatible with dune 1.7; revbump.

3 files changed, 6 insertions, 8 deletions

diff --git a/textproc/ocaml-tyxml/Makefile b/textproc/ocaml-tyxml/Makefile
index a5e78fddfde..238c4834e30 100644
--- a/textproc/ocaml-tyxml/Makefile
+++ b/textproc/ocaml-tyxml/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2018/11/29 12:00:45 jaapb Exp $
+# $NetBSD: Makefile,v 1.23 2019/03/05 17:10:04 jaapb Exp $
 #
 
 VERSION=	4.3.0
 GITHUB_PROJECT=	tyxml
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
diff --git a/textproc/ocaml-tyxml/PLIST b/textproc/ocaml-tyxml/PLIST
index 81e013ce0f7..a286b7910ac 100644
--- a/textproc/ocaml-tyxml/PLIST
+++ b/textproc/ocaml-tyxml/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2018/11/29 12:00:45 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/03/05 17:10:04 jaapb Exp $
 ${OCAML_SITELIB}/tyxml/META
+${OCAML_SITELIB}/tyxml/dune-package
 ${OCAML_SITELIB}/tyxml/functor/html_f.cmi
 ${OCAML_SITELIB}/tyxml/functor/html_f.cmt
 ${OCAML_SITELIB}/tyxml/functor/html_f.cmti
@@ -24,7 +25,6 @@ ${OCAML_SITELIB}/tyxml/functor/svg_sigs.mli
 ${OCAML_SITELIB}/tyxml/functor/svg_types.cmi
 ${OCAML_SITELIB}/tyxml/functor/svg_types.cmti
 ${OCAML_SITELIB}/tyxml/functor/svg_types.mli
-${OCAML_SITELIB}/tyxml/functor/tyxml.functor.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.a
 ${OCAML_SITELIB}/tyxml/functor/tyxml_f.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.cmxa
@@ -57,7 +57,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmx
 ${OCAML_SITELIB}/tyxml/functor/xml_wrap.ml
 ${OCAML_SITELIB}/tyxml/functor/xml_wrap.mli
 ${OCAML_SITELIB}/tyxml/opam
-${OCAML_SITELIB}/tyxml/tools/tyxml.tools.dune
 ${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmi
 ${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmt
 ${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmti
@@ -68,7 +67,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.a
 ${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cmxs
-${OCAML_SITELIB}/tyxml/top/tyxml.top.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.a
 ${OCAML_SITELIB}/tyxml/top/tyxml_top.cma
 ${OCAML_SITELIB}/tyxml/top/tyxml_top.cmi
@@ -84,7 +82,6 @@ ${OCAML_SITELIB}/tyxml/tyxml.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxs
-${OCAML_SITELIB}/tyxml/tyxml.dune
 ${OCAML_SITELIB}/tyxml/tyxml.ml
 ${OCAML_SITELIB}/tyxml/tyxml_html.cmi
 ${OCAML_SITELIB}/tyxml/tyxml_html.cmt
diff --git a/textproc/ocaml-tyxml/buildlink3.mk b/textproc/ocaml-tyxml/buildlink3.mk
index 4bd90a39162..9adc70096b6 100644
--- a/textproc/ocaml-tyxml/buildlink3.mk
+++ b/textproc/ocaml-tyxml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/11/29 12:00:45 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2019/03/05 17:10:04 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-tyxml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-tyxml
 OCAML_TYXML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.0.1
-BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.3.0
+BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.3.0nb1
 BUILDLINK_PKGSRCDIR.ocaml-tyxml?=       ../../textproc/ocaml-tyxml
 
 .endif  # OCAML_TYXML_BUILDLINK3_MK