CVS commit: pkgsrc/devel/ocaml-dune

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 18 21:50:46 UTC 2026

Modified Files:
        pkgsrc/devel/ocaml-dune: Makefile.common PLIST distinfo
Added Files:
        pkgsrc/devel/ocaml-dune/patches: patch-vendor_ocaml-lmdb_lmdb__stubs.c
            patch-vendor_ocaml-lmdb_mdb.c

Log Message:
ocaml-dune: update to 3.21.0.

3.21.0 (2026-01-12)
-------------------

### Fixed

- Fix `include_subdirs qualified` incorrectly picking the furthest module
  instead of the closest when resolving module name ambiguities. (#12587,
  @ElectreAAS and @Alizter)

- Fix: include the module alias in the transitive dependency closure with
  `(include_subdirs qualified)`. (#12299, @anmonteiro)

- Improve error messages for invalid version formats containing non-ASCII
  characters. Previously, non-ASCII characters in version strings (e.g., `(lang
  dune è)` or `(using menhir π3.14)`) would fail with a generic "Invalid file"
  error. Now they display a clear message: "Invalid atom: contains non-ASCII
  character(s). Atoms must only contain ASCII characters." The fix is
  implemented at the lexer level, providing consistent error handling across all
  s-expression parsing. (#12844, fixes #12836, @benodiwal)

- Pass private modules with -H when this is available (#12666, @rgrinberg)

- Allow multiple modules in `(modules_flags ...)`, in `coq.theory` (#12733, @rlepigre)

- Improve error message for invalid version formats in both `(lang dune ...)` and
  `(using extension ...)` declarations. Changes "Atom of the form NNN.NNN expected"
  to "Invalid version. Version must be two numbers separated by a dot." (#12833, @benodiwal)

- Fix crash when running `dune build @check` on a library with virtual modules.
  (#12644, fixes #12636, @Alizter)

- Provide a more informative error message when `(pkg enabled)` is put in
  `dune-project` instead of `dune-workspace`. (#12802, fixes #12801,
  @benodiwal)

- Improve error message when invalid version strings are used in `dune-project`
  files. Non-ASCII characters and malformed versions now show a helpful hint
  with an example of the correct format. (#12794, fixes #12751, @benodiwal)

- Stop hiding the `root_module` from the include path (#12239, @rgrinberg)

- Allow `$ dune init` to work on absolute paths (#12601, fixes #7806,
  @rgrinberg)

- `(include_subdirs qualified)`: Add missing alias dependency to module group.
  (#12530, @anmonteiro)

- Add Melange compilation to the `@all` alias in libraries (#12628,
  @anmonteiro)

- Fix greedy version location in lang declarations. Previously, error locations for
  invalid lang versions would span multiple bytes for multi-byte UTF-8 characters,
  causing carets to appear misaligned and seemingly include the closing
  parenthesis. Now, error locations for ASCII strings show the full length (e.g.,
  "Ali" shows `^^^`), while non-ASCII strings show only the first byte (e.g., "è"
  shows `^`) to avoid multi-byte character display issues. (#12869, fixes #12806,
  @benodiwal)

- melange support: don't emit empty JavaScript modules for generated module
  aliases. (#12464, @anmonteiro)

### Added

- (Experimental): Introduce the `library_parameter` stanza. It allows users to
  declare a parameter when using the OxCaml compiler.
  (#11963, implements #12084, @maiste)

- Added the ability to scroll horizontally in TUI. (#12386, @Alizter)

- Feature: Include shell command that was executed when a cram test has
  occurred in the error message (#12307, @rgrinberg)

-  support expanding variables in `(promote (into ..))` (#12832, fixes #12742,
   @anmonteiro)

- Add support for `%{cmt:...}` and `%{cmti:...}` variables to reference
  compiled annotation files (.cmt and .cmti) containing typed abstract syntax
  trees with location and type information. (#12634, grants #12633, @Alizter)

- Add `$ dune describe tests` to describe the tests in the workspace
  (@Gromototo, #12545, fixes #12030)

- Add `argv`, the process environment, and the dune version to the config event
  in the trace (#12909, @rgrinberg)

- Allow `dune runtest` to properly run while a watch mode server is running.
  (#12473, grants #8114, @gridbugs and @ElectreAAS)

- Use copy-on-write (COW) when copying files on filesystems that support it
  (Btrfs, ZFS, XFS, etc), under Linux. (#12074, fixes #12071, @nojb)

- Add support for Tangled ATproto-based code repositories (#12197, @avsm)

- Add support for instantiating OxCaml parameterised libraries.
  (#12561, @art-w)

- Add a `(conflict_markers error|ignore)` option to the cram stanza. When
  `(conflict_markers error)` is set, the cram test will fail in the presence of
  conflict markers. Git, diff3 and jujutsu conflict markers are detected.
  (#12538, #12617, #12655, fixes #12512, @rgrinberg, @Alizter)

- Introduce a `%{ppx:lib1+..+libn}` stanza to make it possible to refer to ppx
  executables built by dune. This is useful for writing tests (#12711,
  @rgrinberg)

- Introduce a `(dir ..)` field on packages defined in the `dune-project`. This
  field allows to associate a directory with a particular package. This makes
  dune automatically filter out all stanzas in this directory and its
  descendants with `--only-packages`. All users are recommended to switch to
  using this field. (#12614, fixes #3255, @rgrinberg)

- Add support for `DUNE_ROOT` environment variable, similar to the existing
  `--root` CLI parameter. (fixes #12399 @sir4ur0n)

- Introduce an `unused-libs` alias to detect unused libraries.
  (#12623, fixes #650, @rgrinberg)

- Add `--files` flag to `dune describe opam-files` to print only the names of
  the opam files line by line. (#9793, @reynir and @Alizter)

- `dune exec` now accepts absolute paths inside the workspace.
  (#12094, @Alizter)

- Add `coqdoc_header` and `coqdoc_footer` fields to the `coq` field of the
  `env` stanza, and to the `coq.theory` stanza, allowing to configure a
  custom header or footer respectively in the HTML output of `coqdoc`.
  (#11131, @rlepigre)

- Allow `dune fmt` to properly run while a watch mode server is running.
  Note that the `--preview` flag is not supported in this mode.
  (#12064, @ElectreAAS)

- Support for generating `_CoqProject` files for `coq.theory` stanzas.
  (#11752, @rlepigre)

- Added `(files)` stanza, similar to `(dirs)` to control which files are visible
  to Dune on a per-directory basis. (#12879, @nojb)
- Add support for %{ocaml-config:ox} (#12236, @jonludlam)

- Introduce `dune promotion show` command to display the contents of corrected
  files that are ready for promotion. This allows users to preview changes
  before running `dune promote`. The command accepts file arguments to show
  specific files, or displays all promotable files when called without
  arguments. (#12669, fixes #3883, @MixiMaxiMouse)
- New `(lang rocq)` build mode for Rocq 9.0 and later. This new mode
  is very similar to the existing `(lang coq)`, except that it doesn't
  need the `coq*` compatibility wrappers. As of today `(lang rocq)`
  doesn't support yet composed builds with Rocq itself, this will be
  added later.  `(lang coq)` is deprecated, development is frozen, and
  will be removed at some point in the future. (#12035, @ejgallego,
  @lysxia, fixes #11572)

### Changed

- Don't run `ocamldep` to compute false dependencies on the `root_module`
  (#12227, @rgrinberg)

- `dune format-dune-file` now uses the syntax version of the Dune project that
  contains the file being formatted (if any) instead of using the latest version
  available, which remains the default if there is no Dune project in scope.
  (#11865, @nojb)

- Persistent DB and process events have been slightly modified. Persistent
  DB events have more concise names and job events always include full
  information. (#12867, @rgrinberg)

- Removed the `--trace-extended` flag. Its functionality is always enabled when
  tracing is active (#12908, @rgrinberg)

- The `test/dune` file generated by `dune init proj` now depends on the project library. (#12791, @shonfeder)

- Starting with version 3.21 of the Dune language, Dune no longer changes the
  default set of compiler warnings. For users that would like to keep the old
  behaviour, the variable `%{dune-warnings}` can be used in an `(env)` stanza in
  a top-level Dune file: `(env (dev (flags :standard %{dune-warnings})))`.
  (#12766, @nojb)
- Fix: stop generating `cmt` files for cinaps binaries (#12530, @rgrinberg)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-dune/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-dune/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/ocaml-dune/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_lmdb__stubs.c \
    pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_mdb.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.7 pkgsrc/devel/ocaml-dune/Makefile.common:1.8
--- pkgsrc/devel/ocaml-dune/Makefile.common:1.7 Sun Jan 11 18:51:28 2026
+++ pkgsrc/devel/ocaml-dune/Makefile.common     Sun Jan 18 21:50:46 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2026/01/11 18:51:28 alnsn Exp $
+# $NetBSD: Makefile.common,v 1.8 2026/01/18 21:50:46 wiz Exp $
 
 # used by devel/ocaml-dune-configurator/Makefile
 
-DUNE_VERSION=  3.20.2
+DUNE_VERSION=  3.21.0
 DISTNAME=      ${GITHUB_PROJECT}-${DUNE_VERSION}
 
 LICENSE=       mit

Index: pkgsrc/devel/ocaml-dune/PLIST
diff -u pkgsrc/devel/ocaml-dune/PLIST:1.10 pkgsrc/devel/ocaml-dune/PLIST:1.11
--- pkgsrc/devel/ocaml-dune/PLIST:1.10  Sun Jan 11 18:09:04 2026
+++ pkgsrc/devel/ocaml-dune/PLIST       Sun Jan 18 21:50:46 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2026/01/11 18:09:04 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.11 2026/01/18 21:50:46 wiz Exp $
 bin/dune
 doc/dune/CHANGES.md
 doc/dune/LICENSE.md
@@ -30,6 +30,7 @@ man/man1/dune-pkg.1
 man/man1/dune-printenv.1
 man/man1/dune-promote.1
 man/man1/dune-promotion.1
+man/man1/dune-rocq.1
 man/man1/dune-rpc.1
 man/man1/dune-rules.1
 man/man1/dune-runtest.1

Index: pkgsrc/devel/ocaml-dune/distinfo
diff -u pkgsrc/devel/ocaml-dune/distinfo:1.16 pkgsrc/devel/ocaml-dune/distinfo:1.17
--- pkgsrc/devel/ocaml-dune/distinfo:1.16       Sun Jan 11 18:09:04 2026
+++ pkgsrc/devel/ocaml-dune/distinfo    Sun Jan 18 21:50:46 2026
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.16 2026/01/11 18:09:04 alnsn Exp $
+$NetBSD: distinfo,v 1.17 2026/01/18 21:50:46 wiz Exp $
 
-BLAKE2s (dune-3.20.2.tar.gz) = 97c40f8ee15e66359f5df0192edc1a65b375fc9d71d15c2b379cab0cbd31fafb
-SHA512 (dune-3.20.2.tar.gz) = efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355
-Size (dune-3.20.2.tar.gz) = 3051854 bytes
+BLAKE2s (dune-3.21.0.tar.gz) = e96694d48bb0a544738be8f4273325e7bf570e02fd4130576a826447f7cfd6b2
+SHA512 (dune-3.21.0.tar.gz) = ba1ceb5774e7358ae87781853d4a7916980c6a345458407786561b71b02f3a9a19890c9c93000bef095951710d0460553b18375d156b019c0cdc4259cbffc910
+Size (dune-3.21.0.tar.gz) = 3430620 bytes
 SHA1 (patch-otherlibs_configurator_src_v1.ml) = 74ddbf037c59ed81eb858042463fa5016027d9b8
 SHA1 (patch-otherlibs_stdune_src_readdir.c) = 931f784972ddd7f364e9dfe004f41669fd560225
 SHA1 (patch-vendor_notty_src-unix_native_winsize.c) = d970c142e55e217477a54f11801e2d2365e12e7f
+SHA1 (patch-vendor_ocaml-lmdb_lmdb__stubs.c) = e7744a7e008c72753644da4fc2a54cfef5872d43
+SHA1 (patch-vendor_ocaml-lmdb_mdb.c) = 9c46b39da5dd5bb9db7501a7818edf52503cbc1a

Added files:

Index: pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_lmdb__stubs.c
diff -u /dev/null pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_lmdb__stubs.c:1.1
--- /dev/null   Sun Jan 18 21:50:46 2026
+++ pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_lmdb__stubs.c       Sun Jan 18 21:50:46 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-vendor_ocaml-lmdb_lmdb__stubs.c,v 1.1 2026/01/18 21:50:46 wiz Exp $
+
+Fix build on NetBSD.
+
+--- vendor/ocaml-lmdb/lmdb_stubs.c.orig        2026-01-18 14:09:30.274938476 +0000
++++ vendor/ocaml-lmdb/lmdb_stubs.c
+@@ -17,7 +17,7 @@
+ 
+ #ifdef _WIN32
+ #include <malloc.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <stdlib.h>
+ #else
+ #include <alloca.h>
Index: pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_mdb.c
diff -u /dev/null pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_mdb.c:1.1
--- /dev/null   Sun Jan 18 21:50:46 2026
+++ pkgsrc/devel/ocaml-dune/patches/patch-vendor_ocaml-lmdb_mdb.c       Sun Jan 18 21:50:46 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-vendor_ocaml-lmdb_mdb.c,v 1.1 2026/01/18 21:50:46 wiz Exp $
+
+Fix build on NetBSD.
+
+--- vendor/ocaml-lmdb/mdb.c.orig       2026-01-18 14:12:57.789992548 +0000
++++ vendor/ocaml-lmdb/mdb.c
+@@ -38,6 +38,9 @@
+ #if defined(MDB_VL32) || defined(__WIN64__)
+ #define _FILE_OFFSET_BITS     64
+ #endif
++#if defined(__NetBSD__)
++#define _SEM_SEMUN_UNDEFINED 1
++#endif
+ #ifdef _WIN32
+ #include <malloc.h>
+ #include <windows.h>