CVS commit: pkgsrc/devel/ocaml-lwt

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/ocaml-lwt
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Thu, 5 Apr 2018 11:04:40 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Apr  5 11:04:40 UTC 2018

Modified Files:
        pkgsrc/devel/ocaml-lwt: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/devel/ocaml-lwt/patches: patch-META.lwt
Added Files:
        pkgsrc/devel/ocaml-lwt/patches: patch-src_camlp4_jbuild
            patch-src_camlp4_log_jbuild patch-src_camlp4_options_jbuild
            patch-src_ppx_jbuild
            patch-src_unix_unix__c_unix__stat__job__utils.c
Removed Files:
        pkgsrc/devel/ocaml-lwt/patches: patch-src_unix_lwt__unix__unix.h

Log Message:
Updated devel/ocaml-lwt to version 3.3.0.

This includes minor bugfixes and improvements, but nothing that breaks
backwards compatibility.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/ocaml-lwt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-lwt/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/ocaml-lwt/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ocaml-lwt/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocaml-lwt/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-lwt/patches/patch-META.lwt
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_jbuild \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_log_jbuild \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_options_jbuild \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_ppx_jbuild \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_lwt__unix__unix.h

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

Modified files:

Index: pkgsrc/devel/ocaml-lwt/Makefile
diff -u pkgsrc/devel/ocaml-lwt/Makefile:1.33 pkgsrc/devel/ocaml-lwt/Makefile:1.34
--- pkgsrc/devel/ocaml-lwt/Makefile:1.33        Mon Jan 22 11:53:24 2018
+++ pkgsrc/devel/ocaml-lwt/Makefile     Thu Apr  5 11:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2018/01/22 11:53:24 jaapb Exp $
+# $NetBSD: Makefile,v 1.34 2018/04/05 11:04:39 jaapb Exp $
 #
 
 .include "Makefile.common"
@@ -10,7 +10,8 @@ MAINTAINER=   jaapb%NetBSD.org@localhost
 HOMEPAGE=      http://www.ocsigen.org/
 COMMENT=       Cooperative threading library for OCaml
 
-JBUILDER_BUILD_TARGETS=        lwt
+#MAKE_JOBS_SAFE=       no
+JBUILDER_BUILD_PACKAGES=       lwt
 
 CONFIGURE_ARGS=        -use-libev false
 

Index: pkgsrc/devel/ocaml-lwt/Makefile.common
diff -u pkgsrc/devel/ocaml-lwt/Makefile.common:1.2 pkgsrc/devel/ocaml-lwt/Makefile.common:1.3
--- pkgsrc/devel/ocaml-lwt/Makefile.common:1.2  Mon Jan 22 11:53:24 2018
+++ pkgsrc/devel/ocaml-lwt/Makefile.common      Thu Apr  5 11:04:39 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.2 2018/01/22 11:53:24 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.3 2018/04/05 11:04:39 jaapb Exp $
 
 # used by devel/ocaml-lwt_glib/Makefile
+# used by devel/ocaml-lwt_ppx/Makefile
 # used by devel/ocaml-lwt_react/Makefile
-# used by devel/ocaml-lwt_ssl/Makefile
 
-LWT_VERSION=   3.2.0
+LWT_VERSION=   3.3.0
 DISTNAME=      lwt-${LWT_VERSION}
 
 LICENSE=       gnu-lgpl-v2.1
@@ -14,7 +14,6 @@ GITHUB_PROJECT=       lwt
 GITHUB_TAG=    ${LWT_VERSION}
 
 OCAML_USE_JBUILDER=    yes
-JBUILDER_BUILD_FLAGS=  --only-packages
 
 DISTINFO_FILE= ${PKGDIR}/../../devel/ocaml-lwt/distinfo
 PATCHDIR=      ${PKGDIR}/../../devel/ocaml-lwt/patches

