pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/net/ocamlnet

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Jul 11 14:11:57 UTC 2017

Modified Files:
        pkgsrc/net/ocamlnet: Makefile PLIST buildlink3.mk distinfo options.mk
        pkgsrc/net/ocamlnet/patches: patch-Makefile.rules

Log Message:
Revbump assiociated with ocaml-4.04.2, and added patches to compile .cmxs
files


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/ocamlnet/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ocamlnet/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/ocamlnet/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/ocamlnet/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ocamlnet/patches/patch-Makefile.rules

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/net/ocamlnet/Makefile
diff -u pkgsrc/net/ocamlnet/Makefile:1.37 pkgsrc/net/ocamlnet/Makefile:1.38
--- pkgsrc/net/ocamlnet/Makefile:1.37   Sat Apr 22 21:03:50 2017
+++ pkgsrc/net/ocamlnet/Makefile        Tue Jul 11 14:11:57 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2017/04/22 21:03:50 adam Exp $
+# $NetBSD: Makefile,v 1.38 2017/07/11 14:11:57 jaapb Exp $
 #
 
 DISTNAME=              ocamlnet-4.1.2
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            net
 MASTER_SITES=          http://download.camlcity.org/download/
 
@@ -30,6 +30,7 @@ OCAML_FINDLIB_DIRS= \
 PLIST_VARS+=           xti
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 BUILD_TARGET+=         opt
+MAKE_ENV+=             HAVE_SHARED=1
 .endif
 .if ${OPSYS} == "SunOS"
 PLIST.xti=             yes
@@ -37,6 +38,18 @@ OCAML_FINDLIB_DIRS+= rpc-xti
 .endif
 
 .include "options.mk"
+
+.if !empty(PKG_OPTIONS:Mcmxs)
+post-build:
+       for i in ${OCAML_FINDLIB_DIRS}; do \
+               cd ${WRKSRC}/src/$$i && \
+               for j in *.cmxa; do \
+                       k=`echo $$j | sed -e 's/cmxa$$/cmxs$$/'`; \
+                       ocamlopt -linkall -shared -o $$k $$j; \
+               done; \
+       done
+.endif
+
 .include "../../devel/pcre-ocaml/buildlink3.mk"
 .include "../../archivers/ocaml-zip/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ocamlnet/PLIST
