Updated package to newest version, 4.0.4. Changes include:

	* GnuTLS: compatibility with GnuTLS-3.4.2
	* Nethttpd_plex: the post_add_hook was not called by accident
	  (since OCamlnet-4); this is now fixed.
	* Nethtml: new option case_sensitive
	* GnuTLS: initializing the library on-demand. This avoids that
	  /dev/random is kept open all the time since program start, and
	  works around incompatibilities with Netplex. (Thomas Calderon
	  found the problem.)
	* GnuTLS: setting DH parameters on certificates (this was forgotten in
	  previous releases). (Thomas Calderon found the problem.)
	* GnuTLS: supporting GnuTLS versions where SRP is disabled.
	  Supporting GnuTLS-3.4.
	* OpenBSD build: fix linker option (Christopher Zimmermann)
	* Equeue: There is a new method request_proxy_notification,
	  which is only used by Uq_engines.qseq_engine (but unfortunately
	  needs to appear in the public type of the object). This new
	  method permits that chains of Uq_engines.qseq_engine pairs
	  can now be arbitrarily long without consuming too much memory
	  and without the danger of getting stack overflows.

	  This fixes issues where notification chains got too long. In
	  particular, we saw a stack overflow when retrieving a video
	  stream via HTTP. The stream was sent with many chunks, resulting
	  in a long Uq_engines.qseq_engine chain.

	  Implementers of engines can simply define request_proxy_notification
	  as no-ops.
	* Nethttp.set_content_range: this function generated an incorrect
	  header (the "bytes" word was missing). (Török Edwin)
	* _oasis is generated from _oasis.in
	* Netplex: the Netplex socket directory has a different default
	  if not specified in the config file.
	* Netshm: the POSIX specifier has now two args
	* IPv6: automatically enabled if there is a global IPv6 address
  * Unicode tables: Moved them to a separate netunidata library.
	  This library needs to be linked in for getting access to the
	  tables (this is no longer the default).
	* Renamings: Http_client, Ftp_client etc. => Nethttp_client,
	  Netftp_client
    Mimestring => Netmime_string
	  Xdr => Netxdr
	* Netmime: moved functions to Netmime_header and Netmime_channels
  * Netmech_scram: Removed the check that passwords only consist of
	  ASCII chars. The user can now call Netsaslprep.saslprep.
  * Removed: rpc-auth-dh, nethttpd-for-netcgi2
	* Http_client: the authentication mechanisms are now encapsulated
	  in a first-class module HTTP_MECHANISM. So far, there is Digest
	  authentication in this form. The signature of HTTP_MECHANISM
	  is similar to SASL_MECHANISM.

	  Another visible change is that the insecure Basic authentication
	  is no longer enabled for non-TLS-secured connections. This can be
	  changed back by setting flags, though.

	  Some fixes in the design improve Digest authentication for proxy
	  connections.
	* Netpop: implementating SASL authentication for POP3. Moved Netpop
	  into netclient.
	* Netsmtp: implementing SASL authentication for SMTP. Moved Netsmtp
	  into netclient.
	* Adding a framework for SASL, and a number of mechanisms
	  (PLAIN, CRAM-MD5, DIGEST-MD5, SCRAM-SHA1).
	* fcgi/scgi/ajp connectors: exporting a handle_connection function,
	  and unifying existing such functions (Christopher Zimmermann)
  * adding support for modular cryptography (symmetric ciphers and
	  digests)
	* SCRAM is now implemented with the new crypto providers
	* removing dependency on Cryptokit
	* removed library netgssapi; now part of netsys/netstring
	* removed library netmech-scram; now part of netstring
Ocamlnet-4 adds:
	- new library netgss-system
	- new library nettls-gnutls
	- removed equeue-ssl and rpc-ssl
	- X.500 modules Netasn1, Netdn, Netx509
	- Crypto definitions Netsys_crypto_types, Netsys_crypto
	- TLS modules Netsys_tls, Nettls_support
	- Support for SASL and GSSAPI
	- Moved many functions from Uq_engines to new modules in
	  the equeue library (Uq_client, Uq_server, Uq_multiplex,
	  Uq_transfer)

5 files changed, 356 insertions, 342 deletions

diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index 6cabdce5ab8..1db38c89af5 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2015/10/10 01:58:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2016/02/03 13:19:26 jaapb Exp $
 #
 
-DISTNAME=		ocamlnet-3.7.7
+DISTNAME=		ocamlnet-4.0.4
 PKGNAME=	${DISTNAME} # in order to avoid prefixing with ocaml-
-PKGREVISION=	5
 CATEGORIES=		net
 MASTER_SITES=		http://download.camlcity.org/download/
 
@@ -15,8 +14,8 @@ LICENSE=		zlib AND gnu-gpl-v2
 MAKE_JOBS_SAFE=	no
 
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	-without-nethttpd -without-rpc-auth-dh -disable-tcl \
-	-disable-apache -enable-pcre
+CONFIGURE_ARGS+=	-without-nethttpd -disable-tcl -disable-apache \
+			-enable-pcre -enable-zip
 USE_TOOLS+=		gmake
 BUILD_TARGET=		all
 OCAML_USE_FINDLIB=	yes
@@ -24,7 +23,7 @@ OCAML_USE_FINDLIB=	yes
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=		ssl xti
+PLIST_VARS+=		xti
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 BUILD_TARGET+=		opt
 .endif
@@ -34,4 +33,5 @@ PLIST.xti=		yes
 
 .include "options.mk"
 .include "../../devel/pcre-ocaml/buildlink3.mk"
+.include "../../archivers/ocaml-zip/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ocamlnet/PLIST b/net/ocamlnet/PLIST
index 138aafaa31d..271223f28a6 100644
--- a/net/ocamlnet/PLIST
+++ b/net/ocamlnet/PLIST
@@ -1,24 +1,21 @@
-@comment $NetBSD: PLIST,v 1.10 2015/02/11 13:25:25 jaapb Exp $
+@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}/pop
 @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}/netgssapi
 @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}/smtp
 @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
-${PLIST.ssl}@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/rpc-ssl
-${PLIST.xti}@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/rpc-xtl
-${PLIST.ssl}@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/equeue-ssl
+@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
 ${OCAML_SITELIB}/equeue/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
 ${OCAML_SITELIB}/equeue/equeue.cma
@@ -34,8 +31,14 @@ ${OCAML_SITELIB}/equeue/unixqueue_pollset.mli
 ${OCAML_SITELIB}/equeue/unixqueue_select.cmi
 ${OCAML_SITELIB}/equeue/unixqueue_select.mli
 ${OCAML_SITELIB}/equeue/unixqueue_util.cmi
+${OCAML_SITELIB}/equeue/uq_client.cmi
+${OCAML_SITELIB}/equeue/uq_client.mli
+${OCAML_SITELIB}/equeue/uq_datagram.cmi
+${OCAML_SITELIB}/equeue/uq_datagram.mli
 ${OCAML_SITELIB}/equeue/uq_engines.cmi
 ${OCAML_SITELIB}/equeue/uq_engines.mli
+${OCAML_SITELIB}/equeue/uq_engines_compat.cmi
+${OCAML_SITELIB}/equeue/uq_engines_compat.mli
 ${OCAML_SITELIB}/equeue/uq_io.cmi
 ${OCAML_SITELIB}/equeue/uq_io.mli
 ${OCAML_SITELIB}/equeue/uq_libevent.cmi
@@ -44,25 +47,16 @@ ${OCAML_SITELIB}/equeue/uq_lwt.cmi
 ${OCAML_SITELIB}/equeue/uq_lwt.mli
 ${OCAML_SITELIB}/equeue/uq_mt.cmi
 ${OCAML_SITELIB}/equeue/uq_mt.mli
+${OCAML_SITELIB}/equeue/uq_multiplex.cmi
+${OCAML_SITELIB}/equeue/uq_multiplex.mli
 ${OCAML_SITELIB}/equeue/uq_resolver.cmi
 ${OCAML_SITELIB}/equeue/uq_resolver.mli