Index: pkgsrc/devel/ocaml-lwt/PLIST
diff -u pkgsrc/devel/ocaml-lwt/PLIST:1.12 pkgsrc/devel/ocaml-lwt/PLIST:1.13
--- pkgsrc/devel/ocaml-lwt/PLIST:1.12   Mon Jan 22 11:53:24 2018
+++ pkgsrc/devel/ocaml-lwt/PLIST        Thu Apr  5 11:04:39 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2018/01/22 11:53:24 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.13 2018/04/05 11:04:39 jaapb Exp $
 ${OCAML_SITELIB}/lwt/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log.a
 ${OCAML_SITELIB}/lwt/log/lwt_log.cma
@@ -8,12 +8,15 @@ ${OCAML_SITELIB}/lwt/log/lwt_log_core.cm
 ${OCAML_SITELIB}/lwt/log/lwt_log_core.cmt
 ${OCAML_SITELIB}/lwt/log/lwt_log_core.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log_core.cmx
+${OCAML_SITELIB}/lwt/log/lwt_log_core.ml
 ${OCAML_SITELIB}/lwt/log/lwt_log_core.mli
 ${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmi
 ${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmt
 ${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log_rules.cmx
+${OCAML_SITELIB}/lwt/log/lwt_log_rules.ml
 ${OCAML_SITELIB}/lwt/log/lwt_log_rules.mli
+${OCAML_SITELIB}/lwt/log/lwt.log.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.a
 ${OCAML_SITELIB}/lwt/lwt.cma
 ${OCAML_SITELIB}/lwt/lwt.cmi
@@ -22,58 +25,71 @@ ${OCAML_SITELIB}/lwt/lwt.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt.cmxs
+${OCAML_SITELIB}/lwt/lwt.dune
+${OCAML_SITELIB}/lwt/lwt.ml
 ${OCAML_SITELIB}/lwt/lwt.mli
 ${OCAML_SITELIB}/lwt/lwt_condition.cmi
 ${OCAML_SITELIB}/lwt/lwt_condition.cmt
 ${OCAML_SITELIB}/lwt/lwt_condition.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_condition.cmx
+${OCAML_SITELIB}/lwt/lwt_condition.ml
 ${OCAML_SITELIB}/lwt/lwt_condition.mli
 ${OCAML_SITELIB}/lwt/lwt_list.cmi
 ${OCAML_SITELIB}/lwt/lwt_list.cmt
 ${OCAML_SITELIB}/lwt/lwt_list.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_list.cmx
+${OCAML_SITELIB}/lwt/lwt_list.ml
 ${OCAML_SITELIB}/lwt/lwt_list.mli
 ${OCAML_SITELIB}/lwt/lwt_mutex.cmi
 ${OCAML_SITELIB}/lwt/lwt_mutex.cmt
 ${OCAML_SITELIB}/lwt/lwt_mutex.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_mutex.cmx
+${OCAML_SITELIB}/lwt/lwt_mutex.ml
 ${OCAML_SITELIB}/lwt/lwt_mutex.mli
 ${OCAML_SITELIB}/lwt/lwt_mvar.cmi
 ${OCAML_SITELIB}/lwt/lwt_mvar.cmt
 ${OCAML_SITELIB}/lwt/lwt_mvar.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_mvar.cmx
+${OCAML_SITELIB}/lwt/lwt_mvar.ml
 ${OCAML_SITELIB}/lwt/lwt_mvar.mli
 ${OCAML_SITELIB}/lwt/lwt_pool.cmi
 ${OCAML_SITELIB}/lwt/lwt_pool.cmt
 ${OCAML_SITELIB}/lwt/lwt_pool.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_pool.cmx
+${OCAML_SITELIB}/lwt/lwt_pool.ml
 ${OCAML_SITELIB}/lwt/lwt_pool.mli
 ${OCAML_SITELIB}/lwt/lwt_pqueue.cmi
 ${OCAML_SITELIB}/lwt/lwt_pqueue.cmt
 ${OCAML_SITELIB}/lwt/lwt_pqueue.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_pqueue.cmx
+${OCAML_SITELIB}/lwt/lwt_pqueue.ml
 ${OCAML_SITELIB}/lwt/lwt_pqueue.mli
 ${OCAML_SITELIB}/lwt/lwt_result.cmi
 ${OCAML_SITELIB}/lwt/lwt_result.cmt
 ${OCAML_SITELIB}/lwt/lwt_result.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_result.cmx
+${OCAML_SITELIB}/lwt/lwt_result.ml
 ${OCAML_SITELIB}/lwt/lwt_result.mli
 ${OCAML_SITELIB}/lwt/lwt_sequence.cmi
 ${OCAML_SITELIB}/lwt/lwt_sequence.cmt
 ${OCAML_SITELIB}/lwt/lwt_sequence.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_sequence.cmx
+${OCAML_SITELIB}/lwt/lwt_sequence.ml
 ${OCAML_SITELIB}/lwt/lwt_sequence.mli
 ${OCAML_SITELIB}/lwt/lwt_stream.cmi
 ${OCAML_SITELIB}/lwt/lwt_stream.cmt
 ${OCAML_SITELIB}/lwt/lwt_stream.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_stream.cmx
+${OCAML_SITELIB}/lwt/lwt_stream.ml
 ${OCAML_SITELIB}/lwt/lwt_stream.mli
 ${OCAML_SITELIB}/lwt/lwt_switch.cmi
 ${OCAML_SITELIB}/lwt/lwt_switch.cmt
 ${OCAML_SITELIB}/lwt/lwt_switch.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_switch.cmx
+${OCAML_SITELIB}/lwt/lwt_switch.ml
 ${OCAML_SITELIB}/lwt/lwt_switch.mli
 ${OCAML_SITELIB}/lwt/opam
+${OCAML_SITELIB}/lwt/ppx/lwt.ppx.dune
 ${OCAML_SITELIB}/lwt/ppx/ppx.exe
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.a
 ${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cma
@@ -83,6 +99,7 @@ ${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmxs
+${OCAML_SITELIB}/lwt/ppx/ppx_lwt.ml
 ${OCAML_SITELIB}/lwt/ppx/ppx_lwt.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.a
 ${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cma
@@ -92,23 +109,28 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/s
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmxs
 ${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.ml
+${OCAML_SITELIB}/lwt/simple-top/lwt.simple-top.dune
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.a
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cma
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cmxa
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cmxs
+${OCAML_SITELIB}/lwt/syntax/log/lwt.syntax.log.dune
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmi
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmt
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmti
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmx
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.ml
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.mli
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.a
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cma
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cmxa
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cmxs
+${OCAML_SITELIB}/lwt/syntax/lwt.syntax.dune
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.a
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cma
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cmxa
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cmxs
+${OCAML_SITELIB}/lwt/syntax/options/lwt.syntax.options.dune
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmi
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmt
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmx
@@ -117,17 +139,20 @@ ${PLIST.camlp4}${OCAML_SITELIB}/lwt/synt
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmt
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmti
 ${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmx
+${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.ml
 ${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/liblwt_unix_stubs.a
 ${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_bytes.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_bytes.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_chan.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_chan.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_chan.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_chan.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_chan.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_chan.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_config.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_config.cmt
@@ -138,56 +163,67 @@ ${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_daemon.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_daemon.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_daemon.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_engine.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_engine.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_engine.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_engine.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_gc.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_gc.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_gc.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_gc.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_io.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_io.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_io.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_io.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_io.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_io.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_log.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_log.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_log.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_log.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_log.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_log.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_main.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_main.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_main.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_main.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_main.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_main.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_preemptive.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_preemptive.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_preemptive.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_process.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_process.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_process.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_process.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_process.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_process.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_sys.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_sys.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_sys.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_sys.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_sys.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_sys.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_throttle.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_throttle.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_throttle.mli
 ${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmi
 ${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmt
 ${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_timeout.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_timeout.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_timeout.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.a
 ${OCAML_SITELIB}/lwt/unix/lwt_unix.cma
@@ -198,13 +234,13 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/u
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix.cmxs
 ${OCAML_SITELIB}/lwt/unix/lwt_unix.h
+${OCAML_SITELIB}/lwt/unix/lwt_unix.ml
 ${OCAML_SITELIB}/lwt/unix/lwt_unix.mli
-${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.cmi
-${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.cmx
-${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs_generated.ml
-${OCAML_SITELIB}/lwt/unix/lwt_unix_unix.h
-${OCAML_SITELIB}/lwt/unix/lwt_unix_windows.h
+${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmi
+${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.cmx
+${OCAML_SITELIB}/lwt/unix/lwt_unix_jobs.ml
+${OCAML_SITELIB}/lwt/unix/lwt.unix.dune
 ${OCAML_SITELIB}/stublibs/dlllwt_unix_stubs.so
 share/doc/lwt/CHANGES
 share/doc/lwt/README.md

Index: pkgsrc/devel/ocaml-lwt/buildlink3.mk
diff -u pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.8 pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.9
--- pkgsrc/devel/ocaml-lwt/buildlink3.mk:1.8    Mon Jan 22 11:53:24 2018
+++ pkgsrc/devel/ocaml-lwt/buildlink3.mk        Thu Apr  5 11:04:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2018/01/22 11:53:24 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/04/05 11:04:39 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-lwt
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-lwt
 OCAML_LWT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lwt+=      ocaml-lwt>=3.0.0
-BUILDLINK_ABI_DEPENDS.ocaml-lwt+=      ocaml-lwt>=3.2.0
+BUILDLINK_ABI_DEPENDS.ocaml-lwt+=      ocaml-lwt>=3.3.0
 BUILDLINK_PKGSRCDIR.ocaml-lwt?=                ../../devel/ocaml-lwt
 
 #.include "../../devel/libev/buildlink3.mk"

Index: pkgsrc/devel/ocaml-lwt/distinfo
diff -u pkgsrc/devel/ocaml-lwt/distinfo:1.15 pkgsrc/devel/ocaml-lwt/distinfo:1.16
--- pkgsrc/devel/ocaml-lwt/distinfo:1.15        Thu Feb  1 09:40:13 2018
+++ pkgsrc/devel/ocaml-lwt/distinfo     Thu Apr  5 11:04:39 2018
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.15 2018/02/01 09:40:13 jperkin Exp $
+$NetBSD: distinfo,v 1.16 2018/04/05 11:04:39 jaapb Exp $
 
-SHA1 (lwt-3.2.0.tar.gz) = fe821da0bf8e6f38d59d29932b1e5404a745304e
-RMD160 (lwt-3.2.0.tar.gz) = b079c2dbc26f05f02a06d73b877d6178289fff0d
-SHA512 (lwt-3.2.0.tar.gz) = 59e4dc53b81b9673c490b20cd3dd362ed8262d32b07e2656b5de801bd204df6050fec02a461c64533ea6c8863d160ddaf9d0050bccbebe82fa696c923486f0c8
-Size (lwt-3.2.0.tar.gz) = 310769 bytes
-SHA1 (patch-META.lwt) = ddfaf4ebd6c90a7022d0779a4e65ded8feb0864f
+SHA1 (lwt-3.3.0.tar.gz) = 1a8aec06b4080577a989cbaeec0614359465ea73
+RMD160 (lwt-3.3.0.tar.gz) = 2f374a7e315daa03f7f3b3039abbf757dc5b7892
+SHA512 (lwt-3.3.0.tar.gz) = 452425c8c0cddd53463da658b1bb8edb0c5ead2e0de0f733dbf624d373fec94c3121e77cc285427770388e16106fae84c32805b6642d1797200660fed91d0f29
+Size (lwt-3.3.0.tar.gz) = 312052 bytes
+SHA1 (patch-META.lwt) = bd8348dc75f92188db1e00c8afd91c551d5a3267
+SHA1 (patch-src_camlp4_jbuild) = 9cb17cd6cf2b0c4a05b5251829c9c0a42bdf1f10
+SHA1 (patch-src_camlp4_log_jbuild) = 0c8145baebbef764836e41ce1cc308b630513e14
+SHA1 (patch-src_camlp4_options_jbuild) = eac6a3152667d33c14e4b890e395a9d4b52e7a46
+SHA1 (patch-src_ppx_jbuild) = d027f7049f2f3cfe96d4d9d1a5ddcfb3126d17da
 SHA1 (patch-src_unix_config_discover.ml) = ef8ea37d85f20d56654514617050ee46d6080ef1
-SHA1 (patch-src_unix_lwt__unix__unix.h) = 545eabb01a3f10d02a6fa38f8fe6a74cdba75434
+SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = 5ec0ae3afe3d65e673681fcf8faeebf811e64518

Index: pkgsrc/devel/ocaml-lwt/patches/patch-META.lwt
diff -u pkgsrc/devel/ocaml-lwt/patches/patch-META.lwt:1.2 pkgsrc/devel/ocaml-lwt/patches/patch-META.lwt:1.3
--- pkgsrc/devel/ocaml-lwt/patches/patch-META.lwt:1.2   Mon Jan 22 11:53:24 2018
+++ pkgsrc/devel/ocaml-lwt/patches/patch-META.lwt       Thu Apr  5 11:04:39 2018
@@ -1,7 +1,7 @@
-$NetBSD: patch-META.lwt,v 1.2 2018/01/22 11:53:24 jaapb Exp $
+$NetBSD: patch-META.lwt,v 1.3 2018/04/05 11:04:39 jaapb Exp $
 
 Directories need to be recognised
---- META.lwt.orig      2017-12-19 21:28:38.000000000 +0000
+--- META.lwt.orig      2018-03-07 19:44:32.000000000 +0000
 +++ META.lwt
 @@ -14,7 +14,7 @@ plugin(byte) = "lwt.cma"
  plugin(native) = "lwt.cmxs"
@@ -9,60 +9,15 @@ Directories need to be recognised
  package "log" (
 -  #directory = "log"
 +  directory = "log"
-   version = "3.2.0"
+   version = "3.3.0"
    description = "Logger for Lwt (deprecated; use lwt_log)"
    requires = "bytes lwt result"
-@@ -26,7 +26,7 @@ package "log" (
- )
- 
- package "ppx" (
--  #directory = "ppx"
-+  directory = "ppx"
-   version = "3.2.0"
-   description = "Lwt PPX syntax extension (deprecated; use lwt_ppx)"
-   requires(ppx_driver) = "lwt.omp"
-@@ -57,7 +57,7 @@ package "preemptive" (
- )
- 
- package "simple-top" (
--  #directory = "simple-top"
-+  directory = "simple-top"
-   version = "3.2.0"
-   description = "Lwt-OCaml top level integration (deprecated; use utop)"
-   requires = "bigarray
-@@ -77,7 +77,7 @@ package "simple-top" (
- )
- 
- package "syntax" (
--  #directory = "syntax"
-+  directory = "syntax"
-   version = "3.2.0"
-   description = "Camlp4 syntax for Lwt (deprecated; use lwt_ppx)"
-   requires = "camlp4 lwt.syntax.options"
-@@ -88,7 +88,7 @@ package "syntax" (
-   exists_if = "lwt_syntax.cma"
- 
-   package "log" (
--    #directory = "log"
-+    directory = "log"
-     version = "3.2.0"
-     description = "Camlp4 syntax for Lwt logging (deprecated; use lwt_ppx)"
-     requires = "camlp4 lwt.syntax.options"
-@@ -100,7 +100,7 @@ package "syntax" (
-   )
- 
-   package "options" (
--    #directory = "options"
-+    directory = "options"
-     version = "3.2.0"
-     description = "Options for Lwt Camlp4 syntax extension (deprecated; use lwt_ppx)"
-     requires = "camlp4"
 @@ -113,7 +113,7 @@ package "syntax" (
  )
  
  package "unix" (
 -  #directory = "unix"
 +  directory = "unix"
-   version = "3.2.0"
+   version = "3.3.0"
    description = "Unix support for Lwt"
    requires = "bigarray bytes lwt lwt.log result threads unix"

Added files:

Index: pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_jbuild
diff -u /dev/null pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_jbuild:1.1
--- /dev/null   Thu Apr  5 11:04:40 2018
+++ pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_jbuild      Thu Apr  5 11:04:40 2018
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_camlp4_jbuild,v 1.1 2018/04/05 11:04:40 jaapb Exp $
+
+Remove double library (already in CVS upstream)
+--- src/camlp4/jbuild.orig     2018-03-07 19:44:32.000000000 +0000
++++ src/camlp4/jbuild
+@@ -1,15 +1,6 @@
+ (jbuild_version 1)
+ 
+ (library
+- ((name lwt_syntax)
+-  (public_name lwt.syntax)
+-  (synopsis "Camlp4 syntax for Lwt (deprecated; use lwt.ppx)")
+-  (optional)
+-  (wrapped false)
+-  (libraries (camlp4 lwt.syntax.options))
+-  (preprocess (action (run camlp4oof ${<})))))
+-
+-(library
+  ((name lwt_camlp4)
+   (public_name lwt_camlp4)
+   (synopsis "Camlp4 syntax for Lwt (deprecated; use lwt_ppx)")
Index: pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_log_jbuild
diff -u /dev/null pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_log_jbuild:1.1
--- /dev/null   Thu Apr  5 11:04:40 2018
+++ pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_log_jbuild  Thu Apr  5 11:04:40 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_camlp4_log_jbuild,v 1.1 2018/04/05 11:04:40 jaapb Exp $
+
+Remove double library (already in CVS upstream)
+--- src/camlp4/log/jbuild.orig 2018-03-07 19:44:32.000000000 +0000
++++ src/camlp4/log/jbuild
+@@ -1,16 +1,6 @@
+ (jbuild_version 1)
+ 
+ (library
+- ((name lwt_syntax_log)
+-  (public_name lwt.syntax.log)
+-  (synopsis "Camlp4 syntax for Lwt logging (deprecated; use lwt.ppx)")
+-  (optional)
+-  (wrapped false)
+-  (libraries (camlp4 lwt.syntax.options))
+-  (flags (:standard -w +A-3-4-58))
+-  (preprocess (action (run camlp4oof ${<})))))
+-
+-(library
+  ((name lwt_camlp4_log)
+   (public_name lwt_camlp4.log)
+   (synopsis "Camlp4 syntax for Lwt logging (deprecated; use lwt_ppx)")
Index: pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_options_jbuild
diff -u /dev/null pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_options_jbuild:1.1
--- /dev/null   Thu Apr  5 11:04:40 2018
+++ pkgsrc/devel/ocaml-lwt/patches/patch-src_camlp4_options_jbuild      Thu Apr  5 11:04:40 2018
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_camlp4_options_jbuild,v 1.1 2018/04/05 11:04:40 jaapb Exp $
+
+Remove double library (already in CVS upstream)
+--- src/camlp4/options/jbuild.orig     2018-03-07 19:44:32.000000000 +0000
++++ src/camlp4/options/jbuild
+@@ -1,14 +1,6 @@
+ (jbuild_version 1)
+ 
+ (library
+- ((name lwt_syntax_options)
+-  (public_name lwt.syntax.options)
+-  (synopsis "Options for Lwt Camlp4 syntax extension (deprecated; use lwt.ppx)")
+-  (optional)
+-  (wrapped false)
+-  (libraries (camlp4))))
+-
+-(library
+  ((name lwt_camlp4_options)
+   (public_name lwt_camlp4.options)
+   (synopsis "Options for Lwt Camlp4 syntax extension (deprecated; use lwt_ppx)")
Index: pkgsrc/devel/ocaml-lwt/patches/patch-src_ppx_jbuild
diff -u /dev/null pkgsrc/devel/ocaml-lwt/patches/patch-src_ppx_jbuild:1.1
--- /dev/null   Thu Apr  5 11:04:40 2018
+++ pkgsrc/devel/ocaml-lwt/patches/patch-src_ppx_jbuild Thu Apr  5 11:04:40 2018
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_ppx_jbuild,v 1.1 2018/04/05 11:04:40 jaapb Exp $
+
+Remove double library (already in CVS upstream)
+--- src/ppx/jbuild.orig        2018-03-07 19:44:32.000000000 +0000
++++ src/ppx/jbuild
+@@ -2,19 +2,6 @@
+ 
+ (library
+  ((name ppx_lwt)
+-  (public_name lwt.ppx)
+-  (synopsis "Lwt PPX syntax extension")
+-  (modules (ppx_lwt))
+-  (libraries (compiler-libs.common
+-              ocaml-migrate-parsetree
+-              ppx_tools_versioned))
+-  (ppx_runtime_libraries (lwt))
+-  (kind ppx_rewriter)
+-  (preprocess (pps (ppx_tools_versioned.metaquot_404)))
+-  (flags (:standard -w +A-4))))
+-
+-(library
+- ((name ppx_lwt)
+   (public_name lwt_ppx)
+   (synopsis "Lwt PPX syntax extension")
+   (modules (ppx_lwt))
Index: pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c
diff -u /dev/null pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c:1.1
--- /dev/null   Thu Apr  5 11:04:40 2018
+++ pkgsrc/devel/ocaml-lwt/patches/patch-src_unix_unix__c_unix__stat__job__utils.c      Thu Apr  5 11:04:40 2018
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_unix_unix__c_unix__stat__job__utils.c,v 1.1 2018/04/05 11:04:40 jaapb Exp $
+
+Need limits.h for IOV_MAX.
+Avoid system NANOSEC definition.
+
+--- src/unix/unix_c/unix_stat_job_utils.c.orig 2018-01-11 16:40:12.000000000 +0000
++++ src/unix/unix_c/unix_stat_job_utils.c
+@@ -28,6 +28,7 @@
+ #include <caml/alloc.h>
+ #include <caml/memory.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ #include "unix_stat_job_utils.h"
+ 
+@@ -37,11 +38,11 @@ value copy_stat(int use_64, struct stat 
+     CAMLlocal5(atime, mtime, ctime, offset, v);
+ 
+     atime = caml_copy_double((double)buf->st_atime +
+-                             (NANOSEC(buf, a) / 1000000000.0));
++                             (OCNANOSEC(buf, a) / 1000000000.0));
+     mtime = caml_copy_double((double)buf->st_mtime +
+-                             (NANOSEC(buf, m) / 1000000000.0));
++                             (OCNANOSEC(buf, m) / 1000000000.0));
+     ctime = caml_copy_double((double)buf->st_ctime +
+-                             (NANOSEC(buf, c) / 1000000000.0));
++                             (OCNANOSEC(buf, c) / 1000000000.0));
+     offset = use_64 ? caml_copy_int64(buf->st_size) : Val_int(buf->st_size);
+     v = caml_alloc_small(12, 0);
+     Field(v, 0) = Val_int(buf->st_dev);

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index