--- nfdump-1.6.5.ebuild	2012-02-21 12:31:19.000000000 -0500
+++ nfdump-1.6.5-r1.ebuild	2012-03-02 09:11:36.868908133 -0500
@@ -1,44 +1,32 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.6.5.ebuild,v 1.2 2012/02/21 17:10:10 jer Exp $
+# $Header: $
 
 EAPI=4
 inherit autotools eutils
 
-MY_P="${P/_/}"
 DESCRIPTION="A set of tools to collect and process netflow data"
 HOMEPAGE="http://nfdump.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nfdump/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/nfdump/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-# Fails to build readpcap:
-# https://sourceforge.net/tracker/?func=detail&aid=2996582&group_id=119350&atid=683752
-IUSE="compat15 debug ftconv nfprofile sflow"
+IUSE="compat15 debug ftconv nfprofile nftrack pcap sflow"
 
 CDEPEND="
 	ftconv? ( sys-libs/zlib net-analyzer/flow-tools )
-	nfprofile? ( net-analyzer/rrdtool )"
-#	readpcap? ( net-libs/libpcap )"
+	nfprofile? ( net-analyzer/rrdtool )
+	nftrack? ( net-analyzer/rrdtool )
+	pcap? ( net-libs/libpcap )"
 DEPEND="${CDEPEND}
 	sys-devel/flex"
 RDEPEND=${CDEPEND}"
 	dev-lang/perl"
 
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
-	if use ftconv; then
-		sed -e '/ftbuild.h/d' -i bin/ft2nfdump.c || die
-		sed \
-			-e 's:lib\(/ftlib.h\):include\1:' \
-			-e 's:libft.a:libft.so:' \
-			\-i configure.in || die
-	fi
-	sed -i bin/Makefile.am -e '/^AM_CFLAGS/d' || die
+	sed -i.bak configure.in -e 's:+AC_ARG_ENABLE:AC_ARG_ENABLE:' || die
+	sed -i.bak bin/Makefile.am -e '/^AM_CFLAGS/d' || die
 	eautoreconf
 }
 
@@ -47,8 +35,11 @@
 	econf \
 		$(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \
 		$(use nfprofile && echo "--enable-nfprofile") \
+		$(use nftrack && echo "--enable-nftrack") \
+		$(use_enable pcap readpcap) \
 		$(use_enable sflow) \
 		$(use_enable debug devel) \
 		$(use_enable compat15)
-		# $(use_enable readpcap) \
+		#$(use_enable nfprofile) \
+		#$(use_enable nftrack) \
 }