Removed cmxs option from net/ocamlnet.

(This is now correctly detected and does not need an option)

4 files changed, 52 insertions, 87 deletions

diff --git a/net/ocamlnet/PLIST b/net/ocamlnet/PLIST
index b1aa1fbb36e..124db14c28a 100644
--- a/net/ocamlnet/PLIST
+++ b/net/ocamlnet/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.18 2018/01/10 16:37:41 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.19 2018/01/22 11:17:52 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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcamlbox/netcamlbox.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2-plex/netcgi2-plex.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netcgi2/netcgi.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netclient/netclient.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netmulticore/netmulticore.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netplex/netplex.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netshm/netshm.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring-pcre/netstring-pcre.p.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
@@ -359,10 +359,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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netstring.p.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
@@ -406,11 +406,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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys.p.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
@@ -441,24 +441,24 @@ ${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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr.p.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt.p.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
-${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.cmxs
 ${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.o
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_oothr_mt_init.p.cmx
@@ -510,10 +510,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.cmxs}${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.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.cmxs}${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls-gnutls.p.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
@@ -525,22 +525,22 @@ ${OCAML_SITELIB}/netunidata/META
 ${OCAML_SITELIB}/netunidata/netmappings_iso.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_iso.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmx
-${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmxs
 ${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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmxs
 ${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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmxs
 ${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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.o
 ${OCAML_SITELIB}/netunidata/netunichecksums.cmi
 ${OCAML_SITELIB}/netunidata/netuniconfig.cmi
@@ -548,15 +548,15 @@ ${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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.p.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
-${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmxs
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.o
 ${OCAML_SITELIB}/netzip/META
 ${OCAML_SITELIB}/netzip/netgzip.cmi
@@ -564,10 +564,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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.p.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
@@ -576,11 +576,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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-auth-local/rpc_auth_local.p.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
@@ -595,10 +595,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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-generator/rpc_generator.p.cmxs
 ${OCAML_SITELIB}/rpc-generator/rpcgen-packlist
 ${OCAML_SITELIB}/rpc-generator/syntax.cmi
 ${OCAML_SITELIB}/rpc/META
@@ -606,11 +606,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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.p.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
@@ -648,11 +648,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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.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.cmxs}${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.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
@@ -666,9 +666,9 @@ ${PLIST.ocaml-opt}${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.cmxs}${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.cmxs
+${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.cmxs
 ${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.cmxs}${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti.p.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
diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo
index ab1450c20b3..cbb468e33dd 100644
--- a/net/ocamlnet/distinfo
+++ b/net/ocamlnet/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.26 2018/01/10 16:37:41 jaapb Exp $
+$NetBSD: distinfo,v 1.27 2018/01/22 11:17:52 jaapb Exp $
 
 SHA1 (ocamlnet-4.1.5.tar.gz) = 84e17713961536442c440745c4daa158d22d899a
 RMD160 (ocamlnet-4.1.5.tar.gz) = b4b276cd086a6d0901d8d0788b159c451db48ca4
 SHA512 (ocamlnet-4.1.5.tar.gz) = f22c24b3413ccf16fc2538d4390871e60c7c1abc6bd0f599057909d786e7ad852d47c3ba0315b0095c01b345ea58d6d7d9cfefc2f9f9c31fe7b8d5e5c874328c
 Size (ocamlnet-4.1.5.tar.gz) = 4588097 bytes
 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
-SHA1 (patch-src_nettls-nettle.c) = 75748ff2fd30ff6f54f15b9646a22b420d108f28
 SHA1 (patch-src_netzip_netgzip.ml) = ab46274a135c695c4c3776c2a6f00e73338d5c77
diff --git a/net/ocamlnet/options.mk b/net/ocamlnet/options.mk
index 364f279d2f4..56e967f21d5 100644
--- a/net/ocamlnet/options.mk
+++ b/net/ocamlnet/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.8 2017/10/04 13:08:20 jaapb Exp $
+# $NetBSD: options.mk,v 1.9 2018/01/22 11:17:52 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocamlnet
-PKG_SUPPORTED_OPTIONS=	gtk gtk2 gnutls cmxs
+PKG_SUPPORTED_OPTIONS=	gtk gtk2 gnutls
 PKG_SUGGESTED_OPTIONS=	gnutls
 
 PLIST_VARS+=		gnutls cmxs
@@ -41,13 +41,3 @@ 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-src_nettls-nettle.c b/net/ocamlnet/patches/patch-src_nettls-nettle.c
deleted file mode 100644
index 15c9ac742dd..00000000000
--- a/net/ocamlnet/patches/patch-src_nettls-nettle.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_nettls-nettle.c,v 1.1 2018/01/07 21:01:09 joerg Exp $
-
-Newer nettle versions provide macros for this purpose.
-
---- src/nettls-gnutls/nettle.c.orig	2017-08-14 13:16:50.-06639040 +0000
-+++ src/nettls-gnutls/nettle.c
-@@ -98,7 +98,7 @@ static const char *net_nettle_cipher_nam
-     return cipher->name;
- }
- 
--#ifndef HAVE_FUN_nettle_ciphers
-+#if !defined(HAVE_FUN_nettle_ciphers) && !defined(nettle_ciphers)
- const struct nettle_cipher * const nettle_ciphers[] = {
-   &nettle_aes128,
-   &nettle_aes192,
-@@ -337,7 +337,7 @@ static void net_nettle_hash_digest(net_n
-     hash->digest(ctx, length, dst);
- }
- 
--#ifndef HAVE_FUN_nettle_hashes
-+#if defined(HAVE_FUN_nettle_hashes) && !defined(nettle_hashes)
- const struct nettle_hash * const nettle_hashes[] = {
-     &nettle_md2,
-     &nettle_md4,