Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/bwm-ng/, net-analyzer/bwm-ng/files/
Date: Tue, 23 Feb 2016 18:50:35
Message-Id: 1456253421.dcd30cf750b6cc2207a98baff90e15ce8f305c79.soap@gentoo
1 commit: dcd30cf750b6cc2207a98baff90e15ce8f305c79
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 23 18:50:07 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 23 18:50:21 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd30cf7
7
8 net-analyzer/bwm-ng: Amend patch to include missing AC_DEFINE
9
10 Gentoo-Bug: 561718
11
12 Package-Manager: portage-2.2.27
13
14 .../bwm-ng/{bwm-ng-0.6.1.ebuild => bwm-ng-0.6.1-r1.ebuild} | 0
15 .../bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch | 13 ++++++++++++-
16 2 files changed, 12 insertions(+), 1 deletion(-)
17
18 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
19 similarity index 100%
20 rename from net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
21 rename to net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
22
23 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
24 index 85f2819..5e1b227 100644
25 --- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
26 +++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
27 @@ -48,7 +48,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=561718
28 - CURSES_CHECKED="1"
29 -fi
30 +AS_IF([test "x$enable_ncurses" != "xno"], [
31 -+ PKG_CHECK_MODULES([NCURSES], [ncurses])
32 ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
33 ])
34 -fi
35 -
36 @@ -80,3 +80,14 @@ https://bugs.gentoo.org/show_bug.cgi?id=561718
37
38 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
39
40 +--- bwm-ng-0.6.1/src/defines.h
41 ++++ bwm-ng-0.6.1/src/defines.h
42 +@@ -48,7 +48,7 @@
43 + #define LIBSTATGRAB
44 + #endif
45 +
46 +-#if HAVE_LIBCURSES || HAVE_LIBNCURSES
47 ++#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
48 + #define HAVE_CURSES
49 + #endif
50 +