CVS commit: pkgsrc/devel

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Dec  6 16:41:16 UTC 2024

Modified Files:
        pkgsrc/devel/ocaml-dune: Makefile.common distinfo
        pkgsrc/devel/ocaml-dune/patches:
            patch-otherlibs_stdune__filesystem__stubs_readdir.c
Added Files:
        pkgsrc/devel/ocaml-dune/patches: patch-otherlibs_configurator_src_v1.ml
Removed Files:
        pkgsrc/devel/ocaml-dune-configurator/patches:
            patch-otherlibs_configurator_src_v1.ml

Log Message:
devel/ocaml-dune*: Untangle patch mess

ocaml-dune had a shared distinfo file but not a shared patch
directory.  This did not go well when -configurator got a patch.

Declare a shared PATCHDIR,   Move the new patch to it.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-dune/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/ocaml-dune/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/ocaml-dune-configurator/patches/patch-otherlibs_configurator_src_v1.ml
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_configurator_src_v1.ml
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune__filesystem__stubs_readdir.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.4 pkgsrc/devel/ocaml-dune/Makefile.common:1.5
--- pkgsrc/devel/ocaml-dune/Makefile.common:1.4 Sun Nov  5 21:26:41 2023
+++ pkgsrc/devel/ocaml-dune/Makefile.common     Fri Dec  6 16:41:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2023/11/05 21:26:41 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.5 2024/12/06 16:41:16 gdt Exp $
 
 # used by devel/ocaml-dune-configurator/Makefile
 
@@ -11,3 +11,4 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=ocam
 GITHUB_PROJECT=        dune
 
 DISTINFO_FILE= ${PKGDIR}/../../devel/ocaml-dune/distinfo
+PATCHDIR=      ${PKGDIR}/../../devel/ocaml-dune/patches

Index: pkgsrc/devel/ocaml-dune/distinfo
diff -u pkgsrc/devel/ocaml-dune/distinfo:1.13 pkgsrc/devel/ocaml-dune/distinfo:1.14
--- pkgsrc/devel/ocaml-dune/distinfo:1.13       Thu Nov 28 12:51:37 2024
+++ pkgsrc/devel/ocaml-dune/distinfo    Fri Dec  6 16:41:16 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2024/11/28 12:51:37 bacon Exp $
+$NetBSD: distinfo,v 1.14 2024/12/06 16:41:16 gdt 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
-SHA1 (patch-otherlibs_stdune__filesystem__stubs_readdir.c) = 35b116317b5dcca85fe62467544e71935720bc69
+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) = 73dcee62a1356f859eef092e967f4f48383cd5ce

Index: pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune__filesystem__stubs_readdir.c
diff -u pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune__filesystem__stubs_readdir.c:1.1 pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune__filesystem__stubs_readdir.c:1.2
--- pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune__filesystem__stubs_readdir.c:1.1     Sun Nov  5 21:26:42 2023
+++ pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_stdune__filesystem__stubs_readdir.c Fri Dec  6 16:41:16 2024
@@ -1,4 +1,8 @@
-$NetBSD: patch-otherlibs_stdune__filesystem__stubs_readdir.c,v 1.1 2023/11/05 21:26:42 jaapb Exp $
+$NetBSD: patch-otherlibs_stdune__filesystem__stubs_readdir.c,v 1.2 2024/12/06 16:41:16 gdt Exp $
+
+Extend conditional for HAIKU to SunOS, for no apparent reason.
+
+\todo File upstream.  
 
 --- otherlibs/stdune/dune_filesystem_stubs/readdir.c.orig      2023-10-09 11:08:29.000000000 +0000
 +++ otherlibs/stdune/dune_filesystem_stubs/readdir.c

Added files:

Index: pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_configurator_src_v1.ml
diff -u /dev/null pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_configurator_src_v1.ml:1.1
--- /dev/null   Fri Dec  6 16:41:16 2024
+++ pkgsrc/devel/ocaml-dune/patches/patch-otherlibs_configurator_src_v1.ml      Fri Dec  6 16:41:16 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-otherlibs_configurator_src_v1.ml,v 1.1 2024/12/06 16:41:16 gdt Exp $
+
+Don't try to "which" absolute paths.
+
+--- otherlibs/configurator/src/v1.ml~  2023-10-09 11:08:29.000000000 +0000
++++ otherlibs/configurator/src/v1.ml
+@@ -635,7 +635,10 @@ end
+ 
+ let which t prog =
+   logf t "which: %s" prog;
+-  let x = Find_in_path.which prog in
++  let x =
++     if String.length prog > 0 && String.get prog 0 = '/' then Some prog
++     else Find_in_path.which prog
++  in
+   logf
+     t
+     "-> %s"