[pkgsrc/trunk]: pkgsrc/textproc/ocaml-tyxml Revbump for textproc/ocaml-tyxml.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/abed674e5d1e
branches:  trunk
changeset: 373887:abed674e5d1e
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Wed Jan 10 16:48:21 2018 +0000

description:
Revbump for textproc/ocaml-tyxml.

This revision also adds a patch to make the program compile with
safe-string and therefore with OCaml 4.06.

diffstat:

 textproc/ocaml-tyxml/Makefile                          |   4 ++--
 textproc/ocaml-tyxml/buildlink3.mk                     |   8 ++++----
 textproc/ocaml-tyxml/distinfo                          |   3 ++-
 textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml |  15 +++++++++++++++
 4 files changed, 23 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r 2603f35c5233 -r abed674e5d1e textproc/ocaml-tyxml/Makefile
--- a/textproc/ocaml-tyxml/Makefile     Wed Jan 10 16:46:15 2018 +0000
+++ b/textproc/ocaml-tyxml/Makefile     Wed Jan 10 16:48:21 2018 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2017/09/08 09:51:26 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2018/01/10 16:48:21 jaapb Exp $
 #
 
 VERSION=       4.1.0
 GITHUB_PROJECT=        tyxml
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocsigen/}
 
diff -r 2603f35c5233 -r abed674e5d1e textproc/ocaml-tyxml/buildlink3.mk
--- a/textproc/ocaml-tyxml/buildlink3.mk        Wed Jan 10 16:46:15 2018 +0000
+++ b/textproc/ocaml-tyxml/buildlink3.mk        Wed Jan 10 16:48:21 2018 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:35 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/01/10 16:48:21 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-tyxml
 
 .if !defined(OCAML_TYXML_BUILDLINK3_MK)
 OCAML_TYXML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-tyxml+=    ocaml-tyxml>=4.0.1
-BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=    ocaml-tyxml>=4.1.0
-BUILDLINK_PKGSRCDIR.ocaml-tyxml?=      ../../textproc/ocaml-tyxml
+BUILDLINK_API_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.0.1
+BUILDLINK_ABI_DEPENDS.ocaml-tyxml+=     ocaml-tyxml>=4.1.0nb2
+BUILDLINK_PKGSRCDIR.ocaml-tyxml?=       ../../textproc/ocaml-tyxml
 
 .endif  # OCAML_TYXML_BUILDLINK3_MK
 
diff -r 2603f35c5233 -r abed674e5d1e textproc/ocaml-tyxml/distinfo
--- a/textproc/ocaml-tyxml/distinfo     Wed Jan 10 16:46:15 2018 +0000
+++ b/textproc/ocaml-tyxml/distinfo     Wed Jan 10 16:48:21 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2017/07/11 11:12:22 jaapb Exp $
+$NetBSD: distinfo,v 1.11 2018/01/10 16:48:21 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
diff -r 2603f35c5233 -r abed674e5d1e textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml    Wed Jan 10 16:48:21 2018 +0000
@@ -0,0 +1,15 @@
+$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.