[pkgsrc/trunk]: pkgsrc/textproc/ocaml-tyxml Updated package textproc/ocaml-ty...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/21714827fd0a
branches:  trunk
changeset: 378321:21714827fd0a
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Thu Apr 05 12:00:34 2018 +0000

description:
Updated package textproc/ocaml-tyxml to version 4.2.0.

This introduces compatibility with ocaml 4.06, and some other minor
improvements and bugfixes.

diffstat:

 textproc/ocaml-tyxml/Makefile                          |   5 +-
 textproc/ocaml-tyxml/PLIST                             |  34 +++++++++++------
 textproc/ocaml-tyxml/buildlink3.mk                     |   4 +-
 textproc/ocaml-tyxml/distinfo                          |  11 ++---
 textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml |  15 -------
 5 files changed, 30 insertions(+), 39 deletions(-)

diffs (128 lines):

diff -r 48e33263590e -r 21714827fd0a textproc/ocaml-tyxml/Makefile
--- a/textproc/ocaml-tyxml/Makefile     Thu Apr 05 11:52:28 2018 +0000
+++ b/textproc/ocaml-tyxml/Makefile     Thu Apr 05 12:00:34 2018 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2018/01/10 16:48:21 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2018/04/05 12:00:34 jaapb Exp $
 #
 
-VERSION=       4.1.0
+VERSION=       4.2.0
 GITHUB_PROJECT=        tyxml
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
diff -r 48e33263590e -r 21714827fd0a textproc/ocaml-tyxml/PLIST
--- a/textproc/ocaml-tyxml/PLIST        Thu Apr 05 11:52:28 2018 +0000
+++ b/textproc/ocaml-tyxml/PLIST        Thu Apr 05 12:00:34 2018 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/06/20 15:20:03 jaapb Exp $
-bin/ppx_tyxml
+@comment $NetBSD: PLIST,v 1.6 2018/04/05 12:00:34 jaapb Exp $
 ${OCAML_SITELIB}/tyxml/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/basic_types.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/camllexer.cmx
@@ -27,27 +26,36 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/pa_tyxml.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/pa_tyxml.cmxs
 ${OCAML_SITELIB}/tyxml/pa_tyxml.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.a
-${OCAML_SITELIB}/tyxml/ppx.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_attribute_value.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_attributes.cmx
+${OCAML_SITELIB}/tyxml/ppx_common.annot
+${OCAML_SITELIB}/tyxml/ppx_common.cmi
+${OCAML_SITELIB}/tyxml/ppx_common.cmt
+${OCAML_SITELIB}/tyxml/ppx_common.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_common.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_element.cmx
+${OCAML_SITELIB}/tyxml/ppx_common.mli
+${OCAML_SITELIB}/tyxml/ppx_element.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_element_content.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_internal.a
-${OCAML_SITELIB}/tyxml/ppx_internal.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_internal.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_internal.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_namespace.cmx
+${OCAML_SITELIB}/tyxml/ppx_namespace.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml.a
 ${OCAML_SITELIB}/tyxml/ppx_tyxml.annot
+${OCAML_SITELIB}/tyxml/ppx_tyxml.cma
 ${OCAML_SITELIB}/tyxml/ppx_tyxml.cmi
 ${OCAML_SITELIB}/tyxml/ppx_tyxml.cmt
 ${OCAML_SITELIB}/tyxml/ppx_tyxml.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml.cmxs
 ${OCAML_SITELIB}/tyxml/ppx_tyxml.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml_empty.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml_internal.a
+${OCAML_SITELIB}/tyxml/ppx_tyxml_internal.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml_internal.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml_internal.cmxs
+${OCAML_SITELIB}/tyxml/ppx_tyxml_register.annot
+${OCAML_SITELIB}/tyxml/ppx_tyxml_register.cmi
+${OCAML_SITELIB}/tyxml/ppx_tyxml_register.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/ppx_tyxml_register.cmx
+${OCAML_SITELIB}/tyxml/ppx_tyxml_register.ml
 ${OCAML_SITELIB}/tyxml/simplexmlparser.annot
 ${OCAML_SITELIB}/tyxml/simplexmlparser.cmi
 ${OCAML_SITELIB}/tyxml/simplexmlparser.cmt
