From 231809bbdc50036c33ebfcc8a42b58b4371316f8 Mon Sep 17 00:00:00 2001 From: jaapb Date: Fri, 4 Mar 2016 16:06:19 +0000 Subject: [PATCH] Updated package to latest version, 113.24.00. Changes include: Switch code in lib subdir to ppx-style. Inline some calls that js_of_ocaml was unable to recognise as tail-recursive (cf. issue 14) Minor update: documentation. Added sexp_of_ support for GADTs, and remove the not-quite-working support for of_sexp. Improved the implementation of Exn.sexp_of_t, using the unique id in exceptions in OCaml 4.02. We use the identifier to map exception constructors to converters. --- devel/ocaml-sexplib/Makefile | 6 +++--- devel/ocaml-sexplib/PLIST | 16 +--------------- devel/ocaml-sexplib/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile index c5c683338af1..432bd49bb24e 100644 --- a/devel/ocaml-sexplib/Makefile +++ b/devel/ocaml-sexplib/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/04 16:06:19 jaapb Exp $ DISTNAME= sexplib-${VERS} PKGNAME= ocaml-${DISTNAME} -VERS= 113.00.00 +VERS= 113.24.00 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/sexplib/archive/} DISTFILES= ${VERS}${EXTRACT_SUFX} @@ -13,7 +13,7 @@ HOMEPAGE= https://github.com/janestreet/sexplib/ COMMENT= S-Expressions with Type Converters for OCaml LICENSE= modified-bsd AND apache-2.0 -OCAML_USE_OASIS= yes +OCAML_USE_OASIS_DYNRUN= yes .include "../../devel/ocaml-type_conv/buildlink3.mk" .include "../../mk/ocaml.mk" diff --git a/devel/ocaml-sexplib/PLIST b/devel/ocaml-sexplib/PLIST index 5f3dc19316db..45d14a8b8645 100644 --- a/devel/ocaml-sexplib/PLIST +++ b/devel/ocaml-sexplib/PLIST @@ -1,17 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2015/01/20 16:27:02 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/04 16:06:19 jaapb Exp $ ${OCAML_SITELIB}/sexplib/META ${OCAML_SITELIB}/sexplib/conv.mli ${OCAML_SITELIB}/sexplib/conv_error.ml ${OCAML_SITELIB}/sexplib/exn_magic.mli ${OCAML_SITELIB}/sexplib/lexer.mli ${OCAML_SITELIB}/sexplib/macro.mli -${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/pa_sexp_conv.a -${OCAML_SITELIB}/sexplib/pa_sexp_conv.cma -${OCAML_SITELIB}/sexplib/pa_sexp_conv.cmi -${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/pa_sexp_conv.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/pa_sexp_conv.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/pa_sexp_conv.cmxs -${OCAML_SITELIB}/sexplib/pa_sexp_conv.mli ${OCAML_SITELIB}/sexplib/path.mli ${OCAML_SITELIB}/sexplib/pre_sexp.ml ${OCAML_SITELIB}/sexplib/sexp.mli @@ -23,13 +16,6 @@ ${OCAML_SITELIB}/sexplib/sexplib.cmi ${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib.cmx ${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib.cmxs -${OCAML_SITELIB}/sexplib/sexplib_install_printers.cmi -${OCAML_SITELIB}/sexplib/sexplib_install_printers.cmx -${OCAML_SITELIB}/sexplib/sexplib_install_printers.ml -${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib_top.a -${OCAML_SITELIB}/sexplib/sexplib_top.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib_top.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/sexplib/sexplib_top.cmxs ${OCAML_SITELIB}/sexplib/src_pos.mli ${OCAML_SITELIB}/sexplib/std.ml ${OCAML_SITELIB}/sexplib/type.ml diff --git a/devel/ocaml-sexplib/distinfo b/devel/ocaml-sexplib/distinfo index c9c574836a9b..d9e22c370478 100644 --- a/devel/ocaml-sexplib/distinfo +++ b/devel/ocaml-sexplib/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 03:27:52 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/04 16:06:19 jaapb Exp $ -SHA1 (ocaml-sexplib/112.01.00.tar.gz) = 393861050e20f6626cd3b9f52ccbcb847d21f56d -RMD160 (ocaml-sexplib/112.01.00.tar.gz) = 9233b9765352d45d27b4f4075864d3001f01fa64 -SHA512 (ocaml-sexplib/112.01.00.tar.gz) = 44816b888abd4313aeb2d4e33465dafa9dbd5aa5bc77031fa8ce84e663212d7fa807bb67a011f067ae35f725dd75b63569c79ada01bd97fe5837648fc0f5348a -Size (ocaml-sexplib/112.01.00.tar.gz) = 134716 bytes +SHA1 (ocaml-sexplib/113.24.00.tar.gz) = 2809485197f8f0598b6cd9b807509cfe9f1190cc +RMD160 (ocaml-sexplib/113.24.00.tar.gz) = 38372cac8dfe1fb1893476b0205121bbb65a7478 +SHA512 (ocaml-sexplib/113.24.00.tar.gz) = 0331437500a13bc26c6cc635e8f1a63454257c3c699a07562469f6ebe127c61b3428bf4465c12fead5f7ac416e664417b0f9473ab2953e9c446cbda762ba00ea +Size (ocaml-sexplib/113.24.00.tar.gz) = 72087 bytes