Updated package to latest version, 2.6.0. Changes include:

## v2.6.0 (minor release)

- added Bat{Set,Map,Splay}.any and fixed Bat{Map,Splay}.choose
  #751
  (Cedric Cellier)

- added BatList.favg and faster BatList.fsum
  #746
  (Gabriel Scherer, Francois Berenger)

- install .cmt and .cmti files
  #740
  (Francois Berenger, Gabriel Scherer)

- BatMap: added find_default
  #730
  (Francois Berenger)

- added scripts/test_install.sh
  #743
  (Francois Berenger)

- BatHashtbl: added {to|of}_list, bindings
  #728
  (Francois Berenger, Thibault Suzanne)

- added {BatList|BatArray}.shuffle
  #702, #707
  (Francois Berenger, Gabriel Scherer)

- Clarification and improvements to the documentation
  #682, #685, #693
  (Florian Angeletti, Johannes Kloos, Michael Färber)

- make `LazyList.split_at` lazy:
  `split_at : int -> 'a t -> 'a t * 'a t`
  would previously eagerly force the prefix of the list
  and only be lazy in its second returned value.
  #694
  (Michael Färber, Gabriel Scherer, Thibault Suzanne)

- Add `List.{map2i,iter2i}`
  #696
  (Thibault Suzanne)

- Added `Result.{map,map_both}`
  #705
  (Ifaz Kabir)

- Add {BatSet,BatMap}.{Int,Int32,Int64,Nativeint,Float,Char,String} as
  common instantions of the respective `Make` functor.
  #709, #712
  (Thibault Suzanne, François Bérenger)

- BatString: add `chop : ?l:int -> ?r:int -> string -> string`
  #714, #716
  (Gabriel Scherer, request by François Bérenger)

- BatSet: make `to_array` allocate the resulting array at first
  instead of using Dynarray (faster, uses less memory).
  #724
  (Thibault Suzanne)

- BatList: add `fold_left_map : ('a -> 'b -> 'a * 'c) -> 'a -> 'b list ->
    'a * 'c list`
  #734
  (Thibault Suzanne, review by Gabriel Scherer, request by Oscar Gauthier)

