7 files changed, 227 insertions, 124 deletions

diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index df29b780b715..dd08fcbd3c97 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -2,39 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	pmacct
-DISTVERSION=	0.14.3
-PORTREVISION=	3
+DISTVERSION=	1.6.1
+PORTREVISION=	0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.pmacct.net/ \
-		http://mirrors.rit.edu/zi/
+MASTER_SITES=	http://www.pmacct.net/
 
-MAINTAINER=	zi@FreeBSD.org
+MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Accounting and aggregation tool for IPv4 and IPv6 traffic
 
 LICENSE=	GPLv2
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-
-USE_RC_SUBR=	pmacctd
+USE_RC_SUBR=	pmacctd nfacctd sfacctd
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
-PORTSCOUT=	skipv:0.15.0
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE THREADS MMAP LAYER2 IPV6 SHARED DEBUG \
-		MONGO GEOIP DOCS
-OPTIONS_DEFAULT=MMAP LAYER2 SHARED
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3 THREADS LAYER2 IPV6 DEBUG \
+		DOCS PLABEL RABBITMQ KAFKA JANSSON AVRO
+OPTIONS_DEFAULT=MMAP LAYER2 IPV6 THREADS SHARED
 
-SQLITE_DESC=	Enable SQLite support
-MMAP_DESC=	Enable mmap(2) support
+AVRO_DESC=	Enable avro support
+JANSSON_DESC=	Enable Jansson support
+KAFKA_DESC=	Enable Kafka support
 LAYER2_DESC=	Enable Layer-2 support: MAC addresses and VLANs
-SHARED_DESC=	Enable shared objects
+# Requires libnetfilter_log port/package
+# NFLOG_DESC=	Enable NFLOG support
+# Requires legacy mongo-c-driver version 0.8 which is not available
+# MONGO_DESC=	Enable MongoDB support
+PLABEL_DESC=	Enable IP prefix labels
+RABBITMQ_DESC=	Enable RabbitMQ/AMQP support
+SQLITE3_DESC=	Enable SQLite3 support
+
+OPTIONS_RADIO=	GEOLOC
+OPTIONS_RADIO_GEOLOC=GEOIP GEOIP2
+GEOLOC_DESC=	Geolocation support
+GEOIP_DESC=	Enable legacy GeoIP support
+GEOIP2_DESC=	Enable GeoIPv2 (libmaxminddb) support
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
+USES+=		mysql
 CONFIGURE_ARGS+=--enable-mysql
 PLIST_SUB+=	WITH_MYSQL=""
 .else
@@ -44,7 +53,7 @@ PLIST_SUB+=	WITH_MYSQL="@comment "
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
-WANT_PGSQL=	lib
+WANT_PGSQL=	client
 CONFIGURE_ARGS+=--enable-pgsql
 PLIST_SUB+=	WITH_PGSQL=""
 .else
@@ -52,18 +61,14 @@ CONFIGURE_ARGS+=--disable-pgsql
 PLIST_SUB+=	WITH_PGSQL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSQLITE}
+.if ${PORT_OPTIONS:MSQLITE3}
 USES+=		sqlite
 CONFIGURE_ARGS+=--enable-sqlite3 \
 		--with-sqlite3-includes=${LOCALBASE}/include
+PLIST_SUB+=	WITH_SQLITE3=""
 .else
 CONFIGURE_ARGS+=--disable-sqlite3
-.endif
-
-.if ${PORT_OPTIONS:MMMAP}
-CONFIGURE_ARGS+=--enable-mmap
-.else
-CONFIGURE_ARGS+=--disable-mmap
+PLIST_SUB+=	WITH_SQLITE3="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLAYER2}
@@ -84,26 +89,60 @@ CONFIGURE_ARGS+=--enable-threads
 CONFIGURE_ARGS+=--disable-threads
 .endif
 
-.if empty(PORT_OPTIONS:MSHARED)
-CONFIGURE_ARGS+=--disable-so
-.endif
-
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
-.if ${PORT_OPTIONS:MMONGO}
-LIB_DEPENDS+=	libmongoc.so:devel/mongo-c-driver
-CONFIGURE_ARGS+=--enable-mongodb \
-		--with-mongodb-libs=${LOCALBASE}/lib \
-		--with-mongodb-includes=${LOCALBASE}/include
+#.if ${PORT_OPTIONS:MMONGO}
+#CONFIGURE_ARGS+=--enable-mongodb
+#.endif
+
+.if ${PORT_OPTIONS:MRABBITMQ}
+.if ${PORT_OPTIONS:MJANSSON}
+LIB_DEPENDS+=	libjansson.so:devel/jansson
+CONFIGURE_ARGS+=--enable-jansson
+.else
+IGNORE=		RabbitMQ support requires enabled Jansson support
+.endif
+LIB_DEPENDS+=	librabbitmq.so:net/rabbitmq-c-devel
+CONFIGURE_ARGS+=--enable-rabbitmq
 .endif
 
