diff --git a/net-mgmt/bwm-ng/Makefile b/net-mgmt/bwm-ng/Makefile index 3880e5fe3440..b1182555698e 100644 --- a/net-mgmt/bwm-ng/Makefile +++ b/net-mgmt/bwm-ng/Makefile @@ -1,22 +1,23 @@ PORTNAME= bwm-ng -PORTVERSION= 0.6 -PORTREVISION= 2 +PORTVERSION= 0.6.3 CATEGORIES= net-mgmt MASTER_SITES= http://www.gropp.org/bwm-ng/ MAINTAINER= tdb@FreeBSD.org COMMENT= Small and simple bandwidth monitor WWW= https://www.gropp.org/?id=projects&sub=bwm-ng +LICENSE= GPLv2+ + LIB_DEPENDS= libstatgrab.so:devel/libstatgrab GNU_CONFIGURE= yes -USES= ncurses pkgconfig +USES= autoreconf ncurses pkgconfig USE_CSTD= gnu89 PLIST_FILES= bin/bwm-ng man/man1/bwm-ng.1.gz CONFIGURE_ARGS= --with-libstatgrab CPPFLAGS+= `pkg-config --cflags libstatgrab` LIBS+= `pkg-config --libs libstatgrab` .include diff --git a/net-mgmt/bwm-ng/distinfo b/net-mgmt/bwm-ng/distinfo index 62c32f33d198..3aee852d673a 100644 --- a/net-mgmt/bwm-ng/distinfo +++ b/net-mgmt/bwm-ng/distinfo @@ -1,2 +1,3 @@ -SHA256 (bwm-ng-0.6.tar.gz) = c1134358e268329d438b0996399003b0f0b966034fb4b5b138761c2f3c62ffdd -SIZE (bwm-ng-0.6.tar.gz) = 141564 +TIMESTAMP = 1673197275 +SHA256 (bwm-ng-0.6.3.tar.gz) = c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46 +SIZE (bwm-ng-0.6.3.tar.gz) = 70094 diff --git a/net-mgmt/bwm-ng/files/patch-src__bwm-ng.c b/net-mgmt/bwm-ng/files/patch-src__bwm-ng.c deleted file mode 100644 index d22691d9ca8b..000000000000 --- a/net-mgmt/bwm-ng/files/patch-src__bwm-ng.c +++ /dev/null @@ -1,17 +0,0 @@ ---- ./src/bwm-ng.c.orig 2007-02-27 14:29:33.000000000 +0000 -+++ ./src/bwm-ng.c 2014-05-10 23:06:43.231799957 +0100 -@@ -193,7 +193,13 @@ - deinit(1,"invalid output selected\n"); - if (input_method<0) - deinit(1,"invalid input selected\n"); -- -+ -+#ifdef LIBSTATGRAB -+ if (sg_init(0) != 0) { -+ deinit(1,"libstatgrab failed to initialise\n"); -+ } -+#endif -+ - /* init total stats to zero */ - memset(&if_stats_total,0,(size_t)sizeof(t_iface_stats)); - #ifdef HAVE_CURSES diff --git a/net-mgmt/bwm-ng/files/patch-src__input__libstatgrab.c b/net-mgmt/bwm-ng/files/patch-src__input__libstatgrab.c deleted file mode 100644 index 0c558e88607d..000000000000 --- a/net-mgmt/bwm-ng/files/patch-src__input__libstatgrab.c +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/input/libstatgrab.c.orig 2007-02-28 02:05:56.000000000 +0000 -+++ ./src/input/libstatgrab.c 2014-05-10 23:06:43.234799929 +0100 -@@ -27,7 +27,8 @@ - /* do the actual work, get and print stats if verbose */ - void get_iface_stats_libstat (char verbose) { - sg_network_io_stats *network_stats=NULL; -- int num_network_stats,current_if_num=0,hidden_if=0; -+ size_t num_network_stats; -+ int current_if_num=0,hidden_if=0; - - t_iface_speed_stats stats; /* local struct, used to calc total values */ - t_iface_speed_stats tmp_if_stats; -@@ -61,7 +62,8 @@ - - void get_iface_stats_libstatdisk (char verbose) { - sg_disk_io_stats *disk_stats=NULL; -- int num_disk_stats,current_if_num=0,hidden_if=0; -+ size_t num_disk_stats; -+ int current_if_num=0,hidden_if=0; - - t_iface_speed_stats stats; /* local struct, used to calc total values */ - t_iface_speed_stats tmp_if_stats;