From: Christopher Zimmermann <chrisz@openbsd.org>
Subject: Re: [update] dune 3.6.2 -> 3.8.3
To: Daniel Dickman <didickman@gmail.com>, ports@openbsd.org
Date: Tue, 28 Oct 2025 08:52:16 +0100

On Sun, Oct 26, 2025 at 03:27:16AM +0100, Jeremie Courreges-Anglas wrote:
>On Sat, Oct 25, 2025 at 07:37:21PM +0200, Christopher Zimmermann wrote:
>> Hi Daniel,
>>
>> the diff looks fine to me. I still would prefer a test on a non-native arch.
>> Anyone out there with time to spare and build-test this on architectures
>> like powerpc, sparc64 or riscv64?
>
>Builds and packages on riscv64 and sparc64.  devel/ocaml-{cppo,menhir,yojson}
>still package too on sparc64.


well, now I took the time anyway.

Here is a diff to go to 3.20.2 tested on amd64 and arm, but you went 
faster than me :) ok?


Christopher


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/dune/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile	26 Oct 2025 17:29:40 -0000	1.22
+++ Makefile	28 Oct 2025 07:38:10 -0000
@@ -3,7 +3,7 @@ MULTI_PACKAGES =	-main -configurator
  COMMENT-main =		OCaml build system
  COMMENT-configurator =	OCaml library for gathering system configuration
  
-VERSION =		3.8.3
+VERSION =		3.20.2
  
  CATEGORIES =		devel
  
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/dune/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo	26 Oct 2025 17:29:40 -0000	1.7
+++ distinfo	28 Oct 2025 07:38:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (dune-3.8.3.tbz) = 4reLqAXO8yDwtZeMTTcf3oq4JUbVrlGgy0UQQhk7W/g=
-SIZE (dune-3.8.3.tbz) = 2048982
+SHA256 (dune-3.20.2.tbz) = sahrLWC9tKi5u2hhvfL58opufLXYM86Br+zOue+cpUk=
+SIZE (dune-3.20.2.tbz) = 2387805
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile	26 Oct 2025 17:29:40 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Respect MAKE_JOBS during bootstrap phase
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -46,7 +46,7 @@ release: $(BIN)
- 	@$(BIN) build @install -p dune --profile dune-bootstrap
- 
- $(BIN):
--	@ocaml boot/bootstrap.ml
-+	@ocaml boot/bootstrap.ml -j $(JOBS)
- 
- dev: $(BIN)
- 	$(BIN) build @install
Index: pkg/PFRAG.dynlink-native-configurator
===================================================================
RCS file: /cvs/ports/devel/dune/pkg/PFRAG.dynlink-native-configurator,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.dynlink-native-configurator
--- pkg/PFRAG.dynlink-native-configurator	11 Mar 2022 18:50:00 -0000	1.2
+++ pkg/PFRAG.dynlink-native-configurator	28 Oct 2025 07:38:10 -0000
@@ -1 +1,3 @@
  lib/ocaml/dune-configurator/configurator.cmxs
+lib/ocaml/stdune/csexp/csexp.cmxs
+lib/ocaml/stdune/stdune.cmxs
Index: pkg/PFRAG.native-configurator
===================================================================
RCS file: /cvs/ports/devel/dune/pkg/PFRAG.native-configurator,v
retrieving revision 1.5
diff -u -p -r1.5 PFRAG.native-configurator
--- pkg/PFRAG.native-configurator	26 Oct 2025 17:29:40 -0000	1.5
+++ pkg/PFRAG.native-configurator	28 Oct 2025 07:38:10 -0000
@@ -11,15 +11,9 @@ lib/ocaml/dune-configurator/configurator
  lib/ocaml/stdune/csexp/csexp.a
  lib/ocaml/stdune/csexp/csexp.cmx
  lib/ocaml/stdune/csexp/csexp.cmxa
-lib/ocaml/stdune/csexp/csexp.cmxs
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.a
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmx
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmxa
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmxs
  lib/ocaml/stdune/stdune.a
  lib/ocaml/stdune/stdune.cmx
  lib/ocaml/stdune/stdune.cmxa
