diff options
-rw-r--r-- | devel/js_of_ocaml/Makefile | 5 | ||||
-rw-r--r-- | devel/js_of_ocaml/PLIST | 14 | ||||
-rw-r--r-- | devel/js_of_ocaml/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/js_of_ocaml/distinfo | 12 | ||||
-rw-r--r-- | devel/js_of_ocaml/patches/patch-lib_generate_stubs.sh | 11 | ||||
-rw-r--r-- | devel/js_of_ocaml/patches/patch-ppx_ppx__deriving__json_lib_ppx__deriving__json.cppo.ml | 64 |
6 files changed, 19 insertions, 91 deletions
diff --git a/devel/js_of_ocaml/Makefile b/devel/js_of_ocaml/Makefile index 64e90197f91..9f50f5e68fd 100644 --- a/devel/js_of_ocaml/Makefile +++ b/devel/js_of_ocaml/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2018/01/10 14:37:29 jaapb Exp $ +# $NetBSD: Makefile,v 1.23 2018/01/22 11:50:24 jaapb Exp $ # GITHUB_PROJECT= js_of_ocaml -DISTNAME= ${GITHUB_PROJECT}-3.0.0 -PKGREVISION= 2 +DISTNAME= ${GITHUB_PROJECT}-3.0.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} diff --git a/devel/js_of_ocaml/PLIST b/devel/js_of_ocaml/PLIST index 2f2b248b3a0..bec8de75763 100644 --- a/devel/js_of_ocaml/PLIST +++ b/devel/js_of_ocaml/PLIST @@ -1,12 +1,18 @@ -@comment $NetBSD: PLIST,v 1.14 2018/01/10 14:37:29 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.15 2018/01/22 11:50:24 jaapb Exp $ bin/js_of_ocaml -bin/js_of_ocaml.exe bin/jsoo_link -bin/jsoo_link.exe bin/jsoo_minify -bin/jsoo_minify.exe ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/META ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/opam +${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.mli ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.a ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cma ${PLIST.camlp4}${OCAML_SITELIB}/js_of_ocaml-camlp4/pa_js.cmi diff --git a/devel/js_of_ocaml/buildlink3.mk b/devel/js_of_ocaml/buildlink3.mk index 230ce9077bd..70933df8f76 100644 --- a/devel/js_of_ocaml/buildlink3.mk +++ b/devel/js_of_ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/09/08 16:55:19 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/22 11:50:24 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.0.0nb1 +BUILDLINK_ABI_DEPENDS.js_of_ocaml+= js_of_ocaml>=3.0.2 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 47a708de4b1..69e072ef204 100644 --- a/devel/js_of_ocaml/distinfo +++ b/devel/js_of_ocaml/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.13 2018/01/10 14:37:29 jaapb Exp $ +$NetBSD: distinfo,v 1.14 2018/01/22 11:50:24 jaapb Exp $ -SHA1 (js_of_ocaml-3.0.0.tar.gz) = fe20efe864b2e52303ff71073b782ce203cae999 -RMD160 (js_of_ocaml-3.0.0.tar.gz) = 8863a224b6211a23d77d8c73a9461966779e65ce -SHA512 (js_of_ocaml-3.0.0.tar.gz) = dc4bbbfdacb43338aa7f97b7012b6de8a2eac5d7c5f535ceb9565c477c961a212ce5b2a75b1719fcd9f2d57938ee2162f6f04d3364397a469d7a13d1fe4e3908 -Size (js_of_ocaml-3.0.0.tar.gz) = 1433377 bytes -SHA1 (patch-lib_generate_stubs.sh) = 120c972aa6aa30bd778134ce88d275e98067f4ca +SHA1 (js_of_ocaml-3.0.2.tar.gz) = 04be8a9ae516f8412f0250b41b3ca599fc891a99 +RMD160 (js_of_ocaml-3.0.2.tar.gz) = 6f512da8370837a2c24e0a4cc11bc77080996dd6 +SHA512 (js_of_ocaml-3.0.2.tar.gz) = 14ff63d839451c548e1e0f0b8eafa8840400dc7a54b2cb97a1979ad347b63b20df5132ec01adb6699a8ed0905fd713d589308da9cdf3ae2811ae421dd91344a2 +Size (js_of_ocaml-3.0.2.tar.gz) = 1433693 bytes SHA1 (patch-lib_lwt_log_jbuild) = 414e17fc6ee78db2ec87e244259b939009b04336 -SHA1 (patch-ppx_ppx__deriving__json_lib_ppx__deriving__json.cppo.ml) = 38ff24c8490fefc97bd447059183a6e110c2b6e0 diff --git a/devel/js_of_ocaml/patches/patch-lib_generate_stubs.sh b/devel/js_of_ocaml/patches/patch-lib_generate_stubs.sh deleted file mode 100644 index c2bab6c65c8..00000000000 --- a/devel/js_of_ocaml/patches/patch-lib_generate_stubs.sh +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-lib_generate_stubs.sh,v 1.1 2017/09/08 13:19:34 jaapb Exp $ - -Use correct path for bash ---- lib/generate_stubs.sh.orig 2017-06-22 04:36:10.000000000 +0000 -+++ lib/generate_stubs.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/pkg/bin/bash - - set -e -u -o pipefail - shopt -s extglob diff --git a/devel/js_of_ocaml/patches/patch-ppx_ppx__deriving__json_lib_ppx__deriving__json.cppo.ml b/devel/js_of_ocaml/patches/patch-ppx_ppx__deriving__json_lib_ppx__deriving__json.cppo.ml deleted file mode 100644 index 14b2854a6d7..00000000000 --- a/devel/js_of_ocaml/patches/patch-ppx_ppx__deriving__json_lib_ppx__deriving__json.cppo.ml +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-ppx_ppx__deriving__json_lib_ppx__deriving__json.cppo.ml,v 1.1 2018/01/10 14:37:30 jaapb Exp $ - -Compile with OCaml 4.06 ---- ppx/ppx_deriving_json/lib/ppx_deriving_json.cppo.ml.orig 2017-06-22 04:36:10.000000000 +0000 -+++ ppx/ppx_deriving_json/lib/ppx_deriving_json.cppo.ml -@@ -112,7 +112,11 @@ and write_body_of_tuple_type l ~arg ~pol - - and write_poly_case r ~arg ~poly = - match r with -+#if OCAML_VERSION < (4, 06, 0) - | Parsetree.Rtag (label, _, _, l) -> -+#else -+ | Parsetree.Rtag ({txt=label;_}, _, _, l) -> -+#endif - let i = Ppx_deriving.hash_variant label - and n = List.length l in - let v = Ppx_deriving.fresh_var [] in -@@ -221,7 +225,11 @@ let recognize_case_of_constructor i l = - let recognize_body_of_poly_variant l ~loc = - let l = - let f = function -+#if OCAML_VERSION < (4, 06, 0) - | Parsetree.Rtag (label, _, _, l) -> -+#else -+ | Parsetree.Rtag ({txt=label;_}, _, _, l) -> -+#endif - let i = Ppx_deriving.hash_variant label in - recognize_case_of_constructor i l - | Rinherit {ptyp_desc = Ptyp_constr (lid, _); _} -> -@@ -246,7 +254,11 @@ let maybe_tuple_type = function - | l -> Ast_helper.Typ.tuple l - - let rec read_poly_case ?decl y = function -+#if OCAML_VERSION < (4, 06, 0) - | Parsetree.Rtag (label, _, _, l) -> -+#else -+ | Parsetree.Rtag ({txt=label;_}, _, _, l) -> -+#endif - let i = Ppx_deriving.hash_variant label |> Ast_convenience.pint in - (match l with - | [] -> -@@ -433,12 +445,22 @@ let json_str_wrap d e = - let json_str d = - let write = - let f acc id = -+#if OCAML_VERSION < (4, 05, 0) -+ let id = id in -+#else -+ let id = id.Location.txt in -+#endif - let poly = Ast_convenience.evar ("poly_" ^ id) in - [%expr [%e acc] (Deriving_Json.write [%e poly])] - and acc = suffix_decl d ~suffix:"to_json" in - Ppx_deriving.fold_left_type_decl f acc d - and read = - let f acc id = -+#if OCAML_VERSION < (4, 05, 0) -+ let id = id in -+#else -+ let id = id.Location.txt in -+#endif - let poly = Ast_convenience.evar ("poly_" ^ id) in - [%expr [%e acc] (Deriving_Json.read [%e poly])] - and acc = suffix_decl d ~suffix:"of_json" in |