3 files changed, 145 insertions, 109 deletions

diff --git a/net-mgmt/jffnms/Makefile b/net-mgmt/jffnms/Makefile
index b53d2927b29d..d8c491f6045d 100644
--- a/net-mgmt/jffnms/Makefile
+++ b/net-mgmt/jffnms/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jffnms
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTVERSION=	0.7.9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -27,7 +26,7 @@ USE_REINPLACE=	yes
 JFFNMSDIR?=	share/jffnms
 CRONTAB?=	/usr/bin/crontab
 
-PLIST_SUB=	JFFNMSDIR=${JFFNMSDIR} VERSION=${PORTVERSION} LASTVER=0.7.7
+PLIST_SUB=	JFFNMSDIR=${JFFNMSDIR}
 
 do-build:
 	@${REINPLACE_CMD} -e 's|/opt/jffnms|${PREFIX}/${JFFNMSDIR}|g' \
@@ -52,4 +51,19 @@ do-install:
 	@${CRONTAB} -u www ${PREFIX}/${JFFNMSDIR}/jffnms.cron
 	@${SED} -e 's|%JFFNMSDIR%|${PREFIX}/${JFFNMSDIR}|g' ${PKGMESSAGE}
 
+#
+#	!!! Maintainer only !!!
+#
+packinglist: pkg-plist.new
+pkg-plist.new:
+	@${ECHO_MSG} '---> Making ${@}'
+	@${FIND} '${PREFIX}/${JFFNMSDIR}' -type f | \
+		${SED} -e 's|^${PREFIX}/${JFFNMSDIR}|%%JFFNMSDIR%%|' | \
+		${SORT} -t / > ${@}
+	@${FIND} '${PREFIX}/${JFFNMSDIR}' -type d | \
+		${SORT} -rt / | \
+		${SED} -e 's|^${PREFIX}/${JFFNMSDIR}|@dirrm %%JFFNMSDIR%%|' >> ${@}
+	@${ECHO} "@exec crontab -u www %%JFFNMSDIR%%/jffnms.cron" >> ${@}
+	@${ECHO} "@unexec crontab -u www -l | sed 's|.*JFFNMS.*||' | crontab -u www -" >> ${@}
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/jffnms/distinfo b/net-mgmt/jffnms/distinfo
index 4149f1810e73..afa114cb4f92 100644
--- a/net-mgmt/jffnms/distinfo
+++ b/net-mgmt/jffnms/distinfo
@@ -1,2 +1,2 @@
-MD5 (jffnms-0.7.8.tar.gz) = dd807bc9608ef8f3fe350e8d1a6f1970
-SIZE (jffnms-0.7.8.tar.gz) = 499965
+MD5 (jffnms-0.7.9.tar.gz) = 8b2b60fa8ba1d6853e0ed2eda2d0d28d
+SIZE (jffnms-0.7.9.tar.gz) = 503953
diff --git a/net-mgmt/jffnms/pkg-plist b/net-mgmt/jffnms/pkg-plist
index aca3c6bbe6d8..585efd883f2d 100644
--- a/net-mgmt/jffnms/pkg-plist
+++ b/net-mgmt/jffnms/pkg-plist
@@ -12,50 +12,52 @@
 %%JFFNMSDIR%%/conf/functions.php
 %%JFFNMSDIR%%/docs/apache-example
 %%JFFNMSDIR%%/docs/cisco-example
-%%JFFNMSDIR%%/docs/jffnms-%%VERSION%%.mysql
-%%JFFNMSDIR%%/docs/jffnms-%%VERSION%%.pgsql
+%%JFFNMSDIR%%/docs/jffnms-0.7.9.mysql
+%%JFFNMSDIR%%/docs/jffnms-0.7.9.pgsql
 %%JFFNMSDIR%%/docs/sla-creation-example.txt
 %%JFFNMSDIR%%/docs/unix/msyslog-example
 %%JFFNMSDIR%%/docs/unix/php.ini.example
 %%JFFNMSDIR%%/docs/unix/snmp.conf
 %%JFFNMSDIR%%/docs/unix/snmptrap.txt
 %%JFFNMSDIR%%/docs/unix/snmptrapd.conf
+%%JFFNMSDIR%%/docs/unix/syslog-ng-example
 %%JFFNMSDIR%%/docs/unix/syslog.conf
 %%JFFNMSDIR%%/docs/unix/tac_plus.cfg
 %%JFFNMSDIR%%/docs/unix/tftp
