CVS commit: pkgsrc/sysutils/dua-cli

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Wed Oct 11 11:44:22 UTC 2023

Modified Files:
        pkgsrc/sysutils/dua-cli: Makefile distinfo
Added Files:
        pkgsrc/sysutils/dua-cli/patches:
            patch-.._vendor_libc-0.2.142_src_unix_bsd_netbsdlike_netbsd_mod.rs
            patch-.._vendor_trash-3.0.1_src_freedesktop.rs

Log Message:
sysutils/dua-cli: enable move to trash


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/dua-cli/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/dua-cli/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_libc-0.2.142_src_unix_bsd_netbsdlike_netbsd_mod.rs \
    pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_trash-3.0.1_src_freedesktop.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/dua-cli/Makefile
diff -u pkgsrc/sysutils/dua-cli/Makefile:1.21 pkgsrc/sysutils/dua-cli/Makefile:1.22
--- pkgsrc/sysutils/dua-cli/Makefile:1.21       Fri May  5 21:57:11 2023
+++ pkgsrc/sysutils/dua-cli/Makefile    Wed Oct 11 11:44:22 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2023/05/05 21:57:11 pin Exp $
+# $NetBSD: Makefile,v 1.22 2023/10/11 11:44:22 pin Exp $
 
 DISTNAME=      dua-cli-2.20.1
+PKGREVISION=    1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Byron/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -14,11 +15,8 @@ LICENSE=     mit
 
 INSTALLATION_DIRS=     bin
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
 CARGO_NO_DEFAULT_FEATURES=     YES
-CARGO_FEATURES+=               tui-unix
-.endif
+CARGO_FEATURES+=               tui-unix trash-move
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/dua \

Index: pkgsrc/sysutils/dua-cli/distinfo
diff -u pkgsrc/sysutils/dua-cli/distinfo:1.22 pkgsrc/sysutils/dua-cli/distinfo:1.23
--- pkgsrc/sysutils/dua-cli/distinfo:1.22       Fri May  5 21:57:11 2023
+++ pkgsrc/sysutils/dua-cli/distinfo    Wed Oct 11 11:44:22 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2023/05/05 21:57:11 pin Exp $
+$NetBSD: distinfo,v 1.23 2023/10/11 11:44:22 pin Exp $
 
 BLAKE2s (anstream-0.3.1.crate) = 14a51d426b6b7acde27062c42619ce22cf87b47ecaba6037fb50a6c6476d367c
 SHA512 (anstream-0.3.1.crate) = 0eaad41de20fcb8207eecd810e47c833c59bea43cffd7e11450fc74617dcf3adb8d2ae1b5a61f8827dd3ef86ecf3ff7503d6b55c489aefab5f62c8bc746c2e8d
@@ -372,3 +372,5 @@ Size (windows_x86_64_msvc-0.48.0.crate) 
 BLAKE2s (yansi-0.5.1.crate) = 320911635584dafa034235f47c39057166574bad71fa932fb689f67e63e8ee14
 SHA512 (yansi-0.5.1.crate) = 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 Size (yansi-0.5.1.crate) = 16525 bytes
+SHA1 (patch-.._vendor_libc-0.2.142_src_unix_bsd_netbsdlike_netbsd_mod.rs) = c228483db86847ef4c4cc9bc2ebc9fbf7c96bd02
+SHA1 (patch-.._vendor_trash-3.0.1_src_freedesktop.rs) = e2d87ac1e9add8b083a9d1c8031fbff501c71850

Added files:

