UPDATE: net/pmacct

Dear all,

This upgrades pmacct to 1.7.0, the latest stable version. I've only very
lightly tested this. patches/patch-src_network_h can be deleted.

Kind regards,

Job

---
net/pmacct/Makefile | 5 ++---
net/pmacct/distinfo | 4 ++--
net/pmacct/patches/patch-configure_in | 36 +++++++++++++++-------------------
net/pmacct/patches/patch-src_network_h | 12 ------------
net/pmacct/pkg/PFRAG.mysql | 1 -
net/pmacct/pkg/PFRAG.postgresql | 1 -
net/pmacct/pkg/PLIST | 3 +--
7 files changed, 21 insertions(+), 41 deletions(-)
delete mode 100644 net/pmacct/patches/patch-src_network_h

diff --git net/pmacct/Makefile net/pmacct/Makefile
index ae9cc69b5d5..d5d887f3ec0 100644
--- net/pmacct/Makefile
+++ net/pmacct/Makefile
@@ -2,8 +2,7 @@

COMMENT= IP accounting software

-DISTNAME= pmacct-1.5.3
-REVISION= 1
+DISTNAME= pmacct-1.7.0
CATEGORIES= net

HOMEPAGE= http://www.pmacct.net/
@@ -17,7 +16,7 @@ MASTER_SITES= ${HOMEPAGE}

NO_TEST= Yes
CONFIGURE_STYLE= autoconf no-autoheader
-AUTOCONF_VERSION= 2.13
+AUTOCONF_VERSION= 2.69
USE_GMAKE= Yes
CONFIGURE_ARGS= --enable-ipv6 \
--enable-sqlite3 \
diff --git net/pmacct/distinfo net/pmacct/distinfo
index 98d957f139e..6ef9f0baee4 100644
--- net/pmacct/distinfo
+++ net/pmacct/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pmacct-1.5.3.tar.gz) = LvdkaCgWjrXlzBxct20guajKBergvzT8Jr6++/ksM6Q=
-SIZE (pmacct-1.5.3.tar.gz) = 920563
+SHA256 (pmacct-1.7.0.tar.gz) = 19c3795db452191c2b1b9533fecaf69c6767c9fb7b4ae60ae3f28e24eb2ee9c8
+SIZE (pmacct-1.7.0.tar.gz) = 1351888
diff --git net/pmacct/patches/patch-configure_in net/pmacct/patches/patch-configure_in
index a9ff5d7ca7c..dd5e37cb47c 100644
--- net/pmacct/patches/patch-configure_in
+++ net/pmacct/patches/patch-configure_in
@@ -1,21 +1,17 @@
-$OpenBSD: patch-configure_in,v 1.2 2016/06/02 11:52:32 sthen Exp $
---- configure.in.orig Thu Jan 14 11:55:01 2016
-+++ configure.in Sat May 21 11:35:39 2016
-@@ -25,7 +25,6 @@ AC_PROG_RANLIB
- dnl initial checks; tweakings to CFLAGS and LDFLAGS
- dnl see final checks for tweakings to LIBS
- if test "x$ac_cv_prog_gcc" = xyes ; then
-- CFLAGS="-O2 ${CFLAGS}"
- case "$host_os" in
- IRIX*)
- CFLAGS="-mabi=n32 -fno-builtins"
-@@ -542,9 +541,6 @@ AC_ARG_ENABLE(mysql,
- # Adding these as prerequisite for MySQL 5.6
- AC_CHECK_LIB([stdc++], [main], [LIBS="${LIBS} -lstdc++"], [AC_MSG_ERROR([
- ERROR: missing libstdc++ devel. Requirement for building MySQL.
-- ])])
-- AC_CHECK_LIB([rt], [clock_gettime], [LIBS="${LIBS} -lrt"], [AC_MSG_ERROR([
-- ERROR: missing librt devel. Requirement for building MySQL.
- ])])
+diff --git configure.ac configure.ac
+index c22d91e..aacb5b1 100644
+--- configure.ac
++++ configure.ac
+@@ -26,12 +26,6 @@ AC_MSG_RESULT($host_os)
+ AC_MSG_CHECKING(hardware)
+ AC_MSG_RESULT($host_cpu)

- AC_ARG_WITH(mysql-includes,
+-dnl initial checks; tweakings to CFLAGS and LDFLAGS
+-dnl see final checks for tweakings to LIBS
+-if test "x$ac_cv_prog_gcc" = xyes ; then
+- CFLAGS="-O2 ${CFLAGS}"
+-fi
+-
+ dnl set debug level
+ AC_MSG_CHECKING([whether to enable debugging compiler options])
+ AC_ARG_ENABLE(debug,
diff --git net/pmacct/patches/patch-src_network_h net/pmacct/patches/patch-src_network_h
deleted file mode 100644
index 37e67b65953..00000000000
--- net/pmacct/patches/patch-src_network_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_network_h,v 1.1 2014/03/22 23:05:43 sthen Exp $
---- src/network.h.orig Sun Mar 16 01:45:27 2014
-+++ src/network.h Sun Mar 16 01:45:44 2014
-@@ -230,7 +230,7 @@ struct my_icmphdr
- u_int32_t gateway; /* gateway address */
- struct
- {
-- u_int16_t __unused;
-+ u_int16_t __dummy;
- u_int16_t mtu;
- } frag; /* path mtu discovery */
- } un;
diff --git net/pmacct/pkg/PFRAG.mysql net/pmacct/pkg/PFRAG.mysql
index bddc47587fe..64928128cf4 100644
--- net/pmacct/pkg/PFRAG.mysql
+++ net/pmacct/pkg/PFRAG.mysql
@@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.mysql,v 1.4 2016/06/02 11:52:32 sthen Exp $
-@bin bin/pmmyplay
share/doc/pmacct/README.mysql
share/examples/pmacct/sql/pmacct-create-db_bgp_v1.mysql
share/examples/pmacct/sql/pmacct-create-db_v1.mysql
diff --git net/pmacct/pkg/PFRAG.postgresql net/pmacct/pkg/PFRAG.postgresql
index 45ff0a31dde..ff62d9edbb4 100644
--- net/pmacct/pkg/PFRAG.postgresql
+++ net/pmacct/pkg/PFRAG.postgresql
@@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.postgresql,v 1.4 2016/06/02 11:52:32 sthen Exp $
-@bin bin/pmpgplay
share/doc/pmacct/README.pgsql
share/examples/pmacct/sql/pmacct-create-db.pgsql
share/examples/pmacct/sql/pmacct-create-table_bgp_v1.pgsql
diff --git net/pmacct/pkg/PLIST net/pmacct/pkg/PLIST
index 8b0c1ec7dd7..d8983083585 100644
--- net/pmacct/pkg/PLIST
+++ net/pmacct/pkg/PLIST
@@ -6,7 +6,6 @@
@bin sbin/sfacctd
%%mysql%%
%%postgresql%%
-@bin sbin/uacctd
share/doc/pmacct/
share/doc/pmacct/CONFIG-KEYS
share/doc/pmacct/FAQS
@@ -17,7 +16,7 @@ share/doc/pmacct/QUICKSTART
share/doc/pmacct/README.64bit
share/doc/pmacct/README.IPv6
share/doc/pmacct/README.cos
-share/doc/pmacct/README.country
+share/doc/pmacct/README.GeoIP
share/doc/pmacct/README.custom_primitives
share/doc/pmacct/README.etype
share/doc/pmacct/README.iface