-%%JFFNMSDIR%%/docs/unix/syslog-ng-example
-%%JFFNMSDIR%%/docs/upgrade/jffnms-%%LASTVER%%-to-%%VERSION%%.patch
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.app_perf
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.check_status
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.client_filter
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.ip_mask
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.nad
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.popups
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.sysdescr
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.temp
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.udp_ports
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.x1_alert_del
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.x2_minisla
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.x3_dhtml_profile
-%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-%%LASTVER%%-to-%%VERSION%%.mysql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.app_perf
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.check_status
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.client_filter
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.ip_mask
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.nad
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.popups
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.sysdescr
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.temp
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.udp_ports
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.x1_alert_del
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.x2_minisla
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.x3_dhtml_profile
-%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-%%LASTVER%%-to-%%VERSION%%.pgsql.diff.x_fix_internal_ids
-%%JFFNMSDIR%%/docs/utils/export_custom.php
+%%JFFNMSDIR%%/docs/upgrade/jffnms-0.7.8-to-0.7.9.patch
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.aggr
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.apache
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.compaq
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.iis
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.it_rename_bgp
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.mail_from
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.mini_sla
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.pkt_graph
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.pm3
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.temp_aggr
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.win
+%%JFFNMSDIR%%/docs/upgrade/mysql/jffnms-0.7.8-to-0.7.9.mysql.diff.x_fix_internal_ids
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.aggr
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.apache
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.compaq
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.iis
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.it_rename_bgp
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.mail_from
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.mini_sla
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.pkt_graph
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.pm3
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.temp_aggr
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.win
+%%JFFNMSDIR%%/docs/upgrade/pgsql/jffnms-0.7.8-to-0.7.9.pgsql.diff.x_fix_internal_ids
 %%JFFNMSDIR%%/docs/utils/adjust_bw.php
 %%JFFNMSDIR%%/docs/utils/clean_auth.php
 %%JFFNMSDIR%%/docs/utils/exp_poller_test.php
+%%JFFNMSDIR%%/docs/utils/export_custom.php
 %%JFFNMSDIR%%/docs/utils/int_values_convert.php
+%%JFFNMSDIR%%/docs/utils/jffnms-snmp/iptables.inc.php
+%%JFFNMSDIR%%/docs/utils/jffnms-snmp/jffnms-snmp.php
+%%JFFNMSDIR%%/docs/utils/jffnms-snmp/snmpd.conf.example
+%%JFFNMSDIR%%/docs/utils/jffnms-snmp/tc.inc.php
 %%JFFNMSDIR%%/docs/utils/lines.sh
 %%JFFNMSDIR%%/docs/utils/makedb_release.php
 %%JFFNMSDIR%%/docs/utils/mib.php
@@ -63,28 +65,21 @@
 %%JFFNMSDIR%%/docs/utils/ping.php
 %%JFFNMSDIR%%/docs/utils/rrd_export.php
 %%JFFNMSDIR%%/docs/utils/rrd_import.php
+%%JFFNMSDIR%%/docs/utils/satellite-client.php
+%%JFFNMSDIR%%/docs/utils/satellite_sync.php
 %%JFFNMSDIR%%/docs/utils/slice-rrd.php
 %%JFFNMSDIR%%/docs/utils/sql_alter_pg.php
 %%JFFNMSDIR%%/docs/utils/sql_diff.php
 %%JFFNMSDIR%%/docs/utils/syslog_file_import.php
 %%JFFNMSDIR%%/docs/utils/tftp_put_host_config.php
-%%JFFNMSDIR%%/docs/utils/satellite-client.php
-%%JFFNMSDIR%%/docs/utils/satellite_sync.php
-%%JFFNMSDIR%%/docs/utils/jffnms-snmp/iptables.inc.php
-%%JFFNMSDIR%%/docs/utils/jffnms-snmp/jffnms-snmp.php
-%%JFFNMSDIR%%/docs/utils/jffnms-snmp/tc.inc.php
-%%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%%/lib/api.nad.inc.php
-%%JFFNMSDIR%%/engine/poller_helper.php
-%%JFFNMSDIR%%/engine/autodiscovery_network.php
 %%JFFNMSDIR%%/engine/actions/email.inc.php
 %%JFFNMSDIR%%/engine/actions/none.inc.php
 %%JFFNMSDIR%%/engine/actions/smsclient.inc.php
 %%JFFNMSDIR%%/engine/analyzers/sla.inc.php
 %%JFFNMSDIR%%/engine/autodiscovery_interfaces.php
