[pkgsrc/trunk]: pkgsrc/textproc/ocaml-jsonm Updated package to latest version...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7bf0c610bf52
branches:  trunk
changeset: 365146:7bf0c610bf52
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue Jul 11 10:43:46 2017 +0000

description:
Updated package to latest version, 1.0.1. Changes include:

v1.0.1 2016-03-07 La Forclaz (VS)
---------------------------------

- OCaml 4.05.0 compatibility (removal of `Uchar.dump`).

v1.0.0 2016-11-23 Zagreb
------------------------

- Support for RFC 7195/ECMA-404. This means that any JSON value can
  now be codec as JSON text, in RFC 4627 (obsoleted by 7195) this
  could only be an array or an object. If your code was relying on the
  fact the first decoded lexeme was either a `Os` or `As`,
  you will need to review that.
- Fix `Jsonm.decode` not eventually returning `End` on toplevel
  decode error.
- OCaml standard library `Uchar.t` support. At the API level only
  some cases of `Jsonm.error` change.
- Uutf 1.0.0 support.
- Safe string support.
- Build depend on topkg.
- Relicensed from BSD3 to ISC.

diffstat:

 textproc/ocaml-jsonm/Makefile      |  36 ++++++++++++++++++++++++++++++------
 textproc/ocaml-jsonm/PLIST         |  10 ++++++++--
 textproc/ocaml-jsonm/buildlink3.mk |   3 ++-
 textproc/ocaml-jsonm/distinfo      |  10 +++++-----
 4 files changed, 45 insertions(+), 14 deletions(-)

diffs (109 lines):

diff -r e058f40d68b0 -r 7bf0c610bf52 textproc/ocaml-jsonm/Makefile
--- a/textproc/ocaml-jsonm/Makefile     Tue Jul 11 10:41:48 2017 +0000
+++ b/textproc/ocaml-jsonm/Makefile     Tue Jul 11 10:43:46 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2016/12/30 11:17:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.7 2017/07/11 10:43:46 jaapb Exp $
 
-DISTNAME=      jsonm-0.9.1
+DISTNAME=      jsonm-1.0.1
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   4
 CATEGORIES=    textproc
 MASTER_SITES=  http://erratique.ch/software/jsonm/releases/
 EXTRACT_SUFX=  .tbz
@@ -10,11 +9,36 @@
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      http://erratique.ch/software/jsonm/
 COMMENT=       OCaml streaming codec for JSON
-LICENSE=       modified-bsd
+LICENSE=       isc
 
-OCAML_USE_FINDLIB=     yes
-OCAML_USE_OASIS=       yes
+OCAML_USE_TOPKG=       yes
+INSTALLATION_DIRS+=    bin share/doc/jsonm
 
 .include "../../mk/ocaml.mk"
+
+# Normally, we'd do this using opam-installer, but that requires
+# this package.
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/_build/test/jsontrip.native \
+               ${DESTDIR}${PREFIX}/bin/jsontrip
+       for i in CHANGES.md LICENSE.md README.md test/examples.ml test/jtree.ml; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
+               ${DESTDIR}${PREFIX}/share/doc/jsonm; \
+       done
+       ${INSTALL_DATA} ${WRKSRC}/_build/opam \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jsonm/opam
+       for i in pkg/META src/jsonm.cma src/jsonm.cmi src/jsonm.cmti \
+               src/jsonm.mli; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jsonm; \
+       done
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+       for i in jsonm.a jsonm.cmx jsonm.cmxa jsonm.cmxs; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/src/$$i \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jsonm; \
+       done
+.endif
+
+.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../textproc/ocaml-uutf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e058f40d68b0 -r 7bf0c610bf52 textproc/ocaml-jsonm/PLIST
--- a/textproc/ocaml-jsonm/PLIST        Tue Jul 11 10:41:48 2017 +0000
+++ b/textproc/ocaml-jsonm/PLIST        Tue Jul 11 10:43:46 2017 +0000
@@ -1,11 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2014/11/06 11:37:33 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/07/11 10:43:46 jaapb Exp $
 bin/jsontrip
-bin/ocamltweets
 ${OCAML_SITELIB}/jsonm/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/jsonm/jsonm.a
 ${OCAML_SITELIB}/jsonm/jsonm.cma
 ${OCAML_SITELIB}/jsonm/jsonm.cmi
+${OCAML_SITELIB}/jsonm/jsonm.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/jsonm/jsonm.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/jsonm/jsonm.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/jsonm/jsonm.cmxs
 ${OCAML_SITELIB}/jsonm/jsonm.mli
+${OCAML_SITELIB}/jsonm/opam
+share/doc/jsonm/CHANGES.md
+share/doc/jsonm/LICENSE.md
+share/doc/jsonm/README.md
+share/doc/jsonm/examples.ml
+share/doc/jsonm/jtree.ml
diff -r e058f40d68b0 -r 7bf0c610bf52 textproc/ocaml-jsonm/buildlink3.mk
--- a/textproc/ocaml-jsonm/buildlink3.mk        Tue Jul 11 10:41:48 2017 +0000
+++ b/textproc/ocaml-jsonm/buildlink3.mk        Tue Jul 11 10:43:46 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/11/06 11:37:33 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/07/11 10:43:46 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-jsonm
 
@@ -6,6 +6,7 @@
 OCAML_JSONM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-jsonm+=    ocaml-jsonm>=0.9.1
+BUILDLINK_ABI_DEPENDS.ocaml-jsonm+=    ocaml-jsonm>=1.0.1
 BUILDLINK_PKGSRCDIR.ocaml-jsonm?=      ../../textproc/ocaml-jsonm
 
 .include "../../textproc/ocaml-uutf/buildlink3.mk"
diff -r e058f40d68b0 -r 7bf0c610bf52 textproc/ocaml-jsonm/distinfo
--- a/textproc/ocaml-jsonm/distinfo     Tue Jul 11 10:41:48 2017 +0000
+++ b/textproc/ocaml-jsonm/distinfo     Tue Jul 11 10:43:46 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:59:41 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/07/11 10:43:46 jaapb Exp $
 
-SHA1 (jsonm-0.9.1.tbz) = 733fe089fb91ac79ac885e9c80d5554aca3e7805
-RMD160 (jsonm-0.9.1.tbz) = b28c2f168b8068c9d867a9a68b0a0289380f1288
-SHA512 (jsonm-0.9.1.tbz) = 43689c8fa75810a4ca1f99a0273ac5c0f6386b88f42a49715bcb785ac5ca54901c43a62b0983f7fb74a7c2615b0fb3464f4c864832d590192ff828b5dcb9781f
-Size (jsonm-0.9.1.tbz) = 64843 bytes
+SHA1 (jsonm-1.0.1.tbz) = 64a2cd159f1d0367f430bf5b4bcc7591e086b708
+RMD160 (jsonm-1.0.1.tbz) = ed0aa2685dd409cd40f84e53bf78047d67ce556a
+SHA512 (jsonm-1.0.1.tbz) = e86e225073b429f71063af14ad39b87498609db6a122b39e1a739c5b77fcde487bf6b17235b2f9742b7d22aca0f6d475fdba1b0bab2a6329cf7e681fe43d31a6
+Size (jsonm-1.0.1.tbz) = 21608 bytes