-lib/ocaml/stdune/stdune.cmxs
  lib/ocaml/stdune/stdune__.cmx
  lib/ocaml/stdune/stdune__Ansi_color.cmx
  lib/ocaml/stdune/stdune__Appendable_list.cmx
@@ -27,26 +21,33 @@ lib/ocaml/stdune/stdune__Applicative.cmx
  lib/ocaml/stdune/stdune__Applicative_intf.cmx
  lib/ocaml/stdune/stdune__Array.cmx
  lib/ocaml/stdune/stdune__Bin.cmx
+lib/ocaml/stdune/stdune__Bit_set.cmx
  lib/ocaml/stdune/stdune__Bool.cmx
  lib/ocaml/stdune/stdune__Bytes.cmx
  lib/ocaml/stdune/stdune__Bytes_unit.cmx
  lib/ocaml/stdune/stdune__Caller_id.cmx
  lib/ocaml/stdune/stdune__Char.cmx
  lib/ocaml/stdune/stdune__Code_error.cmx
+lib/ocaml/stdune/stdune__Compact_position.cmx
  lib/ocaml/stdune/stdune__Comparable.cmx
  lib/ocaml/stdune/stdune__Comparable_intf.cmx
  lib/ocaml/stdune/stdune__Comparator.cmx
  lib/ocaml/stdune/stdune__Dev_null.cmx
  lib/ocaml/stdune/stdune__Dune_either.cmx
+lib/ocaml/stdune/stdune__Dune_filesystem_stubs.cmx
  lib/ocaml/stdune/stdune__Either.cmx
  lib/ocaml/stdune/stdune__Env.cmx
  lib/ocaml/stdune/stdune__Env_path.cmx
  lib/ocaml/stdune/stdune__Escape.cmx
+lib/ocaml/stdune/stdune__Execution_env.cmx
  lib/ocaml/stdune/stdune__Exn.cmx
  lib/ocaml/stdune/stdune__Exn_with_backtrace.cmx
  lib/ocaml/stdune/stdune__Fdecl.cmx
  lib/ocaml/stdune/stdune__Filename.cmx
+lib/ocaml/stdune/stdune__Filename_set.cmx
  lib/ocaml/stdune/stdune__Float.cmx
+lib/ocaml/stdune/stdune__Flock.cmx
+lib/ocaml/stdune/stdune__Format.cmx
  lib/ocaml/stdune/stdune__Fpath.cmx
  lib/ocaml/stdune/stdune__Hashable.cmx
  lib/ocaml/stdune/stdune__Hashtbl.cmx
@@ -55,6 +56,7 @@ lib/ocaml/stdune/stdune__Id.cmx
  lib/ocaml/stdune/stdune__Int.cmx
  lib/ocaml/stdune/stdune__Io.cmx
  lib/ocaml/stdune/stdune__Io_intf.cmx
+lib/ocaml/stdune/stdune__Lazy.cmx
  lib/ocaml/stdune/stdune__Lexbuf.cmx
  lib/ocaml/stdune/stdune__List.cmx
  lib/ocaml/stdune/stdune__Loc.cmx
@@ -71,6 +73,8 @@ lib/ocaml/stdune/stdune__Option.cmx
  lib/ocaml/stdune/stdune__Or_exn.cmx
  lib/ocaml/stdune/stdune__Path.cmx
  lib/ocaml/stdune/stdune__Path_intf.cmx
+lib/ocaml/stdune/stdune__Per_item.cmx
+lib/ocaml/stdune/stdune__Per_item_intf.cmx
  lib/ocaml/stdune/stdune__Pid.cmx
  lib/ocaml/stdune/stdune__Platform.cmx
  lib/ocaml/stdune/stdune__Poly.cmx
@@ -87,10 +91,12 @@ lib/ocaml/stdune/stdune__Signal.cmx
  lib/ocaml/stdune/stdune__Staged.cmx
  lib/ocaml/stdune/stdune__State.cmx
  lib/ocaml/stdune/stdune__String.cmx