+%%JFFNMSDIR%%/engine/autodiscovery_network.php
 %%JFFNMSDIR%%/engine/backends/alarm.php
 %%JFFNMSDIR%%/engine/backends/buffer.php
 %%JFFNMSDIR%%/engine/backends/db.php
@@ -98,35 +93,44 @@
 %%JFFNMSDIR%%/engine/configs/cisco_sys.inc.php
 %%JFFNMSDIR%%/engine/configs/none.inc.php
 %%JFFNMSDIR%%/engine/consolidate.php
+%%JFFNMSDIR%%/engine/consolidate/alarms.php
 %%JFFNMSDIR%%/engine/consolidate/events.php
 %%JFFNMSDIR%%/engine/consolidate/events_latest.php
 %%JFFNMSDIR%%/engine/consolidate/syslog.php
 %%JFFNMSDIR%%/engine/consolidate/tacacs.php
 %%JFFNMSDIR%%/engine/consolidate/traps.php
-%%JFFNMSDIR%%/engine/consolidate/alarms.php
+%%JFFNMSDIR%%/engine/discovery/apache.inc.php
 %%JFFNMSDIR%%/engine/discovery/bgp_peers.inc.php
 %%JFFNMSDIR%%/engine/discovery/cisco_accounting.inc.php
 %%JFFNMSDIR%%/engine/discovery/cisco_envmib.inc.php
 %%JFFNMSDIR%%/engine/discovery/cisco_saagent.inc.php
+%%JFFNMSDIR%%/engine/discovery/cpqmib.inc.php
 %%JFFNMSDIR%%/engine/discovery/css_vips.inc.php
 %%JFFNMSDIR%%/engine/discovery/host_information.inc.php
 %%JFFNMSDIR%%/engine/discovery/hostmib_apps.inc.php
+%%JFFNMSDIR%%/engine/discovery/iis_info.inc.php
+%%JFFNMSDIR%%/engine/discovery/linux_tc.inc.php
+%%JFFNMSDIR%%/engine/discovery/livingston_serial_port.inc.php
 %%JFFNMSDIR%%/engine/discovery/none.inc.php
 %%JFFNMSDIR%%/engine/discovery/ntp_client.inc.php
+%%JFFNMSDIR%%/engine/discovery/reachability.inc.php
 %%JFFNMSDIR%%/engine/discovery/smokeping.inc.php
 %%JFFNMSDIR%%/engine/discovery/snmp_interfaces.inc.php
 %%JFFNMSDIR%%/engine/discovery/storage.inc.php
 %%JFFNMSDIR%%/engine/discovery/tcp_ports.inc.php
-%%JFFNMSDIR%%/engine/discovery/reachability.inc.php
-%%JFFNMSDIR%%/engine/discovery/linux_tc.inc.php
 %%JFFNMSDIR%%/engine/exp_poller_child.php
 %%JFFNMSDIR%%/engine/exp_poller_master.php
-%%JFFNMSDIR%%/engine/graphs/apps_instances.inc.php
-%%JFFNMSDIR%%/engine/graphs/apps_memory.inc.php
-%%JFFNMSDIR%%/engine/graphs/tc_rate.inc.php
-%%JFFNMSDIR%%/engine/graphs/tc_rate_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/acct_bytes.inc.php
 %%JFFNMSDIR%%/engine/graphs/acct_packets.inc.php
+%%JFFNMSDIR%%/engine/graphs/apache_bpr.inc.php
+%%JFFNMSDIR%%/engine/graphs/apache_cplo.inc.php
+%%JFFNMSDIR%%/engine/graphs/apache_tac.inc.php
+%%JFFNMSDIR%%/engine/graphs/apache_tac_aggregation.inc.php
+%%JFFNMSDIR%%/engine/graphs/apache_tkb.inc.php
+%%JFFNMSDIR%%/engine/graphs/apache_tkb_aggregation.inc.php
+%%JFFNMSDIR%%/engine/graphs/apache_workers.inc.php
+%%JFFNMSDIR%%/engine/graphs/apps_instances.inc.php
+%%JFFNMSDIR%%/engine/graphs/apps_memory.inc.php
 %%JFFNMSDIR%%/engine/graphs/bgp_updates.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_mac_bytes.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_mac_packets.inc.php