Index: pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_libc-0.2.142_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_libc-0.2.142_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null   Wed Oct 11 11:44:22 2023
+++ pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_libc-0.2.142_src_unix_bsd_netbsdlike_netbsd_mod.rs  Wed Oct 11 11:44:22 2023
@@ -0,0 +1,55 @@
+$NetBSD: patch-.._vendor_libc-0.2.142_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2023/10/11 11:44:22 pin Exp $
+
+https://github.com/rust-lang/libc/pull/3368
+
+--- ../vendor/libc-0.2.142/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig  2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/libc-0.2.142/src/unix/bsd/netbsdlike/netbsd/mod.rs
+@@ -1852,6 +1852,9 @@ pub const MNT_NODEVMTIME: ::c_int = 0x40
+ pub const MNT_SOFTDEP: ::c_int = 0x80000000;
+ pub const MNT_POSIX1EACLS: ::c_int = 0x00000800;
+ pub const MNT_ACLS: ::c_int = MNT_POSIX1EACLS;
++pub const MNT_WAIT: ::c_int = 1;
++pub const MNT_NOWAIT: ::c_int = 2;
++pub const MNT_LAZY: ::c_int = 3;
+ 
+ //<sys/timex.h>
+ pub const NTP_API: ::c_int = 4;
+@@ -3153,6 +3156,38 @@ extern "C" {
+     pub fn kinfo_getvmmap(pid: ::pid_t, cntp: *mut ::size_t) -> *mut kinfo_vmentry;
+ }
+ 
++#[link(name = "execinfo")]
++extern "C" {
++    pub fn backtrace(addrlist: *mut *mut ::c_void, len: ::size_t) -> ::size_t;
++    pub fn backtrace_symbols(addrlist: *const *mut ::c_void, len: ::size_t) -> *mut *mut ::c_char;
++    pub fn backtrace_symbols_fd(
++        addrlist: *const *mut ::c_void,
++        len: ::size_t,
++        fd: ::c_int,
++    ) -> ::c_int;
++    pub fn backtrace_symbols_fmt(
++        addrlist: *const *mut ::c_void,
++        len: ::size_t,
++        fmt: *const ::c_char,
++    ) -> *mut *mut ::c_char;
++    pub fn backtrace_symbols_fd_fmt(
++        addrlist: *const *mut ::c_void,
++        len: ::size_t,
++        fd: ::c_int,
++        fmt: *const ::c_char,
++    ) -> ::c_int;
++}
++
++cfg_if! {
++    if #[cfg(libc_union)] {
++        extern {
++            // these functions use statvfs:
++            pub fn getmntinfo(mntbufp: *mut *mut ::statvfs, flags: ::c_int) -> ::c_int;
++            pub fn getvfsstat(buf: *mut statvfs, bufsize: ::size_t, flags: ::c_int) -> ::c_int;
++        }
++    }
++}
++
+ cfg_if! {
+     if #[cfg(target_arch = "aarch64")] {
+         mod aarch64;
Index: pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_trash-3.0.1_src_freedesktop.rs
diff -u /dev/null pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_trash-3.0.1_src_freedesktop.rs:1.1
--- /dev/null   Wed Oct 11 11:44:22 2023
+++ pkgsrc/sysutils/dua-cli/patches/patch-.._vendor_trash-3.0.1_src_freedesktop.rs      Wed Oct 11 11:44:22 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-.._vendor_trash-3.0.1_src_freedesktop.rs,v 1.1 2023/10/11 11:44:22 pin Exp $
+
+https://github.com/Byron/trash-rs/pull/84
+
+--- ../vendor/trash-3.0.1/src/freedesktop.rs.orig      2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/trash-3.0.1/src/freedesktop.rs
+@@ -700,12 +700,12 @@ fn get_mount_points() -> Result<Vec<Moun
+             std::str::from_utf8(buf).ok()
+         }
+     }
+-    let mut fs_infos: *mut libc::statfs = std::ptr::null_mut();
++    let mut fs_infos: *mut libc::statvfs = std::ptr::null_mut();
+     let count = unsafe { libc::getmntinfo(&mut fs_infos, libc::MNT_WAIT) };
+     if count < 1 {
+         return Ok(Vec::new());
+     }
+-    let fs_infos: &[libc::statfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) };
++    let fs_infos: &[libc::statvfs] = unsafe { std::slice::from_raw_parts(fs_infos as _, count as _) };
+ 
+     let mut result = Vec::new();
+     for fs_info in fs_infos {