Fri Jan 24 09:14:10 2020 UTC ()
Updated devel/ocaml-re to version 1.9.0.

This version introduces some minor bugfixes, and works with Dune 2.0.


(jaapb)
diff -r1.21 -r1.22 pkgsrc/devel/ocaml-re/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/ocaml-re/PLIST
diff -r1.6 -r1.7 pkgsrc/devel/ocaml-re/distinfo
diff -r1.11 -r1.12 pkgsrc/devel/ocaml-re/buildlink3.mk
diff -r1.1 -r0 pkgsrc/devel/ocaml-re/patches/patch-lib_jbuild
cvs diff -r1.21 -r1.22 pkgsrc/devel/ocaml-re/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/Makefile 2019/11/03 10:39:25 1.21
+++ pkgsrc/devel/ocaml-re/Makefile 2020/01/24 09:14:10 1.22
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:25 rillig Exp $ 1# $NetBSD: Makefile,v 1.22 2020/01/24 09:14:10 jaapb Exp $
2 2
3VERSION= 1.8.0 3VERSION= 1.9.0
4GITHUB_PROJECT= ocaml-re 4GITHUB_PROJECT= ocaml-re
5DISTNAME= ${GITHUB_PROJECT}-${VERSION} 5DISTNAME= ${GITHUB_PROJECT}-${VERSION}
6PKGREVISION= 2 
7CATEGORIES= devel 6CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/}
9 8
10MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= https://github.com/ocaml/ocaml-re/ 10HOMEPAGE= https://github.com/ocaml/ocaml-re/
12COMMENT= Pure OCaml regular expression library 11COMMENT= Pure OCaml regular expression library
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/re/emacs ${OCAML_SITELIBDIR}/re/glob \ 14INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/re/emacs ${OCAML_SITELIBDIR}/re/glob \
16 ${OCAML_SITELIBDIR}/re/pcre ${OCAML_SITELIBDIR}/re/perl \ 15 ${OCAML_SITELIBDIR}/re/pcre ${OCAML_SITELIBDIR}/re/perl \
17 ${OCAML_SITELIBDIR}/re/posix ${OCAML_SITELIBDIR}/re/str \ 16 ${OCAML_SITELIBDIR}/re/posix ${OCAML_SITELIBDIR}/re/str \
18 share/doc/re 17 share/doc/re
19OCAML_USE_DUNE= yes 18OCAML_USE_DUNE= yes
20 19
21.include "../../mk/ocaml.mk" 20.include "../../mk/ocaml.mk"
22.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/devel/ocaml-re/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/PLIST 2019/03/05 16:50:45 1.6
+++ pkgsrc/devel/ocaml-re/PLIST 2020/01/24 09:14:10 1.7
@@ -1,45 +1,49 @@ @@ -1,45 +1,49 @@
1@comment $NetBSD: PLIST,v 1.6 2019/03/05 16:50:45 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.7 2020/01/24 09:14:10 jaapb Exp $
2${OCAML_SITELIB}/re/META 2${OCAML_SITELIB}/re/META
3${OCAML_SITELIB}/re/automata.ml 3${OCAML_SITELIB}/re/automata.ml
4${OCAML_SITELIB}/re/automata.mli 4${OCAML_SITELIB}/re/automata.mli
5${OCAML_SITELIB}/re/category.ml 5${OCAML_SITELIB}/re/category.ml
6${OCAML_SITELIB}/re/category.mli 6${OCAML_SITELIB}/re/category.mli
 7${OCAML_SITELIB}/re/color_map.ml
 8${OCAML_SITELIB}/re/color_map.mli