@@ -134,37 +138,51 @@
 %%JFFNMSDIR%%/engine/graphs/cisco_saagent_packetloss.inc.php
 %%JFFNMSDIR%%/engine/graphs/cisco_saagent_rtl.inc.php
 %%JFFNMSDIR%%/engine/graphs/cpu_util.inc.php
+%%JFFNMSDIR%%/engine/graphs/cpu_util_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/css_vip_hits.inc.php
 %%JFFNMSDIR%%/engine/graphs/css_vip_output_only_traffic.inc.php
 %%JFFNMSDIR%%/engine/graphs/drop_packets.inc.php
 %%JFFNMSDIR%%/engine/graphs/error_packets.inc.php
 %%JFFNMSDIR%%/engine/graphs/error_rate.inc.php
 %%JFFNMSDIR%%/engine/graphs/hostmib_users_procs.inc.php
+%%JFFNMSDIR%%/engine/graphs/iis_tbr.inc.php
+%%JFFNMSDIR%%/engine/graphs/iis_tcgir.inc.php
+%%JFFNMSDIR%%/engine/graphs/iis_tfs.inc.php
+%%JFFNMSDIR%%/engine/graphs/iis_tptg.inc.php
 %%JFFNMSDIR%%/engine/graphs/memory.inc.php
 %%JFFNMSDIR%%/engine/graphs/packetloss.inc.php
 %%JFFNMSDIR%%/engine/graphs/packets.inc.php
 %%JFFNMSDIR%%/engine/graphs/packets_aggregation.inc.php
+%%JFFNMSDIR%%/engine/graphs/packets_new.inc.php
+%%JFFNMSDIR%%/engine/graphs/pm_serial.inc.php
 %%JFFNMSDIR%%/engine/graphs/rtt.inc.php
 %%JFFNMSDIR%%/engine/graphs/storage.inc.php
 %%JFFNMSDIR%%/engine/graphs/storage_aggregation.inc.php
+%%JFFNMSDIR%%/engine/graphs/tc_rate.inc.php
+%%JFFNMSDIR%%/engine/graphs/tc_rate_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/tcp_conn_delay.inc.php
 %%JFFNMSDIR%%/engine/graphs/tcp_conn_number.inc.php
 %%JFFNMSDIR%%/engine/graphs/tcp_conn_number_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/tcpmib_connections.inc.php
 %%JFFNMSDIR%%/engine/graphs/temperature.inc.php
+%%JFFNMSDIR%%/engine/graphs/temperature_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/traffic.inc.php
 %%JFFNMSDIR%%/engine/graphs/traffic_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/traffic_pl.inc.php
 %%JFFNMSDIR%%/engine/graphs/traffic_util.inc.php
 %%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux.inc.php
+%%JFFNMSDIR%%/engine/graphs/ucd_cpu_linux_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/ucd_cpu_solaris.inc.php
 %%JFFNMSDIR%%/engine/graphs/ucd_load_average.inc.php
+%%JFFNMSDIR%%/engine/graphs/ucd_load_average_aggregation.inc.php
 %%JFFNMSDIR%%/engine/graphs/ucd_memory.inc.php
-%%JFFNMSDIR%%/engine/handlers/tcp_ports.inc.php
-%%JFFNMSDIR%%/engine/handlers/none.inc.php
 %%JFFNMSDIR%%/engine/handlers/bool.inc.php
+%%JFFNMSDIR%%/engine/handlers/none.inc.php
 %%JFFNMSDIR%%/engine/handlers/rrd_ds.inc.php
+%%JFFNMSDIR%%/engine/handlers/tcp_ports.inc.php
 %%JFFNMSDIR%%/engine/poller.php
+%%JFFNMSDIR%%/engine/poller_helper.php
+%%JFFNMSDIR%%/engine/pollers/apache.php
 %%JFFNMSDIR%%/engine/pollers/bgp_peer_status.php
 %%JFFNMSDIR%%/engine/pollers/buffer.php
 %%JFFNMSDIR%%/engine/pollers/cisco_accounting.php
