- Update net/ndpi to 2.2 (latest snapshot)

- Update net/ntopng to 3.2 (latest snapshot)
- For ndpi reapply commit reverted upstream to avoid installing
  include file with wrong relative path
- For ntopng use embedded luajit, it requires a newer (beta) version
  than what we have in the tree

5 files changed, 91 insertions, 64 deletions

diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 11efd9531547..755d48f74d30 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntopng
-PORTVERSION=	3.0.2017.11.02
+PORTVERSION=	3.2.2017.12.06
 CATEGORIES=	net
 
 MAINTAINER=	madpilot@FreeBSD.org
@@ -12,7 +12,6 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool \
-		libluajit-5.1.so:lang/luajit \
 		libzmq.so:net/libzmq4 \
 		libcurl.so:ftp/curl \
 		libndpi.so:net/ndpi \
@@ -32,7 +31,7 @@ GROUPS=		ntopng
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	f0c02af
+GH_TAGNAME=	8c03024
 
 CPE_VENDOR=	ntop
 
@@ -50,6 +49,8 @@ USE_RC_SUBR=	ntopng
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/configure.seed
+	@${REINPLACE_CMD} -e 's|^\(export PREFIX=\).*|\1 ${PREFIX}|' \
+		${WRKSRC}/third-party/LuaJIT-2.1.0-beta3/Makefile
 	cd ${WRKSRC} && ${SH} autogen.sh
 
 post-install:
diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo
index e07e10595b1d..5a696ccc718b 100644
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510582787
-SHA256 (ntop-ntopng-3.0.2017.11.02-f0c02af_GH0.tar.gz) = 93b345190cfa07d13d88d9b5ad41037b40989cd04156f5e9760a9893a890aac6
-SIZE (ntop-ntopng-3.0.2017.11.02-f0c02af_GH0.tar.gz) = 23022605
+TIMESTAMP = 1512577994
+SHA256 (ntop-ntopng-3.2.2017.12.06-8c03024_GH0.tar.gz) = f38c590b6daeb0e1fb0ab21caf276b30465412a351f6d792ebd51e4d45ef5fc6
+SIZE (ntop-ntopng-3.2.2017.12.06-8c03024_GH0.tar.gz) = 24195494
diff --git a/net/ntopng/files/patch-Makefile.in b/net/ntopng/files/patch-Makefile.in
index 9819175dea33..e97ef69aad77 100644
--- a/net/ntopng/files/patch-Makefile.in
+++ b/net/ntopng/files/patch-Makefile.in
@@ -1,8 +1,18 @@
---- Makefile.in.orig	2017-08-12 15:15:33 UTC
+--- Makefile.in.orig	2017-12-06 11:11:19 UTC
 +++ Makefile.in
-@@ -89,7 +89,7 @@ endif
- HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
- ifeq ($(HAS_ZEROMQ), 0)
+@@ -34,7 +34,8 @@ LIBPCAP=-lpcap
+ MONGOOSE_HOME=${PWD}/third-party/mongoose
+ MONGOOSE_INC=-I$(MONGOOSE_HOME)
+ ######
+-HAS_LUAJIT=$(shell pkg-config --exists luajit; echo $$?)
++# Force using embedded luajit
++HAS_LUAJIT=1
+ ifeq ($(HAS_LUAJIT), 0)
+ 	LUAJIT_INC = $(shell pkg-config --cflags luajit)
+ 	LUAJIT_LIB = $(shell pkg-config --libs luajit)
+@@ -91,7 +92,7 @@ ifeq (@NEDGE@, 0)
+  HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?)
+  ifeq ($(HAS_ZEROMQ), 0)
  	ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
 -	ZMQ_STATIC=/usr/local/lib/libzmq.a
 +	ZMQ_STATIC=/nonexistent