+.if ${PORT_OPTIONS:MKAFKA}
+.if ${PORT_OPTIONS:MJANSSON}
+LIB_DEPENDS+=	libjansson.so:devel/jansson
+CONFIGURE_ARGS+=--enable-jansson
+.else
+IGNORE=		Kafaka support requires enabled Jansson support
+.endif
+LIB_DEPENDS+=	librdkafka.so:net/librdkafka
+CONFIGURE_ARGS+=--enable-kafka
+PLIST_SUB+=WITH_KAFKA=""
+.else
+PLIST_SUB+=WITH_KAFKA="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MAVRO}
+LIB_DEPENDS+=	libavro.so:devel/avro-c
+CONFIGURE_ARGS+=--enable-avro
+.endif
+
+#.if ${PORT_OPTIONS:MNFLOG}
+#CONFIGURE_ARGS+=--enable-nflog
+#PLIST_SUB+=WITH_NFLOG=""
+#.else
+CONFIGURE_ARGS+=--disable-nflog
+PLIST_SUB+=WITH_NFLOG="@comment "
+#.endif
+
 .if ${PORT_OPTIONS:MGEOIP}
 LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
-CONFIGURE_ARGS+=--enable-geoip \
-		--with-geoip-libs=${LOCALBASE}/lib \
-		--with-geoip-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=--enable-geoip
+.endif
+
+.if ${PORT_OPTIONS:MGEOIP2}
+LIB_DEPENDS+=	libmaxminddb.so:net/libmaxminddb
+CONFIGURE_ARGS+=--enable-geoipv2
 .endif
 
 .include <bsd.port.pre.mk>