@@ -182,43 +200,45 @@
 %%JFFNMSDIR%%/engine/pollers/cisco_snmp_ping_wait.php
 %%JFFNMSDIR%%/engine/pollers/db.php
 %%JFFNMSDIR%%/engine/pollers/hostmib_apps.php
+%%JFFNMSDIR%%/engine/pollers/hostmib_perf.php
 %%JFFNMSDIR%%/engine/pollers/internal.php
+%%JFFNMSDIR%%/engine/pollers/livingston_serial_port_status.php
 %%JFFNMSDIR%%/engine/pollers/no_poller.php
 %%JFFNMSDIR%%/engine/pollers/ntp_client.php
+%%JFFNMSDIR%%/engine/pollers/reachability_end.php
+%%JFFNMSDIR%%/engine/pollers/reachability_start.php
+%%JFFNMSDIR%%/engine/pollers/reachability_status.php
+%%JFFNMSDIR%%/engine/pollers/reachability_values.php
+%%JFFNMSDIR%%/engine/pollers/reachability_wait.php
 %%JFFNMSDIR%%/engine/pollers/smokeping.php
 %%JFFNMSDIR%%/engine/pollers/snmp_counter.php
 %%JFFNMSDIR%%/engine/pollers/snmp_interface_status_all.php
+%%JFFNMSDIR%%/engine/pollers/snmp_status.php
 %%JFFNMSDIR%%/engine/pollers/snmp_walk_average.php
 %%JFFNMSDIR%%/engine/pollers/tcp_connection_number.php
+%%JFFNMSDIR%%/engine/pollers/tcp_port_content.php
 %%JFFNMSDIR%%/engine/pollers/tcp_status.php
+%%JFFNMSDIR%%/engine/pollers/udp_status.php
 %%JFFNMSDIR%%/engine/pollers/verify_interface_number.php
 %%JFFNMSDIR%%/engine/pollers/verify_smokeping_number.php
-%%JFFNMSDIR%%/engine/pollers/reachability_values.php
-%%JFFNMSDIR%%/engine/pollers/tcp_port_content.php
-%%JFFNMSDIR%%/engine/pollers/reachability_start.php
-%%JFFNMSDIR%%/engine/pollers/reachability_wait.php
 %%JFFNMSDIR%%/engine/pollers/verify_tc_class_number.php
-%%JFFNMSDIR%%/engine/pollers/reachability_end.php
-%%JFFNMSDIR%%/engine/pollers/reachability_status.php
-%%JFFNMSDIR%%/engine/pollers/udp_status.php
-%%JFFNMSDIR%%/engine/pollers/snmp_status.php
-%%JFFNMSDIR%%/engine/pollers/hostmib_perf.php
 %%JFFNMSDIR%%/engine/rrd_analizer.php
 %%JFFNMSDIR%%/engine/satellite/distribution.inc.php
 %%JFFNMSDIR%%/engine/satellite/ping.inc.php
 %%JFFNMSDIR%%/engine/satellite/poller.inc.php
 %%JFFNMSDIR%%/engine/satellite_distribution.php
 %%JFFNMSDIR%%/engine/shared/.check
+%%JFFNMSDIR%%/engine/shared/catos.inc.php
 %%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.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/if_alias.inc.php
+%%JFFNMSDIR%%/engine/tools/none.inc.php
 %%JFFNMSDIR%%/engine/tools/separator.inc.php
+%%JFFNMSDIR%%/engine/tools/tcp_cnx.inc.php
+%%JFFNMSDIR%%/engine/trap_receiver.php
 %%JFFNMSDIR%%/engine/windows/autodiscovery_interfaces.bat
 %%JFFNMSDIR%%/engine/windows/cleanup_raw_tables.bat
 %%JFFNMSDIR%%/engine/windows/consolidate.bat
@@ -241,10 +261,10 @@
 %%JFFNMSDIR%%/htdocs/admin/adm/structures.php
 %%JFFNMSDIR%%/htdocs/admin/adm/test.php
 %%JFFNMSDIR%%/htdocs/admin/calendar.php
-%%JFFNMSDIR%%/htdocs/admin/calendar/calendar_stripped.js
-%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-setup_stripped.js
-%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-en.js
 %%JFFNMSDIR%%/htdocs/admin/calendar/calendar-blue2.css
