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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0117f4cbf51b
branches:  trunk
changeset: 365143:0117f4cbf51b
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Tue Jul 11 10:39:47 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
------------------------

- `Uutf.String.fold_utf_{8,16be,16le}`, allow substring folding via
  optional arguments. Thanks to Rapha?l Proust for the idea and the
  patch.
- OCaml standard library `Uchar.t` support.
  - Removes and substitutes `type Uutf.uchar = int` by the (abstract)
    `Uchar.t` type. `Uchar.{of,to}_int` allows to recover the previous
    representation.
  - Removes `Uutf.{is_uchar,cp_to_string,pp_cp}`. `Uchar.{is_valid,dump}`
    can be used instead.
- Safe string support. Manual sources and destinations now work on bytes
  rather than strings.
- Build depend on topkg.
- Relicense from BSD3 to ISC.

diffstat:

 textproc/ocaml-uutf/Makefile      |  44 +++++++++++++++++++++-----------------
 textproc/ocaml-uutf/PLIST         |   8 ++++++-
 textproc/ocaml-uutf/buildlink3.mk |   3 +-
 textproc/ocaml-uutf/distinfo      |  10 ++++----
 4 files changed, 38 insertions(+), 27 deletions(-)

diffs (121 lines):

diff -r 2ae41fe671d0 -r 0117f4cbf51b textproc/ocaml-uutf/Makefile
--- a/textproc/ocaml-uutf/Makefile      Tue Jul 11 10:35:09 2017 +0000
+++ b/textproc/ocaml-uutf/Makefile      Tue Jul 11 10:39:47 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2016/12/30 11:17:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2017/07/11 10:39:47 jaapb Exp $
 
-DISTNAME=      uutf-0.9.4
+DISTNAME=      uutf-1.0.1
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=  http://erratique.ch/software/uutf/releases/
 EXTRACT_SUFX=  .tbz
@@ -10,32 +9,37 @@
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      http://erratique.ch/software/uutf/
 COMMENT=       Unicode library for OCaml
-LICENSE=       modified-bsd
+LICENSE=       isc
 
-INSTALLATION_DIRS+=    ${OCAML_SITELIBDIR}/uutf
-OCAML_USE_FINDLIB=     yes
+OCAML_USE_TOPKG=       yes
+INSTALLATION_DIRS+=    bin share/doc/uutf
 
 .include "../../mk/ocaml.mk"
 
-do-build:
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ocaml ./pkg/build.ml \
-               native=true native-dynlink=true cmdliner=false
-.else
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ocaml ./pkg/build.ml \
-               native=false native-dynlink=false cmdliner=false
-.endif
-
+# Normally, we'd do this using opam-installer, but that requires
+# this package.
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/_build/pkg/META ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/uutf
-       for i in uutf.mli uutf.cmi uutf.cma; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/src/$$i ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/uutf; \
+       ${INSTALL_PROGRAM} ${WRKSRC}/_build/test/utftrip.native \
+               ${DESTDIR}${PREFIX}/bin/utftrip
+       for i in CHANGES.md LICENSE.md README.md; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
+               ${DESTDIR}${PREFIX}/share/doc/uutf; \
+       done
+       ${INSTALL_DATA} ${WRKSRC}/_build/opam \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/uutf/opam
+       for i in pkg/META src/uutf.cma src/uutf.cmi src/uutf.cmti \
+               src/uutf.mli; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/uutf; \
        done
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
-       for i in uutf.cmx uutf.a uutf.cmxa uutf.cmxs; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/src/$$i ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/uutf; \
+       for i in uutf.a uutf.cmx uutf.cmxa uutf.cmxs; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/src/$$i \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/uutf; \
        done
 .endif
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../devel/ocaml-cmdliner/buildlink3.mk"
+.include "../../textproc/ocaml-uchar/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2ae41fe671d0 -r 0117f4cbf51b textproc/ocaml-uutf/PLIST
--- a/textproc/ocaml-uutf/PLIST Tue Jul 11 10:35:09 2017 +0000
+++ b/textproc/ocaml-uutf/PLIST Tue Jul 11 10:39:47 2017 +0000
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2014/11/06 11:29:15 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/07/11 10:39:47 jaapb Exp $
+bin/utftrip
 ${OCAML_SITELIB}/uutf/META
+${OCAML_SITELIB}/uutf/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uutf/uutf.a
 ${OCAML_SITELIB}/uutf/uutf.cma
 ${OCAML_SITELIB}/uutf/uutf.cmi
+${OCAML_SITELIB}/uutf/uutf.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uutf/uutf.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uutf/uutf.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/uutf/uutf.cmxs
 ${OCAML_SITELIB}/uutf/uutf.mli
+share/doc/uutf/CHANGES.md
+share/doc/uutf/LICENSE.md
+share/doc/uutf/README.md
diff -r 2ae41fe671d0 -r 0117f4cbf51b textproc/ocaml-uutf/buildlink3.mk
--- a/textproc/ocaml-uutf/buildlink3.mk Tue Jul 11 10:35:09 2017 +0000
+++ b/textproc/ocaml-uutf/buildlink3.mk Tue Jul 11 10:39:47 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/01/20 16:04:57 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 10:39:47 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-uutf
 
@@ -6,6 +6,7 @@
 OCAML_UUTF_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-uutf+=     ocaml-uutf>=0.9.3nb1
+BUILDLINK_ABI_DEPENDS.ocaml-uutf+=     ocaml-uutf>=1.0.1
 BUILDLINK_PKGSRCDIR.ocaml-uutf?=       ../../textproc/ocaml-uutf
 .endif # OCAML_UUTF_BUILDLINK3_MK
 
diff -r 2ae41fe671d0 -r 0117f4cbf51b textproc/ocaml-uutf/distinfo
--- a/textproc/ocaml-uutf/distinfo      Tue Jul 11 10:35:09 2017 +0000
+++ b/textproc/ocaml-uutf/distinfo      Tue Jul 11 10:39:47 2017 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/02/06 12:45:35 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2017/07/11 10:39:47 jaapb Exp $
 
-SHA1 (uutf-0.9.4.tbz) = 327196afd135030173ba354f142bee71834a0f53
-RMD160 (uutf-0.9.4.tbz) = e7d79b110cd812b7cc312e37a85b88cdf0849b65
-SHA512 (uutf-0.9.4.tbz) = 95203b06e7506f33822f10607315920b849efde3ed2e032bf8dd805f99ce4851b375bc92a1f95403673c97c6176c5a6974af2be611f530db0a7f36296948edf4
-Size (uutf-0.9.4.tbz) = 36987 bytes
+SHA1 (uutf-1.0.1.tbz) = 63b7afcba68085fa8d096f9d2827938121a0d936
+RMD160 (uutf-1.0.1.tbz) = 3f4ff0d61592578102ecadbaf9efb1529a60fb8e
+SHA512 (uutf-1.0.1.tbz) = 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
+Size (uutf-1.0.1.tbz) = 22215 bytes