Updated package to make sure cmxs option works correctly

7 files changed, 114 insertions, 62 deletions

diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index 60a26b589bc..fa5b25c4810 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2017/07/11 14:11:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.39 2017/07/17 12:30:55 jaapb Exp $
 #
 
 DISTNAME=		ocamlnet-4.1.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		net
 MASTER_SITES=		http://download.camlcity.org/download/
 
diff --git a/net/ocamlnet/PLIST b/net/ocamlnet/PLIST
index e62a29731e2..a4627816cde 100644
--- a/net/ocamlnet/PLIST
+++ b/net/ocamlnet/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.15 2017/07/11 14:11:57 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.16 2017/07/17 12:30:55 jaapb Exp $
 ${OCAML_SITELIB}/equeue/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
 ${OCAML_SITELIB}/equeue/equeue.cma
 ${OCAML_SITELIB}/equeue/equeue.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.cmxs
 ${OCAML_SITELIB}/equeue/equeue.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.cmxs
 ${OCAML_SITELIB}/equeue/unixqueue.cmi
 ${OCAML_SITELIB}/equeue/unixqueue.mli
 ${OCAML_SITELIB}/equeue/unixqueue_pollset.cmi
@@ -47,19 +47,19 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.a
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.cma
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.cmxs
 ${OCAML_SITELIB}/netcamlbox/netcamlbox.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.cmxs
 ${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.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.cmxs
 ${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.cmi
 ${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.mli
 ${OCAML_SITELIB}/netcgi2/META
@@ -67,11 +67,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.a
 ${OCAML_SITELIB}/netcgi2/netcgi.cma
 ${OCAML_SITELIB}/netcgi2/netcgi.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.cmxs
 ${OCAML_SITELIB}/netcgi2/netcgi.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.p.cmxs
 ${OCAML_SITELIB}/netcgi2/netcgi1_compat.cmi
 ${OCAML_SITELIB}/netcgi2/netcgi1_compat.mli
 ${OCAML_SITELIB}/netcgi2/netcgi_ajp.cmi
@@ -92,10 +92,10 @@ ${OCAML_SITELIB}/netclient/META
 ${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.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.p.cmxs
 ${OCAML_SITELIB}/netclient/netftp_client.cmi
 ${OCAML_SITELIB}/netclient/netftp_client.mli
 ${OCAML_SITELIB}/netclient/netftp_data_endpoint.cmi
@@ -150,19 +150,19 @@ ${OCAML_SITELIB}/netmulticore/netmcore_util.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.a
 ${OCAML_SITELIB}/netmulticore/netmulticore.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.p.cmxs
 ${OCAML_SITELIB}/netplex/META
 ${OCAML_SITELIB}/netplex/netplex-packlist
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.a
 ${OCAML_SITELIB}/netplex/netplex.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.p.cmxs
 ${OCAML_SITELIB}/netplex/netplex_admin.cmi
 ${OCAML_SITELIB}/netplex/netplex_cenv.cmi
 ${OCAML_SITELIB}/netplex/netplex_cenv.mli
@@ -219,11 +219,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.a
 ${OCAML_SITELIB}/netshm/netshm.cma
 ${OCAML_SITELIB}/netshm/netshm.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.cmxs
 ${OCAML_SITELIB}/netshm/netshm.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.p.cmxs
 ${OCAML_SITELIB}/netshm/netshm_array.cmi
 ${OCAML_SITELIB}/netshm/netshm_array.mli
 ${OCAML_SITELIB}/netshm/netshm_data.cmi
@@ -234,10 +234,10 @@ ${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.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.cmxs
 ${OCAML_SITELIB}/netstring-pcre/netstring_pcre.cmi
 ${OCAML_SITELIB}/netstring-pcre/netstring_pcre.mli
 ${OCAML_SITELIB}/netstring/META
@@ -347,10 +347,10 @@ ${OCAML_SITELIB}/netstring/netstream.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.a
 ${OCAML_SITELIB}/netstring/netstring.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.p.cmxs
 ${OCAML_SITELIB}/netstring/netstring_str.cmi
 ${OCAML_SITELIB}/netstring/netstring_str.mli
 ${OCAML_SITELIB}/netstring/netstring_top.cmi
@@ -390,11 +390,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.a
 ${OCAML_SITELIB}/netsys/netsys.cma
 ${OCAML_SITELIB}/netsys/netsys.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.cmxs
 ${OCAML_SITELIB}/netsys/netsys.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.p.cmxs
 ${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
@@ -425,20 +425,20 @@ ${OCAML_SITELIB}/netsys/netsys_oothr.cma
 ${OCAML_SITELIB}/netsys/netsys_oothr.cmi
 ${OCAML_SITELIB}/netsys/netsys_oothr.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.cmxs
 ${OCAML_SITELIB}/netsys/netsys_oothr.mli
 ${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.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.p.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.a
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt.cma
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.cmxs
 ${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
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.p.cmxs
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmi
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmx
@@ -493,10 +493,10 @@ ${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettle.mli
 ${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.a
 ${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.cma
 ${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.cmxa
-${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.cmxs
 ${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.p.a
 ${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.p.cmxa
-${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.p.cmxs
 ${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls.cmi
 ${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls.mli
 ${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_gnutls_bindings.cmi
@@ -527,11 +527,11 @@ ${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
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.cmxs
 ${OCAML_SITELIB}/netunidata/netunidata.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.cmxs
 ${OCAML_SITELIB}/netunidata/netuniinit.cmi
 ${OCAML_SITELIB}/netunidata/netuniinit.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmx
@@ -542,10 +542,10 @@ ${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.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.p.cmxs
 ${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
@@ -554,11 +554,11 @@ ${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
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.cmxs
 ${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
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.p.cmxs
 ${OCAML_SITELIB}/rpc-generator/META
 ${OCAML_SITELIB}/rpc-generator/config.cmi
 ${OCAML_SITELIB}/rpc-generator/direct.cmi
@@ -573,10 +573,10 @@ ${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.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.cmxs
 ${OCAML_SITELIB}/rpc-generator/rpcgen-packlist
 ${OCAML_SITELIB}/rpc-generator/syntax.cmi
 ${PLIST.xti}${OCAML_SITELIB}/rpc-xti/META
@@ -588,7 +588,7 @@ ${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.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.p.cmxs
 ${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.cmi
 ${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.mli
 ${OCAML_SITELIB}/rpc/META
@@ -596,11 +596,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.a
 ${OCAML_SITELIB}/rpc/rpc.cma
 ${OCAML_SITELIB}/rpc/rpc.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.cmxs
 ${OCAML_SITELIB}/rpc/rpc.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.p.cmxs
 ${OCAML_SITELIB}/rpc/rpc_auth_gssapi.cmi
 ${OCAML_SITELIB}/rpc/rpc_auth_gssapi.mli
 ${OCAML_SITELIB}/rpc/rpc_auth_gssapi_aux.cmi
@@ -638,11 +638,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.a
 ${OCAML_SITELIB}/shell/shell.cma
 ${OCAML_SITELIB}/shell/shell.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.cmxs
 ${OCAML_SITELIB}/shell/shell.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.a
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.cmxs
+${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.cmxs
 ${OCAML_SITELIB}/shell/shell_fs.cmi
 ${OCAML_SITELIB}/shell/shell_fs.mli
 ${OCAML_SITELIB}/shell/shell_sys.cmi
diff --git a/net/ocamlnet/buildlink3.mk b/net/ocamlnet/buildlink3.mk
index 9f30299e1e2..28ae164e90a 100644
--- a/net/ocamlnet/buildlink3.mk
+++ b/net/ocamlnet/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2017/07/11 14:11:57 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2017/07/17 12:30:55 jaapb Exp $
 
 BUILDLINK_TREE+=	ocamlnet
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocamlnet
 OCAMLNET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlnet+=	ocamlnet>=4.1.2
-BUILDLINK_ABI_DEPENDS.ocamlnet+=	ocamlnet>=4.1.2nb3
+BUILDLINK_ABI_DEPENDS.ocamlnet+=	ocamlnet>=4.1.2nb5
 BUILDLINK_PKGSRCDIR.ocamlnet?=	../../net/ocamlnet
 
 .endif	# OCAMLNET_BUILDLINK3_MK
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index 4656d4532d8..962d2f06906 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2017/07/11 14:11:57 jaapb Exp $
+$NetBSD: distinfo,v 1.23 2017/07/17 12:30:55 jaapb Exp $
 
 SHA1 (ocamlnet-4.1.2.tar.gz) = d45ec92c700b4d431e7c6ebafcff1b57b0d39322
 RMD160 (ocamlnet-4.1.2.tar.gz) = c3807f66a5aa353d07d567b311693e76e604bf3c
 SHA512 (ocamlnet-4.1.2.tar.gz) = 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d
 Size (ocamlnet-4.1.2.tar.gz) = 4623183 bytes
-SHA1 (patch-Makefile.rules) = 410c9f87e318dac9a239800d872329daa9539505
-SHA1 (patch-src_netsys_Makefile) = 09f2cdfd1c8fc0cf0366e4d6a73e3acc246c21bd
+SHA1 (patch-Makefile.rules) = 124b787309e39334036681035e0687120da672c8
+SHA1 (patch-src_netsys_Makefile) = 9edbac14c5f5840933f3e93b27bb95750e946089
 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
diff --git a/net/ocamlnet/options.mk b/net/ocamlnet/options.mk
index 6251a71a937..1bdcd97a692 100644
--- a/net/ocamlnet/options.mk
+++ b/net/ocamlnet/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2017/07/11 14:11:57 jaapb Exp $
+# $NetBSD: options.mk,v 1.7 2017/07/17 12:30:55 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocamlnet
 PKG_SUPPORTED_OPTIONS=	gtk gtk2 gnutls cmxs
@@ -11,17 +11,6 @@ PLIST_VARS+=		gnutls cmxs
 .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)
@@ -51,3 +40,13 @@ CONFIGURE_ARGS+=	-enable-gnutls
 .else
 CONFIGURE_ARGS+=	-disable-gnutls
 .endif
+
+###
+### cmxs support
+###
+.if !empty(PKG_OPTIONS:Mcmxs)
+PLIST.cmxs=	yes
+MAKE_ENV+=	HAVE_SHARED=1
+.else
+MAKE_ENV+=	HAVE_SHARED=0
+.endif
diff --git a/net/ocamlnet/patches/patch-Makefile.rules b/net/ocamlnet/patches/patch-Makefile.rules
index 8795c625312..72890f8684c 100644
--- a/net/ocamlnet/patches/patch-Makefile.rules
+++ b/net/ocamlnet/patches/patch-Makefile.rules
@@ -1,5 +1,6 @@
-$NetBSD: patch-Makefile.rules,v 1.2 2017/07/11 14:11:57 jaapb Exp $
+$NetBSD: patch-Makefile.rules,v 1.3 2017/07/17 12:30:55 jaapb Exp $
 
+Add rules to produce .cmxs files
 --- Makefile.rules.orig	2016-06-19 14:49:12.000000000 +0000
 +++ Makefile.rules
 @@ -48,15 +48,20 @@ ARCHIVE  ?= $(PKGNAME)
diff --git a/net/ocamlnet/patches/patch-src_netsys_Makefile b/net/ocamlnet/patches/patch-src_netsys_Makefile
new file mode 100644
index 00000000000..cd4d7a6ae28
--- /dev/null
+++ b/net/ocamlnet/patches/patch-src_netsys_Makefile
@@ -0,0 +1,52 @@
+$NetBSD: patch-src_netsys_Makefile,v 1.1 2017/07/17 12:30:55 jaapb Exp $
+
+Add rules to produce .cmxs files
+--- src/netsys/Makefile.orig	2016-06-19 14:49:12.000000000 +0000
++++ src/netsys/Makefile
+@@ -41,6 +41,12 @@ OPT_EXTRA = netsys_oothr.cmxa netsys_c_g
+ OPTP_EXTRA = netsys_oothr.p.cmxa netsys_gprof_init.cmx
+ OPTMT_EXTRA = netsys_oothr_mt.cmxa netsys_oothr_mt_init.cmx
+ OPTMTP_EXTRA = netsys_oothr_mt.p.cmxa netsys_oothr_mt_init.cmx
++ifeq ($(HAVE_SHARED),1)
++OPT_EXTRA += netsys_oothr.cmxs
++OPTP_EXTRA += netsys_oothr.p.cmxs
++OPTMT_EXTRA += netsys_oothr_mt.cmxs
++OPTMTP_EXTRA += netsys_oothr_mt.p.cmxs
++endif
+ # Note: we cannot refer here to *.p.cmx because there is no direct
+ # rule to build these files from .ml. They are implicitly built
+ # when the corresponding *.cmx (without .p) is created.
+@@ -81,9 +87,15 @@ netsys_oothr.cma: netsys_oothr.cmo
+ netsys_oothr.cmxa: netsys_oothr.cmx
+ 	$(OCAMLOPT) -o netsys_oothr.cmxa -a netsys_oothr.cmx
+ 
++netsys_oothr.cmxs: netsys_oothr.cmxa
++	$(OCAMLOPT) -linkall -shared -o netsys_oothr.cmxs netsys_oothr.cmxa
++
+ netsys_oothr.p.cmxa: netsys_oothr.cmx
+ 	$(OCAMLOPT) -o netsys_oothr.p.cmxa -a netsys_oothr.p.cmx
+ 
++netsys_oothr.p.cmxs: netsys_oothr.p.cmxa
++	$(OCAMLOPT) -linkall -shared -o netsys_oothr.p.cmxs netsys_oothr.p.cmxa
++
+ netsys_oothr_mt.cma: netsys_oothr.cmo netsys_oothr_mt.cmo
+ 	$(OCAMLC) -o netsys_oothr_mt.cma -a \
+ 		netsys_oothr.cmo netsys_oothr_mt.cmo
+@@ -92,10 +104,17 @@ netsys_oothr_mt.cmxa: netsys_oothr.cmx n
+ 	$(OCAMLOPT) -o netsys_oothr_mt.cmxa -a \
+ 		netsys_oothr.cmx netsys_oothr_mt.cmx
+ 
++netsys_oothr_mt.cmxs: netsys_oothr_mt.cmxa
++	$(OCAMLOPT) -linkall -shared -o netsys_oothr_mt.cmxs netsys_oothr_mt.cmxa
++
+ netsys_oothr_mt.p.cmxa: netsys_oothr.cmx netsys_oothr-$(MT_TYPE)
+ 	$(OCAMLOPT) -o netsys_oothr_mt.p.cmxa -a \
+ 		netsys_oothr.p.cmx netsys_oothr_mt.p.cmx
+ 
++netsys_oothr_mt.p.cmxs: netsys_oothr_mt.p.cmxa
++	$(OCAMLOPT) -linkall -shared -o netsys_oothr_mt.p.cmxs \
++		netsys_oothr_mt.p.cmxa
++
+ .PHONY: netsys_oothr-vm netsys_oothr-posix
+ netsys_oothr-vm:
+