+lib/ocaml/stdune/stdune__String_builder.cmx
  lib/ocaml/stdune/stdune__String_split.cmx
  lib/ocaml/stdune/stdune__Sys.cmx
  lib/ocaml/stdune/stdune__Table.cmx
  lib/ocaml/stdune/stdune__Temp.cmx
+lib/ocaml/stdune/stdune__Terminal_signals.cmx
  lib/ocaml/stdune/stdune__Top_closure.cmx
  lib/ocaml/stdune/stdune__Top_closure_intf.cmx
  lib/ocaml/stdune/stdune__Tuple.cmx
Index: pkg/PLIST-configurator
===================================================================
RCS file: /cvs/ports/devel/dune/pkg/PLIST-configurator,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-configurator
--- pkg/PLIST-configurator	26 Oct 2025 17:29:40 -0000	1.5
+++ pkg/PLIST-configurator	28 Oct 2025 07:38:10 -0000
@@ -44,8 +44,11 @@ lib/ocaml/stdune/applicative.ml
  lib/ocaml/stdune/applicative.mli
  lib/ocaml/stdune/applicative_intf.ml
  lib/ocaml/stdune/array.ml
+lib/ocaml/stdune/array.mli
  lib/ocaml/stdune/bin.ml
  lib/ocaml/stdune/bin.mli
+lib/ocaml/stdune/bit_set.ml
+lib/ocaml/stdune/bit_set.mli
  lib/ocaml/stdune/bool.ml
  lib/ocaml/stdune/bool.mli
  lib/ocaml/stdune/bytes.ml
@@ -58,6 +61,8 @@ lib/ocaml/stdune/char.ml
  lib/ocaml/stdune/char.mli
  lib/ocaml/stdune/code_error.ml
  lib/ocaml/stdune/code_error.mli
+lib/ocaml/stdune/compact_position.ml
+lib/ocaml/stdune/compact_position.mli
  lib/ocaml/stdune/comparable.ml
  lib/ocaml/stdune/comparable.mli
  lib/ocaml/stdune/comparable_intf.ml
@@ -74,6 +79,8 @@ lib/ocaml/stdune/dev_null.ml
  lib/ocaml/stdune/dev_null.mli
  lib/ocaml/stdune/dune-package
  lib/ocaml/stdune/dune_either.ml
+lib/ocaml/stdune/dune_filesystem_stubs.ml
+lib/ocaml/stdune/dune_filesystem_stubs.mli
  lib/ocaml/stdune/either.ml
  lib/ocaml/stdune/either.mli
  lib/ocaml/stdune/env.ml
@@ -82,6 +89,8 @@ lib/ocaml/stdune/env_path.ml
  lib/ocaml/stdune/env_path.mli
  lib/ocaml/stdune/escape.ml
  lib/ocaml/stdune/escape.mli
+lib/ocaml/stdune/execution_env.ml
+lib/ocaml/stdune/execution_env.mli
  lib/ocaml/stdune/exn.ml
  lib/ocaml/stdune/exn.mli
  lib/ocaml/stdune/exn_with_backtrace.ml
@@ -90,16 +99,14 @@ lib/ocaml/stdune/fdecl.ml
  lib/ocaml/stdune/fdecl.mli
  lib/ocaml/stdune/filename.ml
  lib/ocaml/stdune/filename.mli
-lib/ocaml/stdune/filesystem_stubs/
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cma
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmi
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmt
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.cmti
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.ml
-lib/ocaml/stdune/filesystem_stubs/dune_filesystem_stubs.mli
-@static-lib lib/ocaml/stdune/filesystem_stubs/libdune_filesystem_stubs_stubs.a
+lib/ocaml/stdune/filename_set.ml
+lib/ocaml/stdune/filename_set.mli
  lib/ocaml/stdune/float.ml
  lib/ocaml/stdune/float.mli
+lib/ocaml/stdune/flock.ml
+lib/ocaml/stdune/flock.mli
+lib/ocaml/stdune/format.ml
+lib/ocaml/stdune/format.mli
  lib/ocaml/stdune/fpath.ml
  lib/ocaml/stdune/fpath.mli
  lib/ocaml/stdune/hashable.ml
