3 files changed, 49 insertions, 110 deletions

diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index 45a07788e956..1ecb74af37b2 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jffnms
-PORTVERSION=	0.7.6
+PORTVERSION=	0.7.7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -26,7 +26,7 @@ USE_REINPLACE=	yes
 JFFNMSDIR?=	share/jffnms
 CRONTAB?=	/usr/bin/crontab
 
-PLIST_SUB=	JFFNMSDIR=${JFFNMSDIR}
+PLIST_SUB=	JFFNMSDIR=${JFFNMSDIR} VERSION=${PORTVERSION} LASTVER=0.7.6
 
 do-build:
 	@${REINPLACE_CMD} -e 's|/opt/jffnms|${PREFIX}/${JFFNMSDIR}|g' \
diff --git a/net-mgmt/jffnms/distinfo b/net-mgmt/jffnms/distinfo
index 8f8a7f84ab91..41bc41ff2f9c 100644
--- a/net-mgmt/jffnms/distinfo
+++ b/net-mgmt/jffnms/distinfo
@@ -1,2 +1,2 @@
-MD5 (jffnms-0.7.6.tar.gz) = 992a462e575f122ca5e095248f10c337
-SIZE (jffnms-0.7.6.tar.gz) = 468175
+MD5 (jffnms-0.7.7.tar.gz) = e75a78854cb3e8c08169dec1ff45b72c
+SIZE (jffnms-0.7.7.tar.gz) = 505044
diff --git a/net-mgmt/jffnms/pkg-plist b/net-mgmt/jffnms/pkg-plist
index 662bd0464eea..7adffb2f05a3 100644
--- a/net-mgmt/jffnms/pkg-plist
+++ b/net-mgmt/jffnms/pkg-plist
@@ -12,8 +12,8 @@
 %%JFFNMSDIR%%/conf/functions.php
 %%JFFNMSDIR%%/docs/apache-example
 %%JFFNMSDIR%%/docs/cisco-example
-%%JFFNMSDIR%%/docs/jffnms-0.7.6.mysql
-%%JFFNMSDIR%%/docs/jffnms-0.7.6.pgsql
+%%JFFNMSDIR%%/docs/jffnms-%%VERSION%%.mysql
+%%JFFNMSDIR%%/docs/jffnms-%%VERSION%%.pgsql
 %%JFFNMSDIR%%/docs/sla-creation-example.txt
 %%JFFNMSDIR%%/docs/unix/msyslog-example
 %%JFFNMSDIR%%/docs/unix/php.ini.example
@@ -23,107 +23,35 @@
 %%JFFNMSDIR%%/docs/unix/syslog.conf
 %%JFFNMSDIR%%/docs/unix/tac_plus.cfg
 %%JFFNMSDIR%%/docs/unix/tftp
-%%JFFNMSDIR%%/docs/upgrade/jffnms-0.7.5-to-0.7.6.patch
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.auth
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.envmib
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.hosts_config
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.itrigger
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.messages
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.no_alarm
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.smokeping
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.smsclient
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.smsmail
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.snmptrap
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.sw_cat_os
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.2-to-0.7.3.mysql.diff.unackfilter
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.config_size
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.ad_track
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.tcp_content
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.new_trap
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.reachability
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.dates
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.linux_tc
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.sla_in_errors
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.profile_len
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.triggered
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.3-to-0.7.4.mysql.diff.juniper_state
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.reach_fields
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.zone_filter
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.it
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.it_fields
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.pollers
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.cpus
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.hosts_poll
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.slas
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.4-to-0.7.5.mysql.diff.admin_status
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.add_manual
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.admin_status_fix
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.apps_instances
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.bgp_verify_remove
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.clientws
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.default_sla
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.default_view_type
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.descriptions
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.ntp_client
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.pollers_multi_backend
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.sla_cisco
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.sla_linux
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.tc_reorder
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.tcp_analisis
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.traps
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.5-to-0.7.6.mysql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.auth
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.envmib
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.hosts_config
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.itrigger
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.messages
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.no_alarm
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.smokeping
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.smsclient
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.smsmail
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.snmptrap
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.sw_cat_os
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.2-to-0.7.3.pgsql.diff.unackfilter
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.config_size
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.ad_track
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.new_trap
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.tcp_content
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.reachability
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.dates
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.linux_tc
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.sla_in_errors
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.profile_len
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.triggered
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.3-to-0.7.4.pgsql.diff.juniper_state
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.reach_fields
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.it
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.it_fields
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.pollers
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.cpus
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.zone_filter
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.hosts_poll
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.slas
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.4-to-0.7.5.pgsql.diff.admin_status
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.add_manual
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.admin_status_fix
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.apps_instances
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.bgp_verify_remove
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.clientws
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.default_sla
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.default_view_type
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.descriptions
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.ntp_client
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.pollers_multi_backend
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.sla_cisco
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.sla_linux
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.tc_reorder
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.tcp_analisis
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.traps
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.5-to-0.7.6.pgsql.diff.x_fix_internal_ids
+%%JFFNMSDIR%%/docs/unix/syslog-ng-example
+%%JFFNMSDIR%%/docs/upgrade/jffnms-%%LASTVER%%-to-%%VERSION%%.patch
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.x_fix_internal_ids
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.alarm_backend
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.backend
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.default_view
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.filters
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.internal
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.poll_interval
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.severity
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.storage
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.syslog
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.tools
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.triggers_or
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.alarm
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.x_fix_internal_ids
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.alarm_backend
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.backend
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.default_view
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.filters
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.internal
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.poll_interval
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.severity
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.storage
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.syslog
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.tools
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.triggers_or
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.alarm
+%%JFFNMSDIR%%/docs/utils/export_custom.php
 %%JFFNMSDIR%%/docs/utils/adjust_bw.php
 %%JFFNMSDIR%%/docs/utils/clean_auth.php
 %%JFFNMSDIR%%/docs/utils/exp_poller_test.php
