From dcd30cf750b6cc2207a98baff90e15ce8f305c79 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Tue, 23 Feb 2016 19:50:07 +0100
Subject: net-analyzer/bwm-ng: Amend patch to include missing AC_DEFINE

Gentoo-Bug: 561718

Package-Manager: portage-2.2.27
---
 net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild         | 38 ++++++++++++++++++++++
 net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild            | 38 ----------------------
 .../files/bwm-ng-0.6.1-fix-buildsystem.patch       | 13 +++++++-
 3 files changed, 50 insertions(+), 39 deletions(-)
 create mode 100644 net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
 delete mode 100644 net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild

(limited to 'net-analyzer')

diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..ae30fbd3d4f7
--- /dev/null
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.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/bwm-ng-0.6.1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
deleted file mode 100644
index ae30fbd3d4f7..000000000000
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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
index 85f2819786e2..5e1b22749637 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
+ 
-- 
cgit v1.2.3-65-gdbad