svn commit: r512466 - head/net-mgmt/nfdump

[Kurt Jaeger]

Author: pi
Date: Sat Sep 21 05:55:35 2019
New Revision: 512466
URL: https://svnweb.freebsd.org/changeset/ports/512466

Log:
  net-mgmt/nfdump: upgrade 1.6.17 -> 1.6.18
  
  - add nfpcapd OPTION to generate nfdump netflow records directly
    from interfaces/pcaps.
  - The old COMPAT15 mode has been removed. All old 1.5.x files should
    have been converted so far.
  
  Relnotes:	https://github.com/phaag/nfdump/blob/master/ChangeLog

Modified:
  head/net-mgmt/nfdump/Makefile
  head/net-mgmt/nfdump/distinfo

Modified: head/net-mgmt/nfdump/Makefile
==============================================================================
--- head/net-mgmt/nfdump/Makefile	Sat Sep 21 04:47:19 2019	(r512465)
+++ head/net-mgmt/nfdump/Makefile	Sat Sep 21 05:55:35 2019	(r512466)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	nfdump
-PORTVERSION=	1.6.17
+PORTVERSION=	1.6.18
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	pi at FreeBSD.org
@@ -24,7 +23,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 #flow-tools support
 OPTIONS_DEFINE=		DOCS FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \
-			SFLOW NFDUMP15 NSEL INFLUXDB
+			SFLOW NFPCAPD NFDUMP15 NSEL INFLUXDB
 OPTIONS_DEFAULT=	NFPROFILE
 
 FT2NFDUMP_DESC=		With Flow-tools to nfdump converter
@@ -33,13 +32,13 @@ FIXTIMEBUG_DESC=	With fixing swap time bug of some v5
 READPCAP_DESC=		With pcap support
 NFTRACK_DESC=		With PortTracker support
 SFLOW_DESC=		Build sflow collector daemon also
+NFPCAPD_DESC=		Build nfpcapd collector daemon also
 NFDUMP15_DESC=		Enable compatibility with version 1.5
 NSEL_DESC=		Read and process ASA/NSEL/NEL event data
 INFLUXDB_DESC=		Enable stats to InfluxDB
 
 post-patch:
 	${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/bin/Makefile.am
-	${REINPLACE_CMD} "s|1.6.15|${PORTVERSION}|" ${WRKSRC}/bin/Makefile.am
 
 .include <bsd.port.options.mk>
 
@@ -111,6 +110,14 @@ PLIST_FILES+=	bin/sfcapd man/man1/sfcapd.1.gz
 CONFIGURE_ARGS+=	--disable-sflow
 .endif
 
+#nfpcapd capture support
+.if ${PORT_OPTIONS:MNFPCAPD}
+CONFIGURE_ARGS+=	--enable-nfpcapd
+PLIST_FILES+=	bin/nfpcapd man/man1/nfpcapd.1.gz
+.else
+CONFIGURE_ARGS+=	--disable-nfpcapd
+.endif
+
 #influxdb support
 .if ${PORT_OPTIONS:MINFLUXDB}
 CONFIGURE_ARGS+=	--enable-influxdb
@@ -120,7 +127,7 @@ CONFIGURE_ARGS+=	--disable-influxdb
 .endif
 
 do-install:
-.for binary in nfanon nfcapd nfdump nfexpire nfreplay
+.for binary in nfanon nfcapd nfpcapd nfdump nfexpire nfreplay
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/${binary} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/bin/.libs/libnfdump-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib
@@ -142,6 +149,11 @@ do-install:
 .if ${PORT_OPTIONS:MSFLOW}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/sfcapd ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN}	${WRKSRC}/man/sfcapd.1	${STAGEDIR}${PREFIX}/man/man1
+.endif
+
+.if ${PORT_OPTIONS:MNFPCAPD}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/.libs/nfpcapd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN}	${WRKSRC}/man/nfpcapd.1	${STAGEDIR}${PREFIX}/man/man1
 .endif
 
 .for filename in nfanon nfdump nfcapd nfexpire nfreplay

Modified: head/net-mgmt/nfdump/distinfo
==============================================================================
--- head/net-mgmt/nfdump/distinfo	Sat Sep 21 04:47:19 2019	(r512465)
+++ head/net-mgmt/nfdump/distinfo	Sat Sep 21 05:55:35 2019	(r512466)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524474258
-SHA256 (phaag-nfdump-v1.6.17_GH0.tar.gz) = f71c2c57bdcd0731b2cfecf6d45f9bf57fc7c946858644caf829f738c67c393d
-SIZE (phaag-nfdump-v1.6.17_GH0.tar.gz) = 560889
+TIMESTAMP = 1569008765
+SHA256 (phaag-nfdump-v1.6.18_GH0.tar.gz) = 5d6046bf7faa34713b004c6cf8b3d30027c761c5ac22a3195d49388342e8147e
+SIZE (phaag-nfdump-v1.6.18_GH0.tar.gz) = 568524