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: Mon Sep 4 18:17:47 UTC 2017
Modified Files:
pkgsrc/net/ocamlnet: Makefile PLIST buildlink3.mk distinfo
Log Message:
Updated package to latest version, 4.1.4, and made some changes to cmxs
generation (some double work going on there). Changes include:
2017-08-14 Gerd Stolpmann <gerd%gerdbook.fritz.box@localhost>
* Release 4.1.4
* Fix: incompatibility for OCaml < 4.03 because of -opaque
2017-08-05 Gerd Stolpmann <gerd%gerdbook.fritz.box@localhost>
* Release 4.1.3
* Building modules with -opaque flag when we don't install the cmx file
* Fix: incompatbility with OCaml-4.05 (O_KEEPEXEC flag)
* Fix: the local cppo built has been made compatible with -safe-string
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/ocamlnet/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ocamlnet/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/ocamlnet/distinfo
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.39 pkgsrc/net/ocamlnet/Makefile:1.40
--- pkgsrc/net/ocamlnet/Makefile:1.39 Mon Jul 17 12:30:55 2017
+++ pkgsrc/net/ocamlnet/Makefile Mon Sep 4 18:17:47 2017
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2017/07/17 12:30:55 jaapb Exp $
+# $NetBSD: Makefile,v 1.40 2017/09/04 18:17:47 jaapb Exp $
#
-DISTNAME= ocamlnet-4.1.2
-PKGREVISION= 5
+DISTNAME= ocamlnet-4.1.4
CATEGORIES= net
MASTER_SITES= http://download.camlcity.org/download/
@@ -30,7 +29,6 @@ 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
@@ -39,17 +37,6 @@ OCAML_FINDLIB_DIRS+= rpc-xti
.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.16 pkgsrc/net/ocamlnet/PLIST:1.17
--- pkgsrc/net/ocamlnet/PLIST:1.16 Mon Jul 17 12:30:55 2017
+++ pkgsrc/net/ocamlnet/PLIST Mon Sep 4 18:17:47 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2017/07/17 12:30:55 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/09/04 18:17:47 jaapb Exp $
${OCAML_SITELIB}/equeue/META
${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
${OCAML_SITELIB}/equeue/equeue.cma
@@ -242,7 +242,7 @@ ${OCAML_SITELIB}/netstring-pcre/netstrin
${OCAML_SITELIB}/netstring-pcre/netstring_pcre.mli
${OCAML_SITELIB}/netstring/META
${OCAML_SITELIB}/netstring/dllnetaccel_c.so
-${OCAML_SITELIB}/netstring/libnetaccel_c.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/libnetaccel_c.a
${OCAML_SITELIB}/netstring/netaccel.cma
${OCAML_SITELIB}/netstring/netaccel.cmi
${OCAML_SITELIB}/netstring/netaccel.mli
@@ -262,7 +262,11 @@ ${OCAML_SITELIB}/netstring/netauth.mli
${OCAML_SITELIB}/netstring/netaux.cmi
${OCAML_SITELIB}/netstring/netaux.mli
${OCAML_SITELIB}/netstring/netbuffer.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.cmx
${OCAML_SITELIB}/netstring/netbuffer.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.p.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netbuffer.p.o
${OCAML_SITELIB}/netstring/netchannels.cmi
${OCAML_SITELIB}/netstring/netchannels.mli
${OCAML_SITELIB}/netstring/netchannels_crypto.cmi
@@ -272,7 +276,11 @@ ${OCAML_SITELIB}/netstring/netcompressio
${OCAML_SITELIB}/netstring/netconst.cmi
${OCAML_SITELIB}/netstring/netconst.mli
${OCAML_SITELIB}/netstring/netconversion.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.cmx
${OCAML_SITELIB}/netstring/netconversion.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.p.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netconversion.p.o
${OCAML_SITELIB}/netstring/netdate.cmi
${OCAML_SITELIB}/netstring/netdate.mli
${OCAML_SITELIB}/netstring/netdb.cmi
@@ -330,7 +338,11 @@ ${OCAML_SITELIB}/netstring/netmime_heade
${OCAML_SITELIB}/netstring/netmime_string.cmi
${OCAML_SITELIB}/netstring/netmime_string.mli
${OCAML_SITELIB}/netstring/netnumber.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.cmx
${OCAML_SITELIB}/netstring/netnumber.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.p.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netnumber.p.o
${OCAML_SITELIB}/netstring/netoid.cmi
${OCAML_SITELIB}/netstring/netoid.mli
${OCAML_SITELIB}/netstring/netpagebuffer.cmi
@@ -375,12 +387,16 @@ ${OCAML_SITELIB}/netstring/netx509_pubke
${OCAML_SITELIB}/netstring/netx509_pubkey_crypto.cmi
${OCAML_SITELIB}/netstring/netx509_pubkey_crypto.mli
${OCAML_SITELIB}/netstring/netxdr.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netxdr.cmx
${OCAML_SITELIB}/netstring/netxdr.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netxdr.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netxdr.p.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netstring/netxdr.p.o
${OCAML_SITELIB}/netstring/netxdr_mstring.cmi
${OCAML_SITELIB}/netstring/netxdr_mstring.mli
${OCAML_SITELIB}/netsys/META
${OCAML_SITELIB}/netsys/dllnetsys.so
-${OCAML_SITELIB}/netsys/libnetsys.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/libnetsys.a
${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/libnetsys.p.a
${OCAML_SITELIB}/netsys/netexn.cmi
${OCAML_SITELIB}/netsys/netexn.mli
@@ -413,8 +429,8 @@ ${OCAML_SITELIB}/netsys/netsys_global.cm
${OCAML_SITELIB}/netsys/netsys_global.mli
${OCAML_SITELIB}/netsys/netsys_gprof_init.cmi
${OCAML_SITELIB}/netsys/netsys_gprof_init.mli
-${OCAML_SITELIB}/netsys/netsys_gprof_init.p.cmx
-${OCAML_SITELIB}/netsys/netsys_gprof_init.p.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_gprof_init.p.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netsys/netsys_gprof_init.p.o
${OCAML_SITELIB}/netsys/netsys_gssapi.cmi
${OCAML_SITELIB}/netsys/netsys_gssapi.mli
${OCAML_SITELIB}/netsys/netsys_impl_util.cmi
@@ -487,8 +503,8 @@ ${OCAML_SITELIB}/netsys/netsys_xdr.mli
${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/META
${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/dllnettls-gnutls.so
${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/gnutls.mli
-${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/libnettls-gnutls.a
-${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/libnettls-gnutls.p.a
+${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/libnettls-gnutls.a
+${PLIST.ocaml-opt}${PLIST.gnutls}${OCAML_SITELIB}/nettls-gnutls/libnettls-gnutls.p.a
${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
@@ -508,19 +524,19 @@ ${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
-${OCAML_SITELIB}/netunidata/netmappings_iso.o
+${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
-${OCAML_SITELIB}/netunidata/netmappings_jp.o
+${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
-${OCAML_SITELIB}/netunidata/netmappings_kr.o
+${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
-${OCAML_SITELIB}/netunidata/netmappings_other.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netmappings_other.o
${OCAML_SITELIB}/netunidata/netunichecksums.cmi
${OCAML_SITELIB}/netunidata/netuniconfig.cmi
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netunidata.a
@@ -535,7 +551,7 @@ ${PLIST.cmxs}${PLIST.ocaml-opt}${OCAML_S
${OCAML_SITELIB}/netunidata/netuniinit.cmi
${OCAML_SITELIB}/netunidata/netuniinit.cmo
${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.cmx
-${OCAML_SITELIB}/netunidata/netuniinit.o
+${PLIST.ocaml-opt}${OCAML_SITELIB}/netunidata/netuniinit.o
${OCAML_SITELIB}/netzip/META
${OCAML_SITELIB}/netzip/netgzip.cmi
${OCAML_SITELIB}/netzip/netgzip.mli
@@ -579,18 +595,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc-g
${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
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/dllrpc_xti.so
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/librpc_xti.a
-${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.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.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.cmi
-${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.mli
${OCAML_SITELIB}/rpc/META
${PLIST.ocaml-opt}${OCAML_SITELIB}/rpc/rpc.a
${OCAML_SITELIB}/rpc/rpc.cma
@@ -649,3 +653,16 @@ ${OCAML_SITELIB}/shell/shell_sys.cmi
${OCAML_SITELIB}/shell/shell_sys.mli
${OCAML_SITELIB}/shell/shell_uq.cmi
${OCAML_SITELIB}/shell/shell_uq.mli
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/META
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/dllrpc_xti.so
+${PLIST.ocaml-opt}${PLIST.xti}${OCAML_SITELIB}/rpc-xti/librpc_xti.a
+${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.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.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.cmi
+${PLIST.xti}${OCAML_SITELIB}/rpc-xti/rpc_xti_client.mli
Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.6 pkgsrc/net/ocamlnet/buildlink3.mk:1.7
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.6 Mon Jul 17 12:30:55 2017
+++ pkgsrc/net/ocamlnet/buildlink3.mk Mon Sep 4 18:17:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2017/07/17 12:30:55 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2017/09/04 18:17:47 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.2nb5
+BUILDLINK_ABI_DEPENDS.ocamlnet+= ocamlnet>=4.1.4
BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
.endif # OCAMLNET_BUILDLINK3_MK
Index: pkgsrc/net/ocamlnet/distinfo
diff -u pkgsrc/net/ocamlnet/distinfo:1.23 pkgsrc/net/ocamlnet/distinfo:1.24
--- pkgsrc/net/ocamlnet/distinfo:1.23 Mon Jul 17 12:30:55 2017
+++ pkgsrc/net/ocamlnet/distinfo Mon Sep 4 18:17:47 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2017/07/17 12:30:55 jaapb Exp $
+$NetBSD: distinfo,v 1.24 2017/09/04 18:17:47 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 (ocamlnet-4.1.4.tar.gz) = f7bb6e98f2c35850fb8dce428c061ce316d55ce2
+RMD160 (ocamlnet-4.1.4.tar.gz) = a71a5c894db5c540e5b47df750ea4a1468ea7bf8
+SHA512 (ocamlnet-4.1.4.tar.gz) = ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
+Size (ocamlnet-4.1.4.tar.gz) = 4552969 bytes
SHA1 (patch-Makefile.rules) = 124b787309e39334036681035e0687120da672c8
SHA1 (patch-src_netsys_Makefile) = 9edbac14c5f5840933f3e93b27bb95750e946089
SHA1 (patch-src_netsys_netsys__c.c) = d83d7746267523456696057bdd2ade74a9313f01
Home |
Main Index |
Thread Index |
Old Index