CVS commit: pkgsrc/net/bwm-ng

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/bwm-ng
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Mon, 2 Jun 2025 16:49:08 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Jun  2 16:49:08 UTC 2025

Modified Files:
        pkgsrc/net/bwm-ng: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/bwm-ng/patches: patch-bwm-ng.conf-example
            patch-src_input_proc__diskstats.c patch-src_output.c

Log Message:
net/bwm-ng: package revision

* Do no fake ncurses,
* Fix had-coded paths.
* Fix a couple of bugs.
* Install sample configuration files.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/bwm-ng/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bwm-ng/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/bwm-ng/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/bwm-ng/patches/patch-bwm-ng.conf-example \
    pkgsrc/net/bwm-ng/patches/patch-src_input_proc__diskstats.c \
    pkgsrc/net/bwm-ng/patches/patch-src_output.c

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

Modified files:

Index: pkgsrc/net/bwm-ng/Makefile
diff -u pkgsrc/net/bwm-ng/Makefile:1.4 pkgsrc/net/bwm-ng/Makefile:1.5
--- pkgsrc/net/bwm-ng/Makefile:1.4      Tue Dec  6 14:41:38 2022
+++ pkgsrc/net/bwm-ng/Makefile  Mon Jun  2 16:49:07 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2022/12/06 14:41:38 vins Exp $
+# $NetBSD: Makefile,v 1.5 2025/06/02 16:49:07 vins Exp $
 
 DISTNAME=      bwm-ng-0.6.3
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  https://www.gropp.org/bwm-ng/
 
@@ -10,14 +11,28 @@ COMMENT=    Console-based bandwidth monitor
 LICENSE=       gnu-gpl-v2
 
 USE_TOOLS+=            autoconf automake autoreconf
-USE_PKGLOCALEDIR=      yes
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-FAKE_NCURSES=          yes
+
+EGDIR=         share/examples/${PKGBASE}
+CONF_FILES=    ${PREFIX}/${EGDIR}/bwm-ng.conf-example \
+               ${PKG_SYSCONFDIR}/bwm-ng.conf
+
+SUBST_CLASSES+=                conf
+SUBST_STAGE.conf=      pre-configure
+SUBST_MESSAGE.conf=    Adding PKG_SYSCONFDIR support.
+SUBST_FILES.conf+=     bwm-ng.1 src/options.c
+SUBST_SED.conf=                -e "s:/etc/bwm-ng.conf:${PKG_SYSCONFDIR}/bwm-ng.conf:g"
+
+INSTALLATION_DIRS+=    ${EGDIR}
 
 pre-configure:
        ${RUN} set -e; cd ${WRKSRC} && autoreconf -fiv
 
+post-install:
+.for i in bwm-ng.conf-example bwm-ng.css
+       ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/${EGDIR}
+.endfor
+
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/bwm-ng/PLIST
diff -u pkgsrc/net/bwm-ng/PLIST:1.1 pkgsrc/net/bwm-ng/PLIST:1.2
--- pkgsrc/net/bwm-ng/PLIST:1.1 Fri Jul 20 16:22:41 2018
+++ pkgsrc/net/bwm-ng/PLIST     Mon Jun  2 16:49:07 2025
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2018/07/20 16:22:41 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/06/02 16:49:07 vins Exp $
 bin/bwm-ng
 man/man1/bwm-ng.1
+share/examples/bwm-ng/bwm-ng.conf-example
+share/examples/bwm-ng/bwm-ng.css

Index: pkgsrc/net/bwm-ng/distinfo
diff -u pkgsrc/net/bwm-ng/distinfo:1.6 pkgsrc/net/bwm-ng/distinfo:1.7
--- pkgsrc/net/bwm-ng/distinfo:1.6      Tue Jul  5 07:24:41 2022
+++ pkgsrc/net/bwm-ng/distinfo  Mon Jun  2 16:49:07 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.6 2022/07/05 07:24:41 pin Exp $
+$NetBSD: distinfo,v 1.7 2025/06/02 16:49:07 vins Exp $
 
 BLAKE2s (bwm-ng-0.6.3.tar.gz) = 59a18b9f87a6f0ee426dd51785e4f25aa8b210cfd221aa4d0545def540f601b9
 SHA512 (bwm-ng-0.6.3.tar.gz) = 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8
 Size (bwm-ng-0.6.3.tar.gz) = 70094 bytes
