[pkgsrc/trunk]: pkgsrc/devel/ocaml-ppx_expect Updated devel/ocaml-ppx_expect ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/ocaml-ppx_expect Updated devel/ocaml-ppx_expect ...
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Wed, 04 May 2022 19:56:23 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a52be6041f2c
branches:  trunk
changeset: 378589:a52be6041f2c
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Wed May 04 18:04:15 2022 +0000

description:
Updated devel/ocaml-ppx_expect to version 0.15.0.

There is no changelog, but changes seem minor.

diffstat:

 devel/ocaml-ppx_expect/Makefile                                                 |  11 +-
 devel/ocaml-ppx_expect/PLIST                                                    |  44 ++++++--
 devel/ocaml-ppx_expect/buildlink3.mk                                            |   4 +-
 devel/ocaml-ppx_expect/distinfo                                                 |   9 +-
 devel/ocaml-ppx_expect/patches/patch-collector_expect__test__collector__stubs.c |  46 ----------
 5 files changed, 42 insertions(+), 72 deletions(-)

diffs (214 lines):

diff -r e4f196988b3a -r a52be6041f2c devel/ocaml-ppx_expect/Makefile
--- a/devel/ocaml-ppx_expect/Makefile   Wed May 04 18:01:37 2022 +0000
+++ b/devel/ocaml-ppx_expect/Makefile   Wed May 04 18:04:15 2022 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2021/03/08 08:12:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/04 18:04:15 jaapb Exp $
 
+DISTNAME=      ${GITHUB_PROJECT}-0.15.0
+PKGNAME=       ocaml-${DISTNAME}
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=janestreet/}
 GITHUB_PROJECT=        ppx_expect
 GITHUB_TAG=    v${PKGVERSION_NOREV}
-DISTNAME=      ${GITHUB_PROJECT}-0.13.0
-PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   2
-CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=janestreet/}
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/janestreet/ppx_expect/
diff -r e4f196988b3a -r a52be6041f2c devel/ocaml-ppx_expect/PLIST
--- a/devel/ocaml-ppx_expect/PLIST      Wed May 04 18:01:37 2022 +0000
+++ b/devel/ocaml-ppx_expect/PLIST      Wed May 04 18:04:15 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/13 11:19:15 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/05/04 18:04:15 jaapb Exp $
 ${OCAML_SITELIB}/ppx_expect/META
 ${OCAML_SITELIB}/ppx_expect/collector/check_backtraces.ml
 ${OCAML_SITELIB}/ppx_expect/collector/check_backtraces.mli
@@ -30,6 +30,10 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/common/expect_test_common.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/common/expect_test_common.cmxs
 ${OCAML_SITELIB}/ppx_expect/common/expect_test_common.ml