+${OCAML_SITELIB}/equeue/uq_server.cmi
+${OCAML_SITELIB}/equeue/uq_server.mli
 ${OCAML_SITELIB}/equeue/uq_socks5.cmi
 ${OCAML_SITELIB}/equeue/uq_socks5.mli
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/META
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/dllequeue_ssl.so
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue-ssl/equeue_ssl.a
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/equeue_ssl.cma
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue-ssl/equeue_ssl.cmxa
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue-ssl/equeue_ssl.p.a
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue-ssl/equeue_ssl.p.cmxa
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/https_client.cmi
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/https_client.mli
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/libequeue_ssl.a
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue-ssl/libequeue_ssl.p.a
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/ssl_exts.cmi
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/ssl_exts.mli
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/uq_ssl.cmi
-${PLIST.ssl}${OCAML_SITELIB}/equeue-ssl/uq_ssl.mli
+${OCAML_SITELIB}/equeue/uq_transfer.cmi
+${OCAML_SITELIB}/equeue/uq_transfer.mli
 ${OCAML_SITELIB}/netcamlbox/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.a
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.cma
@@ -71,6 +65,14 @@ ${OCAML_SITELIB}/netcamlbox/netcamlbox.cmi
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.cmxa
+${OCAML_SITELIB}/netcgi2-plex/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.a
+${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.cmxa
+${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.cmi
+${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.mli
 ${OCAML_SITELIB}/netcgi2/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.a
 ${OCAML_SITELIB}/netcgi2/netcgi.cma
@@ -95,42 +97,32 @@ ${OCAML_SITELIB}/netcgi2/netcgi_scgi.cmi
 ${OCAML_SITELIB}/netcgi2/netcgi_scgi.mli
 ${OCAML_SITELIB}/netcgi2/netcgi_test.cmi
 ${OCAML_SITELIB}/netcgi2/netcgi_test.mli
-${OCAML_SITELIB}/netcgi2-plex/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.a
-${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.cmxa
-${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.cmi
-${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.cmxa
 ${OCAML_SITELIB}/netclient/META
-${OCAML_SITELIB}/netclient/ftp_client.cmi
-${OCAML_SITELIB}/netclient/ftp_client.mli
-${OCAML_SITELIB}/netclient/ftp_data_endpoint.cmi
-${OCAML_SITELIB}/netclient/ftp_data_endpoint.mli
-${OCAML_SITELIB}/netclient/ftp_fs.cmi
-${OCAML_SITELIB}/netclient/ftp_fs.mli
-${OCAML_SITELIB}/netclient/http_client.cmi
-${OCAML_SITELIB}/netclient/http_client.mli
-${OCAML_SITELIB}/netclient/http_client_conncache.cmi
-${OCAML_SITELIB}/netclient/http_client_conncache.mli
-${OCAML_SITELIB}/netclient/http_fs.cmi
-${OCAML_SITELIB}/netclient/http_fs.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.a
 ${OCAML_SITELIB}/netclient/netclient.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.p.cmxa
-${OCAML_SITELIB}/netclient/telnet_client.cmi
-${OCAML_SITELIB}/netclient/telnet_client.mli
-${OCAML_SITELIB}/netgssapi/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netgssapi/netgssapi.a
-${OCAML_SITELIB}/netgssapi/netgssapi.cma
-${OCAML_SITELIB}/netgssapi/netgssapi.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netgssapi/netgssapi.cmxa
-${OCAML_SITELIB}/netgssapi/netgssapi.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netgssapi/netgssapi.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netgssapi/netgssapi.p.cmxa
+${OCAML_SITELIB}/netclient/netftp_client.cmi
+${OCAML_SITELIB}/netclient/netftp_client.mli
+${OCAML_SITELIB}/netclient/netftp_data_endpoint.cmi
+${OCAML_SITELIB}/netclient/netftp_data_endpoint.mli
+${OCAML_SITELIB}/netclient/netftp_fs.cmi
+${OCAML_SITELIB}/netclient/netftp_fs.mli
+${OCAML_SITELIB}/netclient/nethttp_client.cmi
+${OCAML_SITELIB}/netclient/nethttp_client.mli
+${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/netpop.cmi
+${OCAML_SITELIB}/netclient/netpop.mli
+${OCAML_SITELIB}/netclient/netsmtp.cmi
+${OCAML_SITELIB}/netclient/netsmtp.mli
+${OCAML_SITELIB}/netclient/nettelnet_client.cmi
+${OCAML_SITELIB}/netclient/nettelnet_client.mli
 ${OCAML_SITELIB}/netmulticore/META
 ${OCAML_SITELIB}/netmulticore/netmcore.cmi
 ${OCAML_SITELIB}/netmulticore/netmcore.mli
@@ -237,125 +229,17 @@ ${OCAML_SITELIB}/netshm/netshm_data.cmi
 ${OCAML_SITELIB}/netshm/netshm_data.mli
 ${OCAML_SITELIB}/netshm/netshm_hashtbl.cmi
 ${OCAML_SITELIB}/netshm/netshm_hashtbl.mli
+${OCAML_SITELIB}/netstring-pcre/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.a
+${OCAML_SITELIB}/netstring-pcre/netstring-pcre.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.cmxa
+${OCAML_SITELIB}/netstring-pcre/netstring_pcre.cmi
+${OCAML_SITELIB}/netstring-pcre/netstring_pcre.mli
 ${OCAML_SITELIB}/netstring/META
-${OCAML_SITELIB}/netstring/cmapf.adobe_standard_encoding.netdb
-${OCAML_SITELIB}/netstring/cmapf.adobe_symbol_encoding.netdb
-${OCAML_SITELIB}/netstring/cmapf.adobe_zapf_dingbats_encoding.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp037.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp1006.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp1026.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp1047.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp424.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp437.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp500.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp737.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp775.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp850.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp852.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp855.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp856.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp857.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp860.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp861.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp862.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp863.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp864.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp865.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp866.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp869.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp874.netdb
-${OCAML_SITELIB}/netstring/cmapf.cp875.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88591.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso885910.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso885911.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso885913.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso885914.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso885915.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso885916.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88592.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88593.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88594.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88595.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88596.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88597.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88598.netdb
-${OCAML_SITELIB}/netstring/cmapf.iso88599.netdb
-${OCAML_SITELIB}/netstring/cmapf.jis0201.netdb
-${OCAML_SITELIB}/netstring/cmapf.jis0208.netdb
-${OCAML_SITELIB}/netstring/cmapf.jis0212.netdb
-${OCAML_SITELIB}/netstring/cmapf.koi8r.netdb
-${OCAML_SITELIB}/netstring/cmapf.ks1001.netdb
-${OCAML_SITELIB}/netstring/cmapf.macroman.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1250.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1251.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1252.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1253.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1254.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1255.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1256.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1257.netdb
-${OCAML_SITELIB}/netstring/cmapf.windows1258.netdb
-${OCAML_SITELIB}/netstring/cmapr.adobe_standard_encoding.netdb
-${OCAML_SITELIB}/netstring/cmapr.adobe_symbol_encoding.netdb
-${OCAML_SITELIB}/netstring/cmapr.adobe_zapf_dingbats_encoding.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp037.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp1006.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp1026.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp1047.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp424.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp437.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp500.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp737.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp775.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp850.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp852.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp855.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp856.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp857.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp860.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp861.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp862.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp863.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp864.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp865.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp866.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp869.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp874.netdb
-${OCAML_SITELIB}/netstring/cmapr.cp875.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88591.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso885910.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso885911.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso885913.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso885914.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso885915.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso885916.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88592.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88593.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88594.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88595.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88596.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88597.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88598.netdb
-${OCAML_SITELIB}/netstring/cmapr.iso88599.netdb
-${OCAML_SITELIB}/netstring/cmapr.jis0201.netdb
-${OCAML_SITELIB}/netstring/cmapr.jis0208.netdb
-${OCAML_SITELIB}/netstring/cmapr.jis0212.netdb
-${OCAML_SITELIB}/netstring/cmapr.koi8r.netdb
-${OCAML_SITELIB}/netstring/cmapr.ks1001.netdb
-${OCAML_SITELIB}/netstring/cmapr.macroman.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1250.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1251.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1252.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1253.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1254.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1255.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1256.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1257.netdb
-${OCAML_SITELIB}/netstring/cmapr.windows1258.netdb
 ${OCAML_SITELIB}/netstring/dllnetaccel_c.so
 ${OCAML_SITELIB}/netstring/libnetaccel_c.a
-${OCAML_SITELIB}/netstring/mimestring.cmi
-${OCAML_SITELIB}/netstring/mimestring.mli
 ${OCAML_SITELIB}/netstring/netaccel.cma
 ${OCAML_SITELIB}/netstring/netaccel.cmi
 ${OCAML_SITELIB}/netstring/netaccel.mli
@@ -364,33 +248,32 @@ ${OCAML_SITELIB}/netstring/netaccel_link.cmo
 ${OCAML_SITELIB}/netstring/netaccel_link.mli
 ${OCAML_SITELIB}/netstring/netaddress.cmi
 ${OCAML_SITELIB}/netstring/netaddress.mli
+${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/netauth.cmi
 ${OCAML_SITELIB}/netstring/netauth.mli
 ${OCAML_SITELIB}/netstring/netaux.cmi
 ${OCAML_SITELIB}/netstring/netaux.mli
 ${OCAML_SITELIB}/netstring/netbuffer.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.cmx
 ${OCAML_SITELIB}/netstring/netbuffer.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.p.o
 ${OCAML_SITELIB}/netstring/netchannels.cmi
 ${OCAML_SITELIB}/netstring/netchannels.mli
+${OCAML_SITELIB}/netstring/netchannels_crypto.cmi
+${OCAML_SITELIB}/netstring/netchannels_crypto.mli
 ${OCAML_SITELIB}/netstring/netcompression.cmi
 ${OCAML_SITELIB}/netstring/netcompression.mli
 ${OCAML_SITELIB}/netstring/netconst.cmi
 ${OCAML_SITELIB}/netstring/netconst.mli
 ${OCAML_SITELIB}/netstring/netconversion.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.cmx
 ${OCAML_SITELIB}/netstring/netconversion.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.p.o
 ${OCAML_SITELIB}/netstring/netdate.cmi
 ${OCAML_SITELIB}/netstring/netdate.mli
-${OCAML_SITELIB}/netstring/netdb-packlist
 ${OCAML_SITELIB}/netstring/netdb.cmi
 ${OCAML_SITELIB}/netstring/netdb.mli
+${OCAML_SITELIB}/netstring/netdn.cmi
+${OCAML_SITELIB}/netstring/netdn.mli
 ${OCAML_SITELIB}/netstring/netencoding.cmi
 ${OCAML_SITELIB}/netstring/netencoding.mli
 ${OCAML_SITELIB}/netstring/netfs.cmi
@@ -398,6 +281,10 @@ ${OCAML_SITELIB}/netstring/netfs.mli
 ${OCAML_SITELIB}/netstring/netglob.cmi
 ${OCAML_SITELIB}/netstring/netglob.mli
 ${OCAML_SITELIB}/netstring/netglob_lex.cmi
+${OCAML_SITELIB}/netstring/netgssapi_auth.cmi
+${OCAML_SITELIB}/netstring/netgssapi_auth.mli
+${OCAML_SITELIB}/netstring/netgssapi_support.cmi
+${OCAML_SITELIB}/netstring/netgssapi_support.mli
 ${OCAML_SITELIB}/netstring/nethtml.cmi
 ${OCAML_SITELIB}/netstring/nethtml.mli
 ${OCAML_SITELIB}/netstring/nethtml_scanner.cmi
@@ -405,46 +292,45 @@ ${OCAML_SITELIB}/netstring/nethttp.cmi
 ${OCAML_SITELIB}/netstring/nethttp.mli
 ${OCAML_SITELIB}/netstring/netmappings.cmi
 ${OCAML_SITELIB}/netstring/netmappings.mli
-${OCAML_SITELIB}/netstring/netmappings_iso.cmi
-${OCAML_SITELIB}/netstring/netmappings_iso.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_iso.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_iso.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_iso.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_iso.p.o
-${OCAML_SITELIB}/netstring/netmappings_jp.cmi
-${OCAML_SITELIB}/netstring/netmappings_jp.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_jp.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_jp.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_jp.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_jp.p.o
-${OCAML_SITELIB}/netstring/netmappings_kr.cmi
-${OCAML_SITELIB}/netstring/netmappings_kr.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_kr.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_kr.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_kr.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_kr.p.o
-${OCAML_SITELIB}/netstring/netmappings_min.cmi
-${OCAML_SITELIB}/netstring/netmappings_min.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_min.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_min.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_min.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_min.p.o
-${OCAML_SITELIB}/netstring/netmappings_other.cmi
-${OCAML_SITELIB}/netstring/netmappings_other.cmo
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_other.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_other.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_other.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netmappings_other.p.o
+${OCAML_SITELIB}/netstring/netmappings_asn1.cmi
+${OCAML_SITELIB}/netstring/netmech_crammd5_sasl.cmi
+${OCAML_SITELIB}/netstring/netmech_crammd5_sasl.mli
+${OCAML_SITELIB}/netstring/netmech_digest.cmi
+${OCAML_SITELIB}/netstring/netmech_digest_http.cmi
+${OCAML_SITELIB}/netstring/netmech_digest_http.mli
+${OCAML_SITELIB}/netstring/netmech_digest_sasl.cmi
+${OCAML_SITELIB}/netstring/netmech_digest_sasl.mli
+${OCAML_SITELIB}/netstring/netmech_gs2_sasl.cmi
+${OCAML_SITELIB}/netstring/netmech_gs2_sasl.mli
+${OCAML_SITELIB}/netstring/netmech_krb5_sasl.cmi
+${OCAML_SITELIB}/netstring/netmech_krb5_sasl.mli
+${OCAML_SITELIB}/netstring/netmech_plain_sasl.cmi
+${OCAML_SITELIB}/netstring/netmech_plain_sasl.mli
+${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_sasl.cmi
+${OCAML_SITELIB}/netstring/netmech_scram_sasl.mli
+${OCAML_SITELIB}/netstring/netmech_spnego_http.cmi
+${OCAML_SITELIB}/netstring/netmech_spnego_http.mli
 ${OCAML_SITELIB}/netstring/netmime.cmi
 ${OCAML_SITELIB}/netstring/netmime.mli
+${OCAML_SITELIB}/netstring/netmime_channels.cmi
+${OCAML_SITELIB}/netstring/netmime_channels.mli
+${OCAML_SITELIB}/netstring/netmime_header.cmi
+${OCAML_SITELIB}/netstring/netmime_header.mli
+${OCAML_SITELIB}/netstring/netmime_string.cmi
+${OCAML_SITELIB}/netstring/netmime_string.mli
 ${OCAML_SITELIB}/netstring/netnumber.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.cmx
 ${OCAML_SITELIB}/netstring/netnumber.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.p.o
+${OCAML_SITELIB}/netstring/netoid.cmi
+${OCAML_SITELIB}/netstring/netoid.mli
 ${OCAML_SITELIB}/netstring/netpagebuffer.cmi
 ${OCAML_SITELIB}/netstring/netpagebuffer.mli
+${OCAML_SITELIB}/netstring/netsaslprep.cmi
+${OCAML_SITELIB}/netstring/netsaslprep.mli
+${OCAML_SITELIB}/netstring/netsaslprep_data.cmi
 ${OCAML_SITELIB}/netstring/netsendmail.cmi
 ${OCAML_SITELIB}/netstring/netsendmail.mli
 ${OCAML_SITELIB}/netstring/netsockaddr.cmi
@@ -461,34 +347,20 @@ ${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/nettls_support.cmi
+${OCAML_SITELIB}/netstring/nettls_support.mli
 ${OCAML_SITELIB}/netstring/netulex.cmi
 ${OCAML_SITELIB}/netstring/netulex.mli
 ${OCAML_SITELIB}/netstring/netunichar.cmi
 ${OCAML_SITELIB}/netstring/netunichar.mli
 ${OCAML_SITELIB}/netstring/neturl.cmi
 ${OCAML_SITELIB}/netstring/neturl.mli
-${OCAML_SITELIB}/netstring/rtypes.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/rtypes.cmx
-${OCAML_SITELIB}/netstring/rtypes.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/rtypes.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/rtypes.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/rtypes.p.o
-${OCAML_SITELIB}/netstring/xdr.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/xdr.cmx
-${OCAML_SITELIB}/netstring/xdr.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/xdr.o
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/xdr.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/xdr.p.o
-${OCAML_SITELIB}/netstring/xdr_mstring.cmi
-${OCAML_SITELIB}/netstring/xdr_mstring.mli
-${OCAML_SITELIB}/netstring-pcre/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.a
-${OCAML_SITELIB}/netstring-pcre/netstring-pcre.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.cmxa
-${OCAML_SITELIB}/netstring-pcre/netstring_pcre.cmi
-${OCAML_SITELIB}/netstring-pcre/netstring_pcre.mli
+${OCAML_SITELIB}/netstring/netx509.cmi
+${OCAML_SITELIB}/netstring/netx509.mli
+${OCAML_SITELIB}/netstring/netxdr.cmi
+${OCAML_SITELIB}/netstring/netxdr.mli
+${OCAML_SITELIB}/netstring/netxdr_mstring.cmi
+${OCAML_SITELIB}/netstring/netxdr_mstring.mli
 ${OCAML_SITELIB}/netsys/META
 ${OCAML_SITELIB}/netsys/dllnetsys.so
 ${OCAML_SITELIB}/netsys/libnetsys.a
@@ -507,11 +379,23 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.p.cmxa
 ${OCAML_SITELIB}/netsys/netsys_c_event.h
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_c_gprof.o
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_c_outofheap.o
+${OCAML_SITELIB}/netsys/netsys_ciphers.cmi
+${OCAML_SITELIB}/netsys/netsys_ciphers.mli
 ${OCAML_SITELIB}/netsys/netsys_conf.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_gprof_init.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_gprof_init.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_gprof_init.p.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_gprof_init.p.o
+${OCAML_SITELIB}/netsys/netsys_crypto.cmi
+${OCAML_SITELIB}/netsys/netsys_crypto.mli
+${OCAML_SITELIB}/netsys/netsys_crypto_modes.cmi
+${OCAML_SITELIB}/netsys/netsys_crypto_modes.mli
+${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_gprof_init.cmi
+${OCAML_SITELIB}/netsys/netsys_gprof_init.mli
+${OCAML_SITELIB}/netsys/netsys_gprof_init.p.cmx
+${OCAML_SITELIB}/netsys/netsys_gprof_init.p.o
+${OCAML_SITELIB}/netsys/netsys_gssapi.cmi
+${OCAML_SITELIB}/netsys/netsys_gssapi.mli
 ${OCAML_SITELIB}/netsys/netsys_impl_util.cmi
 ${OCAML_SITELIB}/netsys/netsys_mem.cmi
 ${OCAML_SITELIB}/netsys/netsys_mem.mli
@@ -550,12 +434,19 @@ ${OCAML_SITELIB}/netsys/netsys_pollset_win32.mli
 ${OCAML_SITELIB}/netsys/netsys_posix.cmi
 ${OCAML_SITELIB}/netsys/netsys_posix.mli
 ${OCAML_SITELIB}/netsys/netsys_rng.cmi
-${OCAML_SITELIB}/netsys/netsys_sem.mli
-${OCAML_SITELIB}/netsys/netsys_sem.cmi
 ${OCAML_SITELIB}/netsys/netsys_rng.mli
+${OCAML_SITELIB}/netsys/netsys_sasl.cmi
+${OCAML_SITELIB}/netsys/netsys_sasl.mli
+${OCAML_SITELIB}/netsys/netsys_sasl_types.cmi
+${OCAML_SITELIB}/netsys/netsys_sasl_types.mli
+${OCAML_SITELIB}/netsys/netsys_sasl_util.cmi
+${OCAML_SITELIB}/netsys/netsys_sem.cmi
+${OCAML_SITELIB}/netsys/netsys_sem.mli
 ${OCAML_SITELIB}/netsys/netsys_signal.cmi
 ${OCAML_SITELIB}/netsys/netsys_signal.mli
 ${OCAML_SITELIB}/netsys/netsys_signalling.mli
+${OCAML_SITELIB}/netsys/netsys_tls.cmi
+${OCAML_SITELIB}/netsys/netsys_tls.mli
 ${OCAML_SITELIB}/netsys/netsys_tmp.cmi
 ${OCAML_SITELIB}/netsys/netsys_tmp.mli
 ${OCAML_SITELIB}/netsys/netsys_types.cmi
@@ -564,14 +455,198 @@ ${OCAML_SITELIB}/netsys/netsys_win32.cmi
 ${OCAML_SITELIB}/netsys/netsys_win32.mli
 ${OCAML_SITELIB}/netsys/netsys_xdr.cmi
 ${OCAML_SITELIB}/netsys/netsys_xdr.mli
-${OCAML_SITELIB}/pop/META
-${OCAML_SITELIB}/pop/netpop.cmi
-${OCAML_SITELIB}/pop/netpop.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/pop/pop.a
-${OCAML_SITELIB}/pop/pop.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/pop/pop.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/pop/pop.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/pop/pop.p.cmxa
+${OCAML_SITELIB}/netunidata/META
+${OCAML_SITELIB}/netunidata/cmapf.adobe_standard_encoding.netdb
+${OCAML_SITELIB}/netunidata/cmapf.adobe_symbol_encoding.netdb
+${OCAML_SITELIB}/netunidata/cmapf.adobe_zapf_dingbats_encoding.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp037.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp1006.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp1026.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp1047.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp424.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp437.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp500.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp737.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp775.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp850.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp852.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp855.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp856.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp857.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp860.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp861.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp862.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp863.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp864.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp865.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp866.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp869.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp874.netdb
+${OCAML_SITELIB}/netunidata/cmapf.cp875.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88591.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso885910.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso885911.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso885913.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso885914.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso885915.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso885916.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88592.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88593.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88594.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88595.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88596.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88597.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88598.netdb
+${OCAML_SITELIB}/netunidata/cmapf.iso88599.netdb
+${OCAML_SITELIB}/netunidata/cmapf.jis0201.netdb
+${OCAML_SITELIB}/netunidata/cmapf.jis0208.netdb
+${OCAML_SITELIB}/netunidata/cmapf.jis0212.netdb
+${OCAML_SITELIB}/netunidata/cmapf.koi8r.netdb
+${OCAML_SITELIB}/netunidata/cmapf.ks1001.netdb
+${OCAML_SITELIB}/netunidata/cmapf.macroman.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1250.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1251.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1252.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1253.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1254.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1255.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1256.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1257.netdb
+${OCAML_SITELIB}/netunidata/cmapf.windows1258.netdb
+${OCAML_SITELIB}/netunidata/cmapr.adobe_standard_encoding.netdb
+${OCAML_SITELIB}/netunidata/cmapr.adobe_symbol_encoding.netdb
+${OCAML_SITELIB}/netunidata/cmapr.adobe_zapf_dingbats_encoding.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp037.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp1006.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp1026.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp1047.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp424.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp437.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp500.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp737.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp775.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp850.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp852.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp855.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp856.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp857.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp860.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp861.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp862.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp863.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp864.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp865.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp866.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp869.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp874.netdb
+${OCAML_SITELIB}/netunidata/cmapr.cp875.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88591.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso885910.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso885911.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso885913.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso885914.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso885915.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso885916.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88592.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88593.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88594.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88595.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88596.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88597.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88598.netdb
+${OCAML_SITELIB}/netunidata/cmapr.iso88599.netdb
+${OCAML_SITELIB}/netunidata/cmapr.jis0201.netdb
+${OCAML_SITELIB}/netunidata/cmapr.jis0208.netdb
+${OCAML_SITELIB}/netunidata/cmapr.jis0212.netdb
+${OCAML_SITELIB}/netunidata/cmapr.koi8r.netdb
+${OCAML_SITELIB}/netunidata/cmapr.ks1001.netdb
+${OCAML_SITELIB}/netunidata/cmapr.macroman.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1250.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1251.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1252.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1253.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1254.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1255.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1256.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1257.netdb
+${OCAML_SITELIB}/netunidata/cmapr.windows1258.netdb
+${OCAML_SITELIB}/netunidata/netmappings_iso.cmi
+${OCAML_SITELIB}/netunidata/netmappings_iso.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.o
+${OCAML_SITELIB}/netunidata/netmappings_jp.cmi
+${OCAML_SITELIB}/netunidata/netmappings_jp.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.o
+${OCAML_SITELIB}/netunidata/netmappings_kr.cmi
+${OCAML_SITELIB}/netunidata/netmappings_kr.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.o
+${OCAML_SITELIB}/netunidata/netmappings_other.cmi
+${OCAML_SITELIB}/netunidata/netmappings_other.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.o
+${OCAML_SITELIB}/netunidata/netunichecksums.cmi
+${OCAML_SITELIB}/netunidata/netuniconfig.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.a
+${OCAML_SITELIB}/netunidata/netunidata.cma
+${OCAML_SITELIB}/netunidata/netunidata.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.cmxa
+${OCAML_SITELIB}/netunidata/netunidata.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.cmxa
+${OCAML_SITELIB}/netunidata/netuniinit.cmi
+${OCAML_SITELIB}/netunidata/netuniinit.cmo
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.o
+${OCAML_SITELIB}/netzip/META
+${OCAML_SITELIB}/netzip/netgzip.cmi
+${OCAML_SITELIB}/netzip/netgzip.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.a
+${OCAML_SITELIB}/netzip/netzip.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.p.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.p.cmxa
+${OCAML_SITELIB}/rpc-auth-local/META
+${OCAML_SITELIB}/rpc-auth-local/dllrpc_auth_local.so
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/librpc_auth_local.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/librpc_auth_local.p.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.a
+${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cma
+${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cmxa
+${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.p.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.p.cmxa
+${OCAML_SITELIB}/rpc-generator/META
+${OCAML_SITELIB}/rpc-generator/config.cmi
+${OCAML_SITELIB}/rpc-generator/direct.cmi
+${OCAML_SITELIB}/rpc-generator/dummy.mli
+${OCAML_SITELIB}/rpc-generator/generate.cmi
+${OCAML_SITELIB}/rpc-generator/lexer.cmi
+${OCAML_SITELIB}/rpc-generator/main.cmi
+${OCAML_SITELIB}/rpc-generator/options.cmi
+${OCAML_SITELIB}/rpc-generator/parser.cmi
+${OCAML_SITELIB}/rpc-generator/parser.mli
+${OCAML_SITELIB}/rpc-generator/rename.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.a
+${OCAML_SITELIB}/rpc-generator/rpc_generator.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.cmxa
+${OCAML_SITELIB}/rpc-generator/rpcgen-packlist
+${OCAML_SITELIB}/rpc-generator/syntax.cmi
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/META
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/dllrpc_xti.so
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/librpc_xti.a
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/librpc_xti.p.a
+${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.a
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.cma
+${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.cmxa
+${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.p.a
+${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.p.cmxa
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.cmi
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.mli
 ${OCAML_SITELIB}/rpc/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.a
 ${OCAML_SITELIB}/rpc/rpc.cma
@@ -588,6 +663,8 @@ ${OCAML_SITELIB}/rpc/rpc_auth_sys.cmi
 ${OCAML_SITELIB}/rpc/rpc_auth_sys.mli
 ${OCAML_SITELIB}/rpc/rpc_client.cmi
 ${OCAML_SITELIB}/rpc/rpc_client.mli
+${OCAML_SITELIB}/rpc/rpc_client_pre.cmi
+${OCAML_SITELIB}/rpc/rpc_client_pre.mli
 ${OCAML_SITELIB}/rpc/rpc_common.cmi
 ${OCAML_SITELIB}/rpc/rpc_packer.cmi
 ${OCAML_SITELIB}/rpc/rpc_packer.mli
@@ -597,6 +674,7 @@ ${OCAML_SITELIB}/rpc/rpc_portmapper_aux.cmi
 ${OCAML_SITELIB}/rpc/rpc_portmapper_aux.mli
 ${OCAML_SITELIB}/rpc/rpc_portmapper_clnt.cmi
 ${OCAML_SITELIB}/rpc/rpc_portmapper_clnt.mli
+${OCAML_SITELIB}/rpc/rpc_portmapper_impl.cmi
 ${OCAML_SITELIB}/rpc/rpc_program.cmi
 ${OCAML_SITELIB}/rpc/rpc_program.mli
 ${OCAML_SITELIB}/rpc/rpc_proxy.cmi
@@ -609,55 +687,6 @@ ${OCAML_SITELIB}/rpc/rpc_transport.cmi
 ${OCAML_SITELIB}/rpc/rpc_transport.mli
 ${OCAML_SITELIB}/rpc/rpc_util.cmi
 ${OCAML_SITELIB}/rpc/rpc_util.mli
-${OCAML_SITELIB}/rpc-auth-local/META
-${OCAML_SITELIB}/rpc-auth-local/dllrpc_auth_local.so
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/librpc_auth_local.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/librpc_auth_local.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.a
-${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cma
-${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cmxa
-${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.p.cmxa
-${OCAML_SITELIB}/rpc-generator/META
-${OCAML_SITELIB}/rpc-generator/config.cmi
-${OCAML_SITELIB}/rpc-generator/direct.cmi
-${OCAML_SITELIB}/rpc-generator/dummy.mli
-${OCAML_SITELIB}/rpc-generator/generate.cmi
-${OCAML_SITELIB}/rpc-generator/lexer.cmi
-${OCAML_SITELIB}/rpc-generator/main.cmi
-${OCAML_SITELIB}/rpc-generator/options.cmi
-${OCAML_SITELIB}/rpc-generator/parser.cmi
-${OCAML_SITELIB}/rpc-generator/parser.mli
-${OCAML_SITELIB}/rpc-generator/rename.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.a
-${OCAML_SITELIB}/rpc-generator/rpc_generator.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.cmxa
-${OCAML_SITELIB}/rpc-generator/rpcgen-packlist
-${OCAML_SITELIB}/rpc-generator/syntax.cmi
-${OCAML_SITELIB}/rpc-generator/test_aux.mli
-${PLIST.ssl}${OCAML_SITELIB}/rpc-ssl/META
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-ssl/rpc_ssl.a
-${PLIST.ssl}${OCAML_SITELIB}/rpc-ssl/rpc_ssl.cma
-${PLIST.ssl}${OCAML_SITELIB}/rpc-ssl/rpc_ssl.cmi
-${PLIST.ssl}${OCAML_SITELIB}/rpc-ssl/rpc_ssl.mli
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-ssl/rpc_ssl.cmxa
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-ssl/rpc_ssl.p.a
-${PLIST.ssl}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-ssl/rpc_ssl.p.cmxa
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/META
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/dllrpc_xti.so
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/librpc_xti.a
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/librpc_xti.p.a
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.a
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.cma
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.cmxa
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.p.a
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.p.cmxa
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.cmi
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.mli
 ${OCAML_SITELIB}/shell/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.a
 ${OCAML_SITELIB}/shell/shell.cma
@@ -672,31 +701,20 @@ ${OCAML_SITELIB}/shell/shell_sys.cmi
 ${OCAML_SITELIB}/shell/shell_sys.mli
 ${OCAML_SITELIB}/shell/shell_uq.cmi
 ${OCAML_SITELIB}/shell/shell_uq.mli
-${OCAML_SITELIB}/smtp/META
-${OCAML_SITELIB}/smtp/netsmtp.cmi
-${OCAML_SITELIB}/smtp/netsmtp.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/smtp/smtp.a
-${OCAML_SITELIB}/smtp/smtp.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/smtp/smtp.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/smtp/smtp.p.a
-${PLIST.ocaml-opt}${OCAML_SITELIB}/smtp/smtp.p.cmxa
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/equeue
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcgi2-plex
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netplex
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/pop
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netclient
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netshm
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/shell
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcamlbox
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netgssapi
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netstring
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-auth-local
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/smtp
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcgi2
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netmulticore
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netsys
 @exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-generator
-${PLIST.ssl}@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-ssl
+@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netunidata
+@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netzip
 ${PLIST.xti}@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-xti
-${PLIST.ssl}@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/equeue-ssl
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index c719edd5dfc..146a48fc7cf 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2015/11/04 00:35:17 agc Exp $
+$NetBSD: distinfo,v 1.19 2016/02/03 13:19:26 jaapb Exp $
 
-SHA1 (ocamlnet-3.7.7.tar.gz) = db88039adf941bf6aeaff453f4848b4407e7f560
-RMD160 (ocamlnet-3.7.7.tar.gz) = bb82d537d4bc4706c75c91bbc02da1996e896b9b
-SHA512 (ocamlnet-3.7.7.tar.gz) = b500a92e6c5dc4d96ac26352923d78cb3a8b555deda038c41860aecbd20ee9ccbcfee949014c91f1266c937ae03fadd72c322e3cbe6456d23fd20b871114df6a
-Size (ocamlnet-3.7.7.tar.gz) = 3357674 bytes
+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 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a
-SHA1 (patch-src_netsys_netsys__c.c) = 541f1d1b7466301c3f9010cb8e8308e68b863766
+SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
diff --git a/net/ocamlnet/options.mk b/net/ocamlnet/options.mk
index 84178622034..2a0221eb999 100644
--- a/net/ocamlnet/options.mk
+++ b/net/ocamlnet/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2014/10/13 12:37:50 jaapb Exp $
+# $NetBSD: options.mk,v 1.3 2016/02/03 13:19:26 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocamlnet
-PKG_SUPPORTED_OPTIONS=	ssl gtk gtk2
-PKG_SUGGESTED_OPTIONS=	ssl
+PKG_SUPPORTED_OPTIONS=	gtk gtk2
+PKG_SUGGESTED_OPTIONS=	
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -11,13 +11,13 @@ PKG_SUGGESTED_OPTIONS=	ssl
 ###
 ### SSL support
 ###
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/ocaml-ssl/buildlink3.mk"
-CONFIGURE_ARGS+=	-enable-ssl
-PLIST.ssl=		yes
-.else
-CONFIGURE_ARGS+=	-disable-ssl
-.endif
+#.if !empty(PKG_OPTIONS:Mssl)
+#.  include "../../security/ocaml-ssl/buildlink3.mk"
+#CONFIGURE_ARGS+=	-enable-ssl
+#PLIST.ssl=		yes
+#.else
+#CONFIGURE_ARGS+=	-disable-ssl
+#.endif
 
 ###
 ### GTK(1) support
diff --git a/net/ocamlnet/patches/patch-src_netsys_netsys__c.c b/net/ocamlnet/patches/patch-src_netsys_netsys__c.c
index ba935cd29ea..ba020e5e53d 100644
--- a/net/ocamlnet/patches/patch-src_netsys_netsys__c.c
+++ b/net/ocamlnet/patches/patch-src_netsys_netsys__c.c
@@ -1,14 +1,10 @@
-$NetBSD: patch-src_netsys_netsys__c.c,v 1.5 2014/10/13 12:37:50 jaapb Exp $
+$NetBSD: patch-src_netsys_netsys__c.c,v 1.6 2016/02/03 13:19:33 jaapb Exp $
 
-DragonFly doesn't define AT_SYMLINK_FOLLOW.  The added patch will
-at least unbreak the build for some code that obviously won't work.
-https://sourceforge.net/tracker/?func=detail&aid=3545170&group_id=19774&atid=319774
-
-Also work around absence of AT_REMOVEDIR, as on NetBSD 6.0.
---- src/netsys/netsys_c.c.orig	2014-09-16 11:51:39.000000000 +0000
+Work around absence of AT_REMOVEDIR, as on NetBSD 6.0.
+--- src/netsys/netsys_c.c.orig	2015-06-21 15:26:42.000000000 +0000
 +++ src/netsys/netsys_c.c
-@@ -428,6 +428,10 @@ CAMLprim value netsys_at_fdcwd(value dum
- #define AT_SYMLINK_NOFOLLOW 0
+@@ -432,6 +432,10 @@ CAMLprim value netsys_at_fdcwd(value dum
+ #define AT_SYMLINK_FOLLOW 0
  #endif
  
 +#ifndef AT_REMOVEDIR
@@ -16,9 +12,9 @@ Also work around absence of AT_REMOVEDIR, as on NetBSD 6.0.
 +#endif
 +
  static int at_flags_table[] = {
-     AT_EACCESS, AT_SYMLINK_NOFOLLOW, AT_REMOVEDIR
+     AT_EACCESS, AT_SYMLINK_NOFOLLOW, AT_SYMLINK_FOLLOW, AT_REMOVEDIR
  };
-@@ -545,7 +549,7 @@ CAMLprim value netsys_renameat(value old
+@@ -549,7 +553,7 @@ CAMLprim value netsys_renameat(value old
  CAMLprim value netsys_linkat(value olddirfd, value oldpath,
  			     value newdirfd, value newpath, value flags)
  {