Index: head/net-mgmt/flow-tools/Makefile
===================================================================
--- head/net-mgmt/flow-tools/Makefile	(revision 565130)
+++ head/net-mgmt/flow-tools/Makefile	(revision 565131)
@@ -1,62 +1,66 @@
 # Created by: @BABOLO <.@babolo.ru>
 # $FreeBSD$
 
 PORTNAME=	flow-tools
 PORTVERSION=	0.68.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Suite of tools and library to work with netflow data
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man
-
 USES=		autoreconf libtool:keepla python:patch shebangfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	flow_capture flow_fanout
 
 GH_ACCOUNT=	5u623l20
-GH_TAGNAME=	6e7c849
+GH_TAGNAME=	2ca53f5
 
 SHEBANG_FILES=	bin/flow-*
 GNU_CONFIGURE=	yes
 
 SUB_LIST=	FLOW_CAPTURE_PIDDIR="${FLOW_CAPTURE_PIDDIR}" \
 		FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}"
 
 USERS=		flowtools
 GROUPS=		flowtools
 
 VARDIR?=		/var
 FLOW_CAPTURE_SPOOL=	${VARDIR}/db/flows
 FLOW_CAPTURE_PIDDIR=	${VARDIR}/run/flow-capture
 
 OPTIONS_DEFINE=	MYSQL OPENSSL PGSQL
 
 PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
 PY2TO3_ARGS=	--fix=all --no-diffs --nobackups --verbose --write
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql="${LOCALBASE}"
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-openssl="${OPENSSLBASE}"
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgresql
 PGSQL_CONFIGURE_OFF=	--with-postgresql=no
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if ${PYTHON_MAJOR_VER} >= 3
 	${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/bin/flow-*
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libft.so.0.0.0
+
+post-stage:
+.for f in asn.sym filter.cfg ip-prot.sym ip-type.sym map.cfg mask.cfg stat.cfg \
+	tag.cfg tag.sym tcp-port.sym xlate.cfg
+	@${MV} ${STAGEDIR}${ETCDIR}/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
+.endfor
 
 .include <bsd.port.post.mk>
Index: head/net-mgmt/flow-tools/distinfo
===================================================================
--- head/net-mgmt/flow-tools/distinfo	(revision 565130)
+++ head/net-mgmt/flow-tools/distinfo	(revision 565131)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553203482
-SHA256 (5u623l20-flow-tools-v0.68.6-6e7c849_GH0.tar.gz) = cea67317e205d1f52f9b8aeb980a1cda9ebbbb1886489fc4d56a61f948ecd72e
-SIZE (5u623l20-flow-tools-v0.68.6-6e7c849_GH0.tar.gz) = 1078840
+TIMESTAMP = 1613085161
+SHA256 (5u623l20-flow-tools-v0.68.6-2ca53f5_GH0.tar.gz) = db9e92d234911e4ad32744614ea75454601bfe0e7ebced6cdc17c395c36e01fb
+SIZE (5u623l20-flow-tools-v0.68.6-2ca53f5_GH0.tar.gz) = 1092146
Index: head/net-mgmt/flow-tools/files/patch-src_acl2.c
===================================================================
--- head/net-mgmt/flow-tools/files/patch-src_acl2.c	(revision 565130)
+++ head/net-mgmt/flow-tools/files/patch-src_acl2.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/acl2.c.orig	2020-08-29 06:28:09 UTC
-+++ src/acl2.c
-@@ -46,7 +46,7 @@
- 
- #include "acl2.h"
- 
--struct acl_list acl_list;
-+// struct acl_list acl_list;
- 
- #define E acl_list.acl_ip_ext[index]
- 

Property changes on: head/net-mgmt/flow-tools/files/patch-src_acl2.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-mgmt/flow-tools/files/patch-lib_ftxlate.c
===================================================================
--- head/net-mgmt/flow-tools/files/patch-lib_ftxlate.c	(revision 565130)
+++ head/net-mgmt/flow-tools/files/patch-lib_ftxlate.c	(nonexistent)
@@ -1,39 +0,0 @@
---- lib/ftxlate.c.orig	2019-03-21 19:39:03 UTC
-+++ lib/ftxlate.c
-@@ -2040,21 +2040,21 @@ static int cryptopan_init(struct cryptopan *cp, unsign
- 
- 
-   /* init crypto */
--  if (!(cp->cipher_ctx = (EVP_CIPHER_CTX*) malloc(sizeof(EVP_CIPHER_CTX)))) {
-+  cp->cipher_ctx = EVP_CIPHER_CTX_new();
-+  if (cp->cipher_ctx == NULL)
-     return -1;
--  }
- 
--  EVP_CIPHER_CTX_init(cp->cipher_ctx);
--
-   /* disable padding */
-   if (!(EVP_CIPHER_CTX_set_padding(cp->cipher_ctx, 0))) {
-     cryptopan_free(cp);
-+    EVP_CIPHER_CTX_free(cp->cipher_ctx);
-     return -1;
-   }
- 
-   /* init encryption */
-   if (!(EVP_EncryptInit(cp->cipher_ctx, EVP_aes_128_ecb(), key, NULL))) {
-     cryptopan_free(cp);
-+    EVP_CIPHER_CTX_free(cp->cipher_ctx);
-     return -1;
-   }
- 
-@@ -2062,8 +2062,10 @@ static int cryptopan_init(struct cryptopan *cp, unsign
-   i = 16;
-   if (!(EVP_EncryptUpdate(cp->cipher_ctx, cp->m_pad, &i, key+16, i))) {
-     cryptopan_free(cp);
-+    EVP_CIPHER_CTX_free(cp->cipher_ctx);
-     return -1;
-   }
-+  EVP_CIPHER_CTX_free(cp->cipher_ctx);
- 
- #endif /* HAVE_OPENSSL */
- 

Property changes on: head/net-mgmt/flow-tools/files/patch-lib_ftxlate.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/net-mgmt/flow-tools/pkg-plist
===================================================================
--- head/net-mgmt/flow-tools/pkg-plist	(revision 565130)
+++ head/net-mgmt/flow-tools/pkg-plist	(revision 565131)
@@ -1,72 +1,72 @@
 bin/flow-capture
 bin/flow-cat
 bin/flow-dscan
 bin/flow-expire
 bin/flow-export
 bin/flow-fanout
 bin/flow-filter
 bin/flow-gen
 bin/flow-header
 bin/flow-import
 bin/flow-log2rrd
 bin/flow-mask
 bin/flow-merge
 bin/flow-nfilter
 bin/flow-print
 bin/flow-receive
 bin/flow-report
 bin/flow-rpt2rrd
 bin/flow-rptfmt
 bin/flow-send
 bin/flow-split
 bin/flow-stat
 bin/flow-tag
 bin/flow-xlate
-%%ETCDIR%%/asn.sym
-%%ETCDIR%%/filter.cfg
-%%ETCDIR%%/ip-prot.sym
-%%ETCDIR%%/ip-type.sym
-%%ETCDIR%%/map.cfg
-%%ETCDIR%%/mask.cfg
-%%ETCDIR%%/stat.cfg
-%%ETCDIR%%/tag.cfg
-%%ETCDIR%%/tag.sym
-%%ETCDIR%%/tcp-port.sym
-%%ETCDIR%%/xlate.cfg
+@sample %%ETCDIR%%/asn.sym.sample
+@sample %%ETCDIR%%/filter.cfg.sample
+@sample %%ETCDIR%%/ip-prot.sym.sample
+@sample %%ETCDIR%%/ip-type.sym.sample
+@sample %%ETCDIR%%/map.cfg.sample
+@sample %%ETCDIR%%/mask.cfg.sample
+@sample %%ETCDIR%%/stat.cfg.sample
+@sample %%ETCDIR%%/tag.cfg.sample
+@sample %%ETCDIR%%/tag.sym.sample
+@sample %%ETCDIR%%/tcp-port.sym.sample
+@sample %%ETCDIR%%/xlate.cfg.sample
 include/ftlib.h
 include/ftqueue.h
 lib/libft.a
 lib/libft.la
 lib/libft.so
 lib/libft.so.0
 lib/libft.so.0.0.0
 man/man1/flow-capture.1.gz
 man/man1/flow-cat.1.gz
 man/man1/flow-dscan.1.gz
 man/man1/flow-expire.1.gz
 man/man1/flow-export.1.gz
 man/man1/flow-fanout.1.gz
 man/man1/flow-filter.1.gz
 man/man1/flow-gen.1.gz
 man/man1/flow-header.1.gz
 man/man1/flow-import.1.gz
 man/man1/flow-mask.1.gz
 man/man1/flow-merge.1.gz
 man/man1/flow-nfilter.1.gz
 man/man1/flow-print.1.gz
 man/man1/flow-receive.1.gz
 man/man1/flow-report.1.gz
 man/man1/flow-send.1.gz
 man/man1/flow-split.1.gz
 man/man1/flow-stat.1.gz
 man/man1/flow-tag.1.gz
 man/man1/flow-tools.1.gz
 man/man1/flow-tools-examples.1.gz
 man/man1/flow-xlate.1.gz
 man/man1/flow-rptfmt.1.gz
 man/man1/flow-log2rrd.1.gz
 man/man1/flow-rpt2rrd.1.gz
 %%DATADIR%%/asn2c
 %%DATADIR%%/gasn
 %%DATADIR%%/gprot
 %%DATADIR%%/gserv