[pkgsrc/trunk]: pkgsrc/devel/js_of_ocaml Updated devel/js_of_ocaml for dune c...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e326f3c5473a
branches:  trunk
changeset: 392719:e326f3c5473a
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue Mar 05 17:31:04 2019 +0000

description:
Updated devel/js_of_ocaml for dune compatibility.

Package now compatible with dune 1.7; revbump.

diffstat:

 devel/js_of_ocaml/Makefile      |   3 ++-
 devel/js_of_ocaml/PLIST         |  19 ++++++++-----------
 devel/js_of_ocaml/buildlink3.mk |   4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diffs (138 lines):

diff -r 2cd08a5172ad -r e326f3c5473a devel/js_of_ocaml/Makefile
--- a/devel/js_of_ocaml/Makefile        Tue Mar 05 17:27:22 2019 +0000
+++ b/devel/js_of_ocaml/Makefile        Tue Mar 05 17:31:04 2019 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2019/01/29 12:43:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.32 2019/03/05 17:31:04 jaapb Exp $
 #
 
 GITHUB_PROJECT=        js_of_ocaml
 DISTNAME=      ${GITHUB_PROJECT}-3.3.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
diff -r 2cd08a5172ad -r e326f3c5473a devel/js_of_ocaml/PLIST
--- a/devel/js_of_ocaml/PLIST   Tue Mar 05 17:27:22 2019 +0000
+++ b/devel/js_of_ocaml/PLIST   Tue Mar 05 17:31:04 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2019/01/29 12:43:53 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.22 2019/03/05 17:31:04 jaapb Exp $
 bin/js_of_ocaml
 bin/jsoo_link
 bin/jsoo_minify
@@ -19,10 +19,10 @@
 ${OCAML_SITELIB}/js_of_ocaml-compiler/dgraph.mli
 ${OCAML_SITELIB}/js_of_ocaml-compiler/driver.ml
 ${OCAML_SITELIB}/js_of_ocaml-compiler/driver.mli
+${OCAML_SITELIB}/js_of_ocaml-compiler/dune-package
 ${OCAML_SITELIB}/js_of_ocaml-compiler/dynlink.js
 ${OCAML_SITELIB}/js_of_ocaml-compiler/eval.ml
 ${OCAML_SITELIB}/js_of_ocaml-compiler/eval.mli
-${OCAML_SITELIB}/js_of_ocaml-compiler/findlib-support/js_of_ocaml-compiler.findlib-support.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-compiler/findlib-support/jsoo_findlib_support.a
 ${OCAML_SITELIB}/js_of_ocaml-compiler/findlib-support/jsoo_findlib_support.cma
 ${OCAML_SITELIB}/js_of_ocaml-compiler/findlib-support/jsoo_findlib_support.cmi
