Updated package to latest version, 1.6.0, and straightened out github

variables.

Changes include:

1.6.0 (30-May-2016)

* Add Re.pp and Re.pp_re
* Fix ocamldoc syntax

1.5.0 (04-Jan-2016)

* Add Re.exec_opt. Like exec but doesn't raise
* Add Group module. Old group accessors are deprecated.
* Add Mark module
* Improve docs of Re.repn
* Improve docs of Re_pcre
* Fix doc of Re_pcre.match
* Consolidate variants of Re.glob that takes options to modify its behavior
  (?period, ?expand_braces). Old variants are deprecated.
* New option ?pathname added for Re_glob.glob. Controls how the `/` character
  is matched

1.4.1 (06-Jun-2015)

* Fix 4.00.1 compatibilty with tests.

1.4.0 (12-May-2015)

* Add Re.{mark,marked,mark_set}. Regexps can now be "marked" to query post
  execution if they matched.

1.3.2 (14-Apr-2015)

* Fix replacing 0 length matches

1.3.1 (13-Mar-2015):

* Rename {Cset, Automata} to {Re_cset, Re_automata}

1.3.0 (02-Feb-2015):

* Add Re.split{,_gen,_token,_full,_full_gen}
* Add Re.replace{,_string}
* Add Re.all{,_gen}
* Add posix classes of the form [:xxx:]
* Add complement suport for posix classes
* Add Multiline and anchored flag to Re_pcre
* Add Re_pcre.full_split

4 files changed, 39 insertions, 32 deletions

diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile
index 82f34e39509..6efa5f37b92 100644
--- a/devel/ocaml-re/Makefile
+++ b/devel/ocaml-re/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2016/05/06 22:32:41 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/17 11:45:47 jaapb Exp $
 
-DISTNAME=	ocaml-re-1.2.2
-PKGREVISION=	3
+VERSION=	1.6.0
+GITHUB_PROJECT=	ocaml-re
+DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/ocaml/ocaml-re/archive/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://github.com/ocaml/ocaml-re/
@@ -11,23 +12,7 @@ COMMENT=	Pure OCaml regular expression library
 LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	gmake
-OCAML_USE_FINDLIB=	yes
-CONFIGURE_ARGS+=	--prefix ${PREFIX}
+OCAML_USE_OASIS=	yes
 
-WRKSRC=	${WRKDIR}/ocaml-re-${DISTNAME}
-
-pre-configure:
-	cd ${WRKSRC} && gmake setup.bin
-
-do-configure:
-	cd ${WRKSRC} && ./setup.bin -configure ${CONFIGURE_ARGS}
-
-do-build:
-	cd ${WRKSRC} && ./setup.bin -build
-
-do-install:
-	cd ${WRKSRC} && ./setup.bin -install
-
-.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-re/PLIST b/devel/ocaml-re/PLIST
index b46133cf5a6..cf02cb260a9 100644
--- a/devel/ocaml-re/PLIST
+++ b/devel/ocaml-re/PLIST
@@ -1,52 +1,74 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/26 11:42:52 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/06/17 11:45:47 jaapb Exp $
 ${OCAML_SITELIB}/re/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/re/automata.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/re/cset.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.a
+${OCAML_SITELIB}/re/re.annot
 ${OCAML_SITELIB}/re/re.cma
 ${OCAML_SITELIB}/re/re.cmi