diff --git a/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile b/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile
new file mode 100644
index 000000000000..ab4681b8a090
--- /dev/null
+++ b/net/ntopng/files/patch-third-party_LuaJIT-2.1.0-beta3_src_Makefile
@@ -0,0 +1,23 @@
+--- third-party/LuaJIT-2.1.0-beta3/src/Makefile.orig	2017-12-04 09:31:02 UTC
++++ third-party/LuaJIT-2.1.0-beta3/src/Makefile
+@@ -24,7 +24,7 @@ NODOTABIVER= 51
+ # removing the '#' in front of them. Make sure you force a full recompile
+ # with "make clean", followed by "make" if you change any options.
+ #
+-DEFAULT_CC = gcc
++DEFAULT_CC = cc
+ #
+ # LuaJIT builds as a native 32 or 64 bit binary by default.
+ CC= $(DEFAULT_CC)
+@@ -585,9 +585,9 @@ endif
+ endif
+ endif
+ 
+-Q= @
++#Q= @
+ E= @echo
+-#Q=
++Q=
+ #E= @:
+ 
+ ##############################################################################
diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist
index 0431c4b6ed26..b4e6b5fa6525 100644
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@@ -11,7 +11,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/bootstrap/fonts/glyphicons-halflings-regular.woff
 %%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings-white.png
 %%DATADIR%%/httpdocs/bootstrap/img/glyphicons-halflings.png
-%%DATADIR%%/httpdocs/bootstrap/js/bootstrap.js
 %%DATADIR%%/httpdocs/css/Rickshaw/detail.css
 %%DATADIR%%/httpdocs/css/Rickshaw/graph.css
 %%DATADIR%%/httpdocs/css/Rickshaw/legend.css
@@ -20,7 +19,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/css/bootstrap-nav-wizard.css
 %%DATADIR%%/httpdocs/css/bootstrap-slider.css
 %%DATADIR%%/httpdocs/css/bubble-chart.css
-%%DATADIR%%/httpdocs/css/c3.css
 %%DATADIR%%/httpdocs/css/cal-heatmap.css
 %%DATADIR%%/httpdocs/css/cubism.css
 %%DATADIR%%/httpdocs/css/datepicker.css
@@ -45,7 +43,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/css/nv.d3.css
 %%DATADIR%%/httpdocs/css/pagingbar.css
 %%DATADIR%%/httpdocs/css/pie-chart.css
-%%DATADIR%%/httpdocs/css/prettify.css
 %%DATADIR%%/httpdocs/css/rickshaw.css
 %%DATADIR%%/httpdocs/css/sequence_sunburst.css
 %%DATADIR%%/httpdocs/css/tablesorted.css
@@ -132,86 +129,65 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/img/throbber.gif
 %%DATADIR%%/httpdocs/img/warning.png
 %%DATADIR%%/httpdocs/inc/as_stats_id.inc
-%%DATADIR%%/httpdocs/inc/as_stats_top.inc
-%%DATADIR%%/httpdocs/inc/community_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/community_stats_id.inc
-%%DATADIR%%/httpdocs/inc/community_stats_top.inc
 %%DATADIR%%/httpdocs/inc/country_stats_id.inc
-%%DATADIR%%/httpdocs/inc/country_stats_top.inc
 %%DATADIR%%/httpdocs/inc/flows_stats_id.inc
 %%DATADIR%%/httpdocs/inc/geolocation_disclaimer.inc
 %%DATADIR%%/httpdocs/inc/header-minimal.inc
 %%DATADIR%%/httpdocs/inc/header.inc
 %%DATADIR%%/httpdocs/inc/host_to_server_id.inc
 %%DATADIR%%/httpdocs/inc/host_to_server_top.inc
-%%DATADIR%%/httpdocs/inc/hosts_stats_bottom.inc
 %%DATADIR%%/httpdocs/inc/hosts_stats_id.inc
-%%DATADIR%%/httpdocs/inc/hosts_stats_top.inc
 %%DATADIR%%/httpdocs/inc/http_servers_stats_id.inc
-%%DATADIR%%/httpdocs/inc/http_servers_stats_top.inc
 %%DATADIR%%/httpdocs/inc/index_TopASNs.inc
 %%DATADIR%%/httpdocs/inc/index_TopApplications.inc
 %%DATADIR%%/httpdocs/inc/index_TopFlowSenders.inc
 %%DATADIR%%/httpdocs/inc/index_TopHosts.inc
 %%DATADIR%%/httpdocs/inc/index_TopPorts.inc
-%%DATADIR%%/httpdocs/inc/mac_stats_bottom.inc
 %%DATADIR%%/httpdocs/inc/mac_stats_id.inc
-%%DATADIR%%/httpdocs/inc/mac_stats_top.inc
-%%DATADIR%%/httpdocs/inc/network_stats_bottom.inc
 %%DATADIR%%/httpdocs/inc/network_stats_id.inc