7${OCAML_SITELIB}/re/core.ml 9${OCAML_SITELIB}/re/core.ml
8${OCAML_SITELIB}/re/core.mli 10${OCAML_SITELIB}/re/core.mli
9${OCAML_SITELIB}/re/cset.ml 11${OCAML_SITELIB}/re/cset.ml
10${OCAML_SITELIB}/re/cset.mli 12${OCAML_SITELIB}/re/cset.mli
11${OCAML_SITELIB}/re/dune-package 13${OCAML_SITELIB}/re/dune-package
12${OCAML_SITELIB}/re/emacs.ml 14${OCAML_SITELIB}/re/emacs.ml
13${OCAML_SITELIB}/re/emacs.mli 15${OCAML_SITELIB}/re/emacs.mli
14${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.a 16${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.a
15${OCAML_SITELIB}/re/emacs/re_emacs.cma 17${OCAML_SITELIB}/re/emacs/re_emacs.cma
16${OCAML_SITELIB}/re/emacs/re_emacs.cmi 18${OCAML_SITELIB}/re/emacs/re_emacs.cmi
17${OCAML_SITELIB}/re/emacs/re_emacs.cmt 19${OCAML_SITELIB}/re/emacs/re_emacs.cmt
18${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.cmx 20${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.cmx
19${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.cmxa 21${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.cmxa
20${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.cmxs 22${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.cmxs
21${OCAML_SITELIB}/re/emacs/re_emacs.ml 23${OCAML_SITELIB}/re/emacs/re_emacs.ml
22${OCAML_SITELIB}/re/fmt.ml 24${OCAML_SITELIB}/re/fmt.ml
23${OCAML_SITELIB}/re/glob.ml 25${OCAML_SITELIB}/re/glob.ml
24${OCAML_SITELIB}/re/glob.mli 26${OCAML_SITELIB}/re/glob.mli
25${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.a 27${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.a
26${OCAML_SITELIB}/re/glob/re_glob.cma 28${OCAML_SITELIB}/re/glob/re_glob.cma
27${OCAML_SITELIB}/re/glob/re_glob.cmi 29${OCAML_SITELIB}/re/glob/re_glob.cmi
28${OCAML_SITELIB}/re/glob/re_glob.cmt 30${OCAML_SITELIB}/re/glob/re_glob.cmt
29${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmx 31${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmx
30${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmxa 32${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmxa
31${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmxs 33${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmxs
32${OCAML_SITELIB}/re/glob/re_glob.ml 34${OCAML_SITELIB}/re/glob/re_glob.ml
 35${OCAML_SITELIB}/re/group.ml
 36${OCAML_SITELIB}/re/group.mli
33${OCAML_SITELIB}/re/opam 37${OCAML_SITELIB}/re/opam
34${OCAML_SITELIB}/re/pcre.ml 38${OCAML_SITELIB}/re/pcre.ml
35${OCAML_SITELIB}/re/pcre.mli 39${OCAML_SITELIB}/re/pcre.mli
36${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.a 40${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.a
37${OCAML_SITELIB}/re/pcre/re_pcre.cma 41${OCAML_SITELIB}/re/pcre/re_pcre.cma
38${OCAML_SITELIB}/re/pcre/re_pcre.cmi 42${OCAML_SITELIB}/re/pcre/re_pcre.cmi
39${OCAML_SITELIB}/re/pcre/re_pcre.cmt 43${OCAML_SITELIB}/re/pcre/re_pcre.cmt
40${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.cmx 44${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.cmx
41${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.cmxa 45${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.cmxa
42${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.cmxs 46${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.cmxs
43${OCAML_SITELIB}/re/pcre/re_pcre.ml 47${OCAML_SITELIB}/re/pcre/re_pcre.ml
44${OCAML_SITELIB}/re/perl.ml 48${OCAML_SITELIB}/re/perl.ml
45${OCAML_SITELIB}/re/perl.mli 49${OCAML_SITELIB}/re/perl.mli
@@ -57,61 +61,69 @@ ${OCAML_SITELIB}/re/posix.ml @@ -57,61 +61,69 @@ ${OCAML_SITELIB}/re/posix.ml
57${OCAML_SITELIB}/re/posix.mli 61${OCAML_SITELIB}/re/posix.mli
58${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.a 62${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.a
59${OCAML_SITELIB}/re/posix/re_posix.cma 63${OCAML_SITELIB}/re/posix/re_posix.cma
60${OCAML_SITELIB}/re/posix/re_posix.cmi 64${OCAML_SITELIB}/re/posix/re_posix.cmi
61${OCAML_SITELIB}/re/posix/re_posix.cmt 65${OCAML_SITELIB}/re/posix/re_posix.cmt
62${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.cmx 66${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.cmx
63${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.cmxa 67${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.cmxa
64${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.cmxs 68${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.cmxs
65${OCAML_SITELIB}/re/posix/re_posix.ml 69${OCAML_SITELIB}/re/posix/re_posix.ml
66${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.a 70${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.a
67${OCAML_SITELIB}/re/re.cma 71${OCAML_SITELIB}/re/re.cma
68${OCAML_SITELIB}/re/re.cmi 72${OCAML_SITELIB}/re/re.cmi
69${OCAML_SITELIB}/re/re.cmt 73${OCAML_SITELIB}/re/re.cmt
70${PLIST.ocaml-opt}${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmx 74${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmx
71${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxa 75${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxa
72${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxs 76${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxs
73${OCAML_SITELIB}/re/re.ml 77${OCAML_SITELIB}/re/re.ml
74${OCAML_SITELIB}/re/re__.cmi 78${OCAML_SITELIB}/re/re__.cmi
75${OCAML_SITELIB}/re/re__.cmt 79${OCAML_SITELIB}/re/re__.cmt
76${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__.cmx 80${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__.cmx
77${OCAML_SITELIB}/re/re__.ml 81${OCAML_SITELIB}/re/re__.ml
78${OCAML_SITELIB}/re/re__Automata.cmi 82${OCAML_SITELIB}/re/re__Automata.cmi
79${OCAML_SITELIB}/re/re__Automata.cmt 83${OCAML_SITELIB}/re/re__Automata.cmt
80${OCAML_SITELIB}/re/re__Automata.cmti 84${OCAML_SITELIB}/re/re__Automata.cmti
81${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Automata.cmx 85${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Automata.cmx
82${OCAML_SITELIB}/re/re__Category.cmi 86${OCAML_SITELIB}/re/re__Category.cmi
83${OCAML_SITELIB}/re/re__Category.cmt 87${OCAML_SITELIB}/re/re__Category.cmt
84${OCAML_SITELIB}/re/re__Category.cmti 88${OCAML_SITELIB}/re/re__Category.cmti
85${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Category.cmx 89${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Category.cmx
 90${OCAML_SITELIB}/re/re__Color_map.cmi
 91${OCAML_SITELIB}/re/re__Color_map.cmt
 92${OCAML_SITELIB}/re/re__Color_map.cmti
 93${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Color_map.cmx
86${OCAML_SITELIB}/re/re__Core.cmi 94${OCAML_SITELIB}/re/re__Core.cmi
87${OCAML_SITELIB}/re/re__Core.cmt 95${OCAML_SITELIB}/re/re__Core.cmt
88${OCAML_SITELIB}/re/re__Core.cmti 96${OCAML_SITELIB}/re/re__Core.cmti
89${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Core.cmx 97${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Core.cmx
90${OCAML_SITELIB}/re/re__Cset.cmi 98${OCAML_SITELIB}/re/re__Cset.cmi
91${OCAML_SITELIB}/re/re__Cset.cmt 99${OCAML_SITELIB}/re/re__Cset.cmt
92${OCAML_SITELIB}/re/re__Cset.cmti 100${OCAML_SITELIB}/re/re__Cset.cmti
93${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Cset.cmx 101${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Cset.cmx
94${OCAML_SITELIB}/re/re__Emacs.cmi 102${OCAML_SITELIB}/re/re__Emacs.cmi
95${OCAML_SITELIB}/re/re__Emacs.cmt 103${OCAML_SITELIB}/re/re__Emacs.cmt
96${OCAML_SITELIB}/re/re__Emacs.cmti 104${OCAML_SITELIB}/re/re__Emacs.cmti
97${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Emacs.cmx 105${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Emacs.cmx
98${OCAML_SITELIB}/re/re__Fmt.cmi 106${OCAML_SITELIB}/re/re__Fmt.cmi
99${OCAML_SITELIB}/re/re__Fmt.cmt 107${OCAML_SITELIB}/re/re__Fmt.cmt
100${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Fmt.cmx 108${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Fmt.cmx
101${OCAML_SITELIB}/re/re__Glob.cmi 109${OCAML_SITELIB}/re/re__Glob.cmi
102${OCAML_SITELIB}/re/re__Glob.cmt 110${OCAML_SITELIB}/re/re__Glob.cmt
103${OCAML_SITELIB}/re/re__Glob.cmti 111${OCAML_SITELIB}/re/re__Glob.cmti
104${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Glob.cmx 112${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Glob.cmx
 113${OCAML_SITELIB}/re/re__Group.cmi
 114${OCAML_SITELIB}/re/re__Group.cmt
 115${OCAML_SITELIB}/re/re__Group.cmti
 116${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Group.cmx
105${OCAML_SITELIB}/re/re__Pcre.cmi 117${OCAML_SITELIB}/re/re__Pcre.cmi
106${OCAML_SITELIB}/re/re__Pcre.cmt 118${OCAML_SITELIB}/re/re__Pcre.cmt
107${OCAML_SITELIB}/re/re__Pcre.cmti 119${OCAML_SITELIB}/re/re__Pcre.cmti
108${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Pcre.cmx 120${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Pcre.cmx
109${OCAML_SITELIB}/re/re__Perl.cmi 121${OCAML_SITELIB}/re/re__Perl.cmi
110${OCAML_SITELIB}/re/re__Perl.cmt 122${OCAML_SITELIB}/re/re__Perl.cmt
111${OCAML_SITELIB}/re/re__Perl.cmti 123${OCAML_SITELIB}/re/re__Perl.cmti
112${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Perl.cmx 124${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Perl.cmx
113${OCAML_SITELIB}/re/re__Pmark.cmi 125${OCAML_SITELIB}/re/re__Pmark.cmi
114${OCAML_SITELIB}/re/re__Pmark.cmt 126${OCAML_SITELIB}/re/re__Pmark.cmt
115${OCAML_SITELIB}/re/re__Pmark.cmti 127${OCAML_SITELIB}/re/re__Pmark.cmti
116${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Pmark.cmx 128${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Pmark.cmx
117${OCAML_SITELIB}/re/re__Posix.cmi 129${OCAML_SITELIB}/re/re__Posix.cmi
cvs diff -r1.6 -r1.7 pkgsrc/devel/ocaml-re/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/distinfo 2018/11/27 16:07:28 1.6
+++ pkgsrc/devel/ocaml-re/distinfo 2020/01/24 09:14:10 1.7
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.6 2018/11/27 16:07:28 jaapb Exp $ 1$NetBSD: distinfo,v 1.7 2020/01/24 09:14:10 jaapb Exp $
2 2
3SHA1 (ocaml-re-1.8.0.tar.gz) = 9d6838f20f5b188396d71e83dfc7a36beda73c04 3SHA1 (ocaml-re-1.9.0.tar.gz) = 7118e759f933f83d20d50b1fbea2cac9e8f88a77
4RMD160 (ocaml-re-1.8.0.tar.gz) = 9aa732d75805e8d6361a696bac6b57231b806bd1 4RMD160 (ocaml-re-1.9.0.tar.gz) = 624bbd68034f2b68c2a11d980498a5724e2d3c30
5SHA512 (ocaml-re-1.8.0.tar.gz) = d1cf9160f6e262de975ec459daae88883069006d200c0e5883ebf7dd9f47e427323f7cdaa35b2483b65a403fc2cacfe7a9ef1bdfba1ee918df38dc39fd616ca8 5SHA512 (ocaml-re-1.9.0.tar.gz) = 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
6Size (ocaml-re-1.8.0.tar.gz) = 81774 bytes 6Size (ocaml-re-1.9.0.tar.gz) = 83642 bytes
7SHA1 (patch-lib_jbuild) = 8f4beb5209016f7851aeecaaa281d18e61ca05ff 
cvs diff -r1.11 -r1.12 pkgsrc/devel/ocaml-re/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/buildlink3.mk 2019/11/03 10:39:25 1.11
+++ pkgsrc/devel/ocaml-re/buildlink3.mk 2020/01/24 09:14:10 1.12
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.11 2019/11/03 10:39:25 rillig Exp $ 1# $NetBSD: buildlink3.mk,v 1.12 2020/01/24 09:14:10 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-re 3BUILDLINK_TREE+= ocaml-re
4 4
5.if !defined(OCAML_RE_BUILDLINK3_MK) 5.if !defined(OCAML_RE_BUILDLINK3_MK)
6OCAML_RE_BUILDLINK3_MK:= 6OCAML_RE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-re+= ocaml-re>=1.6.0 8BUILDLINK_API_DEPENDS.ocaml-re+= ocaml-re>=1.6.0
9BUILDLINK_ABI_DEPENDS.ocaml-re+= ocaml-re>=1.8.0nb1 9BUILDLINK_ABI_DEPENDS.ocaml-re+= ocaml-re>=1.9.0
10BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re 10BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re
11.endif # OCAML_RE_BUILDLINK3_MK 11.endif # OCAML_RE_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -ocaml-re 13BUILDLINK_TREE+= -ocaml-re
File Deleted: pkgsrc/devel/ocaml-re/patches/Attic/patch-lib_jbuild