@@ -113,6 +120,7 @@ lib/ocaml/stdune/int.mli
  lib/ocaml/stdune/io.ml
  lib/ocaml/stdune/io.mli
  lib/ocaml/stdune/io_intf.ml
+lib/ocaml/stdune/lazy.ml
  lib/ocaml/stdune/lexbuf.ml
  lib/ocaml/stdune/lexbuf.mli
  @static-lib lib/ocaml/stdune/libstdune_stubs.a
@@ -121,6 +129,7 @@ lib/ocaml/stdune/list.mli
  lib/ocaml/stdune/loc.ml
  lib/ocaml/stdune/loc.mli
  lib/ocaml/stdune/loc0.ml
+lib/ocaml/stdune/loc0.mli
  lib/ocaml/stdune/map.ml
  lib/ocaml/stdune/map.mli
  lib/ocaml/stdune/map_intf.ml
@@ -142,6 +151,9 @@ lib/ocaml/stdune/or_exn.mli
  lib/ocaml/stdune/path.ml
  lib/ocaml/stdune/path.mli
  lib/ocaml/stdune/path_intf.ml
+lib/ocaml/stdune/per_item.ml
+lib/ocaml/stdune/per_item.mli
+lib/ocaml/stdune/per_item_intf.ml
  lib/ocaml/stdune/pid.ml
  lib/ocaml/stdune/pid.mli
  lib/ocaml/stdune/platform.ml
@@ -191,9 +203,13 @@ lib/ocaml/stdune/stdune__Applicative_int
  lib/ocaml/stdune/stdune__Applicative_intf.cmt
  lib/ocaml/stdune/stdune__Array.cmi
  lib/ocaml/stdune/stdune__Array.cmt
+lib/ocaml/stdune/stdune__Array.cmti
  lib/ocaml/stdune/stdune__Bin.cmi
  lib/ocaml/stdune/stdune__Bin.cmt
  lib/ocaml/stdune/stdune__Bin.cmti
+lib/ocaml/stdune/stdune__Bit_set.cmi
+lib/ocaml/stdune/stdune__Bit_set.cmt
+lib/ocaml/stdune/stdune__Bit_set.cmti
  lib/ocaml/stdune/stdune__Bool.cmi
  lib/ocaml/stdune/stdune__Bool.cmt
  lib/ocaml/stdune/stdune__Bool.cmti
@@ -212,6 +228,9 @@ lib/ocaml/stdune/stdune__Char.cmti
  lib/ocaml/stdune/stdune__Code_error.cmi
  lib/ocaml/stdune/stdune__Code_error.cmt
  lib/ocaml/stdune/stdune__Code_error.cmti
+lib/ocaml/stdune/stdune__Compact_position.cmi
+lib/ocaml/stdune/stdune__Compact_position.cmt
+lib/ocaml/stdune/stdune__Compact_position.cmti
  lib/ocaml/stdune/stdune__Comparable.cmi
  lib/ocaml/stdune/stdune__Comparable.cmt
  lib/ocaml/stdune/stdune__Comparable.cmti
@@ -225,6 +244,9 @@ lib/ocaml/stdune/stdune__Dev_null.cmt
  lib/ocaml/stdune/stdune__Dev_null.cmti
  lib/ocaml/stdune/stdune__Dune_either.cmi
  lib/ocaml/stdune/stdune__Dune_either.cmt
+lib/ocaml/stdune/stdune__Dune_filesystem_stubs.cmi
+lib/ocaml/stdune/stdune__Dune_filesystem_stubs.cmt
+lib/ocaml/stdune/stdune__Dune_filesystem_stubs.cmti
  lib/ocaml/stdune/stdune__Either.cmi
  lib/ocaml/stdune/stdune__Either.cmt
  lib/ocaml/stdune/stdune__Either.cmti
@@ -237,6 +259,9 @@ lib/ocaml/stdune/stdune__Env_path.cmti
  lib/ocaml/stdune/stdune__Escape.cmi
  lib/ocaml/stdune/stdune__Escape.cmt
  lib/ocaml/stdune/stdune__Escape.cmti
