Tue Nov 27 16:07:29 2018 UTC ()
Updated devel/ocaml-re to version 1.8.0.

This fixes a bug, and adds iterators based on OCaml's Seq module.
The package now uses dune.


(jaapb)
diff -r1.17 -r1.18 pkgsrc/devel/ocaml-re/Makefile
diff -r1.4 -r1.5 pkgsrc/devel/ocaml-re/PLIST
diff -r1.8 -r1.9 pkgsrc/devel/ocaml-re/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/devel/ocaml-re/distinfo
diff -r0 -r1.1 pkgsrc/devel/ocaml-re/patches/patch-lib_jbuild
cvs diff -r1.17 -r1.18 pkgsrc/devel/ocaml-re/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/Makefile 2018/11/12 16:10:22 1.17
+++ pkgsrc/devel/ocaml-re/Makefile 2018/11/27 16:07:28 1.18
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.17 2018/11/12 16:10:22 jaapb Exp $ 1# $NetBSD: Makefile,v 1.18 2018/11/27 16:07:28 jaapb Exp $
2 2
3VERSION= 1.7.3 3VERSION= 1.8.0
4GITHUB_PROJECT= ocaml-re 4GITHUB_PROJECT= ocaml-re
5DISTNAME= ${GITHUB_PROJECT}-${VERSION} 5DISTNAME= ${GITHUB_PROJECT}-${VERSION}
6PKGREVISION= 3 
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_JBUILDER= 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.4 -r1.5 pkgsrc/devel/ocaml-re/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/PLIST 2018/04/05 10:45:05 1.4
+++ pkgsrc/devel/ocaml-re/PLIST 2018/11/27 16:07:28 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2018/04/05 10:45:05 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.5 2018/11/27 16:07:28 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/core.ml 7${OCAML_SITELIB}/re/core.ml
8${OCAML_SITELIB}/re/core.mli 8${OCAML_SITELIB}/re/core.mli
9${OCAML_SITELIB}/re/cset.ml 9${OCAML_SITELIB}/re/cset.ml
10${OCAML_SITELIB}/re/cset.mli 10${OCAML_SITELIB}/re/cset.mli
11${OCAML_SITELIB}/re/emacs.ml 11${OCAML_SITELIB}/re/emacs.ml
12${OCAML_SITELIB}/re/emacs.mli 12${OCAML_SITELIB}/re/emacs.mli
13${OCAML_SITELIB}/re/emacs/re.emacs.dune 13${OCAML_SITELIB}/re/emacs/re.emacs.dune
14${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.a 14${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.a
@@ -69,27 +69,27 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/po @@ -69,27 +69,27 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/po
69${OCAML_SITELIB}/re/posix/re_posix.ml 69${OCAML_SITELIB}/re/posix/re_posix.ml
70${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.a 70${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.a
71${OCAML_SITELIB}/re/re.cma 71${OCAML_SITELIB}/re/re.cma
72${OCAML_SITELIB}/re/re.cmi 72${OCAML_SITELIB}/re/re.cmi
73${OCAML_SITELIB}/re/re.cmt 73${OCAML_SITELIB}/re/re.cmt
74${PLIST.ocaml-opt}${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmx 74${PLIST.ocaml-opt}${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmx
75${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxa 75${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxa
76${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxs 76${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxs
77${OCAML_SITELIB}/re/re.dune 77${OCAML_SITELIB}/re/re.dune
78${OCAML_SITELIB}/re/re.ml 78${OCAML_SITELIB}/re/re.ml
79${OCAML_SITELIB}/re/re__.cmi 79${OCAML_SITELIB}/re/re__.cmi
80${OCAML_SITELIB}/re/re__.cmt 80${OCAML_SITELIB}/re/re__.cmt
81${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__.cmx 81${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__.cmx
82${OCAML_SITELIB}/re/re__.ml-gen 82${OCAML_SITELIB}/re/re__.ml
83${OCAML_SITELIB}/re/re__Automata.cmi 83${OCAML_SITELIB}/re/re__Automata.cmi
84${OCAML_SITELIB}/re/re__Automata.cmt 84${OCAML_SITELIB}/re/re__Automata.cmt
85${OCAML_SITELIB}/re/re__Automata.cmti 85${OCAML_SITELIB}/re/re__Automata.cmti
86${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Automata.cmx 86${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Automata.cmx
87${OCAML_SITELIB}/re/re__Category.cmi 87${OCAML_SITELIB}/re/re__Category.cmi
88${OCAML_SITELIB}/re/re__Category.cmt 88${OCAML_SITELIB}/re/re__Category.cmt
89${OCAML_SITELIB}/re/re__Category.cmti 89${OCAML_SITELIB}/re/re__Category.cmti
90${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Category.cmx 90${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Category.cmx
91${OCAML_SITELIB}/re/re__Core.cmi 91${OCAML_SITELIB}/re/re__Core.cmi
92${OCAML_SITELIB}/re/re__Core.cmt 92${OCAML_SITELIB}/re/re__Core.cmt
93${OCAML_SITELIB}/re/re__Core.cmti 93${OCAML_SITELIB}/re/re__Core.cmti
94${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Core.cmx 94${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Core.cmx
95${OCAML_SITELIB}/re/re__Cset.cmi 95${OCAML_SITELIB}/re/re__Cset.cmi
cvs diff -r1.8 -r1.9 pkgsrc/devel/ocaml-re/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/buildlink3.mk 2018/07/19 15:15:25 1.8
+++ pkgsrc/devel/ocaml-re/buildlink3.mk 2018/11/27 16:07:28 1.9
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.8 2018/07/19 15:15:25 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2018/11/27 16:07:28 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.7.3nb1 9BUILDLINK_ABI_DEPENDS.ocaml-re+= ocaml-re>=1.8.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
cvs diff -r1.5 -r1.6 pkgsrc/devel/ocaml-re/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/distinfo 2018/04/05 10:45:05 1.5
+++ pkgsrc/devel/ocaml-re/distinfo 2018/11/27 16:07:28 1.6
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.5 2018/04/05 10:45:05 jaapb Exp $ 1$NetBSD: distinfo,v 1.6 2018/11/27 16:07:28 jaapb Exp $
2 2
3SHA1 (ocaml-re-1.7.3.tar.gz) = 59d2fdb470f37df2fe7d952683ff2dcb8ddccd74 3SHA1 (ocaml-re-1.8.0.tar.gz) = 9d6838f20f5b188396d71e83dfc7a36beda73c04
4RMD160 (ocaml-re-1.7.3.tar.gz) = add7f087920a10345caea430973b495a1024a69a 4RMD160 (ocaml-re-1.8.0.tar.gz) = 9aa732d75805e8d6361a696bac6b57231b806bd1
5SHA512 (ocaml-re-1.7.3.tar.gz) = 3d161cb46fa0e855bfbae29b5b769f0054b51e4021f8a66ff8d6a9eee257ba4b02ab7202337d35c4ed2a033560a7b69676525f32cb18406881bed2e68db2ca55 5SHA512 (ocaml-re-1.8.0.tar.gz) = d1cf9160f6e262de975ec459daae88883069006d200c0e5883ebf7dd9f47e427323f7cdaa35b2483b65a403fc2cacfe7a9ef1bdfba1ee918df38dc39fd616ca8
6Size (ocaml-re-1.7.3.tar.gz) = 81668 bytes 6Size (ocaml-re-1.8.0.tar.gz) = 81774 bytes
 7SHA1 (patch-lib_jbuild) = 8f4beb5209016f7851aeecaaa281d18e61ca05ff
File Added: pkgsrc/devel/ocaml-re/patches/Attic/patch-lib_jbuild
$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)))