Update to 3.5.1, from Jaap Boender.

6 years of changes. 3.5.1 in particular has:
it is time for another version of Ocamlnet. The new release 3.5 focuses on
the system interface, and includes a long list of smaller improvements.

The system interface, Netsys_posix, is extended by:
 - Support for POSIX clocks and POSIX timers (with nanosecond resolution)
 - Netsys_posix.spawn usses now the posix_spawn call if present on the OS
 - Adding support for pollable events (as e.g. provided by Linux via
   eventfd). For other OS an emulation is available.
 - Support for epoll on Linux

Note that Netsys_posix covers now large parts of POSIX realtime.

Other improvements:

 - The code generator for XDR has been improved. A new switch -direct for
   ocamlrpcgen can be used to generate direct mappings between OCaml values
   and binary representation (in many cases). Speedups up to 50% are
   possible for large XDR values.
 - The new module Uq_mt allows it to access an event-driven resource from
   several kernel threads (e.g. use an RPC client commonly from several
   threads).
 - The thread-safety of Netplex container functions has been improved.
 - Netmulticore condition variables can now be polled, for better
   integration into event-based programs.
 - Option greedy_accepts for Netplex to support servers that accept
   many connections per second. With this improvement, Netplex can
   now accept more than 5000 connections/s, and assign them to worker
   processes.

Last but not least there is now a new tutorial for Equeue (event systems
and engines). In particular, the section about combining Ocamlnet with Lwt
might be interesting.

8 files changed, 568 insertions, 94 deletions

diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index d67862f0a7f..20a168d91ec 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,27 +1,46 @@
-# $NetBSD: Makefile,v 1.5 2011/12/06 00:19:24 sbd Exp $
+# $NetBSD: Makefile,v 1.6 2012/07/06 09:29:14 wiz Exp $
 #
 
-DISTNAME=		ocamlnet-1.1.2
-PKGREVISION=		1
+DISTNAME=		ocamlnet-3.5.1
 CATEGORIES=		net
 MASTER_SITES=		http://download.camlcity.org/download/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		jaapb@kerguelen.org
 HOMEPAGE=		http://projects.camlcity.org/projects/ocamlnet.html
 COMMENT=		Library focusing on application-level network protocols (OCaml)
-
+LICENSE=		zlib AND gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
-DEPENDS+=		pcre-ocaml-[0-9]*:../../devel/pcre-ocaml
-DEPENDS+=		equeue-[0-9]*:../../devel/equeue
+DEPENDS+=		ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 
 HAS_CONFIGURE=		yes
-CONFIGURE_DIRS=		src
+CONFIGURE_ARGS+=	-without-nethttpd -without-rpc-auth-dh -disable-gtk2 \
+			-disable-tcl -disable-apache
 USE_TOOLS+=		gmake
-BUILD_TARGET=		all opt
-PLIST_SRC=		PLIST.opt PLIST
+BUILD_TARGET=		all
+
+PLIST_VARS=		opt ssl
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
+BUILD_TARGET+=		opt
+PLIST.opt=		yes
+.endif
+
+SUBPKGDIRS=		equeue netcgi2-plex netplex pop rpc-ssl equeue-ssl \
+			netclient netshm rpc shell netcamlbox netgssapi \
+			netstring rpc-auth-local smtp netcgi2 netmulticore \
+			netsys rpc-generator
+
+INSTALLATION_DIRS=	lib/ocaml/site-lib
+
+pre-install:
+.for i in ${SUBPKGDIRS};
+	${RM} -rf ${DESTDIR}/${PREFIX}/lib/ocaml/site-lib/${i}
+.endfor
 
