net-mgmt/nfdump: update 1.7.3 -> 1.7.4

PR:		277613, 277572
Changes:	https://github.com/phaag/nfdump/releases/tag/v1.7.4
Reported by:	Gert Doering <gert@greenie.muc.de>
Author:		Marek Zarycht <zarychtam@plan-b.pwste.edu.pl>

4 files changed, 7 insertions, 76 deletions

diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 29cc06fa8666..f2324b570211 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -1,11 +1,10 @@
 PORTNAME=	nfdump
-PORTVERSION=	1.7.3
-PORTREVISION=	1
+PORTVERSION=	1.7.4
 DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	pi@FreeBSD.org
-COMMENT=	Command-line tools to collect and process NetFlow data
+COMMENT=	Command-line tools to collect and process NetFlow, sFlow and IPFIX data
 WWW=		https://github.com/phaag/nfdump
 
 LICENSE=	BSD3CLAUSE
diff --git a/net-mgmt/nfdump/distinfo b/net-mgmt/nfdump/distinfo
index 3963d10e8949..1bd21b53693c 100644
--- a/net-mgmt/nfdump/distinfo
+++ b/net-mgmt/nfdump/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698484412
-SHA256 (phaag-nfdump-v1.7.3_GH0.tar.gz) = 9ea7e1ded34a81839b73e66cb62c9bc11a8070210584f9a508798d7bd6058c89
-SIZE (phaag-nfdump-v1.7.3_GH0.tar.gz) = 725364
+TIMESTAMP = 1710006224
+SHA256 (phaag-nfdump-v1.7.4_GH0.tar.gz) = 8cf76ad0b4e3c1e7edf9532ec7508b11f125adcfcdac5010fd7eec8fe792cfd8
+SIZE (phaag-nfdump-v1.7.4_GH0.tar.gz) = 756319
diff --git a/net-mgmt/nfdump/files/patch-configure.ac b/net-mgmt/nfdump/files/patch-configure.ac
deleted file mode 100644
index 2f8171cdcca0..000000000000
--- a/net-mgmt/nfdump/files/patch-configure.ac
+++ /dev/null
@@ -1,69 +0,0 @@
---- configure.ac.orig	2023-09-02 11:27:28 UTC
-+++ configure.ac
-@@ -124,7 +124,9 @@ fi
- 
- #Tidz up? esp not using in source dist flow-tools
- AC_ARG_ENABLE(ftconv,
--[  --enable-ftconv         Build the flow-tools to nfdump converter; default is NO],
-+[  --enable-ftconv         Build the flow-tools to nfdump converter; default is NO])
-+
-+AS_IF([test "x$enable_ftconv" = "xyes"],
- AC_CHECK_LIB(z, zlibVersion,,
- AC_MSG_ERROR(Link with "-lz" failed! (Need zlib >= 1.0.2))
- )
-@@ -147,7 +149,9 @@ AM_CONDITIONAL(FT2NFDUMP, false)
- )
- 
- AC_ARG_ENABLE(maxmind,
--[  --enable-maxmind        Build geolookup for MaxMind GeoDB; default is NO],
-+[  --enable-maxmind        Build geolookup for MaxMind GeoDB; default is NO])
-+
-+AS_IF([test "x$enable_maxmind" = "xyes"],
- AM_CONDITIONAL(MAXMIND, true)
- ,
- AM_CONDITIONAL(MAXMIND, false)
-@@ -156,8 +160,10 @@ AM_CONDITIONAL(MAXMIND, false)
- 
- #Needs tidy
- AC_ARG_ENABLE(nfprofile,
--[  --enable-nfprofile      Build nfprofile used by NfSen; default is NO],
--[ 
-+[  --enable-nfprofile      Build nfprofile used by NfSen; default is NO])
-+
-+AS_IF([test "x$enable_nfprofile" = "xyes"],
-+[
- 	AC_CHECK_LIB(rrd, rrd_update,[
- cat >>config.h <<_ACEOF
- #define HAVE_LIBRRD 1
-@@ -211,8 +217,10 @@ AM_CONDITIONAL(INFLXDB, false)
- )
- 
- AC_ARG_ENABLE(nftrack,
--[  --enable-nftrack      Build nftrack used by PortTracker; default is NO],
--[ 
-+[  --enable-nftrack      Build nftrack used by PortTracker; default is NO])
-+
-+AS_IF([test "x$enable_nftrack" = "xyes"],
-+[
- 	AC_CHECK_LIB(rrd, rrd_update,[
- cat >>config.h <<_ACEOF
- #define HAVE_LIBRRD 1
-@@ -252,7 +260,9 @@ AC_ARG_ENABLE(readpcap,
- AM_CONDITIONAL(READPCAP, test "$enable_readpcap" = yes)
- 
- AC_ARG_ENABLE(nfpcapd,
--[  --enable-nfpcapd       Build nfpcapd collector to create netflow data from interface or pcap data; default is NO],
-+[  --enable-nfpcapd       Build nfpcapd collector to create netflow data from interface or pcap data; default is NO])
-+
-+AS_IF([test "x$enable_nfpcapd" = "xyes"],
- [ 
- 	AC_CHECK_LIB(pcap, pcap_create,[
- cat >>config.h <<_ACEOF
-@@ -279,7 +289,6 @@ AC_SUBST(PCAP_LIBS)
- 				struct pcap_pkthdr p; 
- 			]])
- 		],, AC_MSG_ERROR(Can not load pcap library. Not in loader search path! ))
--
- ]
- ,
- AM_CONDITIONAL(BUILDNFPCAPD, false)
diff --git a/net-mgmt/nfdump/pkg-descr b/net-mgmt/nfdump/pkg-descr
index d6ef7a7ffba6..03d666cc5124 100644
--- a/net-mgmt/nfdump/pkg-descr
+++ b/net-mgmt/nfdump/pkg-descr
@@ -1,4 +1,5 @@
-NFDUMP tools support netflow v5, v7 and v9 capturing and processing.
+NFDUMP tools support: NetFlow v5, v7, v9, sFlow and IPFIX capturing and
+processing.
 
 nfcapd - netflow capture daemon.
 Reads the netflow data from the network and stores the data into files.