@@ -149,6 +77,8 @@
 %%JFFNMSDIR%%/docs/utils/jffnms-snmp/snmpd.conf.example
 %%JFFNMSDIR%%/docs/windows/httpd.conf
 %%JFFNMSDIR%%/docs/windows/php.ini
+%%JFFNMSDIR%%/lib/api.tools.inc.php
+%%JFFNMSDIR%%/engine/poller_helper.php
 %%JFFNMSDIR%%/engine/actions/email.inc.php
 %%JFFNMSDIR%%/engine/actions/none.inc.php
 %%JFFNMSDIR%%/engine/actions/smsclient.inc.php
@@ -255,7 +185,6 @@
 %%JFFNMSDIR%%/engine/pollers/ntp_client.php
 %%JFFNMSDIR%%/engine/pollers/smokeping.php
 %%JFFNMSDIR%%/engine/pollers/snmp_counter.php
-%%JFFNMSDIR%%/engine/pollers/snmp_interface_status.php
 %%JFFNMSDIR%%/engine/pollers/snmp_interface_status_all.php
 %%JFFNMSDIR%%/engine/pollers/snmp_walk_average.php
 %%JFFNMSDIR%%/engine/pollers/tcp_connection_number.php
@@ -274,12 +203,17 @@
 %%JFFNMSDIR%%/engine/satellite/ping.inc.php
 %%JFFNMSDIR%%/engine/satellite/poller.inc.php
 %%JFFNMSDIR%%/engine/satellite_distribution.php
+%%JFFNMSDIR%%/engine/shared/.check
 %%JFFNMSDIR%%/engine/temp/.check
 %%JFFNMSDIR%%/engine/tftp_get_host_config.php
 %%JFFNMSDIR%%/engine/ticket/tiba.inc.php
 %%JFFNMSDIR%%/engine/tmpwatch.sh
-%%JFFNMSDIR%%/engine/trap_receiver.pl
 %%JFFNMSDIR%%/engine/trap_receiver.php
+%%JFFNMSDIR%%/engine/tools/none.inc.php
+%%JFFNMSDIR%%/engine/tools/if_alias.inc.php
+%%JFFNMSDIR%%/engine/tools/tcp_cnx.inc.php
+%%JFFNMSDIR%%/engine/tools/if_admin.inc.php
+%%JFFNMSDIR%%/engine/tools/separator.inc.php
 %%JFFNMSDIR%%/engine/windows/autodiscovery_interfaces.bat
 %%JFFNMSDIR%%/engine/windows/cleanup_raw_tables.bat
 %%JFFNMSDIR%%/engine/windows/consolidate.bat
@@ -312,11 +246,11 @@
 %%JFFNMSDIR%%/htdocs/admin/sat_session.inc.php
 %%JFFNMSDIR%%/htdocs/admin/satellite.php
 %%JFFNMSDIR%%/htdocs/admin/setup.php
+%%JFFNMSDIR%%/htdocs/admin/tools.php
 %%JFFNMSDIR%%/htdocs/auth.php
 %%JFFNMSDIR%%/htdocs/blank.html
 %%JFFNMSDIR%%/htdocs/controls.php
 %%JFFNMSDIR%%/htdocs/events.php
-%%JFFNMSDIR%%/htdocs/frame_hosts_events.html
 %%JFFNMSDIR%%/htdocs/frame_interfaces.php
 %%JFFNMSDIR%%/htdocs/frame_interfaces_events.php
 %%JFFNMSDIR%%/htdocs/images/a-down.png
@@ -407,6 +341,9 @@
 %%JFFNMSDIR%%/htdocs/view_interfaces.php
 %%JFFNMSDIR%%/htdocs/view_interfaces_map_list.php
 %%JFFNMSDIR%%/htdocs/view_performance.php
+%%JFFNMSDIR%%/htdocs/views/toolbox.js
+%%JFFNMSDIR%%/htdocs/views/toolbox.inc.php
+%%JFFNMSDIR%%/htdocs/login.php
 %%JFFNMSDIR%%/htdocs/views/infobox.js
 %%JFFNMSDIR%%/htdocs/views/source_hosts_get.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_hosts_init.inc.php
@@ -489,6 +426,8 @@
 %%JFFNMSDIR%%/logs/.check
 %%JFFNMSDIR%%/rrd/.check
 %%JFFNMSDIR%%/tftpd/.check
+@dirrm %%JFFNMSDIR%%/engine/shared
+@dirrm %%JFFNMSDIR%%/engine/tools
 @dirrm %%JFFNMSDIR%%/engine/actions
 @dirrm %%JFFNMSDIR%%/engine/analyzers
 @dirrm %%JFFNMSDIR%%/engine/backends