@@ -117,10 +156,10 @@ post-patch:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-.for i in ChangeLog FAQS README TOOLS CONFIG-KEYS KNOWN-BUGS
+.for i in AUTHORS CONFIG-KEYS COPYING ChangeLog FAQS INSTALL QUICKSTART TOOLS UPGRADE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/net-mgmt/pmacct/distinfo b/net-mgmt/pmacct/distinfo
index d4fc466f55b6..093ee8276804 100644
--- a/net-mgmt/pmacct/distinfo
+++ b/net-mgmt/pmacct/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pmacct-0.14.3.tar.gz) = c3197dcb21b131da82eaaecc9dccbff894c35bf1cb74214e93ae1e7c1bdef50e
-SIZE (pmacct-0.14.3.tar.gz) = 746387
+TIMESTAMP = 1490125463
+SHA256 (pmacct-1.6.1.tar.gz) = eb332a6812d1e02134900a1d115a24f315de7c861a9b63093c1226753486cbe7
+SIZE (pmacct-1.6.1.tar.gz) = 1280968
diff --git a/net-mgmt/pmacct/files/nfacctd.in b/net-mgmt/pmacct/files/nfacctd.in
new file mode 100644
index 000000000000..5a75e6ea20d7
--- /dev/null
+++ b/net-mgmt/pmacct/files/nfacctd.in
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: nfacctd
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable nfacctd:
+#
+# nfacctd_enable="YES"
+#
+# You can define flags for nfacctd running. 
+# See http://wiki.pmacct.net/OfficialConfigKeys for more details.
+#
+# Example:
+# nfacctd_flags="-f %%PREFIX%%/etc/nfacctd.conf -P mysql"
+#
+# Default flags: -f %%PREFIX%%/etc/nfacctd.conf
+#
+
+. /etc/rc.subr
+
+name=nfacctd
+rcvar=nfacctd_enable
+
+command=%%PREFIX%%/sbin/$name
+command_args="-D"
+
+# set defaults
+
+nfacctd_enable=${nfacctd_enable:-"NO"}
+nfacctd_flags=${nfacctd_flags:-"-f %%PREFIX%%/etc/nfacctd.conf"}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net-mgmt/pmacct/files/patch-src__pretag_handlers.c b/net-mgmt/pmacct/files/patch-src__pretag_handlers.c
deleted file mode 100644
index e7ee036bca96..000000000000
--- a/net-mgmt/pmacct/files/patch-src__pretag_handlers.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./src/pretag_handlers.c.orig	2012-08-03 23:29:51.000000000 -0400
-+++ ./src/pretag_handlers.c	2012-08-03 23:30:23.000000000 -0400
-@@ -1067,7 +1067,7 @@
-   if (entry->last_matched == PRETAG_BGP_NEXTHOP) return FALSE;
- 
-   /* check network-related primitives against fallback scenarios */
--  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return;
-+  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return 0;
- 
-   switch(hdr->version) {
-   case 9:
-@@ -1100,7 +1100,7 @@
-   int ret = -1;
- 
-   /* check network-related primitives against fallback scenarios */
--  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_BGP)) return;
-+  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_BGP)) return 0;
- 
-   if (dst_ret) {
-     if (pptrs->bgp_nexthop_info)
-@@ -1660,7 +1660,7 @@
-   SFSample *sample = (SFSample *) pptrs->f_data;
- 
-   /* check network-related primitives against fallback scenarios */
--  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return;
-+  if (!evaluate_lm_method(pptrs, TRUE, config.nfacctd_net, NF_NET_KEEP)) return 0;
- 
-   if (entry->bgp_nexthop.a.family == AF_INET) {
-     if (!memcmp(&entry->bgp_nexthop.a.address.ipv4, &sample->bgp_nextHop.address.ip_v4, 4)) return (FALSE | entry->bgp_nexthop.neg);
diff --git a/net-mgmt/pmacct/files/pmacctd.in b/net-mgmt/pmacct/files/pmacctd.in
index 3aea0939e5c7..2ecf396fb05d 100644
--- a/net-mgmt/pmacct/files/pmacctd.in
+++ b/net-mgmt/pmacct/files/pmacctd.in
@@ -12,7 +12,8 @@
 #
 # pmacctd_enable="YES"
 #
-# You can define flags for pmacctd running. See pmacctd(8) for details.
+# You can define flags for pmacctd running. 
+# See http://wiki.pmacct.net/OfficialConfigKeys for more details.
 #
 # Example:
 # pmacctd_flags="-f %%PREFIX%%/etc/pmacctd.conf -i em0"
diff --git a/net-mgmt/pmacct/files/sfacctd.in b/net-mgmt/pmacct/files/sfacctd.in
new file mode 100644
index 000000000000..a8236c879523
--- /dev/null
+++ b/net-mgmt/pmacct/files/sfacctd.in
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: sfacctd
+# REQUIRE: NETWORKING
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable sfacctd:
+#
+# sfacctd_enable="YES"
+#
+# You can define flags for sfacctd running. 
+# See http://wiki.pmacct.net/OfficialConfigKeys for more details.
+#
+# Example:
+# sfacctd_flags="-f %%PREFIX%%/etc/sfacctd.conf -P mysql"
+#
+# Default flags: -f %%PREFIX%%/etc/sfacctd.conf
+#
+
+. /etc/rc.subr
+
+name=sfacctd
+rcvar=sfacctd_enable
+
+command=%%PREFIX%%/sbin/$name
+command_args="-D"
+
+# set defaults
+
+sfacctd_enable=${sfacctd_enable:-"NO"}
+sfacctd_flags=${sfacctd_flags:-"-f %%PREFIX%%/etc/sfacctd.conf"}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net-mgmt/pmacct/pkg-plist b/net-mgmt/pmacct/pkg-plist
index c3a2103900ff..008d0e8a6afb 100644
--- a/net-mgmt/pmacct/pkg-plist
+++ b/net-mgmt/pmacct/pkg-plist
@@ -1,70 +1,34 @@
 bin/pmacct
-%%WITH_MYSQL%%bin/pmmyplay
-%%WITH_PGSQL%%bin/pmpgplay
 sbin/nfacctd
 sbin/pmacctd
+sbin/pmbgpd
+sbin/pmbmpd
+sbin/pmtelemetryd
 sbin/sfacctd
-sbin/uacctd
-%%DATADIR%%/README.64bit
-%%DATADIR%%/README.IPv6
-%%DATADIR%%/README.agent_id2
-%%DATADIR%%/README.country
-%%DATADIR%%/README.cos
-%%DATADIR%%/README.etype
-%%DATADIR%%/README.iface
-%%DATADIR%%/README.mask
-%%DATADIR%%/README.mpls_vpn_rd
-%%DATADIR%%/README.mysql
-%%DATADIR%%/README.nat
-%%DATADIR%%/README.pgsql
-%%DATADIR%%/README.pkt_len_distrib
-%%DATADIR%%/README.sampling_rate
-%%DATADIR%%/README.sqlite3
-%%DATADIR%%/README.timestamp
-%%DATADIR%%/pmacct-create-db.pgsql
-%%DATADIR%%/pmacct-create-db_bgp_v1.mysql
-%%DATADIR%%/pmacct-create-db_v1.mysql
-%%DATADIR%%/pmacct-create-db_v2.mysql
-%%DATADIR%%/pmacct-create-db_v3.mysql
-%%DATADIR%%/pmacct-create-db_v4.mysql
-%%DATADIR%%/pmacct-create-db_v5.mysql
-%%DATADIR%%/pmacct-create-db_v6.mysql
-%%DATADIR%%/pmacct-create-db_v7.mysql
-%%DATADIR%%/pmacct-create-db_v8.mysql
-%%DATADIR%%/pmacct-create-table_bgp_v1.pgsql
-%%DATADIR%%/pmacct-create-table_bgp_v1.sqlite3
-%%DATADIR%%/pmacct-create-table_v1.pgsql
-%%DATADIR%%/pmacct-create-table_v1.sqlite3
-%%DATADIR%%/pmacct-create-table_v2.pgsql
-%%DATADIR%%/pmacct-create-table_v2.sqlite3
-%%DATADIR%%/pmacct-create-table_v3.pgsql
-%%DATADIR%%/pmacct-create-table_v3.sqlite3
-%%DATADIR%%/pmacct-create-table_v4.pgsql
-%%DATADIR%%/pmacct-create-table_v4.sqlite3
-%%DATADIR%%/pmacct-create-table_v5.pgsql
-%%DATADIR%%/pmacct-create-table_v5.sqlite3
-%%DATADIR%%/pmacct-create-table_v6.pgsql
-%%DATADIR%%/pmacct-create-table_v6.sqlite3
-%%DATADIR%%/pmacct-create-table_v7.pgsql
-%%DATADIR%%/pmacct-create-table_v7.sqlite3
-%%DATADIR%%/pmacct-create-table_v8.sqlite3
-%%DATADIR%%/pmacct-grant-db.mysql
+%%WITH_NFLOG%%sbin/uacctd
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CONFIG-KEYS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TOOLS
-%%PORTDOCS%%%%DOCSDIR%%/CONFIG-KEYS
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN-BUGS
 %%PORTDOCS%%%%DOCSDIR%%/INTERNALS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/IPFIX
+%%PORTDOCS%%%%DOCSDIR%%/MSGLOG_DUMP_FORMATS
 %%PORTDOCS%%%%DOCSDIR%%/PLUGINS
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
 %%PORTDOCS%%%%DOCSDIR%%/SIGNALS
+%%PORTDOCS%%%%DOCSDIR%%/TOOLS
 %%PORTDOCS%%%%DOCSDIR%%/TRIGGER_VARS
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/agent_to_peer.map.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp_md5.lst.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/allow-list.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iface_to_rd.map.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/amqp/amqp_receiver.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgp_md5.lst.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flow_to_rd.map.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot-example.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot.script.example
+%%WITH_KAFKA%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kafka/kafka_consumer.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lpref.map.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/med.map.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mrtg-example.sh
@@ -78,11 +42,62 @@ sbin/uacctd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-multiple-plugins.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sql_v1.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sql_v2.conf.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sqlite3_v4.conf.example
+%%WITH_SQLITE3%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pmacctd-sqlite3_v4.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ports.lst.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pretag.map.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/primitives.lst.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/probe_netflow.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/probe_sflow.conf.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rrdtool-example.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sampling.map.example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tee_receivers.lst.example
+%%DATADIR%%/README.64bit
+%%DATADIR%%/README.IPv6
+%%DATADIR%%/README.cos
+%%DATADIR%%/README.country
+%%DATADIR%%/README.custom_primitives
+%%DATADIR%%/README.etype
+%%DATADIR%%/README.export_proto
+%%DATADIR%%/README.iface
+%%DATADIR%%/README.label
+%%DATADIR%%/README.mask
+%%DATADIR%%/README.mpls
+%%WITH_MYSQL%%%%DATADIR%%/README.mysql
+%%DATADIR%%/README.nat
+%%WITH_PGSQL%%%%DATADIR%%/README.pgsql
+%%DATADIR%%/README.pkt_len_distrib
+%%DATADIR%%/README.sampling_rate
+%%WITH_SQLITE3%%%%DATADIR%%/README.sqlite3
+%%DATADIR%%/README.tag2
+%%DATADIR%%/README.timestamp
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-db.pgsql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_bgp_v1.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v1.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v2.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v3.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v4.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v5.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v6.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v7.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v8.mysql
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-create-db_v9.mysql
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_bgp_v1.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_bgp_v1.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v1.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v1.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v2.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v2.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v3.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v3.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v4.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v4.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v5.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v5.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v6.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v6.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v7.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v7.sqlite3
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v8.sqlite3
+%%WITH_PGSQL%%%%DATADIR%%/pmacct-create-table_v9.pgsql
+%%WITH_SQLITE3%%%%DATADIR%%/pmacct-create-table_v9.sqlite3
+%%WITH_MYSQL%%%%DATADIR%%/pmacct-grant-db.mysql