Tue Mar 5 17:10:05 2019 UTC ()
Updated textproc/ocaml-tyxml for dune compatibility.

Package is now compatible with dune 1.7; revbump.


(jaapb)
diff -r1.22 -r1.23 pkgsrc/textproc/ocaml-tyxml/Makefile
diff -r1.7 -r1.8 pkgsrc/textproc/ocaml-tyxml/PLIST
diff -r1.10 -r1.11 pkgsrc/textproc/ocaml-tyxml/buildlink3.mk
cvs diff -r1.22 -r1.23 pkgsrc/textproc/ocaml-tyxml/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-tyxml/Makefile 2018/11/29 12:00:45 1.22
+++ pkgsrc/textproc/ocaml-tyxml/Makefile 2019/03/05 17:10:04 1.23
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.22 2018/11/29 12:00:45 jaapb Exp $ 1# $NetBSD: Makefile,v 1.23 2019/03/05 17:10:04 jaapb Exp $
2# 2#
3 3
4VERSION= 4.3.0 4VERSION= 4.3.0
5GITHUB_PROJECT= tyxml 5GITHUB_PROJECT= tyxml
6DISTNAME= ${GITHUB_PROJECT}-${VERSION} 6DISTNAME= ${GITHUB_PROJECT}-${VERSION}
7PKGNAME= ocaml-${DISTNAME} 7PKGNAME= ocaml-${DISTNAME}
 8PKGREVISION= 1
8CATEGORIES= textproc 9CATEGORIES= textproc
9MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
10 11
11MAINTAINER= jaapb@NetBSD.org 12MAINTAINER= jaapb@NetBSD.org
12HOMEPAGE= http://ocsigen.org/tyxml/ 13HOMEPAGE= http://ocsigen.org/tyxml/
13COMMENT= OCaml XML typing library 14COMMENT= OCaml XML typing library
14LICENSE= gnu-lgpl-v2.1 # with openssl exemption 15LICENSE= gnu-lgpl-v2.1 # with openssl exemption
15 16
16CONFLICTS+= ocsigen<2.0 17CONFLICTS+= ocsigen<2.0
17 18
18CONFIGURE_ARGS+= --enable-syntax --bindir ${DESTDIR}${PREFIX}/bin 19CONFIGURE_ARGS+= --enable-syntax --bindir ${DESTDIR}${PREFIX}/bin
19 20
20USE_TOOLS= gmake 21USE_TOOLS= gmake
cvs diff -r1.7 -r1.8 pkgsrc/textproc/ocaml-tyxml/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-tyxml/PLIST 2018/11/29 12:00:45 1.7
+++ pkgsrc/textproc/ocaml-tyxml/PLIST 2019/03/05 17:10:04 1.8
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1@comment $NetBSD: PLIST,v 1.7 2018/11/29 12:00:45 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.8 2019/03/05 17:10:04 jaapb Exp $
2${OCAML_SITELIB}/tyxml/META 2${OCAML_SITELIB}/tyxml/META
 3${OCAML_SITELIB}/tyxml/dune-package
