CVS commit: pkgsrc/devel/leahneukirchen-redo

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jun 28 03:05:35 UTC 2025

Modified Files:
        pkgsrc/devel/leahneukirchen-redo: distinfo
        pkgsrc/devel/leahneukirchen-redo/patches: patch-redo.c

Log Message:
leahneukirchen-redo: fix SmartOS build. Still builds NetBSD, macOS.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/leahneukirchen-redo/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.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/leahneukirchen-redo/distinfo
diff -u pkgsrc/devel/leahneukirchen-redo/distinfo:1.7 pkgsrc/devel/leahneukirchen-redo/distinfo:1.8
--- pkgsrc/devel/leahneukirchen-redo/distinfo:1.7       Thu Jan  6 08:51:55 2022
+++ pkgsrc/devel/leahneukirchen-redo/distinfo   Sat Jun 28 03:05:34 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2022/01/06 08:51:55 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2025/06/28 03:05:34 schmonz Exp $
 
 BLAKE2s (leahneukirchen-redo-d2f9517377f5652b4217a6e119205450d44b1e30.tar.gz) = e27d1c25add74f8ac53ecac642a75b1a490fdc069008c299e1741729f7b562e9
 SHA512 (leahneukirchen-redo-d2f9517377f5652b4217a6e119205450d44b1e30.tar.gz) = 
0b689206cc865456075649562cd9f4eefb187062747c36a4f119fa5dcba42593ab08148cdd8246c0e8f473ef33f36baba22871b4513f4078ad988e3c9045dd38
 Size (leahneukirchen-redo-d2f9517377f5652b4217a6e119205450d44b1e30.tar.gz) = 7831 bytes
-SHA1 (patch-redo.c) = 19e57d151fe72907a894f27792ac504ffb5be8fc
+SHA1 (patch-redo.c) = 95bb72daf3987e02a1f35266362f5c887d5a4e38

Index: pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c
diff -u pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c:1.2 pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c:1.3
--- pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c:1.2   Mon Jul 20 19:46:18 2020
+++ pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c       Sat Jun 28 03:05:35 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-redo.c,v 1.2 2020/07/20 19:46:18 schmonz Exp $
+$NetBSD: patch-redo.c,v 1.3 2025/06/28 03:05:35 schmonz Exp $
 
 Avoid CONFLICTS with other redo implementations.
-Define PATH_MAX on Illumos.
+Define PATH_MAX and dprintf() on Illumos.
 
---- redo.c.orig        2020-06-26 21:46:40.000000000 +0000
+--- redo.c.orig        2020-10-01 16:15:36.000000000 +0000
 +++ redo.c
 @@ -34,6 +34,7 @@ todo:
  #include <errno.h>
@@ -13,7 +13,34 @@ Define PATH_MAX on Illumos.
  #include <stdarg.h>
  #include <stdint.h>
  #include <stdio.h>
-@@ -968,20 +969,25 @@ main(int argc, char *argv[])
+@@ -194,6 +195,26 @@ int level = -1;
+ int implicit_jobs = 1;
+ int kflag, jflag, xflag, fflag, sflag;
+ 
++#ifdef __sun
++#include <stdarg.h>
++static int
++dprintf(int fd, const char *format, ...)
++{
++      va_list args;
++      char buffer[1024];
++      int ret;
++
++      va_start(args, format);
++      ret = vsnprintf(buffer, sizeof(buffer), format, args);
++      va_end(args);
++
++      if (ret > 0) {
++              write(fd, buffer, ret);
++      }
++      return ret;
++}
++#endif
++
+ static void
+ redo_ifcreate(int fd, char *target)
+ {
+@@ -969,20 +990,25 @@ main(int argc, char *argv[])
  
        dir_fd = keepdir();