[pkgsrc/trunk]: pkgsrc/net/ocamlnet Updated package to make sure cmxs option ...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a1a65cc0bf5
branches:  trunk
changeset: 365457:9a1a65cc0bf5
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Mon Jul 17 12:30:55 2017 +0000

description:
Updated package to make sure cmxs option works correctly

diffstat:

 net/ocamlnet/Makefile                          |   4 +-
 net/ocamlnet/PLIST                             |  84 +++++++++++++-------------
 net/ocamlnet/buildlink3.mk                     |   4 +-
 net/ocamlnet/distinfo                          |   6 +-
 net/ocamlnet/options.mk                        |  23 +++---
 net/ocamlnet/patches/patch-Makefile.rules      |   3 +-
 net/ocamlnet/patches/patch-src_netsys_Makefile |  52 ++++++++++++++++
 7 files changed, 114 insertions(+), 62 deletions(-)

diffs (truncated from 435 to 300 lines):

diff -r d458b36a6e29 -r 9a1a65cc0bf5 net/ocamlnet/Makefile
--- a/net/ocamlnet/Makefile     Mon Jul 17 09:45:36 2017 +0000
+++ b/net/ocamlnet/Makefile     Mon Jul 17 12:30:55 2017 +0000
@@ -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 -r d458b36a6e29 -r 9a1a65cc0bf5 net/ocamlnet/PLIST
--- a/net/ocamlnet/PLIST        Mon Jul 17 09:45:36 2017 +0000
+++ b/net/ocamlnet/PLIST        Mon Jul 17 12:30:55 2017 +0000
@@ -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 @@
 ${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 @@
 ${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 @@
 ${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 @@
 ${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 @@
 ${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 @@
 ${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 @@
 ${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 @@
 ${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.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.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 @@
 ${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 @@
 ${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 @@
 ${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 @@
 ${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.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 @@
 ${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 @@
 ${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 -r d458b36a6e29 -r 9a1a65cc0bf5 net/ocamlnet/buildlink3.mk
--- a/net/ocamlnet/buildlink3.mk        Mon Jul 17 09:45:36 2017 +0000
+++ b/net/ocamlnet/buildlink3.mk        Mon Jul 17 12:30:55 2017 +0000
@@ -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 $