+.include "options.mk"
+.include "../../devel/pcre-ocaml/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ocamlnet/PLIST b/net/ocamlnet/PLIST
index c6d08fcc2c2..da603eb3a1c 100644
--- a/net/ocamlnet/PLIST
+++ b/net/ocamlnet/PLIST
@@ -1,42 +1,240 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:37 joerg Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/smtp
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/nethttpd
+@comment $NetBSD: PLIST,v 1.3 2012/07/06 09:29:14 wiz Exp $
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/equeue
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netcgi2-plex
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netplex
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/pop
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netclient
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netshm
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/rpc
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/shell
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netcamlbox
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netgssapi
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netstring
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/nethttpd
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/cgi
-lib/ocaml/site-lib/cgi/META
-lib/ocaml/site-lib/cgi/cgi.cma
-lib/ocaml/site-lib/cgi/netcgi.cmi
-lib/ocaml/site-lib/cgi/netcgi.mli
-lib/ocaml/site-lib/cgi/netcgi_env.cmi
-lib/ocaml/site-lib/cgi/netcgi_env.mli
-lib/ocaml/site-lib/cgi/netcgi_fcgi.cmi
-lib/ocaml/site-lib/cgi/netcgi_fcgi.mli
-lib/ocaml/site-lib/cgi/netcgi_fcgi_10.cmi
-lib/ocaml/site-lib/cgi/netcgi_fcgi_10.mli
-lib/ocaml/site-lib/cgi/netcgi_jserv.cmi
-lib/ocaml/site-lib/cgi/netcgi_jserv.mli
-lib/ocaml/site-lib/cgi/netcgi_jserv_ajp12.cmi
-lib/ocaml/site-lib/cgi/netcgi_jserv_ajp12.mli
-lib/ocaml/site-lib/cgi/netcgi_jserv_app.cmi
-lib/ocaml/site-lib/cgi/netcgi_jserv_app.mli
-lib/ocaml/site-lib/cgi/netcgi_types.cmi
-lib/ocaml/site-lib/cgi/netcgi_types.mli
-lib/ocaml/site-lib/nethttpd/LICENSE
-lib/ocaml/site-lib/nethttpd/META
-lib/ocaml/site-lib/nethttpd/nethttpd.cma
-lib/ocaml/site-lib/nethttpd/nethttpd_engine.cmi
-lib/ocaml/site-lib/nethttpd/nethttpd_engine.mli
-lib/ocaml/site-lib/nethttpd/nethttpd_kernel.cmi
-lib/ocaml/site-lib/nethttpd/nethttpd_kernel.mli
-lib/ocaml/site-lib/nethttpd/nethttpd_reactor.cmi
-lib/ocaml/site-lib/nethttpd/nethttpd_reactor.mli
-lib/ocaml/site-lib/nethttpd/nethttpd_services.cmi
-lib/ocaml/site-lib/nethttpd/nethttpd_services.mli
-lib/ocaml/site-lib/nethttpd/nethttpd_types.cmi
-lib/ocaml/site-lib/nethttpd/nethttpd_types.mli
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/rpc-auth-local
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/smtp
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netcgi2
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netmulticore
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netsys
+@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/rpc-generator
+${PLIST.ssl}@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/rpc-ssl
+${PLIST.ssl}@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/equeue-ssl
+lib/ocaml/site-lib/equeue/META
+${PLIST.opt}lib/ocaml/site-lib/equeue/equeue.a
+lib/ocaml/site-lib/equeue/equeue.cma
+${PLIST.opt}lib/ocaml/site-lib/equeue/equeue.cmxa
+lib/ocaml/site-lib/equeue/equeue.cmi
+lib/ocaml/site-lib/equeue/equeue.mli
+${PLIST.opt}lib/ocaml/site-lib/equeue/equeue.p.a
+${PLIST.opt}lib/ocaml/site-lib/equeue/equeue.p.cmxa
+lib/ocaml/site-lib/equeue/unixqueue.cmi
+lib/ocaml/site-lib/equeue/unixqueue.mli
+lib/ocaml/site-lib/equeue/unixqueue_pollset.cmi
+lib/ocaml/site-lib/equeue/unixqueue_pollset.mli
+lib/ocaml/site-lib/equeue/unixqueue_select.cmi
+lib/ocaml/site-lib/equeue/unixqueue_select.mli
+lib/ocaml/site-lib/equeue/unixqueue_util.cmi
+lib/ocaml/site-lib/equeue/uq_engines.cmi
+lib/ocaml/site-lib/equeue/uq_engines.mli
+lib/ocaml/site-lib/equeue/uq_io.cmi
+lib/ocaml/site-lib/equeue/uq_io.mli
+lib/ocaml/site-lib/equeue/uq_libevent.cmi
+lib/ocaml/site-lib/equeue/uq_libevent.mli
+lib/ocaml/site-lib/equeue/uq_lwt.cmi
+lib/ocaml/site-lib/equeue/uq_lwt.mli
+lib/ocaml/site-lib/equeue/uq_mt.cmi
+lib/ocaml/site-lib/equeue/uq_mt.mli
+lib/ocaml/site-lib/equeue/uq_resolver.cmi
+lib/ocaml/site-lib/equeue/uq_resolver.mli
+lib/ocaml/site-lib/equeue/uq_socks5.cmi
+lib/ocaml/site-lib/equeue/uq_socks5.mli
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/META
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/dllequeue_ssl.so
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/equeue-ssl/equeue_ssl.a
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/equeue_ssl.cma
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/equeue-ssl/equeue_ssl.cmxa
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/equeue-ssl/equeue_ssl.p.a
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/equeue-ssl/equeue_ssl.p.cmxa
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/https_client.cmi
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/https_client.mli
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/libequeue_ssl.a
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/equeue-ssl/libequeue_ssl.p.a
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/ssl_exts.cmi
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/ssl_exts.mli
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/uq_ssl.cmi
+${PLIST.ssl}lib/ocaml/site-lib/equeue-ssl/uq_ssl.mli
+lib/ocaml/site-lib/netcamlbox/META
+${PLIST.opt}lib/ocaml/site-lib/netcamlbox/netcamlbox.a
+lib/ocaml/site-lib/netcamlbox/netcamlbox.cma
+${PLIST.opt}lib/ocaml/site-lib/netcamlbox/netcamlbox.cmxa
+lib/ocaml/site-lib/netcamlbox/netcamlbox.cmi
+lib/ocaml/site-lib/netcamlbox/netcamlbox.mli
+${PLIST.opt}lib/ocaml/site-lib/netcamlbox/netcamlbox.p.a
+${PLIST.opt}lib/ocaml/site-lib/netcamlbox/netcamlbox.p.cmxa
+lib/ocaml/site-lib/netcgi2/META
+${PLIST.opt}lib/ocaml/site-lib/netcgi2/netcgi.a
+lib/ocaml/site-lib/netcgi2/netcgi.cma
+${PLIST.opt}lib/ocaml/site-lib/netcgi2/netcgi.cmxa
+lib/ocaml/site-lib/netcgi2/netcgi.cmi
+lib/ocaml/site-lib/netcgi2/netcgi.mli
+${PLIST.opt}lib/ocaml/site-lib/netcgi2/netcgi.p.a
+${PLIST.opt}lib/ocaml/site-lib/netcgi2/netcgi.p.cmxa
+lib/ocaml/site-lib/netcgi2/netcgi1_compat.cmi
+lib/ocaml/site-lib/netcgi2/netcgi1_compat.mli
+lib/ocaml/site-lib/netcgi2/netcgi_ajp.cmi
+lib/ocaml/site-lib/netcgi2/netcgi_ajp.mli
+lib/ocaml/site-lib/netcgi2/netcgi_cgi.cmi
+lib/ocaml/site-lib/netcgi2/netcgi_cgi.mli
+lib/ocaml/site-lib/netcgi2/netcgi_common.cmi
+lib/ocaml/site-lib/netcgi2/netcgi_common.mli
+lib/ocaml/site-lib/netcgi2/netcgi_dbi.cmi
+lib/ocaml/site-lib/netcgi2/netcgi_dbi.mli
+lib/ocaml/site-lib/netcgi2/netcgi_fcgi.cmi
+lib/ocaml/site-lib/netcgi2/netcgi_fcgi.mli
+lib/ocaml/site-lib/netcgi2/netcgi_scgi.cmi
+lib/ocaml/site-lib/netcgi2/netcgi_scgi.mli
+lib/ocaml/site-lib/netcgi2/netcgi_test.cmi
+lib/ocaml/site-lib/netcgi2/netcgi_test.mli
+lib/ocaml/site-lib/netcgi2-plex/META
+${PLIST.opt}lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.a
+lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.cma
+${PLIST.opt}lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.cmxa
+lib/ocaml/site-lib/netcgi2-plex/netcgi_plex.cmi
+lib/ocaml/site-lib/netcgi2-plex/netcgi_plex.mli
+${PLIST.opt}lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.p.a
+${PLIST.opt}lib/ocaml/site-lib/netcgi2-plex/netcgi2-plex.p.cmxa
+lib/ocaml/site-lib/netclient/META
+lib/ocaml/site-lib/netclient/ftp_client.cmi
+lib/ocaml/site-lib/netclient/ftp_client.mli
+lib/ocaml/site-lib/netclient/ftp_data_endpoint.cmi
+lib/ocaml/site-lib/netclient/ftp_data_endpoint.mli
+lib/ocaml/site-lib/netclient/ftp_fs.cmi
+lib/ocaml/site-lib/netclient/ftp_fs.mli
+lib/ocaml/site-lib/netclient/http_client.cmi
+lib/ocaml/site-lib/netclient/http_client.mli
+lib/ocaml/site-lib/netclient/http_client_conncache.cmi
+lib/ocaml/site-lib/netclient/http_client_conncache.mli
+lib/ocaml/site-lib/netclient/http_fs.cmi
+lib/ocaml/site-lib/netclient/http_fs.mli
+${PLIST.opt}lib/ocaml/site-lib/netclient/netclient.a
+lib/ocaml/site-lib/netclient/netclient.cma
+${PLIST.opt}lib/ocaml/site-lib/netclient/netclient.cmxa
+${PLIST.opt}lib/ocaml/site-lib/netclient/netclient.p.a
+${PLIST.opt}lib/ocaml/site-lib/netclient/netclient.p.cmxa
+lib/ocaml/site-lib/netclient/telnet_client.cmi
+lib/ocaml/site-lib/netclient/telnet_client.mli
+lib/ocaml/site-lib/netgssapi/META
+${PLIST.opt}lib/ocaml/site-lib/netgssapi/netgssapi.a
+lib/ocaml/site-lib/netgssapi/netgssapi.cma
+lib/ocaml/site-lib/netgssapi/netgssapi.cmi
+${PLIST.opt}lib/ocaml/site-lib/netgssapi/netgssapi.cmxa
+lib/ocaml/site-lib/netgssapi/netgssapi.mli
+${PLIST.opt}lib/ocaml/site-lib/netgssapi/netgssapi.p.a
+${PLIST.opt}lib/ocaml/site-lib/netgssapi/netgssapi.p.cmxa
+lib/ocaml/site-lib/netmulticore/META
+lib/ocaml/site-lib/netmulticore/netmcore.cmi
+lib/ocaml/site-lib/netmulticore/netmcore.mli
+lib/ocaml/site-lib/netmulticore/netmcore_array.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_array.mli
+lib/ocaml/site-lib/netmulticore/netmcore_bigarray.mli
+lib/ocaml/site-lib/netmulticore/netmcore_buffer.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_buffer.mli
+lib/ocaml/site-lib/netmulticore/netmcore_camlbox.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_camlbox.mli
+lib/ocaml/site-lib/netmulticore/netmcore_condition.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_condition.mli
+lib/ocaml/site-lib/netmulticore/netmcore_hashtbl.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_hashtbl.mli
+lib/ocaml/site-lib/netmulticore/netmcore_heap.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_heap.mli
+lib/ocaml/site-lib/netmulticore/netmcore_matrix.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_matrix.mli
+lib/ocaml/site-lib/netmulticore/netmcore_mempool.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_mempool.mli
+lib/ocaml/site-lib/netmulticore/netmcore_mutex.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_mutex.mli
+lib/ocaml/site-lib/netmulticore/netmcore_process.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_process.mli
+lib/ocaml/site-lib/netmulticore/netmcore_queue.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_queue.mli
+lib/ocaml/site-lib/netmulticore/netmcore_ref.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_ref.mli
+lib/ocaml/site-lib/netmulticore/netmcore_sem.cmi
+lib/ocaml/site-lib/netmulticore/netmcore_sem.mli
+lib/ocaml/site-lib/netmulticore/netmcore_util.cmi
+${PLIST.opt}lib/ocaml/site-lib/netmulticore/netmulticore.a
+lib/ocaml/site-lib/netmulticore/netmulticore.cma
+${PLIST.opt}lib/ocaml/site-lib/netmulticore/netmulticore.cmxa
+${PLIST.opt}lib/ocaml/site-lib/netmulticore/netmulticore.p.a
+${PLIST.opt}lib/ocaml/site-lib/netmulticore/netmulticore.p.cmxa
+lib/ocaml/site-lib/netplex/META
+lib/ocaml/site-lib/netplex/netplex-packlist
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex.a
+lib/ocaml/site-lib/netplex/netplex.cma
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex.cmxa
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex.p.a
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex.p.cmxa
+lib/ocaml/site-lib/netplex/netplex_admin.cmi
+lib/ocaml/site-lib/netplex/netplex_cenv.cmi
+lib/ocaml/site-lib/netplex/netplex_cenv.mli
+lib/ocaml/site-lib/netplex/netplex_config.cmi
+lib/ocaml/site-lib/netplex/netplex_config.mli
+lib/ocaml/site-lib/netplex/netplex_container.cmi
+lib/ocaml/site-lib/netplex/netplex_container.mli
+lib/ocaml/site-lib/netplex/netplex_controller.cmi
+lib/ocaml/site-lib/netplex/netplex_controller.mli
+lib/ocaml/site-lib/netplex/netplex_ctrl_aux.cmi
+lib/ocaml/site-lib/netplex/netplex_ctrl_aux.mli
+lib/ocaml/site-lib/netplex/netplex_ctrl_clnt.cmi
+lib/ocaml/site-lib/netplex/netplex_ctrl_clnt.mli
+lib/ocaml/site-lib/netplex/netplex_ctrl_srv.cmi
+lib/ocaml/site-lib/netplex/netplex_ctrl_srv.mli
+lib/ocaml/site-lib/netplex/netplex_encap.cmi
+lib/ocaml/site-lib/netplex/netplex_encap.mli
+lib/ocaml/site-lib/netplex/netplex_kit.cmi
+lib/ocaml/site-lib/netplex/netplex_kit.mli
+lib/ocaml/site-lib/netplex/netplex_log.cmi
+lib/ocaml/site-lib/netplex/netplex_log.mli
+lib/ocaml/site-lib/netplex/netplex_main.cmi
+lib/ocaml/site-lib/netplex/netplex_main.mli
+lib/ocaml/site-lib/netplex/netplex_mp.cmi
+lib/ocaml/site-lib/netplex/netplex_mp.mli
+lib/ocaml/site-lib/netplex/netplex_mt.cmi
+lib/ocaml/site-lib/netplex/netplex_mt.cmo
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex_mt.cmx
+lib/ocaml/site-lib/netplex/netplex_mt.mli
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex_mt.o
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex_mt.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netplex/netplex_mt.p.o
+lib/ocaml/site-lib/netplex/netplex_mutex.cmi
+lib/ocaml/site-lib/netplex/netplex_mutex.mli
+lib/ocaml/site-lib/netplex/netplex_semaphore.cmi
+lib/ocaml/site-lib/netplex/netplex_semaphore.mli
+lib/ocaml/site-lib/netplex/netplex_sharedvar.cmi
+lib/ocaml/site-lib/netplex/netplex_sharedvar.mli
+lib/ocaml/site-lib/netplex/netplex_sockserv.cmi
+lib/ocaml/site-lib/netplex/netplex_sockserv.mli
+lib/ocaml/site-lib/netplex/netplex_types.cmi
+lib/ocaml/site-lib/netplex/netplex_types.mli
+lib/ocaml/site-lib/netplex/netplex_util.cmi
+lib/ocaml/site-lib/netplex/netplex_workload.cmi
+lib/ocaml/site-lib/netplex/netplex_workload.mli
+lib/ocaml/site-lib/netplex/rpc_netplex.cmi
+lib/ocaml/site-lib/netplex/rpc_netplex.mli
+lib/ocaml/site-lib/netshm/META
+${PLIST.opt}lib/ocaml/site-lib/netshm/netshm.a
+lib/ocaml/site-lib/netshm/netshm.cma
+lib/ocaml/site-lib/netshm/netshm.cmi
+${PLIST.opt}lib/ocaml/site-lib/netshm/netshm.cmxa
+lib/ocaml/site-lib/netshm/netshm.mli
+${PLIST.opt}lib/ocaml/site-lib/netshm/netshm.p.a
+${PLIST.opt}lib/ocaml/site-lib/netshm/netshm.p.cmxa
+lib/ocaml/site-lib/netshm/netshm_array.cmi
+lib/ocaml/site-lib/netshm/netshm_array.mli
+lib/ocaml/site-lib/netshm/netshm_data.cmi
+lib/ocaml/site-lib/netshm/netshm_data.mli
+lib/ocaml/site-lib/netshm/netshm_hashtbl.cmi
+lib/ocaml/site-lib/netshm/netshm_hashtbl.mli
 lib/ocaml/site-lib/netstring/META