-%%DATADIR%%/httpdocs/inc/network_stats_top.inc
 %%DATADIR%%/httpdocs/inc/os_stats_id.inc
-%%DATADIR%%/httpdocs/inc/os_stats_top.inc
 %%DATADIR%%/httpdocs/inc/pool_stats_id.inc
-%%DATADIR%%/httpdocs/inc/pool_stats_top.inc
-%%DATADIR%%/httpdocs/inc/processes_stats_bottom.inc
 %%DATADIR%%/httpdocs/inc/processes_stats_id.inc
-%%DATADIR%%/httpdocs/inc/processes_stats_top.inc
-%%DATADIR%%/httpdocs/inc/sflows_stats_bottom.inc
-%%DATADIR%%/httpdocs/inc/sflows_stats_top.inc
 %%DATADIR%%/httpdocs/inc/sprobe_process.inc
 %%DATADIR%%/httpdocs/inc/sprobe_process_header.inc
 %%DATADIR%%/httpdocs/inc/vlan_stats_id.inc
-%%DATADIR%%/httpdocs/inc/vlan_stats_top.inc
+%%DATADIR%%/httpdocs/js/Makefile
 %%DATADIR%%/httpdocs/js/README.gauge
 %%DATADIR%%/httpdocs/js/ays_utils.js
 %%DATADIR%%/httpdocs/js/bootstrap-datatable.js
 %%DATADIR%%/httpdocs/js/bootstrap-datetimepicker.js
 %%DATADIR%%/httpdocs/js/bootstrap-slider.js
-%%DATADIR%%/httpdocs/js/bootstrap.ajaxpager-0.8.js
+%%DATADIR%%/httpdocs/js/bootstrap.js
 %%DATADIR%%/httpdocs/js/bootstrap3-typeahead.js
 %%DATADIR%%/httpdocs/js/bubble-chart.js
-%%DATADIR%%/httpdocs/js/c3.js
 %%DATADIR%%/httpdocs/js/cal-heatmap.js
-%%DATADIR%%/httpdocs/js/cpu_bar.js
 %%DATADIR%%/httpdocs/js/crossfilter.js
 %%DATADIR%%/httpdocs/js/cubism.v1.js
 %%DATADIR%%/httpdocs/js/cubism_ntop.v1.js
 %%DATADIR%%/httpdocs/js/d3.v3.js
 %%DATADIR%%/httpdocs/js/datatable_utils.js
 %%DATADIR%%/httpdocs/js/dc.js
+%%DATADIR%%/httpdocs/js/deps.min.js
+%%DATADIR%%/httpdocs/js/deps.min.js.map
 %%DATADIR%%/httpdocs/js/gauge.js
 %%DATADIR%%/httpdocs/js/googleMapJson.js
-%%DATADIR%%/httpdocs/js/handlebars-1.0.0.0.beta.6.js
-%%DATADIR%%/httpdocs/js/highlight.js
 %%DATADIR%%/httpdocs/js/html5shiv.js
 %%DATADIR%%/httpdocs/js/jquery-ui.js
 %%DATADIR%%/httpdocs/js/jquery.are-you-sure.js
 %%DATADIR%%/httpdocs/js/jquery.bootstrap-duallistbox.js
-%%DATADIR%%/httpdocs/js/jquery.form.js
 %%DATADIR%%/httpdocs/js/jquery.js
 %%DATADIR%%/httpdocs/js/jquery.peity.js
-%%DATADIR%%/httpdocs/js/jquery.sparkline.js
 %%DATADIR%%/httpdocs/js/jquery.tablesorter.js
-%%DATADIR%%/httpdocs/js/line-graph.js
+%%DATADIR%%/httpdocs/js/jquery_bootstrap.min.js
+%%DATADIR%%/httpdocs/js/jquery_bootstrap.min.js.map
 %%DATADIR%%/httpdocs/js/markerclusterer.js
-%%DATADIR%%/httpdocs/js/matrix_volume.js
 %%DATADIR%%/httpdocs/js/moment.js
+%%DATADIR%%/httpdocs/js/ntop.min.js
+%%DATADIR%%/httpdocs/js/ntop.min.js.map
 %%DATADIR%%/httpdocs/js/ntopng_utils.js
 %%DATADIR%%/httpdocs/js/nv.d3.js
 %%DATADIR%%/httpdocs/js/pdfmake.js
 %%DATADIR%%/httpdocs/js/pie-chart.js