+%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-en.js
+%%JFFNMSDIR%%/htdocs/admin/calendar/calendar-setup_stripped.js
+%%JFFNMSDIR%%/htdocs/admin/calendar/calendar_stripped.js
 %%JFFNMSDIR%%/htdocs/admin/color_select.php
 %%JFFNMSDIR%%/htdocs/admin/event_filter.php
 %%JFFNMSDIR%%/htdocs/admin/menu.php
@@ -339,6 +359,7 @@
 %%JFFNMSDIR%%/htdocs/images/world.png
 %%JFFNMSDIR%%/htdocs/index.php
 %%JFFNMSDIR%%/htdocs/journal.php
+%%JFFNMSDIR%%/htdocs/login.php
 %%JFFNMSDIR%%/htdocs/logout.php
 %%JFFNMSDIR%%/htdocs/sounds/18_16b.wav
 %%JFFNMSDIR%%/htdocs/sounds/boing.wav
@@ -349,39 +370,38 @@
 %%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_dhtml.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_hosts_get.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_hosts_init.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_hosts_normal.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_hosts_text.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_hosts_urls.inc.php
+%%JFFNMSDIR%%/htdocs/views/source_interfaces_dhtml.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_interfaces_get.inc.php
-%%JFFNMSDIR%%/htdocs/views/source_interfaces_init.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_interfaces_infobox.inc.php
+%%JFFNMSDIR%%/htdocs/views/source_interfaces_init.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_interfaces_normal.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_interfaces_performance.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_interfaces_text.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_interfaces_urls.inc.php
+%%JFFNMSDIR%%/htdocs/views/source_maps_dhtml.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_maps_get.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_maps_init.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_maps_normal.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_maps_text.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_maps_urls.inc.php
-%%JFFNMSDIR%%/htdocs/views/source_maps_dhtml.inc.php
-%%JFFNMSDIR%%/htdocs/views/source_interfaces_dhtml.inc.php
-%%JFFNMSDIR%%/htdocs/views/source_hosts_dhtml.inc.php
 %%JFFNMSDIR%%/htdocs/views/source_none.inc.php
-%%JFFNMSDIR%%/htdocs/views/view_dhtml_html_init.inc.php
+%%JFFNMSDIR%%/htdocs/views/toolbox.inc.php
+%%JFFNMSDIR%%/htdocs/views/toolbox.js
 %%JFFNMSDIR%%/htdocs/views/view_dhtml_break_by_card.inc.php
-%%JFFNMSDIR%%/htdocs/views/view_dhtml_init.inc.php
-%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_show.inc.php
+%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_by_zone.inc.php
 %%JFFNMSDIR%%/htdocs/views/view_dhtml_break_finish_row.inc.php
-%%JFFNMSDIR%%/htdocs/views/view_dhtml_interface_show.inc.php
 %%JFFNMSDIR%%/htdocs/views/view_dhtml_break_next_line_span.inc.php
-%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_by_zone.inc.php
+%%JFFNMSDIR%%/htdocs/views/view_dhtml_break_show.inc.php
+%%JFFNMSDIR%%/htdocs/views/view_dhtml_html_init.inc.php
+%%JFFNMSDIR%%/htdocs/views/view_dhtml_init.inc.php
+%%JFFNMSDIR%%/htdocs/views/view_dhtml_interface_show.inc.php
 %%JFFNMSDIR%%/htdocs/views/view_dhtml_no_interfaces.inc.php
 %%JFFNMSDIR%%/htdocs/views/view_dynmap.js
 %%JFFNMSDIR%%/htdocs/views/view_dynmap_finish.inc.php
@@ -422,10 +442,12 @@
 %%JFFNMSDIR%%/lib/api.inc.php
 %%JFFNMSDIR%%/lib/api.interface.inc.php
 %%JFFNMSDIR%%/lib/api.maps.inc.php
+%%JFFNMSDIR%%/lib/api.nad.inc.php
 %%JFFNMSDIR%%/lib/api.network.inc.php
 %%JFFNMSDIR%%/lib/api.profile.inc.php
 %%JFFNMSDIR%%/lib/api.rrdtool.inc.php
 %%JFFNMSDIR%%/lib/api.satellites.inc.php
+%%JFFNMSDIR%%/lib/api.tools.inc.php
 %%JFFNMSDIR%%/lib/api.triggers.inc.php
 %%JFFNMSDIR%%/lib/api.user.inc.php
 %%JFFNMSDIR%%/lib/api.zones.inc.php
