minor update to 0.68.5.1

- remove void * casts for NULL
- install sample configuration files and unbreak some paths

net/flow-tools/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/19 22:31:33 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2011/04/16 10:35:58 sthen Exp $
 
 SHARED_LIBS +=  ft                   0.0      # .0.0
 
 COMMENT=	cisco NetFlow utilities
 
-DISTNAME=	flow-tools-0.68.5
-REVISION=	1
+DISTNAME=	flow-tools-0.68.5.1
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	net
 
@@ -28,9 +27,11 @@ WANTLIB=		c z
 
 MODULES=		lang/python
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	gnu old # XXX allow sysconfdir to be overridden
 SEPARATE_BUILD=		simple
-CONFIGURE_ARGS+=	--localstatedir=/var/flow-tools
+CONFIGURE_ARGS+=	--localstatedir=/var/flow-tools \
+			--mandir="${LOCALBASE}/man" \
+			--sysconfdir="${SYSCONFDIR}/flow-tools"
 
 .if !${FLAVOR:L:Mpgsql}
 CONFIGURE_ARGS+=	--without-postgresql
@@ -39,22 +40,19 @@ WANTLIB +=		pq
 LIB_DEPENDS+=		databases/postgresql,-main
 .endif
 
-MAKE_FLAGS+=		"SUBDIRS=lib src bin configs docs"
+MAKE_FLAGS+=		SUBDIRS="lib src bin configs docs"
 FAKE_FLAGS+=		sysconfdir=${PREFIX}/share/examples/flow-tools
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
-USE_GROFF =		Yes
+USE_GROFF=		Yes
 
-PYTHON_SCRIPTS=		bin/flow-log2rrd \
-			bin/flow-rpt2rrd \
-			bin/flow-rptfmt
-
-post-patch:
-.for file in ${PYTHON_SCRIPTS}
-	mv ${WRKSRC}/${file} ${WRKSRC}/${file}.dist
-	sed "s!/bin/env python!${MODPY_BIN}!" \
-		< ${WRKSRC}/${file}.dist > ${WRKSRC}/${file}
-.endfor
+# let configure generate a new ftconfig.h, the supplied one has
+# problems with libwrap
+pre-configure:
+	rm -f ${WRKSRC}/lib/ftconfig.h
+	cd ${WRKSRC}/bin; perl -pi -e 's,/bin/env python,${MODPY_BIN},;' \
+	    -e 's,/usr/local/netflow/var/sym/,${SYSCONFDIR}/flow-tools/sym/,;' \
+	    flow-log2rrd flow-rpt2rrd flow-rptfmt
 
 .include <bsd.port.mk>

net/flow-tools/distinfo

@@ -1,5 +1,5 @@
-MD5 (flow-tools-0.68.5.tar.bz2) = PF512igiq2tJR8kowJ6jZQ==
-RMD160 (flow-tools-0.68.5.tar.bz2) = jyKK2tVuigXi885xwKHPPbYTxNc=
-SHA1 (flow-tools-0.68.5.tar.bz2) = 1xXvwaIpDBYGxLtpTW0ZCDCAOBM=
-SHA256 (flow-tools-0.68.5.tar.bz2) = ObnWJFYdq+Cgqy2zLoq5zKeGkGD5p7FZ7G/SJT4ePX0=
-SIZE (flow-tools-0.68.5.tar.bz2) = 914600
+MD5 (flow-tools-0.68.5.1.tar.bz2) = uPmkvhnsIuptQDHECm1aYw==
+RMD160 (flow-tools-0.68.5.1.tar.bz2) = e/TxVVGGc6mCHV8LBVkst3kx60s=
+SHA1 (flow-tools-0.68.5.1.tar.bz2) = SoQ6raYxZQ43d6mx7rTsRlYs8NA=
+SHA256 (flow-tools-0.68.5.1.tar.bz2) = gLvTeRtZGY8NIBhHYdlrpQA4awpx6mE8IUpQqgF6H2c=
+SIZE (flow-tools-0.68.5.1.tar.bz2) = 914062

net/flow-tools/patches/patch-src_flow-capture_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_flow-capture_c,v 1.4 2006/12/08 08:23:42 jakob Exp $
---- src/flow-capture.c.orig	Mon Jan  5 18:56:50 2004
-+++ src/flow-capture.c	Wed Nov 22 10:57:02 2006
-@@ -1235,7 +1235,7 @@ skip_pdu_decode:
-           } else if (!n) { /* child */
- 
-             n = execl(post_rotate_exec, post_rotate_exec, cap_file.nname,
--                NULL);
-+                (void *)NULL);
- 
-             if (n == -1) 
-               fterr_err(1, "exec(%s)", post_rotate_exec);

net/flow-tools/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2010/05/06 21:40:31 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.11 2011/04/16 10:35:58 sthen Exp $
 @newgroup _netflow:575
 @newuser _netflow:575:575:daemon:flow-tools user:/var/empty:/sbin/nologin
 @bin bin/flow-capture
@@ -57,16 +57,31 @@ lib/libft.la
 @man man/man1/flow-tools.1
 @man man/man1/flow-xlate.1
 share/examples/flow-tools/
+@sample ${SYSCONFDIR}/flow-tools/
 share/examples/flow-tools/cfg/
+@sample ${SYSCONFDIR}/flow-tools/cfg/
 share/examples/flow-tools/cfg/filter.cfg
+@sample ${SYSCONFDIR}/flow-tools/cfg/filter.cfg
 share/examples/flow-tools/cfg/map.cfg
+@sample ${SYSCONFDIR}/flow-tools/cfg/map.cfg
 share/examples/flow-tools/cfg/mask.cfg
+@sample ${SYSCONFDIR}/flow-tools/cfg/mask.cfg
 share/examples/flow-tools/cfg/stat.cfg
+@sample ${SYSCONFDIR}/flow-tools/cfg/stat.cfg
 share/examples/flow-tools/cfg/tag.cfg
+@sample ${SYSCONFDIR}/flow-tools/cfg/tag.cfg
 share/examples/flow-tools/cfg/xlate.cfg
+@sample ${SYSCONFDIR}/flow-tools/cfg/xlate.cfg
 share/examples/flow-tools/sym/
+@sample ${SYSCONFDIR}/flow-tools/sym/
 share/examples/flow-tools/sym/asn.sym
+@sample ${SYSCONFDIR}/flow-tools/sym/asn.sym
 share/examples/flow-tools/sym/ip-prot.sym
+@sample ${SYSCONFDIR}/flow-tools/sym/ip-prot.sym
 share/examples/flow-tools/sym/ip-type.sym
+@sample ${SYSCONFDIR}/flow-tools/sym/ip-type.sym
 share/examples/flow-tools/sym/tag.sym
+@sample ${SYSCONFDIR}/flow-tools/sym/tag.sym
 share/examples/flow-tools/sym/tcp-port.sym
+@sample ${SYSCONFDIR}/flow-tools/sym/tcp-port.sym
+@extraunexec rm -rf /var/flow-tools