-%%DATADIR%%/httpdocs/js/prettify.js
 %%DATADIR%%/httpdocs/js/rickshaw.js
 %%DATADIR%%/httpdocs/js/ripe_widget_api.js
 %%DATADIR%%/httpdocs/js/sankey.js
@@ -224,6 +200,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/misc/ntopng-add-user.sh
 %%DATADIR%%/httpdocs/misc/ntopng_template_elk.json
 %%DATADIR%%/httpdocs/other/EtherOUI.txt
+%%DATADIR%%/httpdocs/other/trackers.txt
 %%DATADIR%%/httpdocs/ssl/README
 %%DATADIR%%/httpdocs/ssl/ntopng-cert.pem.dummy
 %%DATADIR%%/httpdocs/templates/modal_confirm_dialog.html
@@ -231,13 +208,19 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/typeahead_input.html
 %%DATADIR%%/httpdocs/templates/wizard_dialog.html
 %%DATADIR%%/httpdocs/test.lp
-%%DATADIR%%/scripts/callbacks/5min.lua
-%%DATADIR%%/scripts/callbacks/daily.lua
-%%DATADIR%%/scripts/callbacks/hourly.lua
-%%DATADIR%%/scripts/callbacks/housekeeping.lua
-%%DATADIR%%/scripts/callbacks/minute.lua
-%%DATADIR%%/scripts/callbacks/second.lua
-%%DATADIR%%/scripts/callbacks/startup.lua
+%%DATADIR%%/scripts/callbacks/interface/5min.lua
+%%DATADIR%%/scripts/callbacks/interface/daily.lua
+%%DATADIR%%/scripts/callbacks/interface/hourly.lua
+%%DATADIR%%/scripts/callbacks/interface/minute.lua
+%%DATADIR%%/scripts/callbacks/system/5min.lua
+%%DATADIR%%/scripts/callbacks/system/boot.lua
+%%DATADIR%%/scripts/callbacks/system/daily.lua
+%%DATADIR%%/scripts/callbacks/system/discover.lua
+%%DATADIR%%/scripts/callbacks/system/housekeeping.lua
+%%DATADIR%%/scripts/callbacks/system/minute.lua
+%%DATADIR%%/scripts/callbacks/system/second.lua
+%%DATADIR%%/scripts/callbacks/system/shutdown.lua
+%%DATADIR%%/scripts/callbacks/system/startup.lua
 %%DATADIR%%/scripts/callbacks/user_scripts/inline/default.lua
 %%DATADIR%%/scripts/callbacks/user_scripts/loader.lua
 %%DATADIR%%/scripts/callbacks/user_scripts/periodic/default.lua
@@ -248,19 +231,24 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/admin/add_user.lua
 %%DATADIR%%/scripts/lua/admin/change_user_prefs.lua
 %%DATADIR%%/scripts/lua/admin/delete_user.lua
+%%DATADIR%%/scripts/lua/admin/edit_ndpi_applications.lua
+%%DATADIR%%/scripts/lua/admin/get_ndpi_applications.lua
 %%DATADIR%%/scripts/lua/admin/get_user_info.lua
 %%DATADIR%%/scripts/lua/admin/get_users.lua
 %%DATADIR%%/scripts/lua/admin/host_pools.lua
+%%DATADIR%%/scripts/lua/admin/manage_pool_members.lua
 %%DATADIR%%/scripts/lua/admin/password_reset.lua
 %%DATADIR%%/scripts/lua/admin/prefs.lua
 %%DATADIR%%/scripts/lua/admin/users.lua
 %%DATADIR%%/scripts/lua/admin/validate_new_user.lua
+%%DATADIR%%/scripts/lua/as_details.lua
 %%DATADIR%%/scripts/lua/as_stats.lua
 %%DATADIR%%/scripts/lua/authorize_captive.lua
 %%DATADIR%%/scripts/lua/captive_portal.lua
 %%DATADIR%%/scripts/lua/change_password.lua
 %%DATADIR%%/scripts/lua/check_update.lua
 %%DATADIR%%/scripts/lua/country_stats.lua
