CVS commit: pkgsrc/shells/nushell

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

Module Name:    pkgsrc
Committed By:   pin
Date:           Wed Oct 11 11:42:14 UTC 2023

Modified Files:
        pkgsrc/shells/nushell: Makefile distinfo
Added Files:
        pkgsrc/shells/nushell/patches:
            patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs
            patch-.._vendor_trash-3.0.6_src_freedesktop.rs

Log Message:
shells/nushell: enable trash feature


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/shells/nushell/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/shells/nushell/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/nushell/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs \
    pkgsrc/shells/nushell/patches/patch-.._vendor_trash-3.0.6_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/shells/nushell/Makefile
diff -u pkgsrc/shells/nushell/Makefile:1.40 pkgsrc/shells/nushell/Makefile:1.41
--- pkgsrc/shells/nushell/Makefile:1.40 Wed Sep 20 08:54:24 2023
+++ pkgsrc/shells/nushell/Makefile      Wed Oct 11 11:42:14 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2023/09/20 08:54:24 pin Exp $
+# $NetBSD: Makefile,v 1.41 2023/10/11 11:42:14 pin Exp $
 
 DISTNAME=      nushell-0.85.0
+PKGREVISION=    1
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nushell/}
 
@@ -20,13 +21,6 @@ RUSTFLAGS+=  -C link-arg=${COMPILER_RPATH
 RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib
 RUSTFLAGS+=    -C link-arg=-L${BUILDLINK_PREFIX.libX11}/lib
 
-# The 'trash-support' feature is default but, does not build on NetBSD.
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
-CARGO_NO_DEFAULT_FEATURES=     YES
-CARGO_FEATURES+=               plugin which-support sqlite
-.endif
-
 .include "../../lang/rust/cargo.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"

Index: pkgsrc/shells/nushell/distinfo
diff -u pkgsrc/shells/nushell/distinfo:1.32 pkgsrc/shells/nushell/distinfo:1.33
--- pkgsrc/shells/nushell/distinfo:1.32 Wed Sep 20 08:54:24 2023
+++ pkgsrc/shells/nushell/distinfo      Wed Oct 11 11:42:14 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2023/09/20 08:54:24 pin Exp $
+$NetBSD: distinfo,v 1.33 2023/10/11 11:42:14 pin Exp $
 
 BLAKE2s (Inflector-0.11.4.crate) = 2f8b4a805230be3b58267c7fb6b9c26c2ec966378d195673d1128a851cca515d
 SHA512 (Inflector-0.11.4.crate) = f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
@@ -1749,4 +1749,6 @@ Size (zstd-safe-6.0.5+zstd.1.5.4.crate) 
 BLAKE2s (zstd-sys-2.0.8+zstd.1.5.5.crate) = 6b0ec4a18acadf02653ceb28a5d25cac6314c8b457f722c5ff8d8df17bf171ec
 SHA512 (zstd-sys-2.0.8+zstd.1.5.5.crate) = acfbf6c464678438bcab289c8be2e67a2bdfb910143d77363bf1ad5227dffc4b60e224388b7e59186fd4d1e017b63fef49734e99e383cbda19b82b4ed382fcd8
 Size (zstd-sys-2.0.8+zstd.1.5.5.crate) = 736270 bytes
+SHA1 (patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 4d9bd38b3a8458805bac7e86878d5ee7aa8c64e9
+SHA1 (patch-.._vendor_trash-3.0.6_src_freedesktop.rs) = be103555ff292d8303caa7f2fc1d1a198ed416f3
 SHA1 (patch-.._vendor_uucore-0.0.21_src_lib_features_fs.rs) = 139e7b3a8991e72448ec41f87530b2fd97c1c033

Added files:

Index: pkgsrc/shells/nushell/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs
diff -u /dev/null pkgsrc/shells/nushell/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs:1.1
--- /dev/null   Wed Oct 11 11:42:14 2023
+++ pkgsrc/shells/nushell/patches/patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs    Wed Oct 11 11:42:14 2023
@@ -0,0 +1,55 @@
+$NetBSD: patch-.._vendor_libc-0.2.147_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2023/10/11 11:42:14 pin Exp $
+
+https://github.com/rust-lang/libc/pull/3368
+
+--- ../vendor/libc-0.2.147/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig  2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/libc-0.2.147/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/shells/nushell/patches/patch-.._vendor_trash-3.0.6_src_freedesktop.rs
diff -u /dev/null pkgsrc/shells/nushell/patches/patch-.._vendor_trash-3.0.6_src_freedesktop.rs:1.1
--- /dev/null   Wed Oct 11 11:42:14 2023
+++ pkgsrc/shells/nushell/patches/patch-.._vendor_trash-3.0.6_src_freedesktop.rs        Wed Oct 11 11:42:14 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-.._vendor_trash-3.0.6_src_freedesktop.rs,v 1.1 2023/10/11 11:42:14 pin Exp $
+
+https://github.com/Byron/trash-rs/pull/84
+
+--- ../vendor/trash-3.0.6/src/freedesktop.rs.orig      2006-07-24 01:21:28.000000000 +0000
++++ ../vendor/trash-3.0.6/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 {