CVS commit: pkgsrc/textproc/ocaml-tyxml

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Jan 10 16:48:21 UTC 2018

Modified Files:
        pkgsrc/textproc/ocaml-tyxml: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/textproc/ocaml-tyxml/patches: patch-ppx_ppx__reflect.ml

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/ocaml-tyxml/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/ocaml-tyxml/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/ocaml-tyxml/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ocaml-tyxml/Makefile
diff -u pkgsrc/textproc/ocaml-tyxml/Makefile:1.17 pkgsrc/textproc/ocaml-tyxml/Makefile:1.18
--- pkgsrc/textproc/ocaml-tyxml/Makefile:1.17   Fri Sep  8 09:51:26 2017
+++ pkgsrc/textproc/ocaml-tyxml/Makefile        Wed Jan 10 16:48:21 2018
@@ -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/}
 

Index: pkgsrc/textproc/ocaml-tyxml/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-tyxml/buildlink3.mk:1.6 pkgsrc/textproc/ocaml-tyxml/buildlink3.mk:1.7
--- pkgsrc/textproc/ocaml-tyxml/buildlink3.mk:1.6       Sun Jan  7 13:04:35 2018
+++ pkgsrc/textproc/ocaml-tyxml/buildlink3.mk   Wed Jan 10 16:48:21 2018
@@ -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
 

Index: pkgsrc/textproc/ocaml-tyxml/distinfo
diff -u pkgsrc/textproc/ocaml-tyxml/distinfo:1.10 pkgsrc/textproc/ocaml-tyxml/distinfo:1.11
--- pkgsrc/textproc/ocaml-tyxml/distinfo:1.10   Tue Jul 11 11:12:22 2017
+++ pkgsrc/textproc/ocaml-tyxml/distinfo        Wed Jan 10 16:48:21 2018
@@ -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

Added files:

Index: pkgsrc/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml
diff -u /dev/null pkgsrc/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml:1.1
--- /dev/null   Wed Jan 10 16:48:21 2018
+++ pkgsrc/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml       Wed Jan 10 16:48:21 2018
@@ -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.