+%%DATADIR%%/scripts/lua/discover.lua
 %%DATADIR%%/scripts/lua/do_export_data.lua
 %%DATADIR%%/scripts/lua/examples/debug.lua
 %%DATADIR%%/scripts/lua/examples/hello_world.lua
@@ -268,6 +256,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/examples/ntop.lua
 %%DATADIR%%/scripts/lua/examples/sqlite.lua
 %%DATADIR%%/scripts/lua/export_data.lua
+%%DATADIR%%/scripts/lua/find_app.lua
 %%DATADIR%%/scripts/lua/find_host.lua
 %%DATADIR%%/scripts/lua/find_member.lua
 %%DATADIR%%/scripts/lua/find_prefs.lua
@@ -286,9 +275,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_grouped_hosts_data.lua
 %%DATADIR%%/scripts/lua/get_historical_data.lua
 %%DATADIR%%/scripts/lua/get_historical_favourites.lua
-%%DATADIR%%/scripts/lua/get_hitters_data.lua
-%%DATADIR%%/scripts/lua/get_host_activitymap.lua
-%%DATADIR%%/scripts/lua/get_host_categories.lua
 %%DATADIR%%/scripts/lua/get_host_contacts.lua
 %%DATADIR%%/scripts/lua/get_host_daily_activity.lua
 %%DATADIR%%/scripts/lua/get_host_data.lua
@@ -311,10 +297,9 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_user_info.lua
 %%DATADIR%%/scripts/lua/get_vlan_data.lua
 %%DATADIR%%/scripts/lua/get_vlans_data.lua
-%%DATADIR%%/scripts/lua/host_category_stats.lua
 %%DATADIR%%/scripts/lua/host_details.lua
-%%DATADIR%%/scripts/lua/host_details_categories.lua
 %%DATADIR%%/scripts/lua/host_details_ndpi.lua
+%%DATADIR%%/scripts/lua/host_details_ndpi_categories.lua
 %%DATADIR%%/scripts/lua/host_dns_breakdown.lua
 %%DATADIR%%/scripts/lua/host_get_json.lua
 %%DATADIR%%/scripts/lua/host_http_breakdown.lua
@@ -335,6 +320,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/if_pkt_distro.lua
 %%DATADIR%%/scripts/lua/if_stats.lua
 %%DATADIR%%/scripts/lua/if_stats_ndpi.lua
+%%DATADIR%%/scripts/lua/if_stats_ndpi_categories.lua
 %%DATADIR%%/scripts/lua/if_tcpflags_pkt_distro.lua
 %%DATADIR%%/scripts/lua/iface_flows_sankey.lua
 %%DATADIR%%/scripts/lua/iface_hosts_list.lua
@@ -358,6 +344,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/logout.lua
 %%DATADIR%%/scripts/lua/mac_details.lua
 %%DATADIR%%/scripts/lua/mac_stats.lua
+%%DATADIR%%/scripts/lua/macs_stats.lua
 %%DATADIR%%/scripts/lua/modules/alert_api.lua
 %%DATADIR%%/scripts/lua/modules/alert_state_utils.lua
 %%DATADIR%%/scripts/lua/modules/alert_utils.lua
@@ -365,43 +352,49 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/blacklist_utils.lua
 %%DATADIR%%/scripts/lua/modules/callback_utils.lua
 %%DATADIR%%/scripts/lua/modules/db_utils.lua
+%%DATADIR%%/scripts/lua/modules/discover_utils.lua
 %%DATADIR%%/scripts/lua/modules/dkjson.lua
 %%DATADIR%%/scripts/lua/modules/flow_aggregation_utils.lua
 %%DATADIR%%/scripts/lua/modules/flow_utils.lua
+%%DATADIR%%/scripts/lua/modules/grafana/index.lua
+%%DATADIR%%/scripts/lua/modules/grafana/query.lua
+%%DATADIR%%/scripts/lua/modules/grafana/search.lua
+%%DATADIR%%/scripts/lua/modules/grafana_utils.lua
 %%DATADIR%%/scripts/lua/modules/graph_utils.lua
 %%DATADIR%%/scripts/lua/modules/historical_utils.lua
 %%DATADIR%%/scripts/lua/modules/host_pools_utils.lua
+%%DATADIR%%/scripts/lua/modules/http_bridge_conf_utils.lua
 %%DATADIR%%/scripts/lua/modules/http_lint.lua
