Updated ocaml-batteries to latest version 2.5.0, which adds support for

ocaml 4.03. Also, the package is now compatible with the latest version of
the ocaml.mk framework. Discussed on packages@ and OK'd by jperkin.


Changes include:
## v2.5.0
- BatTuple: add Tuple{N}.make : 'a1 -> ... -> 'an -> 'a1 * ... * 'an
  #657
  (Thibault Suzanne)
- BatBig_int: fix sequence operators (--), (---) to avoid polymorphic comparison
  #674, #675, #676
  (Pieter Goetschalckx and Cedric Cellier)
- Extend all Batteries module to cover OCaml 4.03 features
  #670
  (Gabriel Scherer, KC Sivaramakrishnan)

## v2.4.0

- BatBitSet: use Bytes instead of String
  (Gabriel Scherer)
- BatHashtbl: fix hash computation bug introduced by 4.01 (issue #609)
  (Gabriel Scherer, report by Martin Neuh?u?er)
- BatText: synchronize nsplit to match BatString.nsplit
  (Gabriel Scherer)
- BatLazyList: fix remove_all_such documentation
  (Xavier Van de Woestyne)
- BatMap: add pop_min_binding: 'a t -> (key * 'a) * 'a t
	  and pop_max_binding: 'a t -> (key * 'a) * 'a t
  (Francois Berenger)
- BatMap: add at_rank_exn: int -> ('key, 'a) t -> ('key * 'a)
	  and update: key -> key -> 'a -> 'a t -> 'a t
  (Francois Berenger)
- BatEnum: add interleave: 'a t array -> 'a t
  (Aleksey Z. Arens)
- BatFormat: expose asprintf for V>=4.01
  (Ralf Vogler)
- BatSet: add at_rank_exn: int -> t -> elt
	  and update: elt -> elt -> t -> t
  (Francois Berenger)
- BatUTF8: add enum: t -> BatUChar.t BatEnum.t
  (Kevin Brubeck Unhammer)
- BatSet: add to_array: t -> elt array
	  and of_array: elt array -> t
	  and test for to_list
  (Francois Berenger)
- BatSet: add pop_max: 'a t -> 'a * 'a t
	  and pop_min: 'a t -> 'a * 'a t
  (Francois Berenger)
- BatSplay: hardened against read-only-data compiler optimization
  (Gabriel Scherer)
- BatList: simplified interleave implementation
  (Francois Berenger)
- BatOption: add Infix.(>>=): 'a option -> ('a -> 'b option) -> 'b option
  (Herry Herry)
- BatHashtbl: modify now have same semantics than replace for the key
  (Anders Fugmann)
- BatHashtbl: more efficient modify_opt and modify_def
  (Anders Fugmann)
- BatFormat: add pp_print_list: ?pp_sep:(formatter -> unit -> unit) ->
	                        (formatter -> 'a -> unit) ->
	                        (formatter -> 'a list -> unit)
	     and pp_print_text: formatter -> string -> unit
  (Christoph H?ger)
- BatEnum: add uniq_by: ('a -> 'a -> bool) -> 'a t -> 'a t
	   and uniqq: 'a t -> 'a t
  (Max Mouratov)
- BatEnum: fix uniq to use structural comparison
  (Max Mouratov)
- BatUnix: add run_and_read: string -> process_status * string
  (Francois Berenger)
- BatCache: use hashmap to speed up lru_cache
  (Sang Kil Cha)
- BatQueue: add filter: ('a -> bool) -> 'a t -> 'a t
	    and filter_inplace: ('a -> bool) -> 'a t -> unit
	    and filter_map: ('a -> 'b option) -> 'a t -> 'b t
(Gabriel Scherer)

3 files changed, 14 insertions, 11 deletions

diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile
index 5f6bf6e1321..99cd2eca0d2 100644
--- a/devel/ocaml-batteries/Makefile
+++ b/devel/ocaml-batteries/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2016/05/05 11:45:38 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2016/06/25 14:05:01 jaapb Exp $
 
-DISTNAME=	batteries-2.3
+DISTNAME=	batteries-2.5.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	4
 CATEGORIES=	devel
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1465/
+MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1611/
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://batteries.forge.ocamlcore.org/
@@ -12,10 +11,11 @@ COMMENT=	Alternative standard library for OCaml
 LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	gmake
+OCAML_USE_FINDLIB=	yes
 
 MAKE_ENV=	DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
 
 .include "../../mk/ocaml.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
+.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-batteries/PLIST b/devel/ocaml-batteries/PLIST
index c2f9d457160..9b8fffaa076 100644
--- a/devel/ocaml-batteries/PLIST
+++ b/devel/ocaml-batteries/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/10/09 21:22:27 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/06/25 14:05:01 jaapb Exp $
 ${OCAML_SITELIB}/batteries/META
 ${OCAML_SITELIB}/batteries/batArray.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batArray.cmx
@@ -42,6 +42,9 @@ ${OCAML_SITELIB}/batteries/batCharParser.mli
 ${OCAML_SITELIB}/batteries/batComplex.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batComplex.cmx
 ${OCAML_SITELIB}/batteries/batComplex.mli
+${OCAML_SITELIB}/batteries/batConcreteQueue_403.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batConcreteQueue_403.cmx
+${OCAML_SITELIB}/batteries/batConcreteQueue_403.mli
 ${OCAML_SITELIB}/batteries/batConcurrent.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batConcurrent.cmx
 ${OCAML_SITELIB}/batteries/batConcurrent.mli
diff --git a/devel/ocaml-batteries/distinfo b/devel/ocaml-batteries/distinfo
index f30e88c7d58..e5d83b7d392 100644
--- a/devel/ocaml-batteries/distinfo
+++ b/devel/ocaml-batteries/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:52 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/06/25 14:05:01 jaapb Exp $
 
-SHA1 (batteries-2.3.tar.gz) = de4069c849dd9a11629c7321d7e5aeb98c95366e
-RMD160 (batteries-2.3.tar.gz) = 4fa4618cb3ca3e24ec6466a3203f22412bb877d8
-SHA512 (batteries-2.3.tar.gz) = 0f55e75cc8057ec4ba9683aee91509a3bf2ee93d1990a932cd3924cd602aeeea80a5da50b0651500fc153285b1d80b9378ec1fa656e7f94311e992e9ba308c88
-Size (batteries-2.3.tar.gz) = 728917 bytes
+SHA1 (batteries-2.5.0.tar.gz) = db3b04c6c67c617068d7de5624a76298f6e61571
+RMD160 (batteries-2.5.0.tar.gz) = 6217c29f23406ccb42f254349b1d10b38e807588
+SHA512 (batteries-2.5.0.tar.gz) = 95683687fa3ccf320293dc37ad0227b19faaa60fea7c60f374c9b2be65a0ddab0b8f56934714e8c03dac8bf0bb0447975cd900aa090a423108fa60f4895a22c1
+Size (batteries-2.5.0.tar.gz) = 746553 bytes
 SHA1 (patch-Makefile) = 916f5bb2eeffca3830865e0a63dfdb9a48e1e40f