CVS commit: pkgsrc/net/vnstat

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/vnstat
From: "Stephen Borrill" <sborrill%netbsd.org@localhost>
Date: Wed, 8 Apr 2026 16:08:48 +0000

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Apr  8 16:08:48 UTC 2026

Modified Files:
        pkgsrc/net/vnstat: MESSAGE Makefile Makefile.common PLIST distinfo
        pkgsrc/net/vnstat/files: vnstatd.sh
Added Files:
        pkgsrc/net/vnstat/patches: patch-src_cfg.c

Log Message:
vnstat: bump PKGREVISION and improve build

Don't need gmake any longer.
Its own Makefile now installs correctly, so don't roll our own.
Move example configuration file to subdir.
Move vnstatd daemon to sbin, from bin.
Remove incorrect path to check for a config file.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/vnstat/MESSAGE
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/vnstat/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/vnstat/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/vnstat/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/vnstat/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/vnstat/files/vnstatd.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/net/vnstat/patches/patch-src_cfg.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/vnstat/MESSAGE
diff -u pkgsrc/net/vnstat/MESSAGE:1.1.1.1 pkgsrc/net/vnstat/MESSAGE:1.2
--- pkgsrc/net/vnstat/MESSAGE:1.1.1.1   Thu Nov 19 15:48:19 2009
+++ pkgsrc/net/vnstat/MESSAGE   Wed Apr  8 16:08:47 2026
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2009/11/19 15:48:19 sborrill Exp $
+$NetBSD: MESSAGE,v 1.2 2026/04/08 16:08:47 sborrill Exp $
 
-You must configure the network interfaces you wish to monitor in
+You should configure the network interfaces you wish to monitor in
 ${PKG_SYSCONFDIR}/vnstat.conf before attempting to use this package.
 
 ===========================================================================

Index: pkgsrc/net/vnstat/Makefile
diff -u pkgsrc/net/vnstat/Makefile:1.31 pkgsrc/net/vnstat/Makefile:1.32
--- pkgsrc/net/vnstat/Makefile:1.31     Wed Apr  8 13:35:58 2026
+++ pkgsrc/net/vnstat/Makefile  Wed Apr  8 16:08:47 2026
@@ -1,29 +1,26 @@
-# $NetBSD: Makefile,v 1.31 2026/04/08 13:35:58 sborrill Exp $
+# $NetBSD: Makefile,v 1.32 2026/04/08 16:08:47 sborrill Exp $
+
+# Version is in Makefile.common shared with net/vnstati
+# PKGREVISION can be bumped here
+
+PKGREVISION=   1
 
 CONF_FILES=    ${VNSTAT_EGDIR}/vnstat.conf ${VNSTAT_CONFIG}
 
 CONFIGURE_ARGS+=       --disable-image-output
+
 RCD_SCRIPTS=           vnstatd
 
 VNSTAT_CONFIG= ${PKG_SYSCONFDIR}/vnstat.conf
-VNSTAT_EGDIR=  ${PREFIX}/share/examples
+VNSTAT_EGDIR=  ${PREFIX}/share/examples/${PKGBASE}
 
-INSTALLATION_DIRS=     bin ${VNSTAT_EGDIR} ${PKGMANDIR}/man1 \
+INSTALLATION_DIRS=     bin ${EGDIR} ${VNSTAT_EGDIR} ${PKGMANDIR}/man1 \
                        ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/vnstat                             \
-               ${DESTDIR}${PREFIX}/bin/vnstat
-       ${INSTALL_PROGRAM} ${WRKSRC}/vnstatd                            \
-               ${DESTDIR}${PREFIX}/bin/vnstatd
-       ${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf                       \
-               ${DESTDIR}${VNSTAT_EGDIR}/vnstat.conf
-       ${INSTALL_MAN} ${WRKSRC}/man/vnstat.1                           \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vnstat.1
-       ${INSTALL_MAN} ${WRKSRC}/man/vnstatd.8                          \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/vnstatd.8
-       ${INSTALL_MAN} ${WRKSRC}/man/vnstat.conf.5                      \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/vnstat.conf.5
+post-install:
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/vnstat.conf \
+           ${DESTDIR}${VNSTAT_EGDIR}/vnstat.conf
+       ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vnstati.1
 
 .include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/vnstat/Makefile.common
diff -u pkgsrc/net/vnstat/Makefile.common:1.1 pkgsrc/net/vnstat/Makefile.common:1.2
--- pkgsrc/net/vnstat/Makefile.common:1.1       Wed Apr  8 13:35:58 2026
+++ pkgsrc/net/vnstat/Makefile.common   Wed Apr  8 16:08:47 2026
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.common,v 1.1 2026/04/08 13:35:58 sborrill Exp $
+# $NetBSD: Makefile.common,v 1.2 2026/04/08 16:08:47 sborrill Exp $
 #
 # used by net/vnstat/Makefile
 # used by net/vnstati/Makefile
+#
+# If altering the version, remember to remove any PKGREVISION lines
+# from the above Makefiles
 
 DISTNAME=      vnstat-2.13
 CATEGORIES=    net
@@ -12,8 +15,10 @@ HOMEPAGE=    https://humdi.net/vnstat/
 COMMENT=       Small network traffic monitor
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= yes
-USE_TOOLS+=    gmake
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       -disable-extra-paths
+CONFIGURE_ARGS+=       --localstatedir='${VARBASE}'
+CONFIGURE_ARGS+=       --sysconfdir='${PKG_SYSCONFDIR}'
 
 SUBST_CLASSES+=                        fix-dbpath
 SUBST_STAGE.fix-dbpath=                pre-configure

Index: pkgsrc/net/vnstat/PLIST
diff -u pkgsrc/net/vnstat/PLIST:1.4 pkgsrc/net/vnstat/PLIST:1.5
--- pkgsrc/net/vnstat/PLIST:1.4 Wed Apr  8 13:35:58 2026
+++ pkgsrc/net/vnstat/PLIST     Wed Apr  8 16:08:47 2026
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2026/04/08 13:35:58 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.5 2026/04/08 16:08:47 sborrill Exp $
 bin/vnstat
-bin/vnstatd
 man/man1/vnstat.1
 man/man5/vnstat.conf.5
 man/man8/vnstatd.8
-share/examples/vnstat.conf
+sbin/vnstatd
+share/examples/vnstat/vnstat.conf

Index: pkgsrc/net/vnstat/distinfo
diff -u pkgsrc/net/vnstat/distinfo:1.8 pkgsrc/net/vnstat/distinfo:1.9
--- pkgsrc/net/vnstat/distinfo:1.8      Wed Apr  8 13:35:58 2026
+++ pkgsrc/net/vnstat/distinfo  Wed Apr  8 16:08:47 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2026/04/08 13:35:58 sborrill Exp $
+$NetBSD: distinfo,v 1.9 2026/04/08 16:08:47 sborrill Exp $
 
 BLAKE2s (vnstat-2.13.tar.gz) = 5def825fa8dc8ee5b50bce73847691ea6b0028287f9881374c8330c3ccb3038e
 SHA512 (vnstat-2.13.tar.gz) = 9b5d7b5085ab2ae39fd6b0d59afe56eb927b6e4ca1ca30ee7710afe2a412c4a1a8d756e095e9c3c81d182e3d6bb2efcd9a2a266e0048cac249477a09c1368969
 Size (vnstat-2.13.tar.gz) = 336647 bytes
+SHA1 (patch-src_cfg.c) = d2ced4dfebd3a3540d66b43bdb0eb8a6a6575ac9
 SHA1 (patch-src_common.h) = abd8b9f44cb7b5acc3a0952a7caddaf66a01d4bf

Index: pkgsrc/net/vnstat/files/vnstatd.sh
diff -u pkgsrc/net/vnstat/files/vnstatd.sh:1.2 pkgsrc/net/vnstat/files/vnstatd.sh:1.3
--- pkgsrc/net/vnstat/files/vnstatd.sh:1.2      Wed Apr  8 13:35:58 2026
+++ pkgsrc/net/vnstat/files/vnstatd.sh  Wed Apr  8 16:08:47 2026
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: vnstatd.sh,v 1.2 2026/04/08 13:35:58 sborrill Exp $
+# $NetBSD: vnstatd.sh,v 1.3 2026/04/08 16:08:47 sborrill Exp $
 #
 
 # PROVIDE: vnstatd
@@ -10,7 +10,7 @@ $_rc_subr_loaded . /etc/rc.subr
 
 name="vnstatd"
 rcvar=$name
-command="@PREFIX@/bin/${name}"
+command="@PREFIX@/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 command_args="-d -p $pidfile"
 dbdir="@VARBASE@/db/vnstat"

Added files:

Index: pkgsrc/net/vnstat/patches/patch-src_cfg.c
diff -u /dev/null pkgsrc/net/vnstat/patches/patch-src_cfg.c:1.1
--- /dev/null   Wed Apr  8 16:08:48 2026
+++ pkgsrc/net/vnstat/patches/patch-src_cfg.c   Wed Apr  8 16:08:48 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cfg.c,v 1.1 2026/04/08 16:08:48 sborrill Exp $
+
+Avoid a broken config file path after converting /etc to PKG_SYSCONFDIR
+
+--- src/cfg.c.orig     2026-04-08 16:25:51.959370085 +0100
++++ src/cfg.c  2026-04-08 16:26:06.796945373 +0100
+@@ -484,8 +484,6 @@
+                       strncpy_nt(cfg.cfgfile, buffer, 512);
+               } else if ((*fd = fopen("/etc/vnstat.conf", "r")) != NULL) {
+                       snprintf(cfg.cfgfile, 512, "/etc/vnstat.conf");
+-              } else if ((*fd = fopen("/usr/local/etc/vnstat.conf", "r")) != NULL) {
+-                      snprintf(cfg.cfgfile, 512, "/usr/local/etc/vnstat.conf");
+               } else {
+                       if (debug)
+                               printf("Config file: none\n");

Prev by Date: CVS commit: pkgsrc/lang/ruby
Next by Date: CVS commit: pkgsrc/net/vnstati
Previous by Thread: CVS commit: pkgsrc/lang/ruby
Next by Thread: CVS commit: pkgsrc/net/vnstati
Indexes:

Home | Main Index | Thread Index | Old Index