+%%DATADIR%%/scripts/lua/modules/i18n/i18n.lua
 %%DATADIR%%/scripts/lua/modules/i18n/init.lua
 %%DATADIR%%/scripts/lua/modules/i18n/interpolate.lua
 %%DATADIR%%/scripts/lua/modules/i18n/plural.lua
 %%DATADIR%%/scripts/lua/modules/i18n/variants.lua
 %%DATADIR%%/scripts/lua/modules/i18n/version.lua
 %%DATADIR%%/scripts/lua/modules/json.lua
+%%DATADIR%%/scripts/lua/modules/locales_utils.lua
 %%DATADIR%%/scripts/lua/modules/lua_trace.lua
 %%DATADIR%%/scripts/lua/modules/lua_utils.lua
 %%DATADIR%%/scripts/lua/modules/mac_utils.lua
+%%DATADIR%%/scripts/lua/modules/os_utils.lua
 %%DATADIR%%/scripts/lua/modules/persistence.lua
+%%DATADIR%%/scripts/lua/modules/prefs_dump_utils.lua
+%%DATADIR%%/scripts/lua/modules/prefs_menu.lua
 %%DATADIR%%/scripts/lua/modules/prefs_utils.lua
 %%DATADIR%%/scripts/lua/modules/resty/template.lua
 %%DATADIR%%/scripts/lua/modules/resty/template/html.lua
 %%DATADIR%%/scripts/lua/modules/resty/template/microbenchmark.lua
+%%DATADIR%%/scripts/lua/modules/rrd_5min_dump_utils.lua
+%%DATADIR%%/scripts/lua/modules/rrd_min_dump_utils.lua
 %%DATADIR%%/scripts/lua/modules/rrd_utils.lua
 %%DATADIR%%/scripts/lua/modules/slack_utils.lua
 %%DATADIR%%/scripts/lua/modules/sqlite_utils.lua
 %%DATADIR%%/scripts/lua/modules/template.lua
 %%DATADIR%%/scripts/lua/modules/template_utils.lua
-%%DATADIR%%/scripts/lua/modules/top_scripts/top_asn.lua
-%%DATADIR%%/scripts/lua/modules/top_scripts/top_countries.lua
-%%DATADIR%%/scripts/lua/modules/top_scripts/top_networks.lua
-%%DATADIR%%/scripts/lua/modules/top_scripts/top_os.lua
-%%DATADIR%%/scripts/lua/modules/top_scripts/top_os_local.lua
-%%DATADIR%%/scripts/lua/modules/top_scripts/top_talkers.lua
-%%DATADIR%%/scripts/lua/modules/top_scripts/top_vlan.lua
-%%DATADIR%%/scripts/lua/modules/top_structure.lua
-%%DATADIR%%/scripts/lua/modules/top_talkers.lua
+%%DATADIR%%/scripts/lua/modules/top_talkers_utils.lua
 %%DATADIR%%/scripts/lua/modules/vlan_utils.lua
 %%DATADIR%%/scripts/lua/modules/voip_utils.lua
+%%DATADIR%%/scripts/lua/modules/xmlSimple.lua
 %%DATADIR%%/scripts/lua/network_details.lua
 %%DATADIR%%/scripts/lua/network_load.lua
 %%DATADIR%%/scripts/lua/network_stats.lua
@@ -420,6 +413,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/sflow_tree.lua
 %%DATADIR%%/scripts/lua/sflows_stats.lua
 %%DATADIR%%/scripts/lua/show_alerts.lua
+%%DATADIR%%/scripts/lua/show_geolocation_note.lua
 %%DATADIR%%/scripts/lua/sprobe.lua
 %%DATADIR%%/scripts/lua/sprobe_data.lua
 %%DATADIR%%/scripts/lua/sprobe_flow_data.lua
@@ -431,7 +425,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/sprobe_hosts_interactions_data.lua
 %%DATADIR%%/scripts/lua/test_locales.lua
 %%DATADIR%%/scripts/lua/test_snmp.lua
-%%DATADIR%%/scripts/lua/top_generic.lua
 %%DATADIR%%/scripts/lua/top_hosts.lua
 %%DATADIR%%/scripts/lua/unknown_devices.lua
 %%DATADIR%%/scripts/lua/user_stats.lua