Updated devel/js_of_ocaml to version 3.2.0.

This version has several features and bugfixes, of which the most important
is that it now supports OCaml 4.07.

5 files changed, 20 insertions, 26 deletions

diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile
index c1f6dc0f01d..d8d2705dd7d 100644
--- a/devel/js_of_ocaml/Makefile
+++ b/devel/js_of_ocaml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2018/06/05 16:19:16 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/19 14:05:57 jaapb Exp $
 #
 
 GITHUB_PROJECT=	js_of_ocaml
-DISTNAME=	${GITHUB_PROJECT}-3.1.0
-PKGREVISION=	1
+DISTNAME=	${GITHUB_PROJECT}-3.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocsigen/}
 
diff --git a/devel/js_of_ocaml/PLIST b/devel/js_of_ocaml/PLIST
index 35b71228b82..4a1b78b6534 100644
--- a/devel/js_of_ocaml/PLIST
+++ b/devel/js_of_ocaml/PLIST
@@ -1,19 +1,8 @@
-@comment $NetBSD: PLIST,v 1.17 2018/06/05 16:19:16 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/07/19 14:05:57 jaapb Exp $
 bin/js_of_ocaml
 bin/jsoo_link
 bin/jsoo_minify
 ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/META
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/js_of_ocaml-camlp4.deriving.dune
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.a
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cma
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmi
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmt
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmti
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmx
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxa
-${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.cmxs
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.ml
-${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/deriving/pa_deriving_Json.mli
 ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/js_of_ocaml-camlp4.dune
 ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/opam
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.a
@@ -548,6 +537,12 @@ ${OCAML_SITELIB}/js_of_ocaml/geolocation.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/geolocation.cmx
 ${OCAML_SITELIB}/js_of_ocaml/geolocation.ml
 ${OCAML_SITELIB}/js_of_ocaml/geolocation.mli
+${OCAML_SITELIB}/js_of_ocaml/intl.cmi
+${OCAML_SITELIB}/js_of_ocaml/intl.cmt
+${OCAML_SITELIB}/js_of_ocaml/intl.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml/intl.cmx
+${OCAML_SITELIB}/js_of_ocaml/intl.ml
+${OCAML_SITELIB}/js_of_ocaml/intl.mli
 ${OCAML_SITELIB}/js_of_ocaml/js.cmi
 ${OCAML_SITELIB}/js_of_ocaml/js.cmt
 ${OCAML_SITELIB}/js_of_ocaml/js.cmti
diff --git a/devel/js_of_ocaml/buildlink3.mk b/devel/js_of_ocaml/buildlink3.mk
index 8a41bbbb0f2..05d1abf694d 100644
--- a/devel/js_of_ocaml/buildlink3.mk
+++ b/devel/js_of_ocaml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2018/06/05 16:19:16 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/07/19 14:05:57 jaapb Exp $
 
 BUILDLINK_TREE+=	js_of_ocaml
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	js_of_ocaml
 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.1.0nb1
+BUILDLINK_ABI_DEPENDS.js_of_ocaml+=	js_of_ocaml>=3.2.0
 BUILDLINK_PKGSRCDIR.js_of_ocaml?=	../../devel/js_of_ocaml
 
 .endif	# JS_OF_OCAML_BUILDLINK3_MK
diff --git a/devel/js_of_ocaml/distinfo b/devel/js_of_ocaml/distinfo
index 3ab9b731e26..32dd5c64120 100644
--- a/devel/js_of_ocaml/distinfo
+++ b/devel/js_of_ocaml/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2018/04/13 12:59:41 jaapb Exp $
+$NetBSD: distinfo,v 1.16 2018/07/19 14:05:57 jaapb Exp $
 
-SHA1 (js_of_ocaml-3.1.0.tar.gz) = 932b154120a9dc9e55eb0e1a8c3c97fc40439799
-RMD160 (js_of_ocaml-3.1.0.tar.gz) = 84abe2c1a8b2ee145513c595790e39ac04856570
-SHA512 (js_of_ocaml-3.1.0.tar.gz) = 63bd4961fbdc677cc992d253a7254a159d86c444b6aa5a8b2fac446925f35fbc8454865db167364cb2c2b7f02b113ebb0c0ac1cb5d2f7d7ae06519c68cdbc58a
-Size (js_of_ocaml-3.1.0.tar.gz) = 1438088 bytes
-SHA1 (patch-lib_lwt_log_jbuild) = d1d66a582af542da1497f20cfb7004303680b659
+SHA1 (js_of_ocaml-3.2.0.tar.gz) = 4ad1c710844e37aef57546dec79727539078c0b3
+RMD160 (js_of_ocaml-3.2.0.tar.gz) = 013a2d2d7c0962319735109d79248d815848c499
+SHA512 (js_of_ocaml-3.2.0.tar.gz) = fd205be775b8df1b040c8d7eb733a35cd3bd96b3124d8a8665bfe77f408d5a2cdaaec855a1139281d75572300fdcb10a313f18ea5699c6d28f81519681745b71
+Size (js_of_ocaml-3.2.0.tar.gz) = 1441106 bytes
+SHA1 (patch-lib_lwt_log_jbuild) = 22f1c2ecacc13b48bef0967ff84654341fe63376
 SHA1 (patch-lib_lwt_log_lwt__log__js.mli) = 8ead415e23dc4c446f5f2edbf940af0c845e8da0
diff --git a/devel/js_of_ocaml/patches/patch-lib_lwt_log_jbuild b/devel/js_of_ocaml/patches/patch-lib_lwt_log_jbuild
index ac0f413a7a8..e10ae11d456 100644
--- a/devel/js_of_ocaml/patches/patch-lib_lwt_log_jbuild
+++ b/devel/js_of_ocaml/patches/patch-lib_lwt_log_jbuild
@@ -1,12 +1,12 @@
-$NetBSD: patch-lib_lwt_log_jbuild,v 1.2 2018/04/13 12:59:41 jaapb Exp $
+$NetBSD: patch-lib_lwt_log_jbuild,v 1.3 2018/07/19 14:05:57 jaapb Exp $
 
 Use lwt_log.core instead of lwt_log (threading not needed)
---- lib/lwt/log/jbuild.orig	2018-02-21 22:12:58.000000000 +0000
+--- lib/lwt/log/jbuild.orig	2018-07-09 17:55:02.000000000 +0000
 +++ lib/lwt/log/jbuild
 @@ -4,5 +4,5 @@
    (public_name js_of_ocaml-lwt.logger)
    (synopsis "Lwt logger for js_of_ocaml.")
    (optional)
--  (libraries (js_of_ocaml lwt lwt.log))
+-  (libraries (js_of_ocaml lwt lwt_log))
 +  (libraries (js_of_ocaml lwt lwt_log.core))
    (preprocess (pps (js_of_ocaml-ppx)))))