-lib/ocaml/site-lib/netstring/cgi.mli
 lib/ocaml/site-lib/netstring/cmapf.adobe_standard_encoding.netdb
 lib/ocaml/site-lib/netstring/cmapf.adobe_symbol_encoding.netdb
 lib/ocaml/site-lib/netstring/cmapf.adobe_zapf_dingbats_encoding.netdb
@@ -83,6 +281,7 @@ lib/ocaml/site-lib/netstring/cmapf.jis0201.netdb
 lib/ocaml/site-lib/netstring/cmapf.jis0208.netdb
 lib/ocaml/site-lib/netstring/cmapf.jis0212.netdb
 lib/ocaml/site-lib/netstring/cmapf.koi8r.netdb
+lib/ocaml/site-lib/netstring/cmapf.ks1001.netdb
 lib/ocaml/site-lib/netstring/cmapf.macroman.netdb
 lib/ocaml/site-lib/netstring/cmapf.windows1250.netdb
 lib/ocaml/site-lib/netstring/cmapf.windows1251.netdb
@@ -139,6 +338,7 @@ lib/ocaml/site-lib/netstring/cmapr.jis0201.netdb
 lib/ocaml/site-lib/netstring/cmapr.jis0208.netdb
 lib/ocaml/site-lib/netstring/cmapr.jis0212.netdb
 lib/ocaml/site-lib/netstring/cmapr.koi8r.netdb