+SHA1 (patch-bwm-ng.conf-example) = 32426854f681b6c2b2b6c0b3be955df60c4b5d00
+SHA1 (patch-src_input_proc__diskstats.c) = 1491489a0c2fb76724b733d5ed276c3e31174f6c
+SHA1 (patch-src_output.c) = 0a136cbba7633f4f94e0e459e752b1f4e729ed0b

Added files:

Index: pkgsrc/net/bwm-ng/patches/patch-bwm-ng.conf-example
diff -u /dev/null pkgsrc/net/bwm-ng/patches/patch-bwm-ng.conf-example:1.1
--- /dev/null   Mon Jun  2 16:49:08 2025
+++ pkgsrc/net/bwm-ng/patches/patch-bwm-ng.conf-example Mon Jun  2 16:49:08 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-bwm-ng.conf-example,v 1.1 2025/06/02 16:49:08 vins Exp $
+
+Avoid non portable default settings.
+
+--- bwm-ng.conf-example.orig   2025-06-02 13:55:16.911005498 +0000
++++ bwm-ng.conf-example
+@@ -1,16 +1,17 @@
+ DYNAMIC=1
+ UNIT=bits
+-PROCFILE=/proc/net/dev
+-DISKSTATSFILE=/proc/diskstats
+-PARTITIONSFILE=/proc/partitions
++#PROCFILE=/proc/net/dev
++#DISKSTATSFILE=/proc/diskstats
++#PARTITIONSFILE=/proc/partitions
+ LONGDISKNAMES=0
+ ANSIOUT=0
+-OUTPUT=plain
+ TIMEOUT=666
+ NETSTAT=netstat
+-INPUT=proc
++#INPUT=proc
++#INPUT=getifaddrs
+ ALLIF=0
+-INTERFACES=eth0
++#INTERFACES=wm0
++#OUTPUT=plain
+ OUTPUT=curses
+ CSVCHAR=;
+ #OUTFILE=
Index: pkgsrc/net/bwm-ng/patches/patch-src_input_proc__diskstats.c
diff -u /dev/null pkgsrc/net/bwm-ng/patches/patch-src_input_proc__diskstats.c:1.1
--- /dev/null   Mon Jun  2 16:49:08 2025
+++ pkgsrc/net/bwm-ng/patches/patch-src_input_proc__diskstats.c Mon Jun  2 16:49:08 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_input_proc__diskstats.c,v 1.1 2025/06/02 16:49:08 vins Exp $
+
+Fix buffer dereference.  
+
+--- src/input/proc_diskstats.c.orig    2021-01-10 14:52:39.000000000 +0000
++++ src/input/proc_diskstats.c
+@@ -158,8 +158,8 @@ void get_disk_stats_proc (char verbose) 
+                               } else {
+                                       /* neither new nor old /proc/partitions nor /proc/diskstats */
+                                       free(name);
+-                                      free(buffer);
+                                       deinit(1, "wrong format of procfile. %i: %s\n",n,buffer);
++                                      free(buffer);
+                               }
+                       }
+               }
Index: pkgsrc/net/bwm-ng/patches/patch-src_output.c
diff -u /dev/null pkgsrc/net/bwm-ng/patches/patch-src_output.c:1.1
--- /dev/null   Mon Jun  2 16:49:08 2025
+++ pkgsrc/net/bwm-ng/patches/patch-src_output.c        Mon Jun  2 16:49:08 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_output.c,v 1.1 2025/06/02 16:49:08 vins Exp $
+
+wprintw(WINDOW *win, const char *fmt, ...);
+
+--- src/output.c.orig  2021-01-10 14:52:39.000000000 +0000
++++ src/output.c
+@@ -151,7 +151,7 @@ int print_header(int option) {
+               erase();
+                   mvwprintw(stdscr,1,2,"bwm-ng v" VERSION" (probing every %2.3fs), press 'h' for help",(float)delay/1000);
+             mvwprintw(stdscr,2,2,"input: %s type: %s",input2str(),output_type2str());
+-            wprintw(stdscr,show_all_if2str());
++            wprintw(stdscr,"%s",show_all_if2str());
+               mvwprintw(stdscr,3,2,"%c         iface                   Rx                   Tx                Total",(char)IDLE_CHARS[option]);
+               /* go to next char for next run */
+               option++;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/geography/qgis
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/geography/qgis
Indexes:

Home | Main Index | Thread Index | Old Index