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