[pkgsrc/trunk]: pkgsrc/devel/ocaml-re Updated devel/ocaml-re to version 1.9.0.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1f090347020
branches:  trunk
changeset: 410534:f1f090347020
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Fri Jan 24 09:14:10 2020 +0000

description:
Updated devel/ocaml-re to version 1.9.0.

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

diffstat:

 devel/ocaml-re/Makefile                 |   7 +++----
 devel/ocaml-re/PLIST                    |  16 ++++++++++++++--
 devel/ocaml-re/buildlink3.mk            |   4 ++--
 devel/ocaml-re/distinfo                 |  11 +++++------
 devel/ocaml-re/patches/patch-lib_jbuild |  12 ------------
 5 files changed, 24 insertions(+), 26 deletions(-)

diffs (130 lines):

diff -r 4cfa031206bf -r f1f090347020 devel/ocaml-re/Makefile
--- a/devel/ocaml-re/Makefile   Fri Jan 24 08:17:28 2020 +0000
+++ b/devel/ocaml-re/Makefile   Fri Jan 24 09:14:10 2020 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2019/11/03 10:39:25 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2020/01/24 09:14:10 jaapb Exp $
 
-VERSION=       1.8.0
+VERSION=       1.9.0
 GITHUB_PROJECT=        ocaml-re
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -13,7 +12,7 @@
 LICENSE=       gnu-lgpl-v2.1
 
 INSTALLATION_DIRS+=    ${OCAML_SITELIBDIR}/re/emacs ${OCAML_SITELIBDIR}/re/glob \
-                       ${OCAML_SITELIBDIR}/re/pcre ${OCAML_SITELIBDIR}/re/perl \
+                       ${OCAML_SITELIBDIR}/re/pcre ${OCAML_SITELIBDIR}/re/perl \
                        ${OCAML_SITELIBDIR}/re/posix ${OCAML_SITELIBDIR}/re/str \
                        share/doc/re
 OCAML_USE_DUNE=                yes
diff -r 4cfa031206bf -r f1f090347020 devel/ocaml-re/PLIST
--- a/devel/ocaml-re/PLIST      Fri Jan 24 08:17:28 2020 +0000
+++ b/devel/ocaml-re/PLIST      Fri Jan 24 09:14:10 2020 +0000
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2019/03/05 16:50:45 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/01/24 09:14:10 jaapb Exp $
 ${OCAML_SITELIB}/re/META
 ${OCAML_SITELIB}/re/automata.ml
 ${OCAML_SITELIB}/re/automata.mli
 ${OCAML_SITELIB}/re/category.ml
 ${OCAML_SITELIB}/re/category.mli
+${OCAML_SITELIB}/re/color_map.ml
+${OCAML_SITELIB}/re/color_map.mli
 ${OCAML_SITELIB}/re/core.ml
 ${OCAML_SITELIB}/re/core.mli
 ${OCAML_SITELIB}/re/cset.ml
@@ -30,6 +32,8 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.cmxs
 ${OCAML_SITELIB}/re/glob/re_glob.ml
+${OCAML_SITELIB}/re/group.ml
+${OCAML_SITELIB}/re/group.mli
 ${OCAML_SITELIB}/re/opam
 ${OCAML_SITELIB}/re/pcre.ml
 ${OCAML_SITELIB}/re/pcre.mli
@@ -67,7 +71,7 @@
 ${OCAML_SITELIB}/re/re.cma
 ${OCAML_SITELIB}/re/re.cmi
 ${OCAML_SITELIB}/re/re.cmt