+${OCAML_SITELIB}/re/re.cmt
+${OCAML_SITELIB}/re/re.cmti
 ${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.mli
+${OCAML_SITELIB}/re/re_automata.cmx
+${OCAML_SITELIB}/re/re_cset.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_emacs.a
+${OCAML_SITELIB}/re/re_emacs.annot
 ${OCAML_SITELIB}/re/re_emacs.cma
 ${OCAML_SITELIB}/re/re_emacs.cmi
+${OCAML_SITELIB}/re/re_emacs.cmt
+${OCAML_SITELIB}/re/re_emacs.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_emacs.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_emacs.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_emacs.cmxs
 ${OCAML_SITELIB}/re/re_emacs.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_fmt.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_glob.a
+${OCAML_SITELIB}/re/re_glob.annot
 ${OCAML_SITELIB}/re/re_glob.cma
 ${OCAML_SITELIB}/re/re_glob.cmi
+${OCAML_SITELIB}/re/re_glob.cmt
+${OCAML_SITELIB}/re/re_glob.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_glob.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_glob.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_glob.cmxs
 ${OCAML_SITELIB}/re/re_glob.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_pcre.a
+${OCAML_SITELIB}/re/re_pcre.annot
 ${OCAML_SITELIB}/re/re_pcre.cma
 ${OCAML_SITELIB}/re/re_pcre.cmi
+${OCAML_SITELIB}/re/re_pcre.cmt
+${OCAML_SITELIB}/re/re_pcre.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_pcre.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_pcre.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_pcre.cmxs
-${OCAML_SITELIB}/re/re_pcre.ml
+${OCAML_SITELIB}/re/re_pcre.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_perl.a
+${OCAML_SITELIB}/re/re_perl.annot
 ${OCAML_SITELIB}/re/re_perl.cma
 ${OCAML_SITELIB}/re/re_perl.cmi
+${OCAML_SITELIB}/re/re_perl.cmt
+${OCAML_SITELIB}/re/re_perl.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_perl.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_perl.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_perl.cmxs
 ${OCAML_SITELIB}/re/re_perl.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_posix.a
+${OCAML_SITELIB}/re/re_posix.annot
 ${OCAML_SITELIB}/re/re_posix.cma
 ${OCAML_SITELIB}/re/re_posix.cmi
+${OCAML_SITELIB}/re/re_posix.cmt
+${OCAML_SITELIB}/re/re_posix.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_posix.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_posix.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_posix.cmxs
 ${OCAML_SITELIB}/re/re_posix.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_str.a
+${OCAML_SITELIB}/re/re_str.annot
 ${OCAML_SITELIB}/re/re_str.cma
 ${OCAML_SITELIB}/re/re_str.cmi
+${OCAML_SITELIB}/re/re_str.cmt
+${OCAML_SITELIB}/re/re_str.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_str.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_str.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re_str.cmxs
diff --git a/devel/ocaml-re/buildlink3.mk b/devel/ocaml-re/buildlink3.mk
index ee8718f4bcc..7972c718cd8 100644
--- a/devel/ocaml-re/buildlink3.mk
+++ b/devel/ocaml-re/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/26 11:42:52 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/06/17 11:45:47 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-re
 
 .if !defined(OCAML_RE_BUILDLINK3_MK)
 OCAML_RE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-re+=	ocaml-re>=1.2.2
+BUILDLINK_API_DEPENDS.ocaml-re+=	ocaml-re>=1.6.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 37360e18e1f..e411f704dae 100644
--- a/devel/ocaml-re/distinfo
+++ b/devel/ocaml-re/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:27:52 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/06/17 11:45:47 jaapb Exp $
 
-SHA1 (ocaml-re-1.2.2.tar.gz) = 045bf41966f804c5acb3938202130f10fb29020c
-RMD160 (ocaml-re-1.2.2.tar.gz) = 4368ea40f328d338d3fb4e84f5820d6bda6fda65
-SHA512 (ocaml-re-1.2.2.tar.gz) = 8b9c4d66b2ee8dcee1910979c23731ef5c89aea9e2a8074445b597e28bd84499b4ff007963f44cb6a599c2610cf87263755ae3e1da192b4d6205422ebd46d0c7
-Size (ocaml-re-1.2.2.tar.gz) = 89639 bytes
+SHA1 (ocaml-re-1.6.0.tar.gz) = ba66a6a1d0df08f9445b501c612e8c5cac0e368f
+RMD160 (ocaml-re-1.6.0.tar.gz) = edfae25dc7fa1482c726bc826050b675772955ae
+SHA512 (ocaml-re-1.6.0.tar.gz) = e93aa35e76b6942a68ef65771654ee4cd1530428d253e4a00c89efa8593021748bfb00c75163c3a8a2d96660d6845252474bc73f134199cffb820f707df6a1de
+Size (ocaml-re-1.6.0.tar.gz) = 104014 bytes