* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/bwm-ng/, net-analyzer/bwm-ng/files/
@ 2016-01-24 14:35 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-01-24 14:35 UTC (permalink / raw
To: gentoo-commits
commit: f8110ceab3919bfff6ee2cc32a56771eb513eb67
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 14:31:50 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 14:35:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8110cea
net-analyzer/bwm-ng: Version bump to 0.6.1
Gentoo-Bug: 561718
* EAPI=6
* Fix ncurses underlinking issue
Package-Manager: portage-2.2.27
net-analyzer/bwm-ng/Manifest | 1 +
net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild | 38 ++++++++++
.../files/bwm-ng-0.6.1-fix-buildsystem.patch | 82 ++++++++++++++++++++++
3 files changed, 121 insertions(+)
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index eb0a4d1..78ef7d5 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1 +1,2 @@
+DIST bwm-ng-0.6.1.tar.gz 162620 SHA256 027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0 SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd WHIRLPOOL a83569acf0f4f24f98e5b65733e0a02de2db4a4249ece24eaf457b20a4eed4a6f425256a13477e8d3844c251b4818fc8b1e34243a975cce7e20ec27b3af8e413
DIST bwm-ng-0.6.tar.gz 141564 SHA256 c1134358e268329d438b0996399003b0f0b966034fb4b5b138761c2f3c62ffdd SHA512 7327ec848b0c18d68b2cb0a0ca570bb4d783b534186868d13b453346dbf3ddbcd7e1070803406ff207dc1fd00aa91c06187b0ea7fea28c6c006b44165331c21b WHIRLPOOL 45cc30b6a99ed9c267095e6dca170380be3da698e7b8aab50436d51ea914714facf954b9c26e465f47a1bcd59ca3fbd5511cd654b42fd9d4a5131e2f5bbca233
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
new file mode 100644
index 0000000..ae30fbd
--- /dev/null
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
+SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz"
+HOMEPAGE="http://www.gropp.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="html csv"
+
+DEPEND="sys-libs/ncurses:0=
+ >=sys-apps/net-tools-1.60-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_prepare() {
+ mv configure.{in,ac} || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-ncurses \
+ --with-procnetdev \
+ $(use_enable html) \
+ $(use_enable csv)
+}
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
new file mode 100644
index 0000000..85f2819
--- /dev/null
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
@@ -0,0 +1,82 @@
+* Fix broken buildsystem
+* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS
+https://bugs.gentoo.org/show_bug.cgi?id=561718
+
+--- bwm-ng-0.6.1/configure.ac
++++ bwm-ng-0.6.1/configure.ac
+@@ -3,7 +3,7 @@
+
+ AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng])
+ AC_CONFIG_SRCDIR(src/bwm-ng.c)
+-AM_INIT_AUTOMAKE([gnu])
++AM_INIT_AUTOMAKE([gnu subdir-objects])
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR(./)
+ AC_LANG([C])
+@@ -28,44 +28,12 @@
+ AC_CHECK_TYPES(unsigned long long)
+
+ # Checks for libraries.
+-CURSES_CHECKED="0"
++AC_ARG_ENABLE([ncurses],
++ AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses]))
+
+-AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[
+-if [ test $withval != "no" ]; then
+- OLD_CPPFLAGS=$CPPFLAGS
+- if [ test $withval != "yes" ]; then
+- CPPFLAGS="$CPPFLAGS -I$withval"
+- fi
+- AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
+- CURSES_CHECKED="1"
+-else
+- CURSES_CHECKED="1"
+-fi
+-])
+-
+-
+-if [ test $CURSES_CHECKED != "1" ]; then
+-AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[
+-if [ test $withval != "no" ]; then
+- OLD_CPPFLAGS=$CPPFLAGS
+- if [ test $withval != "yes" ]; then
+- CPPFLAGS="$CPPFLAGS -I$withval"
+- fi
+- AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
+- CURSES_CHECKED="1"
+-else
+- CURSES_CHECKED="1"
+-fi
++AS_IF([test "x$enable_ncurses" != "xno"], [
++ PKG_CHECK_MODULES([NCURSES], [ncurses])
+ ])
+-fi
+-
+-
+-
+-if [ test $CURSES_CHECKED != "1" ]; then
+-AC_CHECK_LIB([curses],[initscr,timeout],,[
+- AC_CHECK_LIB([ncurses],[newterm,timeout])
+-])
+-fi
+
+ AC_CHECK_FUNCS([wattron])
+ AC_CHECK_FUNCS([curs_set])
+--- bwm-ng-0.6.1/src/Makefile.am
++++ bwm-ng-0.6.1/src/Makefile.am
+@@ -2,12 +2,10 @@
+
+ bin_PROGRAMS = bwm-ng
+
+-bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c
++bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
+
+-EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
+-
+-bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
+-bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
++bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@
++bwm_ng_LDADD = @NCURSES_LIBS@
+
+ noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/bwm-ng/, net-analyzer/bwm-ng/files/
@ 2016-02-23 18:50 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-02-23 18:50 UTC (permalink / raw
To: gentoo-commits
commit: dcd30cf750b6cc2207a98baff90e15ce8f305c79
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 18:50:07 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 18:50:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd30cf7
net-analyzer/bwm-ng: Amend patch to include missing AC_DEFINE
Gentoo-Bug: 561718
Package-Manager: portage-2.2.27
.../bwm-ng/{bwm-ng-0.6.1.ebuild => bwm-ng-0.6.1-r1.ebuild} | 0
.../bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch | 13 ++++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
similarity index 100%
rename from net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
rename to net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
index 85f2819..5e1b227 100644
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
@@ -48,7 +48,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=561718
- CURSES_CHECKED="1"
-fi
+AS_IF([test "x$enable_ncurses" != "xno"], [
-+ PKG_CHECK_MODULES([NCURSES], [ncurses])
++ PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
])
-fi
-
@@ -80,3 +80,14 @@ https://bugs.gentoo.org/show_bug.cgi?id=561718
noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
+--- bwm-ng-0.6.1/src/defines.h
++++ bwm-ng-0.6.1/src/defines.h
+@@ -48,7 +48,7 @@
+ #define LIBSTATGRAB
+ #endif
+
+-#if HAVE_LIBCURSES || HAVE_LIBNCURSES
++#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
+ #define HAVE_CURSES
+ #endif
+
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/bwm-ng/, net-analyzer/bwm-ng/files/
@ 2020-09-25 12:07 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-09-25 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 770ec15cace6db071c4690b02064d0433d406c07
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 12:05:04 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 12:07:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770ec15c
net-analyzer/bwm-ng: Version 0.6.2
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/bwm-ng/Manifest | 1 +
net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild | 38 ++++++++++++++++++++++
net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch | 10 ++++++
3 files changed, 49 insertions(+)
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index ce662ef5c6e..44c35c9cce1 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1 +1,2 @@
DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd
+DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
new file mode 100644
index 00000000000..23c71582d27
--- /dev/null
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
+HOMEPAGE="http://www.gropp.org/"
+SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+csv +html"
+
+RDEPEND="
+ >=sys-apps/net-tools-1.60-r1
+ sys-libs/ncurses:0=
+"
+DEPEND="
+ ${RDEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.2-tinfo.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable csv) \
+ $(use_enable html) \
+ --with-ncurses \
+ --with-procnetdev
+}
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch
new file mode 100644
index 00000000000..a51f9c0596a
--- /dev/null
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -52,6 +52,7 @@
+ CPPFLAGS="$CPPFLAGS -I$withval"
+ fi
+ AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
++ AC_SEARCH_LIBS([wtimeout],[tinfo])
+ CURSES_CHECKED="1"
+ else
+ CURSES_CHECKED="1"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-25 12:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-24 14:35 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/bwm-ng/, net-analyzer/bwm-ng/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2016-02-23 18:50 David Seifert
2020-09-25 12:07 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox