diff options
| -rw-r--r-- | net-analyzer/iftop/ChangeLog | 10 | ||||
| -rw-r--r-- | net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch | 8 | ||||
| -rw-r--r-- | net-analyzer/iftop/files/iftop-1.0_pre3-tinfo.patch | 44 | ||||
| -rw-r--r-- | net-analyzer/iftop/iftop-1.0_pre3.ebuild | 40 |
4 files changed, 92 insertions, 10 deletions
diff --git a/net-analyzer/iftop/ChangeLog b/net-analyzer/iftop/ChangeLog index a145fe90ee1c..d850be7a35fe 100644 --- a/net-analyzer/iftop/ChangeLog +++ b/net-analyzer/iftop/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/iftop -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.53 2013/12/13 07:31:32 pinkbyte Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.54 2014/01/08 03:22:37 jer Exp $ + +*iftop-1.0_pre3 (08 Jan 2014) + + 08 Jan 2014; Jeroen Roovers <jer@gentoo.org> +iftop-1.0_pre3.ebuild, + files/iftop-1.0_pre2-tinfo.patch, +files/iftop-1.0_pre3-tinfo.patch: + Version bump. Clean up patch. 13 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> iftop-1.0_pre2.ebuild: Stable on x86, wrt bug #490078 diff --git a/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch index 75468a73215b..68210e35c197 100644 --- a/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch +++ b/net-analyzer/iftop/files/iftop-1.0_pre2-tinfo.patch @@ -1,9 +1,3 @@ - Makefile.am | 2 +- - configure.in | 28 ++++++++++++++++------------ - 2 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 5e5363f..16713ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \ @@ -15,8 +9,6 @@ index 5e5363f..16713ab 100644 noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \ integers.h ip.h llc.h ns_hash.h options.h resolver.h \ -diff --git a/configure.in b/configure.in -index bb525b6..8e0ed6a 100644 --- a/configure.in +++ b/configure.in @@ -350,19 +350,23 @@ dnl a solid chance that mvchgat is a macro, so we can't just use diff --git a/net-analyzer/iftop/files/iftop-1.0_pre3-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre3-tinfo.patch new file mode 100644 index 000000000000..a00d48a03263 --- /dev/null +++ b/net-analyzer/iftop/files/iftop-1.0_pre3-tinfo.patch @@ -0,0 +1,44 @@ +--- a/configure.in ++++ b/configure.in +@@ -350,19 +350,23 @@ + dnl AC_SEARCH_LIBS.... + dnl + +-AC_MSG_CHECKING([for a curses library containing mvchgat]) +-oldLIBS=$LIBS +-for curseslib in ncursesw curses ncurses ; do +- LIBS="$oldLIBS -l$curseslib" +- AC_TRY_LINK([ ++PKG_CHECK_MODULES([NCURSES], [ncursesw], [foundcurseslib="$NCURSES_LIBS"], [ ++ PKG_CHECK_MODULES([NCURSES], [ncurses], [foundcurseslib="$NCURSES_LIBS"], [ ++ AC_MSG_CHECKING([for a curses library containing mvchgat]) ++ oldLIBS=$LIBS ++ for curseslib in ncursesw curses ncurses ; do ++ LIBS="$oldLIBS -l$curseslib" ++ AC_TRY_LINK([ + #include <$curseslib.h> + ], [ + mvchgat(0, 0, 1, A_REVERSE, 0, NULL) + ], [ +- foundcurseslib=$curseslib ++ foundcurseslib=-l$curseslib + break + ]) +-done ++ done ++ ]) ++]) + + if test x$foundcurseslib = x ; then + AC_MSG_RESULT([none found]) +--- a/Makefile.am ++++ b/Makefile.am +@@ -25,7 +25,7 @@ + # addrs_ioctl.c addrs_dlpi.c dlcommon.c \ + # stringmap.c cfgfile.c + +- ++iftop_LDADD = $(NCURSES_LIBS) + + noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \ + integers.h ip.h llc.h ns_hash.h options.h resolver.h \ diff --git a/net-analyzer/iftop/iftop-1.0_pre3.ebuild b/net-analyzer/iftop/iftop-1.0_pre3.ebuild new file mode 100644 index 000000000000..24dc37489265 --- /dev/null +++ b/net-analyzer/iftop/iftop-1.0_pre3.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/iftop-1.0_pre3.ebuild,v 1.1 2014/01/08 03:22:37 jer Exp $ + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="display bandwidth usage on an interface" +SRC_URI="http://www.ex-parrot.com/~pdw/iftop/download/${P/_/}.tar.gz" +HOMEPAGE="http://www.ex-parrot.com/~pdw/iftop/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="" + +DEPEND=" + net-libs/libpcap + sys-libs/ncurses" + +S="${WORKDIR}"/${P/_/} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.0_pre3-tinfo.patch + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die + + # bug 490168 + cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die + epatch "${FILESDIR}"/${PN}-1.0_pre2-pthread.patch + + eautoreconf +} + +src_install() { + dosbin iftop + doman iftop.8 + + dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc +} |