+lib/ocaml/site-lib/netstring/cmapr.ks1001.netdb
 lib/ocaml/site-lib/netstring/cmapr.macroman.netdb
 lib/ocaml/site-lib/netstring/cmapr.windows1250.netdb
 lib/ocaml/site-lib/netstring/cmapr.windows1251.netdb
@@ -161,14 +361,28 @@ lib/ocaml/site-lib/netstring/netaccel_link.cmo
 lib/ocaml/site-lib/netstring/netaccel_link.mli
 lib/ocaml/site-lib/netstring/netaddress.cmi
 lib/ocaml/site-lib/netstring/netaddress.mli
+lib/ocaml/site-lib/netstring/netauth.cmi
+lib/ocaml/site-lib/netstring/netauth.mli
 lib/ocaml/site-lib/netstring/netaux.cmi
 lib/ocaml/site-lib/netstring/netaux.mli
 lib/ocaml/site-lib/netstring/netbuffer.cmi
+${PLIST.opt}lib/ocaml/site-lib/netstring/netbuffer.cmx
 lib/ocaml/site-lib/netstring/netbuffer.mli
+${PLIST.opt}lib/ocaml/site-lib/netstring/netbuffer.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netbuffer.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netbuffer.p.o
 lib/ocaml/site-lib/netstring/netchannels.cmi
 lib/ocaml/site-lib/netstring/netchannels.mli