-${PLIST.ocaml-opt}${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxs
 ${OCAML_SITELIB}/re/re.ml
@@ -83,6 +87,10 @@
 ${OCAML_SITELIB}/re/re__Category.cmt
 ${OCAML_SITELIB}/re/re__Category.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Category.cmx
+${OCAML_SITELIB}/re/re__Color_map.cmi
+${OCAML_SITELIB}/re/re__Color_map.cmt
+${OCAML_SITELIB}/re/re__Color_map.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Color_map.cmx
 ${OCAML_SITELIB}/re/re__Core.cmi
 ${OCAML_SITELIB}/re/re__Core.cmt
 ${OCAML_SITELIB}/re/re__Core.cmti
@@ -102,6 +110,10 @@
 ${OCAML_SITELIB}/re/re__Glob.cmt
 ${OCAML_SITELIB}/re/re__Glob.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Glob.cmx
+${OCAML_SITELIB}/re/re__Group.cmi
+${OCAML_SITELIB}/re/re__Group.cmt
+${OCAML_SITELIB}/re/re__Group.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Group.cmx
 ${OCAML_SITELIB}/re/re__Pcre.cmi
 ${OCAML_SITELIB}/re/re__Pcre.cmt
 ${OCAML_SITELIB}/re/re__Pcre.cmti
diff -r 4cfa031206bf -r f1f090347020 devel/ocaml-re/buildlink3.mk
--- a/devel/ocaml-re/buildlink3.mk      Fri Jan 24 08:17:28 2020 +0000
+++ b/devel/ocaml-re/buildlink3.mk      Fri Jan 24 09:14:10 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2019/11/03 10:39:25 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2020/01/24 09:14:10 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-re
 
@@ -6,7 +6,7 @@
 OCAML_RE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-re+=       ocaml-re>=1.6.0
-BUILDLINK_ABI_DEPENDS.ocaml-re+=       ocaml-re>=1.8.0nb1
+BUILDLINK_ABI_DEPENDS.ocaml-re+=       ocaml-re>=1.9.0
 BUILDLINK_PKGSRCDIR.ocaml-re?=         ../../devel/ocaml-re
 .endif # OCAML_RE_BUILDLINK3_MK
 
diff -r 4cfa031206bf -r f1f090347020 devel/ocaml-re/distinfo
--- a/devel/ocaml-re/distinfo   Fri Jan 24 08:17:28 2020 +0000
+++ b/devel/ocaml-re/distinfo   Fri Jan 24 09:14:10 2020 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2018/11/27 16:07:28 jaapb Exp $
+$NetBSD: distinfo,v 1.7 2020/01/24 09:14:10 jaapb Exp $
 
-SHA1 (ocaml-re-1.8.0.tar.gz) = 9d6838f20f5b188396d71e83dfc7a36beda73c04
-RMD160 (ocaml-re-1.8.0.tar.gz) = 9aa732d75805e8d6361a696bac6b57231b806bd1
-SHA512 (ocaml-re-1.8.0.tar.gz) = d1cf9160f6e262de975ec459daae88883069006d200c0e5883ebf7dd9f47e427323f7cdaa35b2483b65a403fc2cacfe7a9ef1bdfba1ee918df38dc39fd616ca8
-Size (ocaml-re-1.8.0.tar.gz) = 81774 bytes
-SHA1 (patch-lib_jbuild) = 8f4beb5209016f7851aeecaaa281d18e61ca05ff
+SHA1 (ocaml-re-1.9.0.tar.gz) = 7118e759f933f83d20d50b1fbea2cac9e8f88a77
+RMD160 (ocaml-re-1.9.0.tar.gz) = 624bbd68034f2b68c2a11d980498a5724e2d3c30
+SHA512 (ocaml-re-1.9.0.tar.gz) = 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
+Size (ocaml-re-1.9.0.tar.gz) = 83642 bytes
diff -r 4cfa031206bf -r f1f090347020 devel/ocaml-re/patches/patch-lib_jbuild
--- a/devel/ocaml-re/patches/patch-lib_jbuild   Fri Jan 24 08:17:28 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-lib_jbuild,v 1.1 2018/11/27 16:07:28 jaapb Exp $
-
-The seq library is installed by default in NetBSD,
-no need for a compatibility layer
---- lib/jbuild.orig    2018-08-04 15:26:35.000000000 +0000
-+++ lib/jbuild
-@@ -3,5 +3,4 @@
- (library
-  ((name re)
-   (synopsis "Pure OCaml regular expression library")
--  (libraries (seq))
-   (public_name re)))