CVS commit: pkgsrc/devel/ocaml-dune

["Alexander Nasonov" <alnsn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   alnsn
Date:           Sun Jan 11 18:09:04 UTC 2026

Modified Files:
        pkgsrc/devel/ocaml-dune: Makefile Makefile.common PLIST distinfo
        pkgsrc/devel/ocaml-dune/patches:
            patch-vendor_notty_src-unix_native_winsize.c
Added Files:
        pkgsrc/devel/ocaml-dune/patches: patch-otherlibs_stdune_src_readdir.c
Removed Files:
        pkgsrc/devel/ocaml-dune/patches: patch-Makefile
            patch-otherlibs_stdune__filesystem__stubs_readdir.c

Log Message:
Update devel/ocaml-dune to 3.20.2.

All changes between 3.11.1 and 3.20.2 are listed here:
https://github.com/ocaml/dune/blob/main/CHANGES.md


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ocaml-dune/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-dune/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ocaml-dune/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocaml-dune/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/ocaml-dune/patches/patch-Makefile
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune__filesystem__stubs_readdir.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune_src_readdir.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/ocaml-dune/patches/patch-vendor_notty_src-unix_native_winsize.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
diff -u pkgsrc/devel/ocaml-dune/Makefile:1.17 pkgsrc/devel/ocaml-dune/Makefile:1.18
--- pkgsrc/devel/ocaml-dune/Makefile:1.17       Mon Aug 25 08:34:57 2025
+++ pkgsrc/devel/ocaml-dune/Makefile    Sun Jan 11 18:09:04 2026
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2025/08/25 08:34:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2026/01/11 18:09:04 alnsn Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/ocaml-dune/Makefile.common
diff -u pkgsrc/devel/ocaml-dune/Makefile.common:1.5 pkgsrc/devel/ocaml-dune/Makefile.common:1.6
--- pkgsrc/devel/ocaml-dune/Makefile.common:1.5 Fri Dec  6 16:41:16 2024
+++ pkgsrc/devel/ocaml-dune/Makefile.common     Sun Jan 11 18:09:04 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.5 2024/12/06 16:41:16 gdt Exp $
+# $NetBSD: Makefile.common,v 1.6 2026/01/11 18:09:04 alnsn Exp $
 
 # used by devel/ocaml-dune-configurator/Makefile
 
-DUNE_VERSION=  3.11.1
+DUNE_VERSION=  3.20.2
 DISTNAME=      ${GITHUB_PROJECT}-${DUNE_VERSION}
 
 LICENSE=       apache-2.0

Index: pkgsrc/devel/ocaml-dune/PLIST
diff -u pkgsrc/devel/ocaml-dune/PLIST:1.9 pkgsrc/devel/ocaml-dune/PLIST:1.10
--- pkgsrc/devel/ocaml-dune/PLIST:1.9   Sun Nov  5 21:26:41 2023
+++ pkgsrc/devel/ocaml-dune/PLIST       Sun Jan 11 18:09:04 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2023/11/05 21:26:41 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.10 2026/01/11 18:09:04 alnsn Exp $
 bin/dune
 doc/dune/CHANGES.md
 doc/dune/LICENSE.md
@@ -25,6 +25,7 @@ man/man1/dune-internal.1
 man/man1/dune-monitor.1
 man/man1/dune-ocaml-merlin.1
 man/man1/dune-ocaml.1
+man/man1/dune-package.1
 man/man1/dune-pkg.1
 man/man1/dune-printenv.1
 man/man1/dune-promote.1
@@ -36,6 +37,7 @@ man/man1/dune-show.1
 man/man1/dune-shutdown.1
 man/man1/dune-subst.1
 man/man1/dune-test.1
+man/man1/dune-tools.1
 man/man1/dune-top.1
 man/man1/dune-uninstall.1
 man/man1/dune-upgrade.1

Index: pkgsrc/devel/ocaml-dune/distinfo
diff -u pkgsrc/devel/ocaml-dune/distinfo:1.15 pkgsrc/devel/ocaml-dune/distinfo:1.16
--- pkgsrc/devel/ocaml-dune/distinfo:1.15       Fri Jul 11 11:55:36 2025
+++ pkgsrc/devel/ocaml-dune/distinfo    Sun Jan 11 18:09:04 2026
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.15 2025/07/11 11:55:36 jperkin Exp $
+$NetBSD: distinfo,v 1.16 2026/01/11 18:09:04 alnsn Exp $
 
-BLAKE2s (dune-3.11.1.tar.gz) = 3e657f115bcd7fca087a8dfff9a3a95802bf955626d4925445f2c54dd6172faa
-SHA512 (dune-3.11.1.tar.gz) = 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4
-Size (dune-3.11.1.tar.gz) = 2753844 bytes
-SHA1 (patch-Makefile) = 09d6025b4259fe94fd413dc1285b84191436b7c3
+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
 SHA1 (patch-otherlibs_configurator_src_v1.ml) = 74ddbf037c59ed81eb858042463fa5016027d9b8
-SHA1 (patch-otherlibs_stdune__filesystem__stubs_readdir.c) = 514f101bf8bf0d0ee2979917f9fad299751f2e34
-SHA1 (patch-vendor_notty_src-unix_native_winsize.c) = e41fe089725df8fdb748b6a3e53b2c4994f6f83e
+SHA1 (patch-otherlibs_stdune_src_readdir.c) = 931f784972ddd7f364e9dfe004f41669fd560225
+SHA1 (patch-vendor_notty_src-unix_native_winsize.c) = d970c142e55e217477a54f11801e2d2365e12e7f

Index: pkgsrc/devel/ocaml-dune/patches/patch-vendor_notty_src-unix_native_winsize.c
diff -u pkgsrc/devel/ocaml-dune/patches/patch-vendor_notty_src-unix_native_winsize.c:1.2 pkgsrc/devel/ocaml-dune/patches/patch-vendor_notty_src-unix_native_winsize.c:1.3
--- pkgsrc/devel/ocaml-dune/patches/patch-vendor_notty_src-unix_native_winsize.c:1.2    Fri Jul 11 11:55:37 2025
+++ pkgsrc/devel/ocaml-dune/patches/patch-vendor_notty_src-unix_native_winsize.c        Sun Jan 11 18:09:04 2026
@@ -1,12 +1,12 @@
-$NetBSD: patch-vendor_notty_src-unix_native_winsize.c,v 1.2 2025/07/11 11:55:37 jperkin Exp $
+$NetBSD: patch-vendor_notty_src-unix_native_winsize.c,v 1.3 2026/01/11 18:09:04 alnsn Exp $
 
 SunOS build fix.
 
---- vendor/notty/src-unix/native/winsize.c.orig        2023-10-09 11:08:29.000000000 +0000
+--- vendor/notty/src-unix/native/winsize.c.orig        2026-01-11 01:23:58.628536099 +0000
 +++ vendor/notty/src-unix/native/winsize.c
 @@ -3,6 +3,11 @@
  #ifdef _WIN32
- #include <caml/fail.h>
+ #include <windows.h>
  #else
 +#ifdef __sun
 +#include <sys/termios.h>

Added files:

Index: pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune_src_readdir.c
diff -u /dev/null pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune_src_readdir.c:1.1
--- /dev/null   Sun Jan 11 18:09:04 2026
+++ pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune_src_readdir.c        Sun Jan 11 18:09:04 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-otherlibs_stdune_src_readdir.c,v 1.1 2026/01/11 18:09:04 alnsn Exp $
+
+Extend conditional for HAIKU to SunOS, for no apparent reason.
+
+\todo File upstream.  
+
+--- otherlibs/stdune/src/readdir.c.orig        2026-01-11 01:20:55.502757183 +0000
++++ otherlibs/stdune/src/readdir.c
+@@ -18,7 +18,7 @@ typedef struct dirent directory_entry;
+ value val_file_type(int typ) {
+   switch(typ)
+     {
+-#ifndef __HAIKU__     
++#if !defined(__HAIKU__) && !defined(__sun)
+    case DT_REG:
+       return Val_int(0);
+     case DT_DIR:
+@@ -64,7 +64,7 @@ CAMLprim value caml__dune_filesystem_stu
+   v_filename = caml_copy_string(e->d_name);
+   v_tuple = caml_alloc_small(2, 0);
+   Field(v_tuple, 0) = v_filename;
+-#ifndef __HAIKU__
++#if !defined(__HAIKU__) && !defined(__sun)
+   Field(v_tuple, 1) = val_file_type(e->d_type);
+ #else
+   Field(v_tuple, 1) = Val_int(7);