+${OCAML_SITELIB}/ppx_expect/common/expect_test_common__.cmi
+${OCAML_SITELIB}/ppx_expect/common/expect_test_common__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/common/expect_test_common__.cmx
+${OCAML_SITELIB}/ppx_expect/common/expect_test_common__.ml
 ${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Expectation.cmi
 ${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Expectation.cmt
 ${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Expectation.cmti
@@ -38,14 +42,14 @@
 ${OCAML_SITELIB}/ppx_expect/common/expect_test_common__File.cmt
 ${OCAML_SITELIB}/ppx_expect/common/expect_test_common__File.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/common/expect_test_common__File.cmx
-${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Std.cmi
-${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Std.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Std.cmx
+${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Import.cmi
+${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Import.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/common/expect_test_common__Import.cmx
 ${OCAML_SITELIB}/ppx_expect/common/expectation.ml
 ${OCAML_SITELIB}/ppx_expect/common/expectation.mli
 ${OCAML_SITELIB}/ppx_expect/common/file.ml
 ${OCAML_SITELIB}/ppx_expect/common/file.mli
-${OCAML_SITELIB}/ppx_expect/common/std.ml
+${OCAML_SITELIB}/ppx_expect/common/import.ml
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config/expect_test_config.a
 ${OCAML_SITELIB}/ppx_expect/config/expect_test_config.cma
 ${OCAML_SITELIB}/ppx_expect/config/expect_test_config.cmi
@@ -56,6 +60,24 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config/expect_test_config.cmxs
 ${OCAML_SITELIB}/ppx_expect/config/expect_test_config.ml
 ${OCAML_SITELIB}/ppx_expect/config/expect_test_config.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.a
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.cma
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.cmi
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.cmt
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.cmxs
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.ml
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types.mli
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types__.cmi
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types__.cmx
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types__.ml
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types__Expect_test_config_types_intf.cmi
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types__Expect_test_config_types_intf.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types__Expect_test_config_types_intf.cmx
+${OCAML_SITELIB}/ppx_expect/config_types/expect_test_config_types_intf.ml
 ${OCAML_SITELIB}/ppx_expect/dune-package
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/evaluator/ppx_expect_evaluator.a
 ${OCAML_SITELIB}/ppx_expect/evaluator/ppx_expect_evaluator.cma
@@ -69,7 +91,6 @@
 ${OCAML_SITELIB}/ppx_expect/evaluator/ppx_expect_evaluator.mli
 ${OCAML_SITELIB}/ppx_expect/expect_extension.ml
 ${OCAML_SITELIB}/ppx_expect/expect_extension.mli
-${OCAML_SITELIB}/ppx_expect/lifter.ml
 ${OCAML_SITELIB}/ppx_expect/main.ml
 ${OCAML_SITELIB}/ppx_expect/main.mli
 ${OCAML_SITELIB}/ppx_expect/matcher/choose_tag.ml
@@ -84,6 +105,10 @@
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher.cmxs
 ${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher.ml
+${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__.cmi
+${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__.cmx
+${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__.ml
 ${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Choose_tag.cmi
 ${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Choose_tag.cmt
 ${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Choose_tag.cmti
@@ -111,9 +136,6 @@
 ${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Reconcile.cmt
 ${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Reconcile.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Reconcile.cmx
-${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Std.cmi
-${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Std.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/matcher/expect_test_matcher__Std.cmx
 ${OCAML_SITELIB}/ppx_expect/matcher/fmt.ml
 ${OCAML_SITELIB}/ppx_expect/matcher/fmt.mli
 ${OCAML_SITELIB}/ppx_expect/matcher/import.ml
@@ -123,7 +145,6 @@
 ${OCAML_SITELIB}/ppx_expect/matcher/matcher.mli
 ${OCAML_SITELIB}/ppx_expect/matcher/reconcile.ml
 ${OCAML_SITELIB}/ppx_expect/matcher/reconcile.mli
-${OCAML_SITELIB}/ppx_expect/matcher/std.ml
 ${OCAML_SITELIB}/ppx_expect/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/payload/ppx_expect_payload.a
 ${OCAML_SITELIB}/ppx_expect/payload/ppx_expect_payload.cma
@@ -148,9 +169,6 @@
 ${OCAML_SITELIB}/ppx_expect/ppx_expect__Expect_extension.cmt
 ${OCAML_SITELIB}/ppx_expect/ppx_expect__Expect_extension.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/ppx_expect__Expect_extension.cmx
-${OCAML_SITELIB}/ppx_expect/ppx_expect__Lifter.cmi
-${OCAML_SITELIB}/ppx_expect/ppx_expect__Lifter.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_expect/ppx_expect__Lifter.cmx
 ${OCAML_SITELIB}/ppx_expect/ppx_expect__Main.cmi
 ${OCAML_SITELIB}/ppx_expect/ppx_expect__Main.cmt
 ${OCAML_SITELIB}/ppx_expect/ppx_expect__Main.cmti
diff -r e4f196988b3a -r a52be6041f2c devel/ocaml-ppx_expect/buildlink3.mk
--- a/devel/ocaml-ppx_expect/buildlink3.mk      Wed May 04 18:01:37 2022 +0000
+++ b/devel/ocaml-ppx_expect/buildlink3.mk      Wed May 04 18:04:15 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/04/30 08:11:24 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/05/04 18:04:15 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-ppx_expect
 
@@ -6,7 +6,7 @@
 OCAML_PPX_EXPECT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_expect+=       ocaml-ppx_expect>=0.12.0
-BUILDLINK_ABI_DEPENDS.ocaml-ppx_expect+=       ocaml-ppx_expect>=0.13.0nb1
+BUILDLINK_ABI_DEPENDS.ocaml-ppx_expect+=       ocaml-ppx_expect>=0.15.0
 BUILDLINK_PKGSRCDIR.ocaml-ppx_expect?=         ../../devel/ocaml-ppx_expect
 
 .endif # OCAML_PPX_EXPECT_BUILDLINK3_MK
diff -r e4f196988b3a -r a52be6041f2c devel/ocaml-ppx_expect/distinfo
--- a/devel/ocaml-ppx_expect/distinfo   Wed May 04 18:01:37 2022 +0000
+++ b/devel/ocaml-ppx_expect/distinfo   Wed May 04 18:04:15 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:15:52 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/05/04 18:04:15 jaapb Exp $
 
-BLAKE2s (ppx_expect-0.13.0.tar.gz) = ddb7346f437b9f92a91419689d60e1feb6cb63631fafd0e9e594c22c07782888
-SHA512 (ppx_expect-0.13.0.tar.gz) = 3643ff084b9b3c640969ec5cf45d015804cde611202a3f392d29a85fd1becbff93130dc2e3a9d61d2a09d4d74b15697f35cd82e0d2a5c01ffd9d124bfa9dc926
-Size (ppx_expect-0.13.0.tar.gz) = 40160 bytes
-SHA1 (patch-collector_expect__test__collector__stubs.c) = 3b4b0c507a679251a2a9b14c362a02f1fc44538d
+BLAKE2s (ppx_expect-0.15.0.tar.gz) = 320670943cc79784051495f53e69bd64c3cf9393217986a33a170a076a935358
+SHA512 (ppx_expect-0.15.0.tar.gz) = 945ebd31a94debd4a65c3a8dd7e6481e7debe043c48a60bab4085f9d05cba5b8663bf0f5498cb4cd0e86a24182b21006506f20873e5242b31db5de5629113ade
+Size (ppx_expect-0.15.0.tar.gz) = 48825 bytes
diff -r e4f196988b3a -r a52be6041f2c devel/ocaml-ppx_expect/patches/patch-collector_expect__test__collector__stubs.c
--- a/devel/ocaml-ppx_expect/patches/patch-collector_expect__test__collector__stubs.c   Wed May 04 18:01:37 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-collector_expect__test__collector__stubs.c,v 1.1 2020/04/30 08:11:24 jaapb Exp $
-
-Rename stdout and stderr to avoid name clashes with OCaml 4.10
-
---- collector/expect_test_collector_stubs.c.orig       2019-11-18 14:56:06.000000000 +0000
-+++ collector/expect_test_collector_stubs.c
-@@ -51,29 +51,29 @@ static int expect_test_collector_saved_s
- 
- CAMLprim value expect_test_collector_before_test (value voutput, value vstdout, value vstderr) {
-   struct channel* output = Channel(voutput);
--  struct channel* stdout = Channel(vstdout);
--  struct channel* stderr = Channel(vstderr);
-+  struct channel* cstdout = Channel(vstdout);
-+  struct channel* cstderr = Channel(vstderr);
-   int fd, ret;
--  fd = dup(stdout->fd);
-+  fd = dup(cstdout->fd);
-   if(fd == -1) caml_sys_error(NO_ARG);
-   expect_test_collector_saved_stdout = fd;
--  fd = dup(stderr->fd);
-+  fd = dup(cstderr->fd);
-   if(fd == -1) caml_sys_error(NO_ARG);
-   expect_test_collector_saved_stderr = fd;
--  ret = dup2(output->fd, stdout->fd);
-+  ret = dup2(output->fd, cstdout->fd);
-   if(ret == -1) caml_sys_error(NO_ARG);
--  ret = dup2(output->fd, stderr->fd);
-+  ret = dup2(output->fd, cstderr->fd);
-   if(ret == -1) caml_sys_error(NO_ARG);
-   return Val_unit;
- }
- 
- CAMLprim value expect_test_collector_after_test (value vstdout, value vstderr) {
--  struct channel* stdout = Channel(vstdout);
--  struct channel* stderr = Channel(vstderr);
-+  struct channel* cstdout = Channel(vstdout);
-+  struct channel* cstderr = Channel(vstderr);
-   int ret;
--  ret = dup2(expect_test_collector_saved_stdout, stdout->fd);
-+  ret = dup2(expect_test_collector_saved_stdout, cstdout->fd);
-   if(ret == -1) caml_sys_error(NO_ARG);
--  ret = dup2(expect_test_collector_saved_stderr, stderr->fd);
-+  ret = dup2(expect_test_collector_saved_stderr, cstderr->fd);
-   if(ret == -1) caml_sys_error(NO_ARG);
-   ret = close(expect_test_collector_saved_stdout);
-   if(ret == -1) caml_sys_error(NO_ARG);
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-ppx_bin_prot to 0.15.0
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-ppx_expect to 0.15.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-ppx_bin_prot to 0.15.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/ocaml-ppx_expect to 0.15.0
Indexes:
Home | Main Index | Thread Index | Old Index