+lib/ocaml/site-lib/netstring/netcompression.cmi
+lib/ocaml/site-lib/netstring/netcompression.mli
+lib/ocaml/site-lib/netstring/netconst.cmi
+lib/ocaml/site-lib/netstring/netconst.mli
 lib/ocaml/site-lib/netstring/netconversion.cmi
+${PLIST.opt}lib/ocaml/site-lib/netstring/netconversion.cmx
 lib/ocaml/site-lib/netstring/netconversion.mli
+${PLIST.opt}lib/ocaml/site-lib/netstring/netconversion.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netconversion.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netconversion.p.o
 lib/ocaml/site-lib/netstring/netdate.cmi
 lib/ocaml/site-lib/netstring/netdate.mli
 lib/ocaml/site-lib/netstring/netdb-packlist
@@ -176,6 +390,11 @@ lib/ocaml/site-lib/netstring/netdb.cmi
 lib/ocaml/site-lib/netstring/netdb.mli
 lib/ocaml/site-lib/netstring/netencoding.cmi
 lib/ocaml/site-lib/netstring/netencoding.mli
+lib/ocaml/site-lib/netstring/netfs.cmi
+lib/ocaml/site-lib/netstring/netfs.mli
+lib/ocaml/site-lib/netstring/netglob.cmi
+lib/ocaml/site-lib/netstring/netglob.mli
+lib/ocaml/site-lib/netstring/netglob_lex.cmi
 lib/ocaml/site-lib/netstring/nethtml.cmi
 lib/ocaml/site-lib/netstring/nethtml.mli
 lib/ocaml/site-lib/netstring/nethtml_scanner.cmi
@@ -185,22 +404,55 @@ lib/ocaml/site-lib/netstring/netmappings.cmi
 lib/ocaml/site-lib/netstring/netmappings.mli
 lib/ocaml/site-lib/netstring/netmappings_iso.cmi
 lib/ocaml/site-lib/netstring/netmappings_iso.cmo
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_iso.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_iso.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_iso.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_iso.p.o
 lib/ocaml/site-lib/netstring/netmappings_jp.cmi
 lib/ocaml/site-lib/netstring/netmappings_jp.cmo
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_jp.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_jp.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_jp.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_jp.p.o
+lib/ocaml/site-lib/netstring/netmappings_kr.cmi
+lib/ocaml/site-lib/netstring/netmappings_kr.cmo
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_kr.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_kr.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_kr.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_kr.p.o
 lib/ocaml/site-lib/netstring/netmappings_min.cmi
 lib/ocaml/site-lib/netstring/netmappings_min.cmo
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_min.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_min.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_min.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_min.p.o
 lib/ocaml/site-lib/netstring/netmappings_other.cmi
 lib/ocaml/site-lib/netstring/netmappings_other.cmo
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_other.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_other.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_other.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netmappings_other.p.o
 lib/ocaml/site-lib/netstring/netmime.cmi
 lib/ocaml/site-lib/netstring/netmime.mli
+lib/ocaml/site-lib/netstring/netnumber.cmi
+${PLIST.opt}lib/ocaml/site-lib/netstring/netnumber.cmx
+lib/ocaml/site-lib/netstring/netnumber.mli
+${PLIST.opt}lib/ocaml/site-lib/netstring/netnumber.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/netnumber.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/netnumber.p.o
+lib/ocaml/site-lib/netstring/netpagebuffer.cmi
+lib/ocaml/site-lib/netstring/netpagebuffer.mli
 lib/ocaml/site-lib/netstring/netsendmail.cmi
 lib/ocaml/site-lib/netstring/netsendmail.mli
+lib/ocaml/site-lib/netstring/netsockaddr.cmi
+lib/ocaml/site-lib/netstring/netsockaddr.mli
 lib/ocaml/site-lib/netstring/netstream.cmi
 lib/ocaml/site-lib/netstring/netstream.mli
+${PLIST.opt}lib/ocaml/site-lib/netstring/netstring.a
 lib/ocaml/site-lib/netstring/netstring.cma
-lib/ocaml/site-lib/netstring/netstring_mt.cmi
-lib/ocaml/site-lib/netstring/netstring_mt.cmo
-lib/ocaml/site-lib/netstring/netstring_mt.mli
+${PLIST.opt}lib/ocaml/site-lib/netstring/netstring.cmxa
+${PLIST.opt}lib/ocaml/site-lib/netstring/netstring.p.a
+${PLIST.opt}lib/ocaml/site-lib/netstring/netstring.p.cmxa
 lib/ocaml/site-lib/netstring/netstring_pcre.cmi
 lib/ocaml/site-lib/netstring/netstring_pcre.mli
 lib/ocaml/site-lib/netstring/netstring_str.cmi
@@ -212,16 +464,208 @@ lib/ocaml/site-lib/netstring/netulex.cmi
 lib/ocaml/site-lib/netstring/netulex.mli
 lib/ocaml/site-lib/netstring/neturl.cmi
 lib/ocaml/site-lib/netstring/neturl.mli
