Update to version 0.7.0

- A new network daemon, nfacctd, was introduced. It listens for
  Netflow V1/V5 packets coming from the network, and then
  processes data as pmacctd does.

- pmacctd's IP fragmentation handling has been strongly
  enhanced.

4 files changed, 20 insertions, 18 deletions

diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index 82847732232d..7bd0c97f3d08 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pmacct
-PORTVERSION=	0.6.4p1
+PORTVERSION=	0.7.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.ba.cnr.it/~paolo/pmacct/
 
@@ -38,8 +38,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.6.4
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 
@@ -48,7 +46,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in README EXAMPLES INTERNALS PLUGINS
+.for i in ChangeLog EXAMPLES FAQS README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
diff --git a/net-mgmt/pmacct/distinfo b/net-mgmt/pmacct/distinfo
index 109eeb73930b..aa6e6744a342 100644
--- a/net-mgmt/pmacct/distinfo
+++ b/net-mgmt/pmacct/distinfo
@@ -1,2 +1,2 @@
-MD5 (pmacct-0.6.4p1.tar.gz) = 869ad9e366cdfcc5c3b895c7f830fddb
-SIZE (pmacct-0.6.4p1.tar.gz) = 141477
+MD5 (pmacct-0.7.0.tar.gz) = 02b7e756638da1100a25fe449faae1ed
+SIZE (pmacct-0.7.0.tar.gz) = 155161
diff --git a/net-mgmt/pmacct/pkg-descr b/net-mgmt/pmacct/pkg-descr
index 1079eeb0532d..d4838dfb0f9a 100644
--- a/net-mgmt/pmacct/pkg-descr
+++ b/net-mgmt/pmacct/pkg-descr
@@ -1,13 +1,13 @@
-pmacct is a network tool to gather ip traffic informations
-(bytes counter and number of packets); aggregation of
-statistics is done using simple primitives (MAC addresses,
+pmacct is a set of network tools to gather IP traffic
+informations (bytes counter and number of packets); aggregation
+of statistics is done using simple primitives (MAC addresses,
 source host, destination host, ports and ip protocols) that can
 be used alone or combined together to form complex aggregation
-methods; counters are either global or historical (aggregated
-and separated at fixed timeslots). Data is stored in a
-in-memory table or using a SQL database (MySQL or PostgreSQL).
-Gathering packets off the wire is done using pcap library and
-promiscuous mode of network interfaces when specifically
-required.
+methods; counters are either global or historical (broken at
+fixed timeslots). Data is either stored in a memory table,
+pulled to stdout or in a SQL database (MySQL or PostgreSQL).
+Gathering packets off the wire is done either using pcap
+library (and promiscuous mode of the listening interface) or
+reading Netflow packets coming from the network.
 
 WWW: http://www.ba.cnr.it/~paolo/pmacct/ 
diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist
index 44647b817d25..730bb66a1f5a 100644
--- a/net-mgmt/pmacct/pkg-plist
+++ b/net-mgmt/pmacct/pkg-plist
@@ -1,14 +1,18 @@
 bin/pmacct
 %%WITH_MYSQL%%bin/pmmyplay
 %%WITH_PGSQL%%bin/pmpgplay
+sbin/nfacctd
 sbin/pmacctd
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/EXAMPLES
-%%PORTDOCS%%%%DOCSDIR%%/INTERNALS
-%%PORTDOCS%%%%DOCSDIR%%/PLUGINS
+%%PORTDOCS%%%%DOCSDIR%%/FAQS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%EXAMPLESDIR%%/allow-list.example
 %%EXAMPLESDIR%%/mrtg.conf.hosts.example
 %%EXAMPLESDIR%%/mrtg.conf.ports.example
 %%EXAMPLESDIR%%/networks.example
+%%EXAMPLESDIR%%/nfacctd-print.conf.example
+%%EXAMPLESDIR%%/nfacctd-sql.conf.example
 %%EXAMPLESDIR%%/pmacctd-imt.conf.example
 %%EXAMPLESDIR%%/pmacctd-names.conf.example
 %%EXAMPLESDIR%%/pmacctd-sql.conf.example