diff -r 48e33263590e -r 21714827fd0a textproc/ocaml-tyxml/buildlink3.mk
--- a/textproc/ocaml-tyxml/buildlink3.mk        Thu Apr 05 11:52:28 2018 +0000
+++ b/textproc/ocaml-tyxml/buildlink3.mk        Thu Apr 05 12:00:34 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/01/10 16:48:21 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/04/05 12:00:34 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-tyxml
 
@@ -6,7 +6,7 @@
 OCAML_TYXML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.0.1
-BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.1.0nb2
+BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.2.0
 BUILDLINK_PKGSRCDIR.ocaml-tyxml?=       ../../textproc/ocaml-tyxml
 
 .endif  # OCAML_TYXML_BUILDLINK3_MK
diff -r 48e33263590e -r 21714827fd0a textproc/ocaml-tyxml/distinfo
--- a/textproc/ocaml-tyxml/distinfo     Thu Apr 05 11:52:28 2018 +0000
+++ b/textproc/ocaml-tyxml/distinfo     Thu Apr 05 12:00:34 2018 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.11 2018/01/10 16:48:21 jaapb Exp $
+$NetBSD: distinfo,v 1.12 2018/04/05 12:00:34 jaapb Exp $
 
-SHA1 (tyxml-4.1.0.tar.gz) = 6b11f233c819c419195f670102340c88cfc245fb
-RMD160 (tyxml-4.1.0.tar.gz) = 7cdb4e93ccd69f74b43b1f87917dcf0b7cd44806
-SHA512 (tyxml-4.1.0.tar.gz) = add2b82939ea069ee74ee26ff3ee1f3ad2e361e593134da807e1acfbebff4ed546cbc23aca7ee2936a1eb8a736916d673aa2c96aeae8779706cd726bc2d07ead
-Size (tyxml-4.1.0.tar.gz) = 179852 bytes
-SHA1 (patch-ppx_ppx__reflect.ml) = 0aeb623a7c04343dde1f1d0738b2d27f5c6d6de7
+SHA1 (tyxml-4.2.0.tar.gz) = 22470e05c7cd69e135471fc24ff0acb6790f2d74
+RMD160 (tyxml-4.2.0.tar.gz) = 25153ebf256cee762d94112d0a21b15c1fec647d
+SHA512 (tyxml-4.2.0.tar.gz) = 555df1fdf5eb30592a3bd93b7d08345964b1cd6e16c2f746ef777cb3c5fc9a31dddf316432e0457d317eaf7728c5d1156982956169a7b1eb9b660eedcf89ca58
+Size (tyxml-4.2.0.tar.gz) = 182255 bytes
diff -r 48e33263590e -r 21714827fd0a textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml
--- a/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml    Thu Apr 05 11:52:28 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ppx_ppx__reflect.ml,v 1.1 2018/01/10 16:48:21 jaapb Exp $
-
-Quick patch to compile with OCaml 4.06
---- ppx/ppx_reflect.ml.orig    2017-03-03 16:33:22.000000000 +0000
-+++ ppx/ppx_reflect.ml
-@@ -446,7 +446,8 @@ let emit_module () =
-     ] else []
-   end @
- 
--  List.map Combi.(let_ AC.pvar (tuple2 str (list str))) !reflected_variants
-+  List.map Combi.(let_ AC.pvar (tuple2 str (list str)))
-+      (List.map (fun (a, (b, c)) -> (a, (b.txt, List.map (fun x -> x.txt) c))) !reflected_variants)
- 
- 
- (* Crude I/O tools to read a signature and output a structure.