Updated package to version 4.1.1, and added some patches from the upstream

git repository to make package compile with ocaml 4.0.3.

Changes include:
        * Cryptography: adding basic support for public key cryptography
          (provided by GnuTLS)
        * Authentication: the module types for SASL and HTTP authentication
          have been changed to a stateless style. Added an experimental
          SCRAM module for HTTP.
        * Nethttp_client: Supporting Digest authentication with
          SHA-256 as hash algorithm. Supporting Basic authentication
          with "charset" parameter.
        * XDR/RPC: supporting that direct mappings can be disabled
          when this is disadvantegous. For now, this is done for
          internal RPC services, because direct mappings do not
          copy values, which would be very surprising here.
        * Netplex: adding support for so-called internal services.
          This is a fast and type-safe way of exchanging messages
          between netplex containers.
        * ALL MODULES: Transitioning to the new "bytes" type for
          mutable strings while using "string" only for immutable
          strings. If compiled with OCaml-4.02 or newer, Ocamlnet
          is built with the -safe-string compiler option.
        * Netplex_sharedvar: implementing a new protocol that uses shared
          memory for announcing variable updates. Also, almost all functions
          can now be called from controller context.
        * Netsys_global: new module, for keeping a dictionary of global
          strings. The dictionary is connected with Netplex_sharedvar, so
          that the strings can be updated across process boundaries if used
          with Netplex.
        * Netsys_polysocket: adding this module
        * Netsys_polypipe: adding this module
        * Netasn1_encoder: new module for encding ASN.1 messages
        * Netnumber: on 64 bit platforms, the functions lt_uint4 and
          lt_uint8 were wrong. Fixed now.

7 files changed, 107 insertions, 34 deletions

diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index 13b6c7a88b9..935d17d4c77 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2016/05/03 11:40:07 prlw1 Exp $
+# $NetBSD: Makefile,v 1.30 2016/05/05 16:04:21 jaapb Exp $
 #
 
-DISTNAME=		ocamlnet-4.0.4
-PKGREVISION=		3
+DISTNAME=		ocamlnet-4.1.1
 CATEGORIES=		net
 MASTER_SITES=		http://download.camlcity.org/download/
 
@@ -19,6 +18,15 @@ CONFIGURE_ARGS+=	-without-nethttpd -disable-tcl -disable-apache \
 USE_TOOLS+=		gmake
 BUILD_TARGET=		all
 OCAML_USE_FINDLIB=	yes
+OCAML_FINDLIB_DIRS= \
+	${OCAML_SITELIBDIR}/equeue ${OCAML_SITELIBDIR}/netcamlbox \
+	${OCAML_SITELIBDIR}/netcgi2-plex ${OCAML_SITELIBDIR}/netcgi2 \
+	${OCAML_SITELIBDIR}/netclient ${OCAML_SITELIBDIR}/netmulticore \
+	${OCAML_SITELIBDIR}/netplex ${OCAML_SITELIBDIR}/netshm \
+	${OCAML_SITELIBDIR}/netstring-pcre ${OCAML_SITELIBDIR}/netstring \
+	${OCAML_SITELIBDIR}/netsys ${OCAML_SITELIBDIR}/netunidata \
+	${OCAML_SITELIBDIR}/netzip ${OCAML_SITELIBDIR}/rpc-auth-local \
+	${OCAML_SITELIBDIR}/rpc-generator ${OCAML_SITELIBDIR}/rpc
 
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.prefs.mk"
@@ -29,6 +37,7 @@ BUILD_TARGET+=		opt
 .endif
 .if ${OPSYS} == "SunOS"
 PLIST.xti=		yes
+OCAML_FINDLIB_DIRS+=	${OCAML_SITELIBDIR}/rpc-xti
 .endif
 
 .include "options.mk"
diff --git a/net/ocamlnet/PLIST b/net/ocamlnet/PLIST
index 271223f28a6..338b0cf4f3e 100644
--- a/net/ocamlnet/PLIST
+++ b/net/ocamlnet/PLIST
@@ -1,26 +1,9 @@
-@comment $NetBSD: PLIST,v 1.11 2016/02/03 13:19:26 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/equeue
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netcgi2-plex
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netplex
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netclient
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netshm
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/rpc
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/shell
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netcamlbox
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netstring
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/rpc-auth-local
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netcgi2
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netmulticore
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netsys
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/rpc-generator
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netunidata
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/netzip
-${PLIST.xti}@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/rpc-xti
+@comment $NetBSD: PLIST,v 1.12 2016/05/05 16:04:21 jaapb Exp $
 ${OCAML_SITELIB}/equeue/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
 ${OCAML_SITELIB}/equeue/equeue.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.cmxa
 ${OCAML_SITELIB}/equeue/equeue.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.cmxa
 ${OCAML_SITELIB}/equeue/equeue.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.cmxa