+lib/ocaml/stdune/stdune__Execution_env.cmi
+lib/ocaml/stdune/stdune__Execution_env.cmt
+lib/ocaml/stdune/stdune__Execution_env.cmti
  lib/ocaml/stdune/stdune__Exn.cmi
  lib/ocaml/stdune/stdune__Exn.cmt
  lib/ocaml/stdune/stdune__Exn.cmti
@@ -249,9 +274,18 @@ lib/ocaml/stdune/stdune__Fdecl.cmti
  lib/ocaml/stdune/stdune__Filename.cmi
  lib/ocaml/stdune/stdune__Filename.cmt
  lib/ocaml/stdune/stdune__Filename.cmti
+lib/ocaml/stdune/stdune__Filename_set.cmi
+lib/ocaml/stdune/stdune__Filename_set.cmt
+lib/ocaml/stdune/stdune__Filename_set.cmti
  lib/ocaml/stdune/stdune__Float.cmi
  lib/ocaml/stdune/stdune__Float.cmt
  lib/ocaml/stdune/stdune__Float.cmti
+lib/ocaml/stdune/stdune__Flock.cmi
+lib/ocaml/stdune/stdune__Flock.cmt
+lib/ocaml/stdune/stdune__Flock.cmti
+lib/ocaml/stdune/stdune__Format.cmi
+lib/ocaml/stdune/stdune__Format.cmt
+lib/ocaml/stdune/stdune__Format.cmti
  lib/ocaml/stdune/stdune__Fpath.cmi
  lib/ocaml/stdune/stdune__Fpath.cmt
  lib/ocaml/stdune/stdune__Fpath.cmti
@@ -273,6 +307,8 @@ lib/ocaml/stdune/stdune__Io.cmt
  lib/ocaml/stdune/stdune__Io.cmti
  lib/ocaml/stdune/stdune__Io_intf.cmi
  lib/ocaml/stdune/stdune__Io_intf.cmt
+lib/ocaml/stdune/stdune__Lazy.cmi
+lib/ocaml/stdune/stdune__Lazy.cmt
  lib/ocaml/stdune/stdune__Lexbuf.cmi
  lib/ocaml/stdune/stdune__Lexbuf.cmt
  lib/ocaml/stdune/stdune__Lexbuf.cmti
@@ -284,6 +320,7 @@ lib/ocaml/stdune/stdune__Loc.cmt
  lib/ocaml/stdune/stdune__Loc.cmti
  lib/ocaml/stdune/stdune__Loc0.cmi
  lib/ocaml/stdune/stdune__Loc0.cmt
+lib/ocaml/stdune/stdune__Loc0.cmti
  lib/ocaml/stdune/stdune__Map.cmi
  lib/ocaml/stdune/stdune__Map.cmt
  lib/ocaml/stdune/stdune__Map.cmti
@@ -316,6 +353,11 @@ lib/ocaml/stdune/stdune__Path.cmt
  lib/ocaml/stdune/stdune__Path.cmti
  lib/ocaml/stdune/stdune__Path_intf.cmi
  lib/ocaml/stdune/stdune__Path_intf.cmt
+lib/ocaml/stdune/stdune__Per_item.cmi
+lib/ocaml/stdune/stdune__Per_item.cmt
+lib/ocaml/stdune/stdune__Per_item.cmti
+lib/ocaml/stdune/stdune__Per_item_intf.cmi
+lib/ocaml/stdune/stdune__Per_item_intf.cmt
  lib/ocaml/stdune/stdune__Pid.cmi
  lib/ocaml/stdune/stdune__Pid.cmt
  lib/ocaml/stdune/stdune__Pid.cmti
@@ -363,6 +405,9 @@ lib/ocaml/stdune/stdune__State.cmti
  lib/ocaml/stdune/stdune__String.cmi
  lib/ocaml/stdune/stdune__String.cmt
  lib/ocaml/stdune/stdune__String.cmti