@@ -434,44 +456,44 @@
 %%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
-@dirrm %%JFFNMSDIR%%/engine/handlers
-@dirrm %%JFFNMSDIR%%/engine/ticket
-@dirrm %%JFFNMSDIR%%/engine/satellite
-@dirrm %%JFFNMSDIR%%/engine/pollers
-@dirrm %%JFFNMSDIR%%/engine/discovery
-@dirrm %%JFFNMSDIR%%/engine/temp
-@dirrm %%JFFNMSDIR%%/engine/configs
-@dirrm %%JFFNMSDIR%%/engine/consolidate
-@dirrm %%JFFNMSDIR%%/engine/windows
-@dirrm %%JFFNMSDIR%%/engine/graphs
-@dirrm %%JFFNMSDIR%%/engine
+@dirrm %%JFFNMSDIR%%/tftpd
+@dirrm %%JFFNMSDIR%%/rrd
 @dirrm %%JFFNMSDIR%%/logs
 @dirrm %%JFFNMSDIR%%/lib
+@dirrm %%JFFNMSDIR%%/htdocs/views
+@dirrm %%JFFNMSDIR%%/htdocs/sounds
+@dirrm %%JFFNMSDIR%%/htdocs/images/temp
+@dirrm %%JFFNMSDIR%%/htdocs/images
 @dirrm %%JFFNMSDIR%%/htdocs/admin/reports
 @dirrm %%JFFNMSDIR%%/htdocs/admin/calendar
 @dirrm %%JFFNMSDIR%%/htdocs/admin/adm
 @dirrm %%JFFNMSDIR%%/htdocs/admin
-@dirrm %%JFFNMSDIR%%/htdocs/images/temp
-@dirrm %%JFFNMSDIR%%/htdocs/images
-@dirrm %%JFFNMSDIR%%/htdocs/sounds
-@dirrm %%JFFNMSDIR%%/htdocs/views
 @dirrm %%JFFNMSDIR%%/htdocs
-@dirrm %%JFFNMSDIR%%/rrd
-@dirrm %%JFFNMSDIR%%/docs/upgrade/mysql
-@dirrm %%JFFNMSDIR%%/docs/upgrade/pgsql
-@dirrm %%JFFNMSDIR%%/docs/upgrade
+@dirrm %%JFFNMSDIR%%/engine/windows
+@dirrm %%JFFNMSDIR%%/engine/tools
+@dirrm %%JFFNMSDIR%%/engine/ticket
+@dirrm %%JFFNMSDIR%%/engine/temp
+@dirrm %%JFFNMSDIR%%/engine/shared
+@dirrm %%JFFNMSDIR%%/engine/satellite
+@dirrm %%JFFNMSDIR%%/engine/pollers
+@dirrm %%JFFNMSDIR%%/engine/handlers
+@dirrm %%JFFNMSDIR%%/engine/graphs
+@dirrm %%JFFNMSDIR%%/engine/discovery
+@dirrm %%JFFNMSDIR%%/engine/consolidate
+@dirrm %%JFFNMSDIR%%/engine/configs
+@dirrm %%JFFNMSDIR%%/engine/backends
+@dirrm %%JFFNMSDIR%%/engine/analyzers
+@dirrm %%JFFNMSDIR%%/engine/actions
+@dirrm %%JFFNMSDIR%%/engine
+@dirrm %%JFFNMSDIR%%/docs/windows
 @dirrm %%JFFNMSDIR%%/docs/utils/jffnms-snmp
 @dirrm %%JFFNMSDIR%%/docs/utils
-@dirrm %%JFFNMSDIR%%/docs/windows
+@dirrm %%JFFNMSDIR%%/docs/upgrade/pgsql
+@dirrm %%JFFNMSDIR%%/docs/upgrade/mysql
+@dirrm %%JFFNMSDIR%%/docs/upgrade
 @dirrm %%JFFNMSDIR%%/docs/unix
 @dirrm %%JFFNMSDIR%%/docs
 @dirrm %%JFFNMSDIR%%/conf
-@dirrm %%JFFNMSDIR%%/tftpd
 @dirrm %%JFFNMSDIR%%
 @exec crontab -u www %%JFFNMSDIR%%/jffnms.cron
 @unexec crontab -u www -l | sed 's|.*JFFNMS.*||' | crontab -u www -