Updated package to latest version, 2.3 and changed distribution to

GitHub.

Changes include:
2.3.0
    * Enable OCaml >= 4.02 compatibility
    * Enable safe-string compatibility
    * Backport fixes from 2.1.8
    * Use OASIS to build the documentation
    * Bug fixed: Ldap_protocol doesn't handle SASL correctly (RFC 4511 4.2.2)
      (Patch by David Allsopp)
    * Added paged result control
      (Patch by Christian Wills)
    * Fix: Add Str to the build dependencies

4 files changed, 82 insertions, 112 deletions

diff --git a/databases/ocaml-ldap/Makefile b/databases/ocaml-ldap/Makefile
index 5d99d6b00f3..16f9af83c92 100644
--- a/databases/ocaml-ldap/Makefile
+++ b/databases/ocaml-ldap/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2017/07/11 14:19:19 jaapb Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/07 15:03:51 jaapb Exp $
 
-VERSION=	2.2
+VERSION=	2.3.0
+GITHUB_PROJECT=	ocamldap
+GITHUB_TAG=	${VERSION}
 PKGNAME=	ocaml-ldap-${VERSION}
-PKGREVISION=	2
 DISTNAME=	ocamldap-${VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	http://bitbucket.org/deplai_j/ocamldap/downloads/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=jpdeplaix/}
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://ocamldap.sourceforge.net/
diff --git a/databases/ocaml-ldap/PLIST b/databases/ocaml-ldap/PLIST
index 13b70fc32cf..0384a18ab57 100644
--- a/databases/ocaml-ldap/PLIST
+++ b/databases/ocaml-ldap/PLIST
@@ -1,80 +1,151 @@
-@comment $NetBSD: PLIST,v 1.1 2016/09/20 12:52:59 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/09/07 15:03:51 jaapb Exp $
 ${OCAML_SITELIB}/ldap/META
+${OCAML_SITELIB}/ldap/lber.annot
 ${OCAML_SITELIB}/ldap/lber.cmi
+${OCAML_SITELIB}/ldap/lber.cmt
+${OCAML_SITELIB}/ldap/lber.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/lber.cmx
 ${OCAML_SITELIB}/ldap/lber.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap.a
 ${OCAML_SITELIB}/ldap/ldap.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap.cmxs
+${OCAML_SITELIB}/ldap/ldap_dn.annot
 ${OCAML_SITELIB}/ldap/ldap_dn.cmi
+${OCAML_SITELIB}/ldap/ldap_dn.cmt
+${OCAML_SITELIB}/ldap/ldap_dn.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_dn.cmx
 ${OCAML_SITELIB}/ldap/ldap_dn.mli
+${OCAML_SITELIB}/ldap/ldap_dnlexer.annot
 ${OCAML_SITELIB}/ldap/ldap_dnlexer.cmi
+${OCAML_SITELIB}/ldap/ldap_dnlexer.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_dnlexer.cmx
+${OCAML_SITELIB}/ldap/ldap_dnparser.annot
 ${OCAML_SITELIB}/ldap/ldap_dnparser.cmi
+${OCAML_SITELIB}/ldap/ldap_dnparser.cmt
+${OCAML_SITELIB}/ldap/ldap_dnparser.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_dnparser.cmx
+${OCAML_SITELIB}/ldap/ldap_error.annot
 ${OCAML_SITELIB}/ldap/ldap_error.cmi
+${OCAML_SITELIB}/ldap/ldap_error.cmt
+${OCAML_SITELIB}/ldap/ldap_error.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_error.cmx
 ${OCAML_SITELIB}/ldap/ldap_error.mli
+${OCAML_SITELIB}/ldap/ldap_filter.annot
 ${OCAML_SITELIB}/ldap/ldap_filter.cmi
+${OCAML_SITELIB}/ldap/ldap_filter.cmt
+${OCAML_SITELIB}/ldap/ldap_filter.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_filter.cmx
 ${OCAML_SITELIB}/ldap/ldap_filter.mli
+${OCAML_SITELIB}/ldap/ldap_filterlexer.annot
 ${OCAML_SITELIB}/ldap/ldap_filterlexer.cmi
+${OCAML_SITELIB}/ldap/ldap_filterlexer.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_filterlexer.cmx
+${OCAML_SITELIB}/ldap/ldap_filterparser.annot
 ${OCAML_SITELIB}/ldap/ldap_filterparser.cmi
+${OCAML_SITELIB}/ldap/ldap_filterparser.cmt
+${OCAML_SITELIB}/ldap/ldap_filterparser.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_filterparser.cmx
+${OCAML_SITELIB}/ldap/ldap_funclient.annot
 ${OCAML_SITELIB}/ldap/ldap_funclient.cmi
+${OCAML_SITELIB}/ldap/ldap_funclient.cmt
+${OCAML_SITELIB}/ldap/ldap_funclient.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_funclient.cmx
 ${OCAML_SITELIB}/ldap/ldap_funclient.mli
+${OCAML_SITELIB}/ldap/ldap_funserver.annot
 ${OCAML_SITELIB}/ldap/ldap_funserver.cmi
+${OCAML_SITELIB}/ldap/ldap_funserver.cmt
+${OCAML_SITELIB}/ldap/ldap_funserver.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_funserver.cmx
 ${OCAML_SITELIB}/ldap/ldap_funserver.mli
+${OCAML_SITELIB}/ldap/ldap_mutex.annot
 ${OCAML_SITELIB}/ldap/ldap_mutex.cmi
+${OCAML_SITELIB}/ldap/ldap_mutex.cmt
+${OCAML_SITELIB}/ldap/ldap_mutex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_mutex.cmx
 ${OCAML_SITELIB}/ldap/ldap_mutex.mli
+${OCAML_SITELIB}/ldap/ldap_ooclient.annot
 ${OCAML_SITELIB}/ldap/ldap_ooclient.cmi
+${OCAML_SITELIB}/ldap/ldap_ooclient.cmt
+${OCAML_SITELIB}/ldap/ldap_ooclient.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_ooclient.cmx
 ${OCAML_SITELIB}/ldap/ldap_ooclient.mli
+${OCAML_SITELIB}/ldap/ldap_protocol.annot
 ${OCAML_SITELIB}/ldap/ldap_protocol.cmi
+${OCAML_SITELIB}/ldap/ldap_protocol.cmt
+${OCAML_SITELIB}/ldap/ldap_protocol.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_protocol.cmx
 ${OCAML_SITELIB}/ldap/ldap_protocol.mli
+${OCAML_SITELIB}/ldap/ldap_schemalexer.annot
 ${OCAML_SITELIB}/ldap/ldap_schemalexer.cmi
+${OCAML_SITELIB}/ldap/ldap_schemalexer.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_schemalexer.cmx
+${OCAML_SITELIB}/ldap/ldap_schemaparser.annot
 ${OCAML_SITELIB}/ldap/ldap_schemaparser.cmi
+${OCAML_SITELIB}/ldap/ldap_schemaparser.cmt
+${OCAML_SITELIB}/ldap/ldap_schemaparser.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_schemaparser.cmx
 ${OCAML_SITELIB}/ldap/ldap_schemaparser.mli
+${OCAML_SITELIB}/ldap/ldap_toplevel.annot
 ${OCAML_SITELIB}/ldap/ldap_toplevel.cmi
+${OCAML_SITELIB}/ldap/ldap_toplevel.cmt
+${OCAML_SITELIB}/ldap/ldap_toplevel.cmti
 ${OCAML_SITELIB}/ldap/ldap_toplevel.mli
+${OCAML_SITELIB}/ldap/ldap_txooclient.annot
 ${OCAML_SITELIB}/ldap/ldap_txooclient.cmi
+${OCAML_SITELIB}/ldap/ldap_txooclient.cmt
+${OCAML_SITELIB}/ldap/ldap_txooclient.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_txooclient.cmx
 ${OCAML_SITELIB}/ldap/ldap_txooclient.mli
+${OCAML_SITELIB}/ldap/ldap_types.annot
 ${OCAML_SITELIB}/ldap/ldap_types.cmi
+${OCAML_SITELIB}/ldap/ldap_types.cmt
+${OCAML_SITELIB}/ldap/ldap_types.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_types.cmx
 ${OCAML_SITELIB}/ldap/ldap_types.mli
+${OCAML_SITELIB}/ldap/ldap_url.annot
 ${OCAML_SITELIB}/ldap/ldap_url.cmi
+${OCAML_SITELIB}/ldap/ldap_url.cmt
+${OCAML_SITELIB}/ldap/ldap_url.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_url.cmx
 ${OCAML_SITELIB}/ldap/ldap_url.mli
+${OCAML_SITELIB}/ldap/ldap_urllexer.annot
 ${OCAML_SITELIB}/ldap/ldap_urllexer.cmi
+${OCAML_SITELIB}/ldap/ldap_urllexer.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldap_urllexer.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif.a
 ${OCAML_SITELIB}/ldap/ldif.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif.cmxs
+${OCAML_SITELIB}/ldap/ldif_changerec_lexer.annot
 ${OCAML_SITELIB}/ldap/ldif_changerec_lexer.cmi
+${OCAML_SITELIB}/ldap/ldif_changerec_lexer.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif_changerec_lexer.cmx
+${OCAML_SITELIB}/ldap/ldif_changerec_oo.annot
 ${OCAML_SITELIB}/ldap/ldif_changerec_oo.cmi
+${OCAML_SITELIB}/ldap/ldif_changerec_oo.cmt
+${OCAML_SITELIB}/ldap/ldif_changerec_oo.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif_changerec_oo.cmx
 ${OCAML_SITELIB}/ldap/ldif_changerec_oo.mli
+${OCAML_SITELIB}/ldap/ldif_changerec_parser.annot
 ${OCAML_SITELIB}/ldap/ldif_changerec_parser.cmi
+${OCAML_SITELIB}/ldap/ldif_changerec_parser.cmt
+${OCAML_SITELIB}/ldap/ldif_changerec_parser.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif_changerec_parser.cmx
+${OCAML_SITELIB}/ldap/ldif_oo.annot
 ${OCAML_SITELIB}/ldap/ldif_oo.cmi
+${OCAML_SITELIB}/ldap/ldif_oo.cmt
+${OCAML_SITELIB}/ldap/ldif_oo.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif_oo.cmx
 ${OCAML_SITELIB}/ldap/ldif_oo.mli
+${OCAML_SITELIB}/ldap/ldif_parser.annot
 ${OCAML_SITELIB}/ldap/ldif_parser.cmi
+${OCAML_SITELIB}/ldap/ldif_parser.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ldif_parser.cmx
 ${OCAML_SITELIB}/ldap/ldif_parser.ml
 ${OCAML_SITELIB}/ldap/toplevel.cma
+${OCAML_SITELIB}/ldap/ulist.annot
 ${OCAML_SITELIB}/ldap/ulist.cmi
+${OCAML_SITELIB}/ldap/ulist.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ldap/ulist.cmx
 ${OCAML_SITELIB}/ldap/ulist.ml
diff --git a/databases/ocaml-ldap/distinfo b/databases/ocaml-ldap/distinfo
index e60f9cd3d56..6cd4fb76f1c 100644
--- a/databases/ocaml-ldap/distinfo
+++ b/databases/ocaml-ldap/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2016/09/20 12:52:59 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2017/09/07 15:03:51 jaapb Exp $
 
-SHA1 (ocamldap-2.2.tar.gz) = 897d1b49f16fd321b4bc6654be80e84dfc95ce7b
-RMD160 (ocamldap-2.2.tar.gz) = 8d38657b2aca54fff4ee087036b3003253fca8e0
-SHA512 (ocamldap-2.2.tar.gz) = e24e78497b7c9ed89b0ae73c5773cc9ec28c7c7d317b4b8b39f6b20536ff8f44e15c2657d6aba4bb4689afb5bb155fc7391bea6edab50d0855b22bc457982a2d
-Size (ocamldap-2.2.tar.gz) = 174204 bytes
-SHA1 (patch-src_ldap_ooclient.ml) = 2165beac31f9189d519e171b5fb2fad2f9fc8b18
+SHA1 (ocamldap-2.3.0.tar.gz) = 9030eebac693767fd4e6725088439f32df522a04
+RMD160 (ocamldap-2.3.0.tar.gz) = e7b29c1194d5b010ed00daebc637fc9b9541204a
+SHA512 (ocamldap-2.3.0.tar.gz) = f7d850dd15c6b6a057aee2a01960a4479658143db59dff27635960bc414c4498d9601edc66780fe4f3400b43bb14a2fc3c8d256274cce5124377cb5b3ac28f52
+Size (ocamldap-2.3.0.tar.gz) = 133061 bytes
diff --git a/databases/ocaml-ldap/patches/patch-src_ldap_ooclient.ml b/databases/ocaml-ldap/patches/patch-src_ldap_ooclient.ml
deleted file mode 100644
index 9174fb2749a..00000000000
--- a/databases/ocaml-ldap/patches/patch-src_ldap_ooclient.ml
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-src_ldap_ooclient.ml,v 1.1 2016/09/20 12:52:59 jaapb Exp $
-
-Compile with ocaml 4.02 (patch from upstream Github repository)
---- src/ldap_ooclient.ml.orig	2012-09-29 09:56:40.000000000 +0000
-+++ src/ldap_ooclient.ml
-@@ -23,7 +23,6 @@
- open Ldap_types
- open Ldap_funclient
- open Ldap_schemaparser
--open String
- 
- (* types used throughout the library *)
- (* add types *)
-@@ -200,13 +199,13 @@ object (self)
-   method flush_changes = changes <- []
-   method changes = changes
- 
--  method exists x = Hashtbl.mem data (lowercase x)
-+  method exists x = Hashtbl.mem data (String.lowercase x)
-   method add (x:op_lst) =
-     let rec do_add (x:op_lst) =
-       match x with
-           [] -> ()
-         | (name, value) :: lst ->
--            let lcname = lowercase name in
-+            let lcname = String.lowercase name in
-               try
-                 Ulist.addlst (Hashtbl.find data lcname) value; do_add lst
-               with Not_found ->
-@@ -269,7 +268,7 @@ object (self)
-       match x with
-           [] -> ()
-         | (attr, values) :: lst ->
--            let lcname = lowercase attr in
-+            let lcname = String.lowercase attr in
-               match values with
-                   [] -> Hashtbl.remove data lcname;do_delete lst
-                 | _  ->
-@@ -287,7 +286,7 @@ object (self)
-       match x with
-           [] -> ()
-         | (attr, values) :: lst -> let n = Ulist.create 5 in
--            Ulist.addlst n values; Hashtbl.replace data (lowercase attr) n;
-+            Ulist.addlst n values; Hashtbl.replace data (String.lowercase attr) n;
-             do_replace lst;
-     in
-       do_replace x; self#push_change `REPLACE x
-@@ -310,7 +309,7 @@ object (self)
-     in
-       keys data
- 
--  method get_value attr = Ulist.tolst (Hashtbl.find data (lowercase attr))
-+  method get_value attr = Ulist.tolst (Hashtbl.find data (String.lowercase attr))
-   method set_dn x = dn <- x
-   method dn = dn
-   method print =
-@@ -1058,7 +1057,7 @@ object (self)
-            can generate. *)
-       let generateing = (List.filter
-                            (fun gen ->
--                              if (Hashtbl.mem generators (lowercase (oidToAttr schema gen))) then
-+                              if (Hashtbl.mem generators (String.lowercase (oidToAttr schema gen))) then
-                                 true
-                               else false)
-                            (List.rev_append
-@@ -1073,7 +1072,7 @@ object (self)
-           (List.rev_append generateing (find_generatable_deps
-                                           generators
-                                           (List.rev_map
--                                             (fun e -> lowercase (oidToAttr schema e))
-+                                             (fun e -> String.lowercase (oidToAttr schema e))
-                                              generateing)))
-     in
-     let generate_missing togen generators =
-@@ -1191,7 +1190,7 @@ object (self)
- (* add a service to the account, if they already satisfy the service
-    then do nothing *)
-   method add_service svc =
--    let service = try Hashtbl.find services (lowercase svc)
-+    let service = try Hashtbl.find services (String.lowercase svc)
-     with Not_found -> raise (No_service svc) in
-       (try List.iter (self#add_service) service.depends
-        with (No_service x) -> raise (Service_dep_unsatisfiable x));
-@@ -1225,7 +1224,7 @@ object (self)
-               deplst)
-          services [])
-     in
--    let service = try Hashtbl.find services (lowercase svc)
-+    let service = try Hashtbl.find services (String.lowercase svc)
-     with Not_found -> raise (No_service svc) in
-       (List.iter (self#delete_service) (find_deps services svc));
-       (List.iter
-@@ -1269,7 +1268,7 @@ object (self)
-   method of_entry ?(scflavor=Pessimistic) e = super#of_entry ~scflavor e;self#resolve_missing
- 
-   method add_generate x =
--    (if (Hashtbl.mem generators (lowercase x)) then
-+    (if (Hashtbl.mem generators (String.lowercase x)) then
-        toGenerate <- Setstr.add (attrToOid schema (Lcstring.of_string x)) toGenerate
-      else raise (No_generator x));
-     self#resolve_missing