update to nfdump-1.6.17

net/nfdump/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2018/03/17 11:04:36 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2018/04/23 13:48:49 sthen Exp $
 
 COMMENT-main =		tools to collect and process netflow data
 COMMENT-nfprofile =	filters data from nfdump according to profiles
 
-V =			1.6.16
+V =			1.6.17
 GH_ACCOUNT =		phaag
 GH_PROJECT =		nfdump
 GH_TAGNAME =		v$V
@@ -41,7 +41,8 @@ WANTLIB-main =		${WANTLIB} ft
 LIB_DEPENDS-nfprofile =	net/rrdtool \
 			net/nfdump,-main
 RUN_DEPENDS-nfprofile =	nfdump-$V:net/nfdump,-main
-WANTLIB-nfprofile =  ${WANTLIB} 
+
+WANTLIB-nfprofile =  ${WANTLIB}
 WANTLIB-nfprofile += X11 Xext Xrender cairo expat ffi fontconfig freetype
 WANTLIB-nfprofile += glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz
 WANTLIB-nfprofile += iconv intl lzma m nfdump pango-1.0 pangocairo-1.0
@@ -53,9 +54,19 @@ REORDER_DEPENDENCIES += ${PORTSDIR}/infrastructure/mk/automake.dep
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nfdump
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nfdump
-	head -119 ${WRKSRC}/bin/sflow.c > ${PREFIX}/share/doc/nfdump/COPYRIGHT
 
-CONFIGURE_ENV =		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+CONFIGURE_ENV =		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \
+			ac_cv_path_DOXYGEN=
 TEST_FLAGS =		TZ=CET
 
+AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.15
+BUILD_DEPENDS =		devel/libtool \
+			${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+
+post-patch:
+	cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+	    AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
+
 .include <bsd.port.mk>

net/nfdump/distinfo

@@ -1,2 +1,2 @@
-SHA256 (nfdump-1.6.16.tar.gz) = sYR5IVxRqY+9+XPvVIRkeA56nZ9/5z5Pq5q37Io73I8=
-SIZE (nfdump-1.6.16.tar.gz) = 1814857
+SHA256 (nfdump-1.6.17.tar.gz) = 9xwsV73NBzGyz+z21F+b9X/HyUaFhkTK+Cn3OMZ8OT0=
+SIZE (nfdump-1.6.17.tar.gz) = 560889

net/nfdump/patches/patch-bin_Makefile_am

@@ -0,0 +1,14 @@
+$OpenBSD: patch-bin_Makefile_am,v 1.1 2018/04/23 13:48:49 sthen Exp $
+
+Index: bin/Makefile.am
+--- bin/Makefile.am.orig
++++ bin/Makefile.am
+@@ -62,7 +62,7 @@ launch = launch.c launch.h
+ lib_LTLIBRARIES = libnfdump.la
+ libnfdump_la_SOURCES = $(output) $(common) $(util) $(filelzo) $(nflist) $(filter) $(exporter)
+ #libnfdump_la_LIBADD = -lz
+-libnfdump_la_LDFLAGS = -release 1.6.17
++libnfdump_la_LDFLAGS = 
+ 
+ 
+ nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h  \

net/nfdump/patches/patch-bin_Makefile_in

@@ -1,14 +0,0 @@
-$OpenBSD: patch-bin_Makefile_in,v 1.1 2018/03/17 11:04:36 sthen Exp $
-
-Index: bin/Makefile.in
---- bin/Makefile.in.orig
-+++ bin/Makefile.in
-@@ -709,7 +709,7 @@ launch = launch.c launch.h
- lib_LTLIBRARIES = libnfdump.la
- libnfdump_la_SOURCES = $(common) $(util) $(filelzo) $(nflist) $(filter) $(exporter)
- #libnfdump_la_LIBADD = -lz
--libnfdump_la_LDFLAGS = -release 1.6.15
-+libnfdump_la_LDFLAGS = 
- nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h  \
- 	$(nflowcache) $(nfprof)
- 

net/nfdump/patches/patch-bin_nfprofile_c

@@ -1,11 +0,0 @@
-$OpenBSD: patch-bin_nfprofile_c,v 1.2 2014/06/02 12:31:24 sthen Exp $
---- bin/nfprofile.c.orig	Sun Feb 16 12:59:29 2014
-+++ bin/nfprofile.c	Mon Jun  2 10:59:51 2014
-@@ -48,6 +48,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
- #include <fcntl.h>
- 

net/nfdump/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2018/03/17 11:04:36 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2018/04/23 13:48:49 sthen Exp $
 @newgroup _nfcapd:649
 @newuser _nfcapd:649:_nfcapd:daemon:nfcapd user:/nonexistent:/sbin/nologin
 @bin bin/ft2nfdump
@@ -19,5 +19,4 @@ lib/libnfdump.la
 @man man/man1/nfreplay.1
 @man man/man1/sfcapd.1
 share/doc/nfdump/
-share/doc/nfdump/COPYRIGHT
 share/doc/nfdump/README