3${OCAML_SITELIB}/tyxml/functor/html_f.cmi 4${OCAML_SITELIB}/tyxml/functor/html_f.cmi
4${OCAML_SITELIB}/tyxml/functor/html_f.cmt 5${OCAML_SITELIB}/tyxml/functor/html_f.cmt
5${OCAML_SITELIB}/tyxml/functor/html_f.cmti 6${OCAML_SITELIB}/tyxml/functor/html_f.cmti
6${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/html_f.cmx 7${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/html_f.cmx
7${OCAML_SITELIB}/tyxml/functor/html_f.ml 8${OCAML_SITELIB}/tyxml/functor/html_f.ml
8${OCAML_SITELIB}/tyxml/functor/html_f.mli 9${OCAML_SITELIB}/tyxml/functor/html_f.mli
9${OCAML_SITELIB}/tyxml/functor/html_sigs.cmi 10${OCAML_SITELIB}/tyxml/functor/html_sigs.cmi
10${OCAML_SITELIB}/tyxml/functor/html_sigs.cmti 11${OCAML_SITELIB}/tyxml/functor/html_sigs.cmti
11${OCAML_SITELIB}/tyxml/functor/html_sigs.mli 12${OCAML_SITELIB}/tyxml/functor/html_sigs.mli
12${OCAML_SITELIB}/tyxml/functor/html_types.cmi 13${OCAML_SITELIB}/tyxml/functor/html_types.cmi
13${OCAML_SITELIB}/tyxml/functor/html_types.cmti 14${OCAML_SITELIB}/tyxml/functor/html_types.cmti
14${OCAML_SITELIB}/tyxml/functor/html_types.mli 15${OCAML_SITELIB}/tyxml/functor/html_types.mli
15${OCAML_SITELIB}/tyxml/functor/svg_f.cmi 16${OCAML_SITELIB}/tyxml/functor/svg_f.cmi
16${OCAML_SITELIB}/tyxml/functor/svg_f.cmt 17${OCAML_SITELIB}/tyxml/functor/svg_f.cmt
17${OCAML_SITELIB}/tyxml/functor/svg_f.cmti 18${OCAML_SITELIB}/tyxml/functor/svg_f.cmti
18${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/svg_f.cmx 19${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/svg_f.cmx
19${OCAML_SITELIB}/tyxml/functor/svg_f.ml 20${OCAML_SITELIB}/tyxml/functor/svg_f.ml
20${OCAML_SITELIB}/tyxml/functor/svg_f.mli 21${OCAML_SITELIB}/tyxml/functor/svg_f.mli
21${OCAML_SITELIB}/tyxml/functor/svg_sigs.cmi 22${OCAML_SITELIB}/tyxml/functor/svg_sigs.cmi
22${OCAML_SITELIB}/tyxml/functor/svg_sigs.cmti 23${OCAML_SITELIB}/tyxml/functor/svg_sigs.cmti
23${OCAML_SITELIB}/tyxml/functor/svg_sigs.mli 24${OCAML_SITELIB}/tyxml/functor/svg_sigs.mli
24${OCAML_SITELIB}/tyxml/functor/svg_types.cmi 25${OCAML_SITELIB}/tyxml/functor/svg_types.cmi
25${OCAML_SITELIB}/tyxml/functor/svg_types.cmti 26${OCAML_SITELIB}/tyxml/functor/svg_types.cmti
26${OCAML_SITELIB}/tyxml/functor/svg_types.mli 27${OCAML_SITELIB}/tyxml/functor/svg_types.mli
27${OCAML_SITELIB}/tyxml/functor/tyxml.functor.dune 
28${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.a 28${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.a
29${OCAML_SITELIB}/tyxml/functor/tyxml_f.cma 29${OCAML_SITELIB}/tyxml/functor/tyxml_f.cma
30${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.cmxa 30${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.cmxa
31${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.cmxs 31${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/tyxml_f.cmxs
32${OCAML_SITELIB}/tyxml/functor/xml_iter.cmi 32${OCAML_SITELIB}/tyxml/functor/xml_iter.cmi
33${OCAML_SITELIB}/tyxml/functor/xml_iter.cmt 33${OCAML_SITELIB}/tyxml/functor/xml_iter.cmt
34${OCAML_SITELIB}/tyxml/functor/xml_iter.cmti 34${OCAML_SITELIB}/tyxml/functor/xml_iter.cmti
35${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/xml_iter.cmx 35${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/xml_iter.cmx
36${OCAML_SITELIB}/tyxml/functor/xml_iter.ml 36${OCAML_SITELIB}/tyxml/functor/xml_iter.ml
37${OCAML_SITELIB}/tyxml/functor/xml_iter.mli 37${OCAML_SITELIB}/tyxml/functor/xml_iter.mli
38${OCAML_SITELIB}/tyxml/functor/xml_print.cmi 38${OCAML_SITELIB}/tyxml/functor/xml_print.cmi
39${OCAML_SITELIB}/tyxml/functor/xml_print.cmt 39${OCAML_SITELIB}/tyxml/functor/xml_print.cmt
40${OCAML_SITELIB}/tyxml/functor/xml_print.cmti 40${OCAML_SITELIB}/tyxml/functor/xml_print.cmti
@@ -47,54 +47,51 @@ ${OCAML_SITELIB}/tyxml/functor/xml_sigs. @@ -47,54 +47,51 @@ ${OCAML_SITELIB}/tyxml/functor/xml_sigs.
47${OCAML_SITELIB}/tyxml/functor/xml_stream.cmi 47${OCAML_SITELIB}/tyxml/functor/xml_stream.cmi
48${OCAML_SITELIB}/tyxml/functor/xml_stream.cmt 48${OCAML_SITELIB}/tyxml/functor/xml_stream.cmt
49${OCAML_SITELIB}/tyxml/functor/xml_stream.cmti 49${OCAML_SITELIB}/tyxml/functor/xml_stream.cmti
50${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/xml_stream.cmx 50${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/xml_stream.cmx
51${OCAML_SITELIB}/tyxml/functor/xml_stream.ml 51${OCAML_SITELIB}/tyxml/functor/xml_stream.ml
52${OCAML_SITELIB}/tyxml/functor/xml_stream.mli 52${OCAML_SITELIB}/tyxml/functor/xml_stream.mli
53${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmi 53${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmi
54${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmt 54${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmt
55${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmti 55${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmti
56${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmx 56${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/functor/xml_wrap.cmx
57${OCAML_SITELIB}/tyxml/functor/xml_wrap.ml 57${OCAML_SITELIB}/tyxml/functor/xml_wrap.ml
58${OCAML_SITELIB}/tyxml/functor/xml_wrap.mli 58${OCAML_SITELIB}/tyxml/functor/xml_wrap.mli
59${OCAML_SITELIB}/tyxml/opam 59${OCAML_SITELIB}/tyxml/opam
60${OCAML_SITELIB}/tyxml/tools/tyxml.tools.dune 
61${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmi 60${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmi
62${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmt 61${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmt
63${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmti 62${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmti
64${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmx 63${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_name.cmx
65${OCAML_SITELIB}/tyxml/tools/tyxml_name.ml 64${OCAML_SITELIB}/tyxml/tools/tyxml_name.ml
66${OCAML_SITELIB}/tyxml/tools/tyxml_name.mli 65${OCAML_SITELIB}/tyxml/tools/tyxml_name.mli
67${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.a 66${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.a
68${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cma 67${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cma
69${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cmxa 68${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cmxa
70${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cmxs 69${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tools/tyxml_tools.cmxs
71${OCAML_SITELIB}/tyxml/top/tyxml.top.dune 
72${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.a 70${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.a
73${OCAML_SITELIB}/tyxml/top/tyxml_top.cma 71${OCAML_SITELIB}/tyxml/top/tyxml_top.cma
74${OCAML_SITELIB}/tyxml/top/tyxml_top.cmi 72${OCAML_SITELIB}/tyxml/top/tyxml_top.cmi
75${OCAML_SITELIB}/tyxml/top/tyxml_top.cmt 73${OCAML_SITELIB}/tyxml/top/tyxml_top.cmt
76${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.cmx 74${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.cmx
77${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.cmxa 75${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.cmxa
78${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.cmxs 76${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/top/tyxml_top.cmxs
79${OCAML_SITELIB}/tyxml/top/tyxml_top.ml 77${OCAML_SITELIB}/tyxml/top/tyxml_top.ml
80${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.a 78${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.a
81${OCAML_SITELIB}/tyxml/tyxml.cma 79${OCAML_SITELIB}/tyxml/tyxml.cma
82${OCAML_SITELIB}/tyxml/tyxml.cmi 80${OCAML_SITELIB}/tyxml/tyxml.cmi
83${OCAML_SITELIB}/tyxml/tyxml.cmt 81${OCAML_SITELIB}/tyxml/tyxml.cmt
84${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmx 82${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmx
85${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxa 83${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxa
86${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxs 84${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml.cmxs
87${OCAML_SITELIB}/tyxml/tyxml.dune 
88${OCAML_SITELIB}/tyxml/tyxml.ml 85${OCAML_SITELIB}/tyxml/tyxml.ml
89${OCAML_SITELIB}/tyxml/tyxml_html.cmi 86${OCAML_SITELIB}/tyxml/tyxml_html.cmi
90${OCAML_SITELIB}/tyxml/tyxml_html.cmt 87${OCAML_SITELIB}/tyxml/tyxml_html.cmt
91${OCAML_SITELIB}/tyxml/tyxml_html.cmti 88${OCAML_SITELIB}/tyxml/tyxml_html.cmti
92${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_html.cmx 89${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_html.cmx
93${OCAML_SITELIB}/tyxml/tyxml_html.ml 90${OCAML_SITELIB}/tyxml/tyxml_html.ml
94${OCAML_SITELIB}/tyxml/tyxml_html.mli 91${OCAML_SITELIB}/tyxml/tyxml_html.mli
95${OCAML_SITELIB}/tyxml/tyxml_svg.cmi 92${OCAML_SITELIB}/tyxml/tyxml_svg.cmi
96${OCAML_SITELIB}/tyxml/tyxml_svg.cmt 93${OCAML_SITELIB}/tyxml/tyxml_svg.cmt
97${OCAML_SITELIB}/tyxml/tyxml_svg.cmti 94${OCAML_SITELIB}/tyxml/tyxml_svg.cmti
98${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_svg.cmx 95${PLIST.ocaml-opt}${OCAML_SITELIB}/tyxml/tyxml_svg.cmx
99${OCAML_SITELIB}/tyxml/tyxml_svg.ml 96${OCAML_SITELIB}/tyxml/tyxml_svg.ml
100${OCAML_SITELIB}/tyxml/tyxml_svg.mli 97${OCAML_SITELIB}/tyxml/tyxml_svg.mli
cvs diff -r1.10 -r1.11 pkgsrc/textproc/ocaml-tyxml/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-tyxml/buildlink3.mk 2018/11/29 12:00:45 1.10
+++ pkgsrc/textproc/ocaml-tyxml/buildlink3.mk 2019/03/05 17:10:04 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.10 2018/11/29 12:00:45 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2019/03/05 17:10:04 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-tyxml 3BUILDLINK_TREE+= ocaml-tyxml
4 4
5.if !defined(OCAML_TYXML_BUILDLINK3_MK) 5.if !defined(OCAML_TYXML_BUILDLINK3_MK)
6OCAML_TYXML_BUILDLINK3_MK:= 6OCAML_TYXML_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.0.1 8BUILDLINK_API_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.0.1
9BUILDLINK_ABI_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.3.0 9BUILDLINK_ABI_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.3.0nb1
10BUILDLINK_PKGSRCDIR.ocaml-tyxml?= ../../textproc/ocaml-tyxml 10BUILDLINK_PKGSRCDIR.ocaml-tyxml?= ../../textproc/ocaml-tyxml
11 11
12.endif # OCAML_TYXML_BUILDLINK3_MK 12.endif # OCAML_TYXML_BUILDLINK3_MK
13 13
14BUILDLINK_TREE+= -ocaml-tyxml 14BUILDLINK_TREE+= -ocaml-tyxml