From: | "Jeroen Roovers (jer)" <jer@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-analyzer/nfdump: nfdump-1.6.1-r2.ebuild ChangeLog nfdump-1.6.1-r1.ebuild |
Date: | Wed, 25 Aug 2010 17:19:47 |
Message-Id: | 20100825171943.9798E20054@flycatcher.gentoo.org |
1 | jer 10/08/25 17:19:43 |
2 | |
3 | Modified: ChangeLog |
4 | Added: nfdump-1.6.1-r2.ebuild |
5 | Removed: nfdump-1.6.1-r1.ebuild |
6 | Log: |
7 | Fix configure option by Alexander Zubkov (bug #334233). |
8 | |
9 | (Portage version: 2.2_rc69/cvs/Linux i686) |
10 | |
11 | Revision Changes Path |
12 | 1.15 net-analyzer/nfdump/ChangeLog |
13 | |
14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.15&view=markup |
15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?rev=1.15&content-type=text/plain |
16 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/ChangeLog?r1=1.14&r2=1.15 |
17 | |
18 | Index: ChangeLog |
19 | =================================================================== |
20 | RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v |
21 | retrieving revision 1.14 |
22 | retrieving revision 1.15 |
23 | diff -u -r1.14 -r1.15 |
24 | --- ChangeLog 12 Jul 2010 22:34:45 -0000 1.14 |
25 | +++ ChangeLog 25 Aug 2010 17:19:43 -0000 1.15 |
26 | @@ -1,6 +1,12 @@ |
27 | # ChangeLog for net-analyzer/nfdump |
28 | # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
29 | -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.14 2010/07/12 22:34:45 jer Exp $ |
30 | +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.15 2010/08/25 17:19:43 jer Exp $ |
31 | + |
32 | +*nfdump-1.6.1-r2 (25 Aug 2010) |
33 | + |
34 | + 25 Aug 2010; Jeroen Roovers <jer@g.o> -nfdump-1.6.1-r1.ebuild, |
35 | + +nfdump-1.6.1-r2.ebuild: |
36 | + Fix configure option by Alexander Zubkov (bug #334233). |
37 | |
38 | *nfdump-1.6.1-r1 (12 Jul 2010) |
39 | |
40 | |
41 | |
42 | |
43 | 1.1 net-analyzer/nfdump/nfdump-1.6.1-r2.ebuild |
44 | |
45 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1-r2.ebuild?rev=1.1&view=markup |
46 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1-r2.ebuild?rev=1.1&content-type=text/plain |
47 | |
48 | Index: nfdump-1.6.1-r2.ebuild |
49 | =================================================================== |
50 | # Copyright 1999-2010 Gentoo Foundation |
51 | # Distributed under the terms of the GNU General Public License v2 |
52 | # $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.1-r2.ebuild,v 1.1 2010/08/25 17:19:43 jer Exp $ |
53 | |
54 | EAPI=2 |
55 | inherit autotools eutils |
56 | |
57 | DESCRIPTION="A set of tools to collect and process netflow data" |
58 | HOMEPAGE="http://nfdump.sourceforge.net/" |
59 | SRC_URI="mirror://sourceforge/nfdump/${P}.tar.gz" |
60 | |
61 | LICENSE="BSD" |
62 | SLOT="0" |
63 | KEYWORDS="~amd64 ~x86" |
64 | # Fails to build readpcap: |
65 | # https://sourceforge.net/tracker/?func=detail&aid=2996582&group_id=119350&atid=683752 |
66 | IUSE="compat15 debug ftconv nfprofile sflow" |
67 | |
68 | CDEPEND=" |
69 | ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) |
70 | nfprofile? ( net-analyzer/rrdtool )" |
71 | # readpcap? ( net-libs/libpcap )" |
72 | DEPEND="${CDEPEND} |
73 | sys-devel/flex" |
74 | RDEPEND=${CDEPEND}" |
75 | dev-lang/perl" |
76 | |
77 | src_prepare() { |
78 | if use ftconv; then |
79 | sed '/ftbuild.h/d' -i bin/ft2nfdump.c || die |
80 | sed 's:lib\(/ftlib.h\):include\1:' -i configure.in || die |
81 | fi |
82 | sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die |
83 | eautoreconf |
84 | } |
85 | |
86 | src_configure() { |
87 | # --without-ftconf is not handled well #322201 |
88 | econf \ |
89 | $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ |
90 | $(use nfprofile && echo "--enable-nfprofile") \ |
91 | $(use_enable sflow) \ |
92 | $(use_enable debug devel) \ |
93 | $(use_enable compat15) |
94 | # $(use_enable readpcap) \ |
95 | } |
96 | |
97 | src_install() { |
98 | emake DESTDIR="${D}" install || die |
99 | dodoc AUTHORS ChangeLog NEWS README || die |
100 | } |