- add ``BatList.frange : float -> [< `To | `Downto ] -> float -> int ->
    float list``
  ``frange 0. `To 1. 3`` is `[0.; 0.5; 1.]`.
  #745
  (François Bérenger)

5 files changed, 203 insertions, 18 deletions

diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile
index ab9f7b4748e..4530d0c9db1 100644
--- a/devel/ocaml-batteries/Makefile
+++ b/devel/ocaml-batteries/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2016/12/30 11:21:47 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2017/07/11 11:34:25 jaapb Exp $
 
-VERSION=	2.5.3
+VERSION=	2.6.0
 GITHUB_PROJECT=	batteries-included
 GITHUB_TAG=	v${VERSION}
 DISTNAME=	batteries-${VERSION}
diff --git a/devel/ocaml-batteries/PLIST b/devel/ocaml-batteries/PLIST
index 36a8b58a298..bfa081be860 100644
--- a/devel/ocaml-batteries/PLIST
+++ b/devel/ocaml-batteries/PLIST
@@ -1,291 +1,475 @@
-@comment $NetBSD: PLIST,v 1.4 2016/08/18 10:07:41 jaapb Exp $
-${OCAML_SITELIB}/batteries/BatConcreteQueue.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/BatConcreteQueue.cmx
+@comment $NetBSD: PLIST,v 1.5 2017/07/11 11:34:25 jaapb Exp $
 ${OCAML_SITELIB}/batteries/META
 ${OCAML_SITELIB}/batteries/batArray.cmi
+${OCAML_SITELIB}/batteries/batArray.cmt
+${OCAML_SITELIB}/batteries/batArray.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batArray.cmx
 ${OCAML_SITELIB}/batteries/batArray.mli
 ${OCAML_SITELIB}/batteries/batAvlTree.cmi
+${OCAML_SITELIB}/batteries/batAvlTree.cmt
+${OCAML_SITELIB}/batteries/batAvlTree.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batAvlTree.cmx
 ${OCAML_SITELIB}/batteries/batAvlTree.mli
 ${OCAML_SITELIB}/batteries/batBase64.cmi
+${OCAML_SITELIB}/batteries/batBase64.cmt
+${OCAML_SITELIB}/batteries/batBase64.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBase64.cmx
 ${OCAML_SITELIB}/batteries/batBase64.mli
 ${OCAML_SITELIB}/batteries/batBig_int.cmi
+${OCAML_SITELIB}/batteries/batBig_int.cmt
+${OCAML_SITELIB}/batteries/batBig_int.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBig_int.cmx
 ${OCAML_SITELIB}/batteries/batBig_int.mli
 ${OCAML_SITELIB}/batteries/batBigarray.cmi
+${OCAML_SITELIB}/batteries/batBigarray.cmt
+${OCAML_SITELIB}/batteries/batBigarray.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBigarray.cmx
 ${OCAML_SITELIB}/batteries/batBigarray.mli
 ${OCAML_SITELIB}/batteries/batBitSet.cmi
+${OCAML_SITELIB}/batteries/batBitSet.cmt
+${OCAML_SITELIB}/batteries/batBitSet.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBitSet.cmx
 ${OCAML_SITELIB}/batteries/batBitSet.mli
 ${OCAML_SITELIB}/batteries/batBool.cmi
+${OCAML_SITELIB}/batteries/batBool.cmt
+${OCAML_SITELIB}/batteries/batBool.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBool.cmx
 ${OCAML_SITELIB}/batteries/batBool.mli
 ${OCAML_SITELIB}/batteries/batBounded.cmi
+${OCAML_SITELIB}/batteries/batBounded.cmt
+${OCAML_SITELIB}/batteries/batBounded.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBounded.cmx
 ${OCAML_SITELIB}/batteries/batBounded.mli
 ${OCAML_SITELIB}/batteries/batBuffer.cmi
+${OCAML_SITELIB}/batteries/batBuffer.cmt
+${OCAML_SITELIB}/batteries/batBuffer.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBuffer.cmx
 ${OCAML_SITELIB}/batteries/batBuffer.mli
 ${OCAML_SITELIB}/batteries/batBytes.cmi
+${OCAML_SITELIB}/batteries/batBytes.cmt
+${OCAML_SITELIB}/batteries/batBytes.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batBytes.cmx
 ${OCAML_SITELIB}/batteries/batBytes.mli
 ${OCAML_SITELIB}/batteries/batCache.cmi
+${OCAML_SITELIB}/batteries/batCache.cmt
+${OCAML_SITELIB}/batteries/batCache.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batCache.cmx
 ${OCAML_SITELIB}/batteries/batCache.mli
 ${OCAML_SITELIB}/batteries/batChar.cmi
+${OCAML_SITELIB}/batteries/batChar.cmt
+${OCAML_SITELIB}/batteries/batChar.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batChar.cmx
 ${OCAML_SITELIB}/batteries/batChar.mli
 ${OCAML_SITELIB}/batteries/batCharParser.cmi
+${OCAML_SITELIB}/batteries/batCharParser.cmt
+${OCAML_SITELIB}/batteries/batCharParser.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batCharParser.cmx
 ${OCAML_SITELIB}/batteries/batCharParser.mli
 ${OCAML_SITELIB}/batteries/batComplex.cmi
+${OCAML_SITELIB}/batteries/batComplex.cmt
+${OCAML_SITELIB}/batteries/batComplex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batComplex.cmx
 ${OCAML_SITELIB}/batteries/batComplex.mli
+${OCAML_SITELIB}/batteries/batConcreteQueue.cmi
+${OCAML_SITELIB}/batteries/batConcreteQueue.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batConcreteQueue.cmx
 ${OCAML_SITELIB}/batteries/batConcurrent.cmi
+${OCAML_SITELIB}/batteries/batConcurrent.cmt
+${OCAML_SITELIB}/batteries/batConcurrent.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batConcurrent.cmx
 ${OCAML_SITELIB}/batteries/batConcurrent.mli
 ${OCAML_SITELIB}/batteries/batDeque.cmi
+${OCAML_SITELIB}/batteries/batDeque.cmt
+${OCAML_SITELIB}/batteries/batDeque.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batDeque.cmx
 ${OCAML_SITELIB}/batteries/batDeque.mli
 ${OCAML_SITELIB}/batteries/batDigest.cmi
+${OCAML_SITELIB}/batteries/batDigest.cmt
+${OCAML_SITELIB}/batteries/batDigest.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batDigest.cmx
 ${OCAML_SITELIB}/batteries/batDigest.mli
 ${OCAML_SITELIB}/batteries/batDllist.cmi
+${OCAML_SITELIB}/batteries/batDllist.cmt
+${OCAML_SITELIB}/batteries/batDllist.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batDllist.cmx
 ${OCAML_SITELIB}/batteries/batDllist.mli
 ${OCAML_SITELIB}/batteries/batDynArray.cmi
+${OCAML_SITELIB}/batteries/batDynArray.cmt
+${OCAML_SITELIB}/batteries/batDynArray.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batDynArray.cmx
 ${OCAML_SITELIB}/batteries/batDynArray.mli
 ${OCAML_SITELIB}/batteries/batEnum.cmi
+${OCAML_SITELIB}/batteries/batEnum.cmt
+${OCAML_SITELIB}/batteries/batEnum.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batEnum.cmx
 ${OCAML_SITELIB}/batteries/batEnum.mli
 ${OCAML_SITELIB}/batteries/batFile.cmi
+${OCAML_SITELIB}/batteries/batFile.cmt
+${OCAML_SITELIB}/batteries/batFile.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batFile.cmx
 ${OCAML_SITELIB}/batteries/batFile.mli
 ${OCAML_SITELIB}/batteries/batFingerTree.cmi
+${OCAML_SITELIB}/batteries/batFingerTree.cmt
+${OCAML_SITELIB}/batteries/batFingerTree.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batFingerTree.cmx
 ${OCAML_SITELIB}/batteries/batFingerTree.mli
 ${OCAML_SITELIB}/batteries/batFloat.cmi
+${OCAML_SITELIB}/batteries/batFloat.cmt
+${OCAML_SITELIB}/batteries/batFloat.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batFloat.cmx
 ${OCAML_SITELIB}/batteries/batFloat.mli
 ${OCAML_SITELIB}/batteries/batFormat.cmi
+${OCAML_SITELIB}/batteries/batFormat.cmt
+${OCAML_SITELIB}/batteries/batFormat.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batFormat.cmx
 ${OCAML_SITELIB}/batteries/batFormat.mli
 ${OCAML_SITELIB}/batteries/batGc.cmi
+${OCAML_SITELIB}/batteries/batGc.cmt
+${OCAML_SITELIB}/batteries/batGc.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batGc.cmx
 ${OCAML_SITELIB}/batteries/batGc.mli
 ${OCAML_SITELIB}/batteries/batGenlex.cmi
+${OCAML_SITELIB}/batteries/batGenlex.cmt
+${OCAML_SITELIB}/batteries/batGenlex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batGenlex.cmx
 ${OCAML_SITELIB}/batteries/batGenlex.mli
 ${OCAML_SITELIB}/batteries/batGlobal.cmi
+${OCAML_SITELIB}/batteries/batGlobal.cmt
+${OCAML_SITELIB}/batteries/batGlobal.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batGlobal.cmx
 ${OCAML_SITELIB}/batteries/batGlobal.mli
 ${OCAML_SITELIB}/batteries/batHashcons.cmi
+${OCAML_SITELIB}/batteries/batHashcons.cmt
+${OCAML_SITELIB}/batteries/batHashcons.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batHashcons.cmx
 ${OCAML_SITELIB}/batteries/batHashcons.mli
 ${OCAML_SITELIB}/batteries/batHashtbl.cmi
+${OCAML_SITELIB}/batteries/batHashtbl.cmt
+${OCAML_SITELIB}/batteries/batHashtbl.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batHashtbl.cmx
 ${OCAML_SITELIB}/batteries/batHashtbl.mli
 ${OCAML_SITELIB}/batteries/batHeap.cmi
+${OCAML_SITELIB}/batteries/batHeap.cmt
+${OCAML_SITELIB}/batteries/batHeap.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batHeap.cmx
 ${OCAML_SITELIB}/batteries/batHeap.mli
 ${OCAML_SITELIB}/batteries/batIMap.cmi
+${OCAML_SITELIB}/batteries/batIMap.cmt
+${OCAML_SITELIB}/batteries/batIMap.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batIMap.cmx
 ${OCAML_SITELIB}/batteries/batIMap.mli
 ${OCAML_SITELIB}/batteries/batIO.cmi
+${OCAML_SITELIB}/batteries/batIO.cmt
+${OCAML_SITELIB}/batteries/batIO.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batIO.cmx
 ${OCAML_SITELIB}/batteries/batIO.mli
 ${OCAML_SITELIB}/batteries/batISet.cmi
+${OCAML_SITELIB}/batteries/batISet.cmt
+${OCAML_SITELIB}/batteries/batISet.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batISet.cmx
 ${OCAML_SITELIB}/batteries/batISet.mli
 ${OCAML_SITELIB}/batteries/batInnerIO.cmi
+${OCAML_SITELIB}/batteries/batInnerIO.cmt
+${OCAML_SITELIB}/batteries/batInnerIO.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInnerIO.cmx
 ${OCAML_SITELIB}/batteries/batInnerIO.mli
 ${OCAML_SITELIB}/batteries/batInnerPervasives.cmi
+${OCAML_SITELIB}/batteries/batInnerPervasives.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInnerPervasives.cmx
+${OCAML_SITELIB}/batteries/batInnerShuffle.cmi
+${OCAML_SITELIB}/batteries/batInnerShuffle.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInnerShuffle.cmx
 ${OCAML_SITELIB}/batteries/batInnerWeaktbl.cmi
+${OCAML_SITELIB}/batteries/batInnerWeaktbl.cmt
+${OCAML_SITELIB}/batteries/batInnerWeaktbl.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInnerWeaktbl.cmx
 ${OCAML_SITELIB}/batteries/batInnerWeaktbl.mli
 ${OCAML_SITELIB}/batteries/batInt.cmi
+${OCAML_SITELIB}/batteries/batInt.cmt
+${OCAML_SITELIB}/batteries/batInt.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInt.cmx
 ${OCAML_SITELIB}/batteries/batInt.mli
 ${OCAML_SITELIB}/batteries/batInt32.cmi
+${OCAML_SITELIB}/batteries/batInt32.cmt
+${OCAML_SITELIB}/batteries/batInt32.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInt32.cmx
 ${OCAML_SITELIB}/batteries/batInt32.mli
 ${OCAML_SITELIB}/batteries/batInt64.cmi
+${OCAML_SITELIB}/batteries/batInt64.cmt
+${OCAML_SITELIB}/batteries/batInt64.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInt64.cmx
 ${OCAML_SITELIB}/batteries/batInt64.mli
 ${OCAML_SITELIB}/batteries/batInterfaces.cmi
+${OCAML_SITELIB}/batteries/batInterfaces.cmt
+${OCAML_SITELIB}/batteries/batInterfaces.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batInterfaces.cmx
 ${OCAML_SITELIB}/batteries/batInterfaces.mli
 ${OCAML_SITELIB}/batteries/batLazyList.cmi
+${OCAML_SITELIB}/batteries/batLazyList.cmt
+${OCAML_SITELIB}/batteries/batLazyList.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batLazyList.cmx
 ${OCAML_SITELIB}/batteries/batLazyList.mli
 ${OCAML_SITELIB}/batteries/batLexing.cmi
+${OCAML_SITELIB}/batteries/batLexing.cmt
+${OCAML_SITELIB}/batteries/batLexing.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batLexing.cmx
 ${OCAML_SITELIB}/batteries/batLexing.mli
 ${OCAML_SITELIB}/batteries/batList.cmi
+${OCAML_SITELIB}/batteries/batList.cmt
+${OCAML_SITELIB}/batteries/batList.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batList.cmx
 ${OCAML_SITELIB}/batteries/batList.mli
 ${OCAML_SITELIB}/batteries/batLog.cmi
+${OCAML_SITELIB}/batteries/batLog.cmt
+${OCAML_SITELIB}/batteries/batLog.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batLog.cmx
 ${OCAML_SITELIB}/batteries/batLog.mli
 ${OCAML_SITELIB}/batteries/batLogger.cmi
+${OCAML_SITELIB}/batteries/batLogger.cmt
+${OCAML_SITELIB}/batteries/batLogger.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batLogger.cmx
 ${OCAML_SITELIB}/batteries/batLogger.mli
 ${OCAML_SITELIB}/batteries/batMap.cmi
+${OCAML_SITELIB}/batteries/batMap.cmt
+${OCAML_SITELIB}/batteries/batMap.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batMap.cmx
 ${OCAML_SITELIB}/batteries/batMap.mli
 ${OCAML_SITELIB}/batteries/batMarshal.cmi
+${OCAML_SITELIB}/batteries/batMarshal.cmt
+${OCAML_SITELIB}/batteries/batMarshal.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batMarshal.cmx
 ${OCAML_SITELIB}/batteries/batMarshal.mli
 ${OCAML_SITELIB}/batteries/batMultiMap.cmi
+${OCAML_SITELIB}/batteries/batMultiMap.cmt
+${OCAML_SITELIB}/batteries/batMultiMap.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batMultiMap.cmx
 ${OCAML_SITELIB}/batteries/batMultiMap.mli
 ${OCAML_SITELIB}/batteries/batMultiPMap.cmi
+${OCAML_SITELIB}/batteries/batMultiPMap.cmt
+${OCAML_SITELIB}/batteries/batMultiPMap.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batMultiPMap.cmx
 ${OCAML_SITELIB}/batteries/batMultiPMap.mli
 ${OCAML_SITELIB}/batteries/batMutex.cmi
+${OCAML_SITELIB}/batteries/batMutex.cmt
+${OCAML_SITELIB}/batteries/batMutex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batMutex.cmx
 ${OCAML_SITELIB}/batteries/batMutex.mli
 ${OCAML_SITELIB}/batteries/batNativeint.cmi
+${OCAML_SITELIB}/batteries/batNativeint.cmt
+${OCAML_SITELIB}/batteries/batNativeint.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batNativeint.cmx
 ${OCAML_SITELIB}/batteries/batNativeint.mli
 ${OCAML_SITELIB}/batteries/batNum.cmi
+${OCAML_SITELIB}/batteries/batNum.cmt
+${OCAML_SITELIB}/batteries/batNum.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batNum.cmx
 ${OCAML_SITELIB}/batteries/batNum.mli
 ${OCAML_SITELIB}/batteries/batNumber.cmi
+${OCAML_SITELIB}/batteries/batNumber.cmt
+${OCAML_SITELIB}/batteries/batNumber.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batNumber.cmx
 ${OCAML_SITELIB}/batteries/batNumber.mli
 ${OCAML_SITELIB}/batteries/batOo.cmi
+${OCAML_SITELIB}/batteries/batOo.cmt
+${OCAML_SITELIB}/batteries/batOo.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batOo.cmx
 ${OCAML_SITELIB}/batteries/batOo.mli
 ${OCAML_SITELIB}/batteries/batOpaqueInnerSys.cmi
+${OCAML_SITELIB}/batteries/batOpaqueInnerSys.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batOpaqueInnerSys.cmx
 ${OCAML_SITELIB}/batteries/batOptParse.cmi
+${OCAML_SITELIB}/batteries/batOptParse.cmt
+${OCAML_SITELIB}/batteries/batOptParse.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batOptParse.cmx
 ${OCAML_SITELIB}/batteries/batOptParse.mli
 ${OCAML_SITELIB}/batteries/batOption.cmi
+${OCAML_SITELIB}/batteries/batOption.cmt
+${OCAML_SITELIB}/batteries/batOption.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batOption.cmx
 ${OCAML_SITELIB}/batteries/batOption.mli
 ${OCAML_SITELIB}/batteries/batOrd.cmi
+${OCAML_SITELIB}/batteries/batOrd.cmt
+${OCAML_SITELIB}/batteries/batOrd.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batOrd.cmx
 ${OCAML_SITELIB}/batteries/batOrd.mli
 ${OCAML_SITELIB}/batteries/batParserCo.cmi
+${OCAML_SITELIB}/batteries/batParserCo.cmt
+${OCAML_SITELIB}/batteries/batParserCo.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batParserCo.cmx
 ${OCAML_SITELIB}/batteries/batParserCo.mli
 ${OCAML_SITELIB}/batteries/batPathGen.cmi
+${OCAML_SITELIB}/batteries/batPathGen.cmt
+${OCAML_SITELIB}/batteries/batPathGen.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batPathGen.cmx
 ${OCAML_SITELIB}/batteries/batPathGen.mli
 ${OCAML_SITELIB}/batteries/batPervasives.cmi
+${OCAML_SITELIB}/batteries/batPervasives.cmt
+${OCAML_SITELIB}/batteries/batPervasives.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batPervasives.cmx
 ${OCAML_SITELIB}/batteries/batPervasives.mli
 ${OCAML_SITELIB}/batteries/batPrintexc.cmi
+${OCAML_SITELIB}/batteries/batPrintexc.cmt
+${OCAML_SITELIB}/batteries/batPrintexc.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batPrintexc.cmx
 ${OCAML_SITELIB}/batteries/batPrintexc.mli
 ${OCAML_SITELIB}/batteries/batPrintf.cmi
+${OCAML_SITELIB}/batteries/batPrintf.cmt
+${OCAML_SITELIB}/batteries/batPrintf.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batPrintf.cmx
 ${OCAML_SITELIB}/batteries/batPrintf.mli
 ${OCAML_SITELIB}/batteries/batQueue.cmi
+${OCAML_SITELIB}/batteries/batQueue.cmt
+${OCAML_SITELIB}/batteries/batQueue.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batQueue.cmx
 ${OCAML_SITELIB}/batteries/batQueue.mli
 ${OCAML_SITELIB}/batteries/batRMutex.cmi
+${OCAML_SITELIB}/batteries/batRMutex.cmt
+${OCAML_SITELIB}/batteries/batRMutex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batRMutex.cmx
 ${OCAML_SITELIB}/batteries/batRMutex.mli
 ${OCAML_SITELIB}/batteries/batRandom.cmi
+${OCAML_SITELIB}/batteries/batRandom.cmt
+${OCAML_SITELIB}/batteries/batRandom.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batRandom.cmx
 ${OCAML_SITELIB}/batteries/batRandom.mli
 ${OCAML_SITELIB}/batteries/batRef.cmi
+${OCAML_SITELIB}/batteries/batRef.cmt
+${OCAML_SITELIB}/batteries/batRef.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batRef.cmx
 ${OCAML_SITELIB}/batteries/batRef.mli
 ${OCAML_SITELIB}/batteries/batRefList.cmi
+${OCAML_SITELIB}/batteries/batRefList.cmt
+${OCAML_SITELIB}/batteries/batRefList.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batRefList.cmx
 ${OCAML_SITELIB}/batteries/batRefList.mli
 ${OCAML_SITELIB}/batteries/batResult.cmi
+${OCAML_SITELIB}/batteries/batResult.cmt
+${OCAML_SITELIB}/batteries/batResult.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batResult.cmx
 ${OCAML_SITELIB}/batteries/batResult.mli
 ${OCAML_SITELIB}/batteries/batReturn.cmi
+${OCAML_SITELIB}/batteries/batReturn.cmt
+${OCAML_SITELIB}/batteries/batReturn.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batReturn.cmx
 ${OCAML_SITELIB}/batteries/batReturn.mli
 ${OCAML_SITELIB}/batteries/batScanf.cmi
+${OCAML_SITELIB}/batteries/batScanf.cmt
+${OCAML_SITELIB}/batteries/batScanf.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batScanf.cmx
 ${OCAML_SITELIB}/batteries/batScanf.mli
 ${OCAML_SITELIB}/batteries/batSeq.cmi
+${OCAML_SITELIB}/batteries/batSeq.cmt
+${OCAML_SITELIB}/batteries/batSeq.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batSeq.cmx
 ${OCAML_SITELIB}/batteries/batSeq.mli
 ${OCAML_SITELIB}/batteries/batSet.cmi
+${OCAML_SITELIB}/batteries/batSet.cmt
+${OCAML_SITELIB}/batteries/batSet.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batSet.cmx
 ${OCAML_SITELIB}/batteries/batSet.mli
 ${OCAML_SITELIB}/batteries/batSplay.cmi
+${OCAML_SITELIB}/batteries/batSplay.cmt
+${OCAML_SITELIB}/batteries/batSplay.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batSplay.cmx
 ${OCAML_SITELIB}/batteries/batSplay.mli
 ${OCAML_SITELIB}/batteries/batStack.cmi
+${OCAML_SITELIB}/batteries/batStack.cmt
+${OCAML_SITELIB}/batteries/batStack.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batStack.cmx
 ${OCAML_SITELIB}/batteries/batStack.mli
 ${OCAML_SITELIB}/batteries/batStream.cmi
+${OCAML_SITELIB}/batteries/batStream.cmt
+${OCAML_SITELIB}/batteries/batStream.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batStream.cmx
 ${OCAML_SITELIB}/batteries/batStream.mli
 ${OCAML_SITELIB}/batteries/batString.cmi
+${OCAML_SITELIB}/batteries/batString.cmt
+${OCAML_SITELIB}/batteries/batString.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batString.cmx
 ${OCAML_SITELIB}/batteries/batString.mli
 ${OCAML_SITELIB}/batteries/batSubstring.cmi
+${OCAML_SITELIB}/batteries/batSubstring.cmt
+${OCAML_SITELIB}/batteries/batSubstring.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batSubstring.cmx
 ${OCAML_SITELIB}/batteries/batSubstring.mli
 ${OCAML_SITELIB}/batteries/batSys.cmi
+${OCAML_SITELIB}/batteries/batSys.cmt
+${OCAML_SITELIB}/batteries/batSys.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batSys.cmx
 ${OCAML_SITELIB}/batteries/batSys.mli
 ${OCAML_SITELIB}/batteries/batText.cmi
+${OCAML_SITELIB}/batteries/batText.cmt
+${OCAML_SITELIB}/batteries/batText.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batText.cmx
 ${OCAML_SITELIB}/batteries/batText.mli
 ${OCAML_SITELIB}/batteries/batTuple.cmi
+${OCAML_SITELIB}/batteries/batTuple.cmt
+${OCAML_SITELIB}/batteries/batTuple.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batTuple.cmx
 ${OCAML_SITELIB}/batteries/batTuple.mli
 ${OCAML_SITELIB}/batteries/batUChar.cmi
+${OCAML_SITELIB}/batteries/batUChar.cmt
+${OCAML_SITELIB}/batteries/batUChar.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batUChar.cmx
 ${OCAML_SITELIB}/batteries/batUChar.mli
 ${OCAML_SITELIB}/batteries/batUTF8.cmi
+${OCAML_SITELIB}/batteries/batUTF8.cmt
+${OCAML_SITELIB}/batteries/batUTF8.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batUTF8.cmx
 ${OCAML_SITELIB}/batteries/batUTF8.mli
 ${OCAML_SITELIB}/batteries/batUnit.cmi
+${OCAML_SITELIB}/batteries/batUnit.cmt
+${OCAML_SITELIB}/batteries/batUnit.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batUnit.cmx
 ${OCAML_SITELIB}/batteries/batUnit.mli
 ${OCAML_SITELIB}/batteries/batUnix.cmi
+${OCAML_SITELIB}/batteries/batUnix.cmt
+${OCAML_SITELIB}/batteries/batUnix.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batUnix.cmx
 ${OCAML_SITELIB}/batteries/batUnix.mli
 ${OCAML_SITELIB}/batteries/batUref.cmi
+${OCAML_SITELIB}/batteries/batUref.cmt
+${OCAML_SITELIB}/batteries/batUref.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batUref.cmx
 ${OCAML_SITELIB}/batteries/batUref.mli
 ${OCAML_SITELIB}/batteries/batVect.cmi
+${OCAML_SITELIB}/batteries/batVect.cmt
+${OCAML_SITELIB}/batteries/batVect.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batVect.cmx
 ${OCAML_SITELIB}/batteries/batVect.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteries.a
 ${OCAML_SITELIB}/batteries/batteries.cma
 ${OCAML_SITELIB}/batteries/batteries.cmi
+${OCAML_SITELIB}/batteries/batteries.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteries.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteries.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteries.cmxs
 ${OCAML_SITELIB}/batteries/batteriesConfig.cmi
+${OCAML_SITELIB}/batteries/batteriesConfig.cmt
 ${OCAML_SITELIB}/batteries/batteriesConfig.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteriesConfig.cmx
 ${OCAML_SITELIB}/batteries/batteriesExceptionless.cmi
+${OCAML_SITELIB}/batteries/batteriesExceptionless.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteriesExceptionless.cmx
 ${OCAML_SITELIB}/batteries/batteriesHelp.cmi
+${OCAML_SITELIB}/batteries/batteriesHelp.cmt
+${OCAML_SITELIB}/batteries/batteriesHelp.cmti
 ${OCAML_SITELIB}/batteries/batteriesHelp.cmo
 ${OCAML_SITELIB}/batteries/batteriesHelp.mli
 ${OCAML_SITELIB}/batteries/batteriesPrint.cmi
+${OCAML_SITELIB}/batteries/batteriesPrint.cmt
 ${OCAML_SITELIB}/batteries/batteriesPrint.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteriesPrint.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteriesThread.a
 ${OCAML_SITELIB}/batteries/batteriesThread.cma
 ${OCAML_SITELIB}/batteries/batteriesThread.cmi
+${OCAML_SITELIB}/batteries/batteriesThread.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteriesThread.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteriesThread.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/batteriesThread.cmxs
 ${OCAML_SITELIB}/batteries/battop.ml
 ${OCAML_SITELIB}/batteries/extlib.cmi
+${OCAML_SITELIB}/batteries/extlib.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/batteries/extlib.cmx
 ${OCAML_SITELIB}/batteries/ocaml
 ${OCAML_SITELIB}/batteries/ocamlinit
diff --git a/devel/ocaml-batteries/buildlink3.mk b/devel/ocaml-batteries/buildlink3.mk
index 39ddc1c10be..0945920c232 100644
--- a/devel/ocaml-batteries/buildlink3.mk
+++ b/devel/ocaml-batteries/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/07/03 10:40:33 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/07/11 11:34:25 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-batteries
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ocaml-batteries
 OCAML_BATTERIES_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-batteries+=	ocaml-batteries>=2.0
+BUILDLINK_ABI_DEPENDS.ocaml-batteries+=	ocaml-batteries>=2.6.0
 BUILDLINK_PKGSRCDIR.ocaml-batteries?=	../../devel/ocaml-batteries
 
 .endif	# OCAML_BATTERIES_BUILDLINK3_MK
diff --git a/devel/ocaml-batteries/distinfo b/devel/ocaml-batteries/distinfo
index efb76f36127..1e0df3e3da9 100644
--- a/devel/ocaml-batteries/distinfo
+++ b/devel/ocaml-batteries/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2016/12/30 11:21:47 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2017/07/11 11:34:25 jaapb Exp $
 
-SHA1 (batteries-2.5.3.tar.gz) = 0a208161b402ba5584a26ebea030db0ac0744412
-RMD160 (batteries-2.5.3.tar.gz) = 43cbceb0b3fb543e1ab9c8dd272c607d844ac2ba
-SHA512 (batteries-2.5.3.tar.gz) = d1b776c82a8a79c2908da5f5c7b7ee335ea8520e05b725910c03f4eb3c6e653619e1ff9fab8811d94a613620a84ec016651d13773e1ceea8830bb8c1ce7b46ba
-Size (batteries-2.5.3.tar.gz) = 756020 bytes
-SHA1 (patch-Makefile) = 916f5bb2eeffca3830865e0a63dfdb9a48e1e40f
+SHA1 (batteries-2.6.0.tar.gz) = 85c35308f4b887189cd4eb78e223c569de7d12fa
+RMD160 (batteries-2.6.0.tar.gz) = 43d183817e508108d1eba44f185259091c7eaff7
+SHA512 (batteries-2.6.0.tar.gz) = 8267272d4ecfdd52a042d84c023072a87eab6fc238dc00d741bc77c97e413b8ea3a3935d33afaaf9e084d3e0c4a6fb9ab51eab1ade548dbc9f6ed5e94df54d27
+Size (batteries-2.6.0.tar.gz) = 761787 bytes
+SHA1 (patch-Makefile) = 461b36e023fd5d63202edc9a35c242c181e38def
diff --git a/devel/ocaml-batteries/patches/patch-Makefile b/devel/ocaml-batteries/patches/patch-Makefile
index 7f5c12bcb4a..6d88b8f9afa 100644
--- a/devel/ocaml-batteries/patches/patch-Makefile
+++ b/devel/ocaml-batteries/patches/patch-Makefile
@@ -1,17 +1,17 @@
-$NetBSD: patch-Makefile,v 1.2 2013/11/01 10:32:53 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/07/11 11:34:25 jaapb Exp $
 
 Install into DESTDIR
---- Makefile.orig	2013-07-18 05:02:22.000000000 +0000
+--- Makefile.orig	2017-04-12 15:33:01.000000000 +0000
 +++ Makefile
-@@ -88,8 +88,9 @@ man: all batteries.odocl
+@@ -103,8 +103,9 @@ man: all batteries.odocl
  	-mkdir man
  	ocamlfind ocamldoc -package threads.posix -sort -man -hide-warnings -d man -I _build/libs -I _build/src libs/uniclib.mli src/*.mli
  
 -install: all uninstall_packages
 -	ocamlfind install $(NAME) $(INSTALL_FILES) \
 +install: all
-+	ocamlfind install $(NAME) -destdir "${DESTDIR}${PREFIX}/lib/ocaml/site-lib" \
-+	  $(INSTALL_FILES) \
++	ocamlfind install $(NAME) -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib \
++		$(INSTALL_FILES) \
  		-optional $(OPT_INSTALL_FILES)
  
- uninstall_packages:
+ test_install: