diff options
| author | jaapb <jaapb@pkgsrc.org> | 2018-01-10 16:48:21 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2018-01-10 16:48:21 +0000 |
| commit | bd1f68a55da04b5d205d69faeaef6c0122634f6b (patch) | |
| tree | 9fe140c57578b0a3e08c8c1b2c3156e5d552cc28 | |
| parent | 85f3d508992d45a627e689a89fc1a4bf8bffd8b0 (diff) | |
| download | pkgsrc-bd1f68a55da04b5d205d69faeaef6c0122634f6b.tar.gz | |
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.
| -rw-r--r-- | textproc/ocaml-tyxml/Makefile | 4 | ||||
| -rw-r--r-- | textproc/ocaml-tyxml/buildlink3.mk | 8 | ||||
| -rw-r--r-- | textproc/ocaml-tyxml/distinfo | 3 | ||||
| -rw-r--r-- | textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml | 15 |
4 files changed, 23 insertions, 7 deletions
diff --git a/textproc/ocaml-tyxml/Makefile b/textproc/ocaml-tyxml/Makefile index e15b49e3e34..cd22afaa5af 100644 --- a/textproc/ocaml-tyxml/Makefile +++ b/textproc/ocaml-tyxml/Makefile @@ -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 --git a/textproc/ocaml-tyxml/buildlink3.mk b/textproc/ocaml-tyxml/buildlink3.mk index 61f9b118166..5a9082ef4da 100644 --- a/textproc/ocaml-tyxml/buildlink3.mk +++ b/textproc/ocaml-tyxml/buildlink3.mk @@ -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 --git a/textproc/ocaml-tyxml/distinfo b/textproc/ocaml-tyxml/distinfo index 541f7cd6574..e54c4c33e1b 100644 --- a/textproc/ocaml-tyxml/distinfo +++ b/textproc/ocaml-tyxml/distinfo @@ -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 --git a/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml b/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml new file mode 100644 index 00000000000..95b8a00ca31 --- /dev/null +++ b/textproc/ocaml-tyxml/patches/patch-ppx_ppx__reflect.ml @@ -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. |