+lib/ocaml/site-lib/netstring/rtypes.cmi
+${PLIST.opt}lib/ocaml/site-lib/netstring/rtypes.cmx
+lib/ocaml/site-lib/netstring/rtypes.mli
+${PLIST.opt}lib/ocaml/site-lib/netstring/rtypes.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/rtypes.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/rtypes.p.o
+lib/ocaml/site-lib/netstring/xdr.cmi
+${PLIST.opt}lib/ocaml/site-lib/netstring/xdr.cmx
+lib/ocaml/site-lib/netstring/xdr.mli
+${PLIST.opt}lib/ocaml/site-lib/netstring/xdr.o
+${PLIST.opt}lib/ocaml/site-lib/netstring/xdr.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netstring/xdr.p.o
+lib/ocaml/site-lib/netstring/xdr_mstring.cmi
+lib/ocaml/site-lib/netstring/xdr_mstring.mli
+lib/ocaml/site-lib/netsys/META
+lib/ocaml/site-lib/netsys/dllnetsys.so
+lib/ocaml/site-lib/netsys/libnetsys.a
+${PLIST.opt}lib/ocaml/site-lib/netsys/libnetsys.p.a
+lib/ocaml/site-lib/netsys/netexn.cmi
+lib/ocaml/site-lib/netsys/netexn.mli
+lib/ocaml/site-lib/netsys/netlog.cmi
+lib/ocaml/site-lib/netsys/netlog.mli
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys.a
+lib/ocaml/site-lib/netsys/netsys.cma
+lib/ocaml/site-lib/netsys/netsys.cmi
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys.cmxa
+lib/ocaml/site-lib/netsys/netsys.mli
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys.p.a
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys.p.cmxa
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_c_gprof.o
+lib/ocaml/site-lib/netsys/netsys_conf.cmi
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_gprof_init.cmi
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_gprof_init.mli
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_gprof_init.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_gprof_init.p.o
+lib/ocaml/site-lib/netsys/netsys_impl_util.cmi
+lib/ocaml/site-lib/netsys/netsys_mem.cmi
+lib/ocaml/site-lib/netsys/netsys_mem.mli
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr.a
+lib/ocaml/site-lib/netsys/netsys_oothr.cma
+lib/ocaml/site-lib/netsys/netsys_oothr.cmi
+lib/ocaml/site-lib/netsys/netsys_oothr.cmo
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr.cmxa
+lib/ocaml/site-lib/netsys/netsys_oothr.mli
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr.p.a
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr.p.cmxa
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt.a
+lib/ocaml/site-lib/netsys/netsys_oothr_mt.cma
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt.cmxa
+lib/ocaml/site-lib/netsys/netsys_oothr_mt.cmi
+lib/ocaml/site-lib/netsys/netsys_oothr_mt.mli
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt.p.a
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt.p.cmxa
+lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.cmi
+lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.cmo
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.cmx
+lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.mli
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.o
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.p.cmx
+${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.p.o
+lib/ocaml/site-lib/netsys/netsys_pollset.cmi
+lib/ocaml/site-lib/netsys/netsys_pollset.mli
+lib/ocaml/site-lib/netsys/netsys_pollset_generic.cmi
+lib/ocaml/site-lib/netsys/netsys_pollset_generic.mli
+lib/ocaml/site-lib/netsys/netsys_pollset_posix.cmi
+lib/ocaml/site-lib/netsys/netsys_pollset_posix.mli
+lib/ocaml/site-lib/netsys/netsys_pollset_win32.cmi
+lib/ocaml/site-lib/netsys/netsys_pollset_win32.mli
+lib/ocaml/site-lib/netsys/netsys_posix.cmi
+lib/ocaml/site-lib/netsys/netsys_posix.mli
+lib/ocaml/site-lib/netsys/netsys_rng.cmi
+lib/ocaml/site-lib/netsys/netsys_rng.mli
+lib/ocaml/site-lib/netsys/netsys_signal.cmi
+lib/ocaml/site-lib/netsys/netsys_signal.mli
+lib/ocaml/site-lib/netsys/netsys_signalling.mli
+lib/ocaml/site-lib/netsys/netsys_tmp.cmi
+lib/ocaml/site-lib/netsys/netsys_tmp.mli
+lib/ocaml/site-lib/netsys/netsys_types.cmi
+lib/ocaml/site-lib/netsys/netsys_types.mli
+lib/ocaml/site-lib/netsys/netsys_win32.cmi
+lib/ocaml/site-lib/netsys/netsys_win32.mli
+lib/ocaml/site-lib/netsys/netsys_xdr.cmi
+lib/ocaml/site-lib/netsys/netsys_xdr.mli
 lib/ocaml/site-lib/pop/META
 lib/ocaml/site-lib/pop/netpop.cmi
 lib/ocaml/site-lib/pop/netpop.mli
+${PLIST.opt}lib/ocaml/site-lib/pop/pop.a
 lib/ocaml/site-lib/pop/pop.cma
+${PLIST.opt}lib/ocaml/site-lib/pop/pop.cmxa
+${PLIST.opt}lib/ocaml/site-lib/pop/pop.p.a
+${PLIST.opt}lib/ocaml/site-lib/pop/pop.p.cmxa
+lib/ocaml/site-lib/rpc/META
+${PLIST.opt}lib/ocaml/site-lib/rpc/rpc.a
+lib/ocaml/site-lib/rpc/rpc.cma
+lib/ocaml/site-lib/rpc/rpc.cmi
+${PLIST.opt}lib/ocaml/site-lib/rpc/rpc.cmxa
+lib/ocaml/site-lib/rpc/rpc.mli
+${PLIST.opt}lib/ocaml/site-lib/rpc/rpc.p.a
+${PLIST.opt}lib/ocaml/site-lib/rpc/rpc.p.cmxa
+lib/ocaml/site-lib/rpc/rpc_auth_gssapi.cmi
+lib/ocaml/site-lib/rpc/rpc_auth_gssapi.mli
+lib/ocaml/site-lib/rpc/rpc_auth_gssapi_aux.cmi
+lib/ocaml/site-lib/rpc/rpc_auth_gssapi_aux.mli
+lib/ocaml/site-lib/rpc/rpc_auth_sys.cmi
+lib/ocaml/site-lib/rpc/rpc_auth_sys.mli
+lib/ocaml/site-lib/rpc/rpc_client.cmi
+lib/ocaml/site-lib/rpc/rpc_client.mli
+lib/ocaml/site-lib/rpc/rpc_common.cmi
+lib/ocaml/site-lib/rpc/rpc_packer.cmi
+lib/ocaml/site-lib/rpc/rpc_packer.mli
+lib/ocaml/site-lib/rpc/rpc_portmapper.cmi
+lib/ocaml/site-lib/rpc/rpc_portmapper.mli
+lib/ocaml/site-lib/rpc/rpc_portmapper_aux.cmi
+lib/ocaml/site-lib/rpc/rpc_portmapper_aux.mli
+lib/ocaml/site-lib/rpc/rpc_portmapper_clnt.cmi
+lib/ocaml/site-lib/rpc/rpc_portmapper_clnt.mli
+lib/ocaml/site-lib/rpc/rpc_program.cmi
+lib/ocaml/site-lib/rpc/rpc_program.mli
+lib/ocaml/site-lib/rpc/rpc_proxy.cmi
+lib/ocaml/site-lib/rpc/rpc_proxy.mli
+lib/ocaml/site-lib/rpc/rpc_server.cmi
+lib/ocaml/site-lib/rpc/rpc_server.mli
+lib/ocaml/site-lib/rpc/rpc_simple_client.cmi
+lib/ocaml/site-lib/rpc/rpc_simple_client.mli
+lib/ocaml/site-lib/rpc/rpc_transport.cmi
+lib/ocaml/site-lib/rpc/rpc_transport.mli
+lib/ocaml/site-lib/rpc/rpc_util.cmi
+lib/ocaml/site-lib/rpc/rpc_util.mli
+lib/ocaml/site-lib/rpc-auth-local/META
+lib/ocaml/site-lib/rpc-auth-local/dllrpc_auth_local.so
+${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/librpc_auth_local.a
+${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/librpc_auth_local.p.a
+${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.a
+lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.cma
+lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.cmi
+${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.cmxa
+lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.mli
+${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.p.a
+${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.p.cmxa
+lib/ocaml/site-lib/rpc-generator/META
+lib/ocaml/site-lib/rpc-generator/direct.cmi
+lib/ocaml/site-lib/rpc-generator/dummy.mli
+lib/ocaml/site-lib/rpc-generator/generate.cmi
+lib/ocaml/site-lib/rpc-generator/lexer.cmi
+lib/ocaml/site-lib/rpc-generator/main.cmi
+lib/ocaml/site-lib/rpc-generator/options.cmi
+lib/ocaml/site-lib/rpc-generator/parser.cmi
+lib/ocaml/site-lib/rpc-generator/parser.mli
+lib/ocaml/site-lib/rpc-generator/rename.cmi
+${PLIST.opt}lib/ocaml/site-lib/rpc-generator/rpc_generator.a
+lib/ocaml/site-lib/rpc-generator/rpc_generator.cma
+${PLIST.opt}lib/ocaml/site-lib/rpc-generator/rpc_generator.cmxa
+${PLIST.opt}lib/ocaml/site-lib/rpc-generator/rpc_generator.p.a
+${PLIST.opt}lib/ocaml/site-lib/rpc-generator/rpc_generator.p.cmxa
+lib/ocaml/site-lib/rpc-generator/rpcgen-packlist
+lib/ocaml/site-lib/rpc-generator/syntax.cmi
+${PLIST.ssl}lib/ocaml/site-lib/rpc-ssl/META
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.a
+${PLIST.ssl}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.cma
+${PLIST.ssl}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.cmi
+${PLIST.ssl}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.mli
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.cmxa
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.p.a
+${PLIST.ssl}${PLIST.opt}lib/ocaml/site-lib/rpc-ssl/rpc_ssl.p.cmxa
+lib/ocaml/site-lib/shell/META
+${PLIST.opt}lib/ocaml/site-lib/shell/shell.a
+lib/ocaml/site-lib/shell/shell.cma
+lib/ocaml/site-lib/shell/shell.cmi
+${PLIST.opt}lib/ocaml/site-lib/shell/shell.cmxa
+lib/ocaml/site-lib/shell/shell.mli
+${PLIST.opt}lib/ocaml/site-lib/shell/shell.p.a
+${PLIST.opt}lib/ocaml/site-lib/shell/shell.p.cmxa
+lib/ocaml/site-lib/shell/shell_fs.cmi
+lib/ocaml/site-lib/shell/shell_fs.mli
+lib/ocaml/site-lib/shell/shell_sys.cmi
+lib/ocaml/site-lib/shell/shell_sys.mli
+lib/ocaml/site-lib/shell/shell_uq.cmi
+lib/ocaml/site-lib/shell/shell_uq.mli
 lib/ocaml/site-lib/smtp/META
 lib/ocaml/site-lib/smtp/netsmtp.cmi
 lib/ocaml/site-lib/smtp/netsmtp.mli
+${PLIST.opt}lib/ocaml/site-lib/smtp/smtp.a
 lib/ocaml/site-lib/smtp/smtp.cma
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/cgi
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/nethttpd
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netstring
+${PLIST.opt}lib/ocaml/site-lib/smtp/smtp.cmxa
+${PLIST.opt}lib/ocaml/site-lib/smtp/smtp.p.a
+${PLIST.opt}lib/ocaml/site-lib/smtp/smtp.p.cmxa
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/equeue
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netcgi2-plex
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netplex
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/pop
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netclient
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netshm
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/rpc
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/shell
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netcamlbox
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netgssapi
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netstring
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/rpc-auth-local
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/smtp
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netcgi2
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netmulticore
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/netsys
+@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/rpc-generator
+${PLIST.ssl}@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/rpc-ssl
+${PLIST.ssl}@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/equeue-ssl
diff --git a/net/ocamlnet/buildlink3.mk b/net/ocamlnet/buildlink3.mk
index 5e19a4346dc..2ee68bcb6e1 100644
--- a/net/ocamlnet/buildlink3.mk
+++ b/net/ocamlnet/buildlink3.mk
@@ -1,14 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2012/06/04 13:12:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2012/07/06 09:29:14 wiz Exp $
 
 BUILDLINK_TREE+=	ocamlnet
 
 .if !defined(OCAMLNET_BUILDLINK3_MK)
 OCAMLNET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocamlnet+=	ocamlnet>=1.1.2nb1
+BUILDLINK_API_DEPENDS.ocamlnet+=	ocamlnet>=3.5.1
 BUILDLINK_PKGSRCDIR.ocamlnet?=	../../net/ocamlnet
 
-.include "../../lang/ocaml/buildlink3.mk"
 .endif	# OCAMLNET_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ocamlnet
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index 8fc094e748c..4bb9495102d 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2010/02/11 13:10:15 joerg Exp $
+$NetBSD: distinfo,v 1.4 2012/07/06 09:29:14 wiz Exp $
 
-SHA1 (ocamlnet-1.1.2.tar.gz) = 09683bd8d2116449deaf96873424cebf569d65e7
-RMD160 (ocamlnet-1.1.2.tar.gz) = 2c554571f53b99e7cd23dcf043bebc3c3f779435
-Size (ocamlnet-1.1.2.tar.gz) = 817450 bytes
-SHA1 (patch-aa) = 17926b7a3096615f773fa3241030fb514b4a5f5d
-SHA1 (patch-ab) = 5b3ac5e7c238142e233585311df7844dd23c3915
+SHA1 (ocamlnet-3.5.1.tar.gz) = 7e1c2ab3ada6735139b47eb852495cd609ebfd6e
+RMD160 (ocamlnet-3.5.1.tar.gz) = 133a2572e9ef8a5bf62880a2a6696391d0938a08
+Size (ocamlnet-3.5.1.tar.gz) = 3290994 bytes
+SHA1 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a
diff --git a/net/ocamlnet/options.mk b/net/ocamlnet/options.mk
new file mode 100644
index 00000000000..15732b63930
--- /dev/null
+++ b/net/ocamlnet/options.mk
@@ -0,0 +1,30 @@
+# $NetBSD: options.mk,v 1.1 2012/07/06 09:29:14 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ocamlnet
+PKG_SUPPORTED_OPTIONS=	ssl gtk
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/bsd.options.mk"
+
+###
+### 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
+
+###
+### GTK(1) support
+###
+.if !empty(PKG_OPTIONS:Mgtk)
+.  include  "../../x11/lablgtk1/buildlink3.mk"
+CONFIGURE_ARGS+=	-enable-gtk
+.else
+CONFIGURE_ARGS+=	-disable-gtk
+.endif
diff --git a/net/ocamlnet/patches/patch-Makefile.rules b/net/ocamlnet/patches/patch-Makefile.rules
new file mode 100644
index 00000000000..28913053ebe
--- /dev/null
+++ b/net/ocamlnet/patches/patch-Makefile.rules
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.rules,v 1.1 2012/07/06 09:29:14 wiz Exp $
+
+make package work with DESTDIR support
+--- Makefile.rules.orig	2012-02-29 18:02:51.000000000 +0000
++++ Makefile.rules
+@@ -148,7 +148,8 @@ realuninstall: $(UNINSTOTHER) uninstall-
+ .PHONY: install-findlib
+ install-findlib: META
+ 	files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a dll* META $(INSTALL_EXTRA)` && \
+-	$(OCAMLFIND) install $(PKGNAME) $$files
++	$(OCAMLFIND) install -destdir $(DESTDIR)/$(PREFIX)/lib/ocaml/site-lib \
++	-ldconf /dev/null $(PKGNAME) $$files
+ 
+ .PHONY: uninstall-findlib
+ uninstall-findlib:
diff --git a/net/ocamlnet/patches/patch-aa b/net/ocamlnet/patches/patch-aa
deleted file mode 100644
index 95ecfd24fa5..00000000000
--- a/net/ocamlnet/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/01/30 19:43:18 joerg Exp $
-
---- src/netstring/Makefile.orig	2010-01-30 19:35:56.000000000 +0000
-+++ src/netstring/Makefile
-@@ -172,9 +172,9 @@ netdb-packlist: mk_netdb
- 
- .PHONY: install-netdb
- install-netdb:
--	mkdir -p $(NET_DB_DIR)
--	cp netdb/*.netdb $(NET_DB_DIR)
--	@echo "Installed .netdb files into $(NET_DB_DIR)"
-+	mkdir -p ${DESTDIR}$(NET_DB_DIR)
-+	cp netdb/*.netdb ${DESTDIR}$(NET_DB_DIR)
-+	@echo "Installed .netdb files into ${DESTDIR}$(NET_DB_DIR)"
- 	if [ "$(INSTMETHOD)" != "findlib" ]; then                     \
- 		cat netdb-packlist >>$(LIBDIR)/packlist-$(PKGNAME);   \
- 	fi
diff --git a/net/ocamlnet/patches/patch-ab b/net/ocamlnet/patches/patch-ab
deleted file mode 100644
index 6dc735b7c3a..00000000000
--- a/net/ocamlnet/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2010/02/11 13:10:15 joerg Exp $
-
---- src/Makefile.rules.orig	2006-03-06 16:59:47.000000000 +0000
-+++ src/Makefile.rules
-@@ -92,8 +92,9 @@ uninstall: $(UNINSTOTHER) uninstall-$(IN
- 
- .PHONY: install-findlib
- install-findlib:
-+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}`$(OCAMLC) -where`/site-lib
- 	files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a META $(INSTALL_EXTRA)` && \
--	$(OCAMLFIND) install $(PKGNAME) $$files
-+	$(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}`$(OCAMLC) -where`/site-lib $(PKGNAME) $$files
- 
- .PHONY: uninstall-findlib
- uninstall-findlib: