Hi ports@. Hi pea@,
Update vnstat to the latest stable version. Tests and feedback welcome.
$ vnstat
em0: Not enough data available yet.
I'm still waiting for something to see.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/vnstat/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile 4 Sep 2018 12:46:19 -0000 1.32
+++ Makefile 14 Sep 2018 17:39:08 -0000
@@ -3,16 +3,15 @@
COMMENT-main = network traffic monitor
COMMENT-vnstati = image output support for vnstat
-V = 1.14
+V = 1.18
EPOCH = 0
DISTNAME = vnstat-${V}
-PKGNAME-main = ${DISTNAME}
-PKGNAME-vnstati = vnstati-${V}
-REVISION-main = 0
+PKGNAME-main = ${DISTNAME}
+PKGNAME-vnstati = vnstati-${V}
CATEGORIES = net sysutils
-HOMEPAGE = http://humdi.net/vnstat/
+HOMEPAGE = https://humdi.net/vnstat/
MASTER_SITES = ${HOMEPAGE}
@@ -21,8 +20,8 @@ MAINTAINER = Pierre-Emmanuel Andre <pea@
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c m
-WANTLIB-vnstati = ${WANTLIB} gd pthread
+WANTLIB = c m
+WANTLIB-vnstati = ${WANTLIB} gd
MULTI_PACKAGES = -main -vnstati
@@ -31,14 +30,14 @@ RUN_DEPENDS-vnstati = net/vnstat
USE_GMAKE = Yes
-NO_TEST = Yes
+CONFIGURE_STYLE = gnu
-INSTALL_TARGET = bsdinstall
-
-MAKE_FLAGS = CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib " \
+ CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vnstat/
${INSTALL_DATA} ${WRKSRC}/examples/vnstat.cgi
${PREFIX}/share/examples/vnstat/
+ ${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf
${PREFIX}/share/examples/vnstat/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/vnstat/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo 18 Apr 2018 10:25:06 -0000 1.7
+++ distinfo 14 Sep 2018 17:39:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (vnstat-1.14.tar.gz) = +EYqR9hdCJBJPcnq6vvHJa5jGqWxA/t/ivTdsjFOg4Y=
-SIZE (vnstat-1.14.tar.gz) = 103281
+SHA256 (vnstat-1.18.tar.gz) = 1xk1krnnRF+ly+ivfTs5mC8WXuj8WAQf9B9QmzfGh9U=
+SIZE (vnstat-1.18.tar.gz) = 242502
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 1 Jun 2015 16:23:09 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.5 2015/06/01 16:23:09 pea Exp $
-
-- From 6a34745f0e84a990a8fa48e1f1f25be0f08c92a9 Mon Sep 17 00:00:00 2001
- From: Jasper Lievisse Adriaanse <jas...@humppa.nl>
- Date: Sat, 3 Jan 2015 14:30:52 +0100
- Subject: [PATCH] Allow for overriding BIN, SBIN and MAN
-
-- From e4b9c2747bb044f48b35ea02294e73d7c366d9d9 Mon Sep 17 00:00:00 2001
- From: Jasper Lievisse Adriaanse <jas...@humppa.nl>
- Date: Sat, 3 Jan 2015 14:34:50 +0100
- Subject: [PATCH] make the path to vnstat.conf variable
-
-- From ee354ae5e61f332d22b9242f5a2d5af07e4a5373 Mon Sep 17 00:00:00 2001
- From: Jasper Lievisse Adriaanse <jas...@humppa.nl>
- Date: Sun, 4 Jan 2015 22:04:20 +0100
- Subject: [PATCH] Adjust manpages for /var/db/ too, just like vnstat.conf
-
---- Makefile.orig Mon Jan 5 23:19:37 2015
-+++ Makefile Mon Jun 1 16:37:25 2015
-@@ -5,11 +5,12 @@ MAN ?= $(DESTDIR)/usr/share/man
- ETC ?= $(DESTDIR)/etc/
-
- # bin and man dirs for *BSD
--BIN_BSD ?= $(DESTDIR)/usr/local/bin
--SBIN_BSD ?= $(DESTDIR)/usr/local/sbin
--MAN_BSD ?= $(DESTDIR)/usr/local/man
--ETC_BSD ?= $(DESTDIR)/etc
-+BIN_BSD ?= ${PREFIX}/bin
-+SBIN_BSD ?= ${PREFIX}/sbin
-+MAN_BSD ?= ${PREFIX}/man
-+ETC_BSD ?= ${PREFIX}/share/examples/vnstat
-
-+
- .PHONY: vnstat tests check all clean debug install uninstall bsdinstall
bsduninstall dist
-
- default: vnstat
-@@ -140,7 +141,6 @@ bsdinstall:
- fi
-
- # install binaries
-- install -d -m 755 $(DESTDIR)/var/db/vnstat
- install -s -m 755 src/vnstat $(BIN_BSD)
- install -s -m 755 src/vnstatd $(SBIN_BSD)
-
-@@ -166,14 +166,9 @@ bsdinstall:
- install -m 644 man/vnstat.1 $(MAN_BSD)/man1
- install -m 644 man/vnstatd.1 $(MAN_BSD)/man1
- install -m 644 man/vnstat.conf.5 $(MAN_BSD)/man5
-- gzip -f9 $(MAN_BSD)/man1/vnstat.1
-- gzip -f9 $(MAN_BSD)/man1/vnstatd.1
-- gzip -f9 $(MAN_BSD)/man5/vnstat.conf.5
- @if [ -f "src/vnstati" ]; \
- then echo install -m 644 man/vnstati.1 $(MAN_BSD)/man1; \
- install -m 644 man/vnstati.1 $(MAN_BSD)/man1; \
-- echo gzip -f9 $(MAN_BSD)/man1/vnstati.1; \
-- gzip -f9 $(MAN_BSD)/man1/vnstati.1; \
- fi
-
- # remove vnstat.conf.1 is such exists in the wrong place
Index: patches/patch-src_Makefile
===================================================================
RCS file: patches/patch-src_Makefile
diff -N patches/patch-src_Makefile
--- patches/patch-src_Makefile 18 Apr 2018 10:25:06 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_Makefile,v 1.5 2018/04/18 10:25:06 kn Exp $
---- src/Makefile.orig Sun Mar 29 20:56:55 2015
-+++ src/Makefile Mon Jun 1 16:28:52 2015
-@@ -1,8 +1,9 @@
- ifeq "$(origin CC)" "default"
- CC = gcc
- endif
-+CC ?= gcc
- CFLAGS ?= -O2
--LDLIBS = -lm
-+LDLIBS ?= -lm
- OBJS = vnstat.o ifinfo.o dbxml.o dbjson.o dbshow.o dbaccess.o dbmerge.o
common.o misc.o cfg.o ibw.o traffic.o
- DOBJS = vnstatd.o ifinfo.o dbaccess.o dbcache.o common.o misc.o cfg.o ibw.o
daemon.o
- IOBJS = vnstati.o image.o dbaccess.o dbmerge.o common.o misc.o cfg.o
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/vnstat/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 4 Sep 2018 12:46:19 -0000 1.5
+++ pkg/PLIST-main 14 Sep 2018 17:39:08 -0000
@@ -2,6 +2,7 @@
@pkgpath net/vnstat
@newgroup _vnstat:658
@newuser _vnstat:658:_vnstat:daemon:vnstat daemon:/var/db/vnstat:/sbin/nologin
+@rcscript ${RCDIR}/vnstatd
@bin bin/vnstat
@man man/man1/vnstat.1
@man man/man1/vnstatd.1
@@ -14,7 +15,6 @@
@owner
@group
share/doc/pkg-readmes/${PKGSTEM}
+@sample ${SYSCONFDIR}/vnstat.conf
share/examples/vnstat/
share/examples/vnstat/vnstat.conf
-@sample ${SYSCONFDIR}/vnstat.conf
-@rcscript ${RCDIR}/vnstatd
