CVS commit: pkgsrc/sysutils/ncdu

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan  3 13:29:49 UTC 2023

Modified Files:
        pkgsrc/sysutils/ncdu: Makefile distinfo
Added Files:
        pkgsrc/sysutils/ncdu/patches: patch-src_main.c

Log Message:
ncdu: update to 1.18.

1.18 - 2022-12-06
        - Fix 'dark-bg' color scheme to actually have a dark background
        - Backport configuration file support from 2.x
        - Backport many new CLI options from 2.x
        - Negation of existing flags: --no-si, --no-confirm-quit, --no-follow-symlinks, --include-caches, --include-kernfs
        - --[no-]extended in addition to -e
        - --one-file-system and --cross-file-system in addition to -x
        - --slow-ui-updates, --fast-ui-updates in addition to -q
        - Column visibility options: --(show|hide)-(hidden|itemcount|mtime|graph|percent)
        - Sorting: --sort, --[no-]group-directories-first
        - Feature selection: --(enable|disable)-(shell|delete|refresh)
        - Deletion confirmation: --[no-]confirm-delete
        - Hidden file visibility: --show-hidden, --hide-hidden
        - Size display: --apparent-size, --disk-usage


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/ncdu/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/ncdu/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/ncdu/patches/patch-src_main.c

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

Modified files:

Index: pkgsrc/sysutils/ncdu/Makefile
diff -u pkgsrc/sysutils/ncdu/Makefile:1.15 pkgsrc/sysutils/ncdu/Makefile:1.16
--- pkgsrc/sysutils/ncdu/Makefile:1.15  Thu Jul 21 17:19:37 2022
+++ pkgsrc/sysutils/ncdu/Makefile       Tue Jan  3 13:29:49 2023
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2022/07/21 17:19:37 fcambus Exp $
+# $NetBSD: Makefile,v 1.16 2023/01/03 13:29:49 wiz Exp $
 
-DISTNAME=      ncdu-1.17
+DISTNAME=      ncdu-1.18
 CATEGORIES=    sysutils
 MASTER_SITES=  https://dev.yorhel.nl/download/
 
-COMMENT=       Disk usage visualization tool
 MAINTAINER=    slitvinov%gmail.com@localhost
 HOMEPAGE=      https://dev.yorhel.nl/ncdu
+COMMENT=       Disk usage visualization tool
 LICENSE=       modified-bsd
 
 GNU_CONFIGURE= yes

Index: pkgsrc/sysutils/ncdu/distinfo
diff -u pkgsrc/sysutils/ncdu/distinfo:1.11 pkgsrc/sysutils/ncdu/distinfo:1.12
--- pkgsrc/sysutils/ncdu/distinfo:1.11  Thu Jul 21 17:19:37 2022
+++ pkgsrc/sysutils/ncdu/distinfo       Tue Jan  3 13:29:49 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2022/07/21 17:19:37 fcambus Exp $
+$NetBSD: distinfo,v 1.12 2023/01/03 13:29:49 wiz Exp $
 
-BLAKE2s (ncdu-1.17.tar.gz) = 1052419587718521fe07cc8868f6071737c690868a7210e3db7dd17246663ab4
-SHA512 (ncdu-1.17.tar.gz) = aa2366797760f0c0b2bea866f0ae0446b8113e3ff6460192a4a42d4d888d473d7f37bc4acff6220fa86003bd96d71761168a2ae0ded36456072176a69564c775
-Size (ncdu-1.17.tar.gz) = 157187 bytes
+BLAKE2s (ncdu-1.18.tar.gz) = 970c3374f5776b52b50ed46bd6f95839a14ad84842260843926be952ac554b22
+SHA512 (ncdu-1.18.tar.gz) = 959ca90ad35055467346c196d7d6e5afc1e57d87c83855dfb92dd8e370bce10c1a1633064854abb3ed581e0ea7b6451474472acd9e4ad3ae91b90311b07cc7d7
+Size (ncdu-1.18.tar.gz) = 159781 bytes
+SHA1 (patch-src_main.c) = c287bc35122c47bfc3a2496165ea99387cb9011f

Added files:

Index: pkgsrc/sysutils/ncdu/patches/patch-src_main.c
diff -u /dev/null pkgsrc/sysutils/ncdu/patches/patch-src_main.c:1.1
--- /dev/null   Tue Jan  3 13:29:49 2023
+++ pkgsrc/sysutils/ncdu/patches/patch-src_main.c       Tue Jan  3 13:29:49 2023
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_main.c,v 1.1 2023/01/03 13:29:49 wiz Exp $
+
+Fix build on non-Linux.
+
+--- src/main.c.orig    2022-11-30 10:30:55.000000000 +0000
++++ src/main.c
+@@ -257,8 +257,10 @@ static int arg_option(void) {
+     if(exclude_addfile(arg)) die("Can't open %s: %s\n", arg, strerror(errno));
+   } else if(OPT("--exclude-caches")) cachedir_tags = 1;
+   else if(OPT("--include-caches")) cachedir_tags = 0;
++#if HAVE_LINUX_MAGIC_H && HAVE_SYS_STATFS_H && HAVE_STATFS
+   else if(OPT("--exclude-kernfs")) exclude_kernfs = 1;
+   else if(OPT("--include-kernfs")) exclude_kernfs = 0;
++#endif
+   else if(OPT("--follow-firmlinks")) follow_firmlinks = 1;
+   else if(OPT("--exclude-firmlinks")) follow_firmlinks = 0;
+   else if(OPT("--confirm-quit")) confirm_quit = 1;
+@@ -395,7 +397,7 @@ static void argv_parse(int argc, char **
+     else if(!arg_option()) die("Unknown option '%s'.\n", argparser_state.last);
+   }
+ 
+-#if !(HAVE_LINUX_MAGIC_H && HAVE_SYS_STATFS_H && HAVE_STATFS)
++#if HAVE_LINUX_MAGIC_H && HAVE_SYS_STATFS_H && HAVE_STATFS
+   if(exclude_kernfs) die("The --exclude-kernfs flag is currently only supported on Linux.\n");
+ #endif
+