@@ -60,8 +43,8 @@ ${OCAML_SITELIB}/equeue/uq_transfer.mli
 ${OCAML_SITELIB}/netcamlbox/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.a
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.cmxa
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.cmxa
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.cmxa
@@ -76,8 +59,8 @@ ${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.mli
 ${OCAML_SITELIB}/netcgi2/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.a
 ${OCAML_SITELIB}/netcgi2/netcgi.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.cmxa
 ${OCAML_SITELIB}/netcgi2/netcgi.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.cmxa
 ${OCAML_SITELIB}/netcgi2/netcgi.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.p.cmxa
@@ -115,8 +98,8 @@ ${OCAML_SITELIB}/netclient/nethttp_client_conncache.cmi
 ${OCAML_SITELIB}/netclient/nethttp_client_conncache.mli
 ${OCAML_SITELIB}/netclient/nethttp_fs.cmi
 ${OCAML_SITELIB}/netclient/nethttp_fs.mli
-${OCAML_SITELIB}/netclient/netnetpop.mli
-${OCAML_SITELIB}/netclient/netnetsmtp.mli
+${OCAML_SITELIB}/netclient/netldap.cmi
+${OCAML_SITELIB}/netclient/netldap.mli
 ${OCAML_SITELIB}/netclient/netpop.cmi
 ${OCAML_SITELIB}/netclient/netpop.mli
 ${OCAML_SITELIB}/netclient/netsmtp.cmi
@@ -183,6 +166,8 @@ ${OCAML_SITELIB}/netplex/netplex_ctrl_srv.cmi
 ${OCAML_SITELIB}/netplex/netplex_ctrl_srv.mli
 ${OCAML_SITELIB}/netplex/netplex_encap.cmi
 ${OCAML_SITELIB}/netplex/netplex_encap.mli
+${OCAML_SITELIB}/netplex/netplex_internal.cmi
+${OCAML_SITELIB}/netplex/netplex_internal.mli
 ${OCAML_SITELIB}/netplex/netplex_kit.cmi
 ${OCAML_SITELIB}/netplex/netplex_kit.mli
 ${OCAML_SITELIB}/netplex/netplex_log.cmi
@@ -252,6 +237,8 @@ ${OCAML_SITELIB}/netstring/netascii_armor.cmi
 ${OCAML_SITELIB}/netstring/netascii_armor.mli
 ${OCAML_SITELIB}/netstring/netasn1.cmi
 ${OCAML_SITELIB}/netstring/netasn1.mli
+${OCAML_SITELIB}/netstring/netasn1_encode.cmi
+${OCAML_SITELIB}/netstring/netasn1_encode.mli
 ${OCAML_SITELIB}/netstring/netauth.cmi
 ${OCAML_SITELIB}/netstring/netauth.mli
 ${OCAML_SITELIB}/netstring/netaux.cmi
@@ -310,6 +297,8 @@ ${OCAML_SITELIB}/netstring/netmech_scram.cmi
 ${OCAML_SITELIB}/netstring/netmech_scram.mli
 ${OCAML_SITELIB}/netstring/netmech_scram_gssapi.cmi
 ${OCAML_SITELIB}/netstring/netmech_scram_gssapi.mli
+${OCAML_SITELIB}/netstring/netmech_scram_http.cmi
+${OCAML_SITELIB}/netstring/netmech_scram_http.mli
 ${OCAML_SITELIB}/netstring/netmech_scram_sasl.cmi
 ${OCAML_SITELIB}/netstring/netmech_scram_sasl.mli
 ${OCAML_SITELIB}/netstring/netmech_spnego_http.cmi
@@ -347,6 +336,8 @@ ${OCAML_SITELIB}/netstring/netstring_str.mli
 ${OCAML_SITELIB}/netstring/netstring_top.cmi
 ${OCAML_SITELIB}/netstring/netstring_top.cmo
 ${OCAML_SITELIB}/netstring/netstring_top.mli
+${OCAML_SITELIB}/netstring/netstring_tstring.cmi
+${OCAML_SITELIB}/netstring/netstring_tstring.mli
 ${OCAML_SITELIB}/netstring/nettls_support.cmi
 ${OCAML_SITELIB}/netstring/nettls_support.mli
 ${OCAML_SITELIB}/netstring/netulex.cmi
@@ -355,8 +346,14 @@ ${OCAML_SITELIB}/netstring/netunichar.cmi
 ${OCAML_SITELIB}/netstring/netunichar.mli
 ${OCAML_SITELIB}/netstring/neturl.cmi
 ${OCAML_SITELIB}/netstring/neturl.mli
+${OCAML_SITELIB}/netstring/neturl_ldap.cmi
+${OCAML_SITELIB}/netstring/neturl_ldap.mli
 ${OCAML_SITELIB}/netstring/netx509.cmi
 ${OCAML_SITELIB}/netstring/netx509.mli
+${OCAML_SITELIB}/netstring/netx509_pubkey.cmi
+${OCAML_SITELIB}/netstring/netx509_pubkey.mli
+${OCAML_SITELIB}/netstring/netx509_pubkey_crypto.cmi
+${OCAML_SITELIB}/netstring/netx509_pubkey_crypto.mli
 ${OCAML_SITELIB}/netstring/netxdr.cmi
 ${OCAML_SITELIB}/netstring/netxdr.mli
 ${OCAML_SITELIB}/netstring/netxdr_mstring.cmi
@@ -390,6 +387,8 @@ ${OCAML_SITELIB}/netsys/netsys_crypto_types.cmi
 ${OCAML_SITELIB}/netsys/netsys_crypto_types.mli
 ${OCAML_SITELIB}/netsys/netsys_digests.cmi
 ${OCAML_SITELIB}/netsys/netsys_digests.mli
+${OCAML_SITELIB}/netsys/netsys_global.cmi
+${OCAML_SITELIB}/netsys/netsys_global.mli
 ${OCAML_SITELIB}/netsys/netsys_gprof_init.cmi
 ${OCAML_SITELIB}/netsys/netsys_gprof_init.mli
 ${OCAML_SITELIB}/netsys/netsys_gprof_init.p.cmx
@@ -409,8 +408,8 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.p.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.a
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.cmxa
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.cmxa
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.p.cmxa
@@ -431,6 +430,10 @@ ${OCAML_SITELIB}/netsys/netsys_pollset_posix.cmi
 ${OCAML_SITELIB}/netsys/netsys_pollset_posix.mli
 ${OCAML_SITELIB}/netsys/netsys_pollset_win32.cmi
 ${OCAML_SITELIB}/netsys/netsys_pollset_win32.mli
+${OCAML_SITELIB}/netsys/netsys_polypipe.cmi
+${OCAML_SITELIB}/netsys/netsys_polypipe.mli
+${OCAML_SITELIB}/netsys/netsys_polysocket.cmi
+${OCAML_SITELIB}/netsys/netsys_polysocket.mli
 ${OCAML_SITELIB}/netsys/netsys_posix.cmi
 ${OCAML_SITELIB}/netsys/netsys_posix.mli
 ${OCAML_SITELIB}/netsys/netsys_rng.cmi
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index 146a48fc7cf..26bf086a106 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.19 2016/02/03 13:19:26 jaapb Exp $
+$NetBSD: distinfo,v 1.20 2016/05/05 16:04:21 jaapb Exp $
 
-SHA1 (ocamlnet-4.0.4.tar.gz) = 5747489d21e19aee4c1d9dad48d2764bb1bdbcbc
-RMD160 (ocamlnet-4.0.4.tar.gz) = eb7f140b0a1545d37e766bab1f621954ce3784a1
-SHA512 (ocamlnet-4.0.4.tar.gz) = f3bce94d43161e46bf0973bfbe0d9d5d7232136a24a27b987ae371a7aab129720df35bd0d6ef75126d587ee1fde56fe29d05bc44840724adf3be50ac250e7c85
-Size (ocamlnet-4.0.4.tar.gz) = 4336176 bytes
+SHA1 (ocamlnet-4.1.1.tar.gz) = 16a5ba8e0155fa04c9fdb3de73db8b8417530ec5
+RMD160 (ocamlnet-4.1.1.tar.gz) = 04e74fea3478110d0fddaa3d0b4fe15bca6fcf58
+SHA512 (ocamlnet-4.1.1.tar.gz) = cd10f7fe622bed3208cc5ad66d65911c1c0992bdc6f4d1bc10d6e7ef197fe157226e6b8ca7857b91cd1c6d6103ac9c3d586d39f3cb32a9ccb9ab83e00bf4444d
+Size (ocamlnet-4.1.1.tar.gz) = 4561784 bytes
 SHA1 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a
+SHA1 (patch-src_equeue_uq_engines_compat.ml) = 35ed1e404aafe5e34963dd6730c68c11e7903e86
+SHA1 (patch-src_netstring_netasn1.ml) = 4637b290ac05613a38e0d8c0853f07a904c7254c
+SHA1 (patch-src_netsys_netlog.ml) = 8de2d59aecd88c0e5fee000238efad625e28104b
 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
diff --git a/net/ocamlnet/options.mk b/net/ocamlnet/options.mk
index 2a0221eb999..730f03b07d5 100644
--- a/net/ocamlnet/options.mk
+++ b/net/ocamlnet/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2016/02/03 13:19:26 jaapb Exp $
+# $NetBSD: options.mk,v 1.4 2016/05/05 16:04:21 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocamlnet
 PKG_SUPPORTED_OPTIONS=	gtk gtk2
-PKG_SUGGESTED_OPTIONS=	
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/ocamlnet/patches/patch-src_equeue_uq_engines_compat.ml b/net/ocamlnet/patches/patch-src_equeue_uq_engines_compat.ml
new file mode 100644
index 00000000000..973144858a9
--- /dev/null
+++ b/net/ocamlnet/patches/patch-src_equeue_uq_engines_compat.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_equeue_uq_engines_compat.ml,v 1.1 2016/05/05 16:04:21 jaapb Exp $
+
+Temporary patch for ocaml 4.03 (from upstream git repository)
+--- src/equeue/uq_engines_compat.ml.orig	2016-02-29 12:24:18.000000000 +0000
++++ src/equeue/uq_engines_compat.ml
+@@ -7,7 +7,7 @@ class type server_socket_acceptor = serv
+ class type client_socket_connector = client_endpoint_connector
+           
+ 
+-exception Mem_not_supported = Uq_multiplex.Mem_not_supported
++(* exception Mem_not_supported = Uq_multiplex.Mem_not_supported *)
+ 
+ let create_multiplex_controller_for_connected_socket =
+   Uq_multiplex.create_multiplex_controller_for_connected_socket
diff --git a/net/ocamlnet/patches/patch-src_netstring_netasn1.ml b/net/ocamlnet/patches/patch-src_netstring_netasn1.ml
new file mode 100644
index 00000000000..a0dfc8fa2a1
--- /dev/null
+++ b/net/ocamlnet/patches/patch-src_netstring_netasn1.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_netstring_netasn1.ml,v 1.1 2016/05/05 16:04:21 jaapb Exp $
+
+Temporary patch for ocaml 4.03 (from package's git repository)
+--- src/netstring/netasn1.ml.orig	2016-02-29 12:24:17.000000000 +0000
++++ src/netstring/netasn1.ml
+@@ -437,7 +437,7 @@ module Value = struct
+                let hour = int_of_string (Netstring_str.matched_group m 4 s) in
+                let minute = int_of_string (Netstring_str.matched_group m 5 s) in
+                let second = int_of_string (Netstring_str.matched_group m 6 s) in
+-               let zonestr = Netstring_str.matched_group m 8s in
++               let zonestr = Netstring_str.matched_group m 8 s in
+                let zone = get_zone zonestr in
+                if month = 0 || month > 12 || day = 0 || day > 31 ||
+                     hour > 23 || minute > 59 || second > 59 
diff --git a/net/ocamlnet/patches/patch-src_netsys_netlog.ml b/net/ocamlnet/patches/patch-src_netsys_netlog.ml
new file mode 100644
index 00000000000..0c9eeb177c3
--- /dev/null
+++ b/net/ocamlnet/patches/patch-src_netsys_netlog.ml
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_netsys_netlog.ml,v 1.1 2016/05/05 16:04:21 jaapb Exp $
+
+Temporary patch for ocaml 4.03 (from package's git repository)
+--- src/netsys/netlog.ml.orig	2016-02-29 12:24:18.000000000 +0000
++++ src/netsys/netlog.ml
+@@ -8,6 +8,15 @@ type level =
+ type logger =
+     level -> string -> unit
+ 
++type timespec = float * int
++type clock_id
++type clock =
++  | CLOCK_REALTIME
++  | CLOCK_MONOTONIC
++  | CLOCK_ID of clock_id
++
++external clock_gettime : clock -> timespec = "netsys_clock_gettime"
++
+ let level_weight =
+   function
+     | `Emerg   -> 0
+@@ -95,7 +104,7 @@ let current_formatter =
+ let channel_logger ch max_lev lev msg = 
+   if level_weight lev <= level_weight max_lev then (
+     let (sec,ns) =
+-      try Netsys_posix.clock_gettime Netsys_posix.CLOCK_REALTIME
++      try clock_gettime CLOCK_REALTIME
+       with Invalid_argument _ ->
+ 	(Unix.gettimeofday(), 0) in
+     let s =   (* Netdate is unavailable here *)