diff -u pkgsrc/net/ocamlnet/PLIST:1.14 pkgsrc/net/ocamlnet/PLIST:1.15
--- pkgsrc/net/ocamlnet/PLIST:1.14      Fri Dec 30 11:48:41 2016
+++ pkgsrc/net/ocamlnet/PLIST   Tue Jul 11 14:11:57 2017
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.14 2016/12/30 11:48:41 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.15 2017/07/11 14:11:57 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
 ${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
 ${OCAML_SITELIB}/equeue/unixqueue.cmi
 ${OCAML_SITELIB}/equeue/unixqueue.mli
 ${OCAML_SITELIB}/equeue/unixqueue_pollset.cmi
@@ -45,15 +47,19 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netca
 ${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
 ${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
 ${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.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
 ${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.cmi
 ${OCAML_SITELIB}/netcgi2-plex/netcgi_plex.mli
 ${OCAML_SITELIB}/netcgi2/META
@@ -61,9 +67,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netcg
 ${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
 ${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
 ${OCAML_SITELIB}/netcgi2/netcgi1_compat.cmi
 ${OCAML_SITELIB}/netcgi2/netcgi1_compat.mli
 ${OCAML_SITELIB}/netcgi2/netcgi_ajp.cmi
@@ -84,8 +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.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
 ${OCAML_SITELIB}/netclient/netftp_client.cmi
 ${OCAML_SITELIB}/netclient/netftp_client.mli
 ${OCAML_SITELIB}/netclient/netftp_data_endpoint.cmi
@@ -140,15 +150,19 @@ ${OCAML_SITELIB}/netmulticore/netmcore_u
 ${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.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
 ${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.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
 ${OCAML_SITELIB}/netplex/netplex_admin.cmi
 ${OCAML_SITELIB}/netplex/netplex_cenv.cmi
 ${OCAML_SITELIB}/netplex/netplex_cenv.mli
@@ -205,9 +219,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsh
 ${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
 ${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
 ${OCAML_SITELIB}/netshm/netshm_array.cmi
 ${OCAML_SITELIB}/netshm/netshm_array.mli
 ${OCAML_SITELIB}/netshm/netshm_data.cmi
@@ -218,8 +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.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
 ${OCAML_SITELIB}/netstring-pcre/netstring_pcre.cmi
 ${OCAML_SITELIB}/netstring-pcre/netstring_pcre.mli
 ${OCAML_SITELIB}/netstring/META
@@ -329,8 +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.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
 ${OCAML_SITELIB}/netstring/netstring_str.cmi
 ${OCAML_SITELIB}/netstring/netstring_str.mli
 ${OCAML_SITELIB}/netstring/netstring_top.cmi
@@ -370,9 +390,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/netsy
 ${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
 ${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
 ${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
@@ -403,16 +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
 ${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.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
 ${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
 ${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
@@ -467,8 +493,10 @@ ${PLIST.gnutls}${OCAML_SITELIB}/nettls-g
 ${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.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.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
@@ -477,157 +505,47 @@ ${PLIST.gnutls}${OCAML_SITELIB}/nettls-g
 ${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_nettle_bindings.cmi
 ${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/nettls_nettle_bindings.mli
 ${OCAML_SITELIB}/netunidata/META
-${OCAML_SITELIB}/netunidata/cmapf.adobe_standard_encoding.netdb
-${OCAML_SITELIB}/netunidata/cmapf.adobe_symbol_encoding.netdb
-${OCAML_SITELIB}/netunidata/cmapf.adobe_zapf_dingbats_encoding.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp037.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp1006.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp1026.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp1047.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp424.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp437.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp500.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp737.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp775.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp850.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp852.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp855.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp856.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp857.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp860.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp861.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp862.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp863.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp864.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp865.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp866.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp869.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp874.netdb
-${OCAML_SITELIB}/netunidata/cmapf.cp875.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88591.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso885910.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso885911.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso885913.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso885914.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso885915.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso885916.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88592.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88593.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88594.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88595.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88596.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88597.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88598.netdb
-${OCAML_SITELIB}/netunidata/cmapf.iso88599.netdb
-${OCAML_SITELIB}/netunidata/cmapf.jis0201.netdb
-${OCAML_SITELIB}/netunidata/cmapf.jis0208.netdb
-${OCAML_SITELIB}/netunidata/cmapf.jis0212.netdb
-${OCAML_SITELIB}/netunidata/cmapf.koi8r.netdb
-${OCAML_SITELIB}/netunidata/cmapf.ks1001.netdb
-${OCAML_SITELIB}/netunidata/cmapf.macroman.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1250.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1251.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1252.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1253.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1254.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1255.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1256.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1257.netdb
-${OCAML_SITELIB}/netunidata/cmapf.windows1258.netdb
-${OCAML_SITELIB}/netunidata/cmapr.adobe_standard_encoding.netdb
-${OCAML_SITELIB}/netunidata/cmapr.adobe_symbol_encoding.netdb
-${OCAML_SITELIB}/netunidata/cmapr.adobe_zapf_dingbats_encoding.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp037.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp1006.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp1026.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp1047.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp424.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp437.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp500.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp737.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp775.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp850.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp852.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp855.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp856.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp857.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp860.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp861.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp862.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp863.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp864.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp865.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp866.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp869.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp874.netdb
-${OCAML_SITELIB}/netunidata/cmapr.cp875.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88591.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso885910.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso885911.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso885913.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso885914.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso885915.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso885916.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88592.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88593.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88594.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88595.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88596.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88597.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88598.netdb
-${OCAML_SITELIB}/netunidata/cmapr.iso88599.netdb
-${OCAML_SITELIB}/netunidata/cmapr.jis0201.netdb
-${OCAML_SITELIB}/netunidata/cmapr.jis0208.netdb
-${OCAML_SITELIB}/netunidata/cmapr.jis0212.netdb
-${OCAML_SITELIB}/netunidata/cmapr.koi8r.netdb
-${OCAML_SITELIB}/netunidata/cmapr.ks1001.netdb
-${OCAML_SITELIB}/netunidata/cmapr.macroman.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1250.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1251.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1252.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1253.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1254.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1255.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1256.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1257.netdb
-${OCAML_SITELIB}/netunidata/cmapr.windows1258.netdb
 ${OCAML_SITELIB}/netunidata/netmappings_iso.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_iso.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_iso.o
+${OCAML_SITELIB}/netunidata/netmappings_iso.o
 ${OCAML_SITELIB}/netunidata/netmappings_jp.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_jp.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_jp.o
+${OCAML_SITELIB}/netunidata/netmappings_jp.o
 ${OCAML_SITELIB}/netunidata/netmappings_kr.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_kr.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_kr.o
+${OCAML_SITELIB}/netunidata/netmappings_kr.o
 ${OCAML_SITELIB}/netunidata/netmappings_other.cmi
 ${OCAML_SITELIB}/netunidata/netmappings_other.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.o
+${OCAML_SITELIB}/netunidata/netmappings_other.o
 ${OCAML_SITELIB}/netunidata/netunichecksums.cmi
 ${OCAML_SITELIB}/netunidata/netuniconfig.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.a
 ${OCAML_SITELIB}/netunidata/netunidata.cma
 ${OCAML_SITELIB}/netunidata/netunidata.cmi
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.cmxa
+${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
 ${OCAML_SITELIB}/netunidata/netuniinit.cmi
 ${OCAML_SITELIB}/netunidata/netuniinit.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.o
+${OCAML_SITELIB}/netunidata/netuniinit.o
 ${OCAML_SITELIB}/netzip/META
 ${OCAML_SITELIB}/netzip/netgzip.cmi
 ${OCAML_SITELIB}/netzip/netgzip.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.a
 ${OCAML_SITELIB}/netzip/netzip.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netzip/netzip.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
 ${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
@@ -636,9 +554,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-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
 ${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
 ${OCAML_SITELIB}/rpc-generator/META
 ${OCAML_SITELIB}/rpc-generator/config.cmi
 ${OCAML_SITELIB}/rpc-generator/direct.cmi
@@ -653,8 +573,10 @@ ${OCAML_SITELIB}/rpc-generator/rename.cm
 ${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.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
 ${OCAML_SITELIB}/rpc-generator/rpcgen-packlist
 ${OCAML_SITELIB}/rpc-generator/syntax.cmi
 ${PLIST.xti}${OCAML_SITELIB}/rpc-xti/META
@@ -666,6 +588,7 @@ ${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc
 ${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.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.cmi
 ${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.mli
 ${OCAML_SITELIB}/rpc/META
@@ -673,9 +596,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/r
 ${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
 ${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
 ${OCAML_SITELIB}/rpc/rpc_auth_gssapi.cmi
 ${OCAML_SITELIB}/rpc/rpc_auth_gssapi.mli
 ${OCAML_SITELIB}/rpc/rpc_auth_gssapi_aux.cmi
@@ -713,9 +638,11 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/shell
 ${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
 ${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
 ${OCAML_SITELIB}/shell/shell_fs.cmi
 ${OCAML_SITELIB}/shell/shell_fs.mli
 ${OCAML_SITELIB}/shell/shell_sys.cmi

Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.4 pkgsrc/net/ocamlnet/buildlink3.mk:1.5
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.4       Fri Dec 30 11:48:41 2016
+++ pkgsrc/net/ocamlnet/buildlink3.mk   Tue Jul 11 14:11:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2016/12/30 11:48:41 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2017/07/11 14:11:57 jaapb Exp $
 
 BUILDLINK_TREE+=       ocamlnet
 
@@ -6,6 +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_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
 
 .endif # OCAMLNET_BUILDLINK3_MK

Index: pkgsrc/net/ocamlnet/distinfo
diff -u pkgsrc/net/ocamlnet/distinfo:1.21 pkgsrc/net/ocamlnet/distinfo:1.22
--- pkgsrc/net/ocamlnet/distinfo:1.21   Fri Dec 30 11:48:41 2016
+++ pkgsrc/net/ocamlnet/distinfo        Tue Jul 11 14:11:57 2017
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.21 2016/12/30 11:48:41 jaapb Exp $
+$NetBSD: distinfo,v 1.22 2017/07/11 14:11:57 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) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a
+SHA1 (patch-Makefile.rules) = 410c9f87e318dac9a239800d872329daa9539505
+SHA1 (patch-src_netsys_Makefile) = 09f2cdfd1c8fc0cf0366e4d6a73e3acc246c21bd
 SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01

Index: pkgsrc/net/ocamlnet/options.mk
diff -u pkgsrc/net/ocamlnet/options.mk:1.5 pkgsrc/net/ocamlnet/options.mk:1.6
--- pkgsrc/net/ocamlnet/options.mk:1.5  Fri Dec 30 11:48:41 2016
+++ pkgsrc/net/ocamlnet/options.mk      Tue Jul 11 14:11:57 2017
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2016/12/30 11:48:41 jaapb Exp $
+# $NetBSD: options.mk,v 1.6 2017/07/11 14:11:57 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocamlnet
-PKG_SUPPORTED_OPTIONS= gtk gtk2 gnutls
+PKG_SUPPORTED_OPTIONS= gtk gtk2 gnutls cmxs
 PKG_SUGGESTED_OPTIONS= gnutls
 
-PLIST_VARS+=           gnutls
+PLIST_VARS+=           gnutls cmxs
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/net/ocamlnet/patches/patch-Makefile.rules
diff -u pkgsrc/net/ocamlnet/patches/patch-Makefile.rules:1.1 pkgsrc/net/ocamlnet/patches/patch-Makefile.rules:1.2
--- pkgsrc/net/ocamlnet/patches/patch-Makefile.rules:1.1        Fri Jul  6 09:29:14 2012
+++ pkgsrc/net/ocamlnet/patches/patch-Makefile.rules    Tue Jul 11 14:11:57 2017
@@ -1,15 +1,73 @@
-$NetBSD: patch-Makefile.rules,v 1.1 2012/07/06 09:29:14 wiz Exp $
+$NetBSD: patch-Makefile.rules,v 1.2 2017/07/11 14:11:57 jaapb Exp $
 
-make package work with DESTDIR support
---- Makefile.rules.orig        2012-02-29 18:02:51.000000000 +0000
+--- Makefile.rules.orig        2016-06-19 14:49:12.000000000 +0000
 +++ Makefile.rules
-@@ -148,7 +148,8 @@ realuninstall: $(UNINSTOTHER) uninstall-
+@@ -48,15 +48,20 @@ ARCHIVE  ?= $(PKGNAME)
+ 
+ ARCHIVE_CMA ?= $(ARCHIVE).cma 
+ ARCHIVE_CMXA ?= $(ARCHIVE).cmxa 
++ARCHIVE_CMXS ?= $(ARCHIVE).cmxs 
+ ARCHIVE_P ?= $(ARCHIVE).p
+ ARCHIVE_P_CMXA ?= $(ARCHIVE_P).cmxa
++ARCHIVE_P_CMXS ?= $(ARCHIVE_P).cmxs
+ 
+ MT_TYPE ?= posix
+ HAVE_GPROF ?= 0
++HAVE_SHARED ?= 0
+ ALL ?= $(ARCHIVE_CMA) $(ALL_EXTRA) \
+        all-mt-$(MT_TYPE)
+ OPT ?= $(ARCHIVE_CMXA) $(OPT_EXTRA) \
+-       opt-mt-$(MT_TYPE) opt-p-$(HAVE_GPROF) opt-mt-$(MT_TYPE)-p-$(HAVE_GPROF)
++       opt-mt-$(MT_TYPE) opt-p-$(HAVE_GPROF) opt-mt-$(MT_TYPE)-p-$(HAVE_GPROF) \
++                       opt-shared-$(HAVE_SHARED) opt-p-$(HAVE_GPROF)-shared-$(HAVE_SHARED)
++
+ 
+ all: $(ALL)
+ 
+@@ -72,7 +77,12 @@ opt-mt-vm-p-0:
+ opt-mt-posix-p-0:
+ opt-mt-vm-p-1:
+ opt-mt-posix-p-1: $(OPTMTP_EXTRA)
+-
++opt-shared-0:
++opt-shared-1: $(ARCHIVE_CMXS)
++opt-p-0-shared-0:
++opt-p-0-shared-1:
++opt-p-1-shared-0:
++opt-p-1-shared-1: $(ARCHIVE_P_CMXS)
+ 
+ 
+ $(ARCHIVE_CMA): $(OBJECTS) $(COBJECTS)
+@@ -89,6 +99,9 @@ $(ARCHIVE_CMXA): $(XOBJECTS) $(COBJECTS)
+               $(OCAMLMKLIB) -o $(ARCHIVE) $(XOBJECTS) $(COBJECTS) $(LINK_OPTIONS); \
+       fi
+ 
++$(ARCHIVE_CMXS): $(ARCHIVE_CMXA)
++              $(OCAMLOPT) -linkall -shared -I . -o $(ARCHIVE_CMXS) $(ARCHIVE_CMXA);
++
+ $(ARCHIVE_P_CMXA): $(XOBJECTS) $(COBJECTS)
+       if [ "X$(COBJECTS)" = "X" ]; then \
+               $(OCAMLOPT) -a -o $(ARCHIVE_P_CMXA) $(POBJECTS); \
+@@ -96,9 +109,12 @@ $(ARCHIVE_P_CMXA): $(XOBJECTS) $(COBJECT
+               $(OCAMLMKLIB) -o $(ARCHIVE_P) $(POBJECTS) $(COBJECTS) $(LINK_OPTIONS); \
+       fi
+ 
++$(ARCHIVE_P_CMXS): $(ARCHIVE_P_CMXA)
++              $(OCAMLOPT) -linkall -shared -I . -o $(ARCHIVE_P_CMXS) $(ARCHIVE_P_CMXA);
++
+ # Files to remove everywhere by "make clean":
+ 
+-CLEAN_LIST = *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa dll* packlist-* \
++CLEAN_LIST = *.cmi *.cmo *.cma *.cmx *.o *.a *.cmxa *.cmxs dll* packlist-* \
+            ocamldoc.dump META depend $(PACKLIST) $(GENERATE)
+ 
+ # Generic build rules:
+@@ -158,7 +174,7 @@ 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
+-      files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a dll* META $(INSTALL_EXTRA)` && \
++      files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.cmxs *.a dll* META $(INSTALL_EXTRA)` && \
+       $(OCAMLFIND) install $(PKGNAME) $$files
  
  .PHONY: uninstall-findlib
- uninstall-findlib:
Home | Main Index | Thread Index | Old Index