+lib/ocaml/stdune/stdune__String_builder.cmi
+lib/ocaml/stdune/stdune__String_builder.cmt
+lib/ocaml/stdune/stdune__String_builder.cmti
  lib/ocaml/stdune/stdune__String_split.cmi
  lib/ocaml/stdune/stdune__String_split.cmt
  lib/ocaml/stdune/stdune__String_split.cmti
@@ -375,6 +420,9 @@ lib/ocaml/stdune/stdune__Table.cmti
  lib/ocaml/stdune/stdune__Temp.cmi
  lib/ocaml/stdune/stdune__Temp.cmt
  lib/ocaml/stdune/stdune__Temp.cmti
+lib/ocaml/stdune/stdune__Terminal_signals.cmi
+lib/ocaml/stdune/stdune__Terminal_signals.cmt
+lib/ocaml/stdune/stdune__Terminal_signals.cmti
  lib/ocaml/stdune/stdune__Top_closure.cmi
  lib/ocaml/stdune/stdune__Top_closure.cmt
  lib/ocaml/stdune/stdune__Top_closure.cmti
@@ -405,6 +453,8 @@ lib/ocaml/stdune/stdune__User_warning.cm
  lib/ocaml/stdune/stdune__User_warning.cmti
  lib/ocaml/stdune/string.ml
  lib/ocaml/stdune/string.mli
+lib/ocaml/stdune/string_builder.ml
+lib/ocaml/stdune/string_builder.mli
  lib/ocaml/stdune/string_split.ml
  lib/ocaml/stdune/string_split.mli
  lib/ocaml/stdune/sys.ml
@@ -413,6 +463,8 @@ lib/ocaml/stdune/table.ml
  lib/ocaml/stdune/table.mli
  lib/ocaml/stdune/temp.ml
  lib/ocaml/stdune/temp.mli
+lib/ocaml/stdune/terminal_signals.ml
+lib/ocaml/stdune/terminal_signals.mli
  lib/ocaml/stdune/top_closure.ml
  lib/ocaml/stdune/top_closure.mli
  lib/ocaml/stdune/top_closure_intf.ml
@@ -431,6 +483,7 @@ lib/ocaml/stdune/user_message.ml
  lib/ocaml/stdune/user_message.mli
  lib/ocaml/stdune/user_warning.ml
  lib/ocaml/stdune/user_warning.mli
+@so lib/ocaml/stublibs/dllstdune_stubs.so
  share/doc/dune-configurator/
  share/doc/dune-configurator/CHANGES.md
  share/doc/dune-configurator/LICENSE.md
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/dune/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main	26 Oct 2025 17:29:40 -0000	1.4
+++ pkg/PLIST-main	28 Oct 2025 07:38:10 -0000
@@ -7,8 +7,6 @@ lib/ocaml/dune/
  lib/ocaml/dune/META
  lib/ocaml/dune/dune-package
  lib/ocaml/dune/opam
-@so lib/ocaml/stublibs/dlldune_filesystem_stubs_stubs.so
-@so lib/ocaml/stublibs/dllstdune_stubs.so
  @man man/man1/dune-build.1
  @man man/man1/dune-cache.1
  @man man/man1/dune-clean.1
@@ -24,17 +22,22 @@ lib/ocaml/dune/opam
  @man man/man1/dune-install.1
  @man man/man1/dune-installed-libraries.1
  @man man/man1/dune-internal.1
+@man man/man1/dune-monitor.1
  @man man/man1/dune-ocaml-merlin.1
  @man man/man1/dune-ocaml.1
+@man man/man1/dune-package.1
+@man man/man1/dune-pkg.1
  @man man/man1/dune-printenv.1
  @man man/man1/dune-promote.1
  @man man/man1/dune-promotion.1
  @man man/man1/dune-rpc.1
  @man man/man1/dune-rules.1
  @man man/man1/dune-runtest.1
+@man man/man1/dune-show.1
  @man man/man1/dune-shutdown.1
  @man man/man1/dune-subst.1
  @man man/man1/dune-test.1
+@man man/man1/dune-tools.1
  @man man/man1/dune-top.1
  @man man/man1/dune-uninstall.1
  @man man/man1/dune-upgrade.1