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.

5 files changed, 25 insertions, 13 deletions

diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile
index f5c4d141365..f1eb8daa814 100644
--- a/devel/ocaml-re/Makefile
+++ b/devel/ocaml-re/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2018/11/12 16:10:22 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2018/11/27 16:07:28 jaapb Exp $
 
-VERSION=	1.7.3
+VERSION=	1.8.0
 GITHUB_PROJECT=	ocaml-re
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -16,7 +15,7 @@ INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/re/emacs ${OCAML_SITELIBDIR}/re/glob \
 		       	${OCAML_SITELIBDIR}/re/pcre ${OCAML_SITELIBDIR}/re/perl \
 			${OCAML_SITELIBDIR}/re/posix ${OCAML_SITELIBDIR}/re/str \
 			share/doc/re
-OCAML_USE_JBUILDER=	yes
+OCAML_USE_DUNE=	yes
 
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-re/PLIST b/devel/ocaml-re/PLIST
index 9ab49d9561c..78f3c3f122d 100644
--- a/devel/ocaml-re/PLIST
+++ b/devel/ocaml-re/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/04/05 10:45:05 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/11/27 16:07:28 jaapb Exp $
 ${OCAML_SITELIB}/re/META
 ${OCAML_SITELIB}/re/automata.ml
 ${OCAML_SITELIB}/re/automata.mli
@@ -79,7 +79,7 @@ ${OCAML_SITELIB}/re/re.ml
 ${OCAML_SITELIB}/re/re__.cmi
 ${OCAML_SITELIB}/re/re__.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__.cmx
-${OCAML_SITELIB}/re/re__.ml-gen
+${OCAML_SITELIB}/re/re__.ml
 ${OCAML_SITELIB}/re/re__Automata.cmi
 ${OCAML_SITELIB}/re/re__Automata.cmt
 ${OCAML_SITELIB}/re/re__Automata.cmti
diff --git a/devel/ocaml-re/buildlink3.mk b/devel/ocaml-re/buildlink3.mk
index c9b303250d5..f42aa528601 100644
--- a/devel/ocaml-re/buildlink3.mk
+++ b/devel/ocaml-re/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2018/07/19 15:15:25 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/11/27 16:07:28 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-re
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-re
 OCAML_RE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-re+=	ocaml-re>=1.6.0
-BUILDLINK_ABI_DEPENDS.ocaml-re+=	ocaml-re>=1.7.3nb1
+BUILDLINK_ABI_DEPENDS.ocaml-re+=	ocaml-re>=1.8.0
 BUILDLINK_PKGSRCDIR.ocaml-re?=	../../devel/ocaml-re
 .endif	# OCAML_RE_BUILDLINK3_MK
 
diff --git a/devel/ocaml-re/distinfo b/devel/ocaml-re/distinfo
index d5ba1f01cce..2fdde896e3c 100644
--- a/devel/ocaml-re/distinfo
+++ b/devel/ocaml-re/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2018/04/05 10:45:05 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2018/11/27 16:07:28 jaapb Exp $
 
-SHA1 (ocaml-re-1.7.3.tar.gz) = 59d2fdb470f37df2fe7d952683ff2dcb8ddccd74
-RMD160 (ocaml-re-1.7.3.tar.gz) = add7f087920a10345caea430973b495a1024a69a
-SHA512 (ocaml-re-1.7.3.tar.gz) = 3d161cb46fa0e855bfbae29b5b769f0054b51e4021f8a66ff8d6a9eee257ba4b02ab7202337d35c4ed2a033560a7b69676525f32cb18406881bed2e68db2ca55
-Size (ocaml-re-1.7.3.tar.gz) = 81668 bytes
+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
diff --git a/devel/ocaml-re/patches/patch-lib_jbuild b/devel/ocaml-re/patches/patch-lib_jbuild
new file mode 100644
index 00000000000..5235b1ee625
--- /dev/null
+++ b/devel/ocaml-re/patches/patch-lib_jbuild
@@ -0,0 +1,12 @@
+$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)))