@@ -60,7 +60,6 @@
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_assign.mli
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_lexer.ml
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_lexer.mli
-${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml-compiler.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler.a
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler.cma
 ${OCAML_SITELIB}/js_of_ocaml-compiler/js_of_ocaml_compiler.cmi
@@ -321,7 +320,7 @@
 ${OCAML_SITELIB}/js_of_ocaml-compiler/vlq64.mli
 ${OCAML_SITELIB}/js_of_ocaml-compiler/weak.js
 ${OCAML_SITELIB}/js_of_ocaml-lwt/META
-${OCAML_SITELIB}/js_of_ocaml-lwt/js_of_ocaml-lwt.dune
+${OCAML_SITELIB}/js_of_ocaml-lwt/dune-package
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-lwt/js_of_ocaml_lwt.a
 ${OCAML_SITELIB}/js_of_ocaml-lwt/js_of_ocaml_lwt.cma
 ${OCAML_SITELIB}/js_of_ocaml-lwt/js_of_ocaml_lwt.cmi
@@ -330,7 +329,6 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-lwt/js_of_ocaml_lwt.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-lwt/js_of_ocaml_lwt.cmxs
 ${OCAML_SITELIB}/js_of_ocaml-lwt/js_of_ocaml_lwt.ml
-${OCAML_SITELIB}/js_of_ocaml-lwt/logger/js_of_ocaml-lwt.logger.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-lwt/logger/lwt_log_js.a
 ${OCAML_SITELIB}/js_of_ocaml-lwt/logger/lwt_log_js.cma
 ${OCAML_SITELIB}/js_of_ocaml-lwt/logger/lwt_log_js.cmi
@@ -373,7 +371,7 @@
 ${OCAML_SITELIB}/js_of_ocaml-lwt/lwt_xmlHttpRequest.mli
 ${OCAML_SITELIB}/js_of_ocaml-lwt/opam
 ${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/META
-${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/js_of_ocaml-ocamlbuild.dune
+${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/dune-package
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/ocamlbuild_js_of_ocaml.a
 ${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/ocamlbuild_js_of_ocaml.cma
 ${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/ocamlbuild_js_of_ocaml.cmi
@@ -386,7 +384,7 @@
 ${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/ocamlbuild_js_of_ocaml.mli
 ${OCAML_SITELIB}/js_of_ocaml-ocamlbuild/opam
 ${OCAML_SITELIB}/js_of_ocaml-ppx/META
-${OCAML_SITELIB}/js_of_ocaml-ppx/js_of_ocaml-ppx.dune
+${OCAML_SITELIB}/js_of_ocaml-ppx/dune-package
 ${OCAML_SITELIB}/js_of_ocaml-ppx/opam
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx.exe
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js
@@ -409,7 +407,7 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js__Ppx_js_internal.cmx
 ${OCAML_SITELIB}/js_of_ocaml-ppx/ppx_js_internal.ml
 ${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/META
-${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/js_of_ocaml-ppx_deriving_json.dune
+${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/dune-package
 ${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/ppx_deriving_json.a
 ${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/ppx_deriving_json.cma
@@ -420,7 +418,7 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/ppx_deriving_json.cmxs
 ${OCAML_SITELIB}/js_of_ocaml-ppx_deriving_json/ppx_deriving_json.ml
 ${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml-tyxml/META
-${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml-tyxml/js_of_ocaml-tyxml.dune
+${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml-tyxml/dune-package
 ${PLIST.tyxml}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-tyxml/js_of_ocaml_tyxml.a
 ${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml-tyxml/js_of_ocaml_tyxml.cma
 ${PLIST.tyxml}${OCAML_SITELIB}/js_of_ocaml-tyxml/js_of_ocaml_tyxml.cmi
@@ -490,7 +488,6 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/deriving/deriving_Json_lexer.cmx
 ${OCAML_SITELIB}/js_of_ocaml/deriving/deriving_Json_lexer.ml
 ${OCAML_SITELIB}/js_of_ocaml/deriving/deriving_Json_lexer.mli
-${OCAML_SITELIB}/js_of_ocaml/deriving/js_of_ocaml.deriving.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/deriving/js_of_ocaml_deriving.a
 ${OCAML_SITELIB}/js_of_ocaml/deriving/js_of_ocaml_deriving.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/deriving/js_of_ocaml_deriving.cmxa
@@ -515,6 +512,7 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/dom_svg.cmx
 ${OCAML_SITELIB}/js_of_ocaml/dom_svg.ml
 ${OCAML_SITELIB}/js_of_ocaml/dom_svg.mli
+${OCAML_SITELIB}/js_of_ocaml/dune-package
 ${OCAML_SITELIB}/js_of_ocaml/eventSource.cmi
 ${OCAML_SITELIB}/js_of_ocaml/eventSource.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/eventSource.cmx
@@ -557,7 +555,6 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml.cmxs
-${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml.dune
 ${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml.ml
 ${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml__.cmi
 ${OCAML_SITELIB}/js_of_ocaml/js_of_ocaml__.cmt
diff -r 2cd08a5172ad -r e326f3c5473a devel/js_of_ocaml/buildlink3.mk
--- a/devel/js_of_ocaml/buildlink3.mk   Tue Mar 05 17:27:22 2019 +0000
+++ b/devel/js_of_ocaml/buildlink3.mk   Tue Mar 05 17:31:04 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2019/01/29 12:43:53 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2019/03/05 17:31:04 jaapb Exp $
 
 BUILDLINK_TREE+=       js_of_ocaml
 
@@ -6,7 +6,7 @@
 JS_OF_OCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.js_of_ocaml+=    js_of_ocaml>=3.0.0
-BUILDLINK_ABI_DEPENDS.js_of_ocaml+=    js_of_ocaml>=3.3.0
+BUILDLINK_ABI_DEPENDS.js_of_ocaml+=    js_of_ocaml>=3.3.0nb1
 BUILDLINK_PKGSRCDIR.js_of_ocaml?=      ../../devel/js_of_ocaml
 
 .endif # JS_OF_OCAML_BUILDLINK3_MK