CVS commit: pkgsrc/devel/ocaml-dune

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May 17 14:19:26 UTC 2026

Modified Files:
        pkgsrc/devel/ocaml-dune: Makefile.common distinfo
Removed Files:
        pkgsrc/devel/ocaml-dune/patches: patch-src_lev_src_lev__stubs.c

Log Message:
ocaml-dune: update to 3.23.1.

3.23.1 (2026-05-14)
-------------------

### Fixed

- Fix the `menhir` opam dependency injection introduced in 3.23. Dune
  now only fills in the lower bound `{>= "20180523"}` on an existing
  user-declared `menhir` dependency; it no longer adds `menhir` as a
  new dependency to packages that did not declare it themselves.
  (#14434, fixes #14428, @robinbb)

- Gate the `dune` version-bound deduplication in generated opam files
  (introduced in 3.23) on `(lang dune 3.23)`. Projects at earlier lang
  versions get the prior `And [...]` shape — e.g.
  `{>= "3.17" & >= "3.20"}` — restoring 3.22 behaviour and avoiding a
  silent change to opam output on dune-binary upgrade. (#14436,
  @robinbb)

- Preserve library order when building a shared jsoo standalone runtime.
  (#14438, @vouillon)

- Fix the fallback to the secondary compiler, allowing recovering of support for
  packages with upper bounds on OCaml less than 4.14. Packages depending on dune
  3.23.1 or later and with an upper bound on the OCaml compiler that is less
  than 4.14, will now be able to use the latest dune, but dune will be built
  with the secondary compiler at version 4.14. (#14443, @Alizter)

- Fix the bootstrap on NetBSD by including `<sys/wait.h>` in `lev_stubs.c`,
  matching the existing FreeBSD/OpenBSD guard.
  (#14512, fixes #14484, @0-wiz-0)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-dune/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/ocaml-dune/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/ocaml-dune/patches/patch-src_lev_src_lev__stubs.c

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-dune/Makefile.common
diff -u pkgsrc/devel/ocaml-dune/Makefile.common:1.13 pkgsrc/devel/ocaml-dune/Makefile.common:1.14
--- pkgsrc/devel/ocaml-dune/Makefile.common:1.13        Sun May 10 12:14:49 2026
+++ pkgsrc/devel/ocaml-dune/Makefile.common     Sun May 17 14:19:26 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2026/05/10 12:14:49 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2026/05/17 14:19:26 wiz Exp $
 
 # used by devel/ocaml-dune-configurator/Makefile
 
-DUNE_VERSION=  3.23.0
+DUNE_VERSION=  3.23.1
 DISTNAME=      ${GITHUB_PROJECT}-${DUNE_VERSION}
 
 LICENSE=       mit

Index: pkgsrc/devel/ocaml-dune/distinfo
diff -u pkgsrc/devel/ocaml-dune/distinfo:1.24 pkgsrc/devel/ocaml-dune/distinfo:1.25
--- pkgsrc/devel/ocaml-dune/distinfo:1.24       Sun May 10 12:14:49 2026
+++ pkgsrc/devel/ocaml-dune/distinfo    Sun May 17 14:19:26 2026
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.24 2026/05/10 12:14:49 wiz Exp $
+$NetBSD: distinfo,v 1.25 2026/05/17 14:19:26 wiz Exp $
 
-BLAKE2s (dune-3.23.0.tar.gz) = d3e9c357637d07f465c965a00fac0d9e8097582a025bf93936f22eca03c10995
-SHA512 (dune-3.23.0.tar.gz) = fadcf88303a5ef476a6a38976360c8990d5f70f666da8c2853609eb3fe5b5b74d89e2b9380723b29598b68ed4674e07dbd226582d8eada6651715354a2a45d0a
-Size (dune-3.23.0.tar.gz) = 3707019 bytes
+BLAKE2s (dune-3.23.1.tar.gz) = 3b60037daab1e742b9181595d848345f0d1ec2b35de97137fa9d45568236a543
+SHA512 (dune-3.23.1.tar.gz) = ffc3e0bc9e9b79dc58341fd9d7bbf4f7ad087708e469a36c6a4f773fd3b511293831524ca309f72a77ee17b33642d9ecc35d42dc8e76eff8fd0d43738911795b
+Size (dune-3.23.1.tar.gz) = 3710713 bytes
 SHA1 (patch-otherlibs_configurator_src_v1.ml) = 74ddbf037c59ed81eb858042463fa5016027d9b8
 SHA1 (patch-otherlibs_stdune_src_readdir.c) = 640249f86e95d43dcd672fb61eb146af1434a11d
 SHA1 (patch-otherlibs_stdune_src_wait4__stubs.c) = 3294a78f451b450ba0614803c68ba340901cc8c7
-SHA1 (patch-src_lev_src_lev__stubs.c) = 913e0bcd32a925e5874e2552fae084d3d259204d
 SHA1 (patch-vendor_notty_src-unix_native_winsize.c) = d970c142e55e217477a54f11801e2d2365e12e7f
 SHA1 (patch-vendor_ocaml-lmdb_mdb.c) = 9c46b39da5dd5bb9db7501a7818edf52503cbc1a
 SHA1 (patch-vendor_spawn_src_spawn__stubs.c) = be446f444daae8cb97a500d6491ac9f92eb9c446