- Update to 1.6

- Make jabber support optional (default on)

PR:		ports/127618
Submitted by:	Dmitry Lohansky <d.lohansky at zsupport.ru> (maintainer)

8 files changed, 688 insertions, 518 deletions

diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile
index ea0950b25c7c..68d742b28590 100644
--- a/net-mgmt/zabbix/Makefile
+++ b/net-mgmt/zabbix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.6
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
@@ -24,7 +23,8 @@ OPTIONS=	MYSQL "Use MySQL backend" on \
 		SQLITE "Use SQLite backend" off \
 		LDAP "Support for checking LDAP servers" on \
 		IPV6 "Support for IPv6" on \
-		FPING "Use fping for pinging hosts" on
+		FPING "Use fping for pinging hosts" on \
+		JABBER "Use jabber media type" on
 
 USE_GMAKE=	yes
 USE_PHP=	gd snmp sockets pcre bcmath
@@ -32,25 +32,32 @@ USE_RC_SUBR=	zabbix_server.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-agent --enable-server \
 		--with-net-snmp=${LOCALBASE}/bin/net-snmp-config \
-		--with-curl=${LOCALBASE}/bin/curl-config \
-		--with-jabber=${LOCALBASE}
+		--with-curl=${LOCALBASE}/bin/curl-config
 MAKE_ARGS=	ARCH=freebsd
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
+.ifndef WITHOUT_JABBER
+USE_JABBER=	yes
+CONFIGURE_ARGS+=--with-jabber=${LOCALBASE}
+.endif
+
 .ifndef WITHOUT_LDAP
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
 		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 .endif
+
 .ifdef WITH_IPV6
 CONFIGURE_ARGS+=--enable-ipv6
 .endif
+
 .ifndef WITHOUT_FPING
 RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 .endif
+
 .ifndef WITHOUT_MYSQL
 USE_MYSQL=	yes
 USE_PHP+=	mysql
@@ -73,6 +80,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/test.*rf/s|-rf|-f|;/LDFLAGS/s|-static||;\
 		/LIBS="-lnetsnmp/s|="|="-lcrypto |;s|-lsqlite3|-lsqlite3 ${PTHREAD_LIBS}|'\
 			${WRKSRC}/configure
+
 .ifdef WITHOUT_FPING
 	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf
 .endif
diff --git a/net-mgmt/zabbix/distinfo b/net-mgmt/zabbix/distinfo
index 5f9b3bac2d66..d77c2dd12e0b 100644
--- a/net-mgmt/zabbix/distinfo
+++ b/net-mgmt/zabbix/distinfo
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.4.5.tar.gz) = f87d73852fdab33f99beebfd16c21c63
-SHA256 (zabbix-1.4.5.tar.gz) = abde9b369960d9075605e12e915d05c04b3c81f1e3445b5d7b39919b0d1648c1
-SIZE (zabbix-1.4.5.tar.gz) = 4137972
+MD5 (zabbix-1.6.tar.gz) = 39d4c871439b1b4f0429964b4abbfc45
+SHA256 (zabbix-1.6.tar.gz) = 16d7f2f41e84c0525365d5faf62da1f5edafd5c55c4e4a451e382c24c6ffe1df
+SIZE (zabbix-1.6.tar.gz) = 6098034
diff --git a/net-mgmt/zabbix/files/patch-src__libs__zbxsysinfo__simple__simple.c b/net-mgmt/zabbix/files/patch-src__libs__zbxsysinfo__simple__simple.c
deleted file mode 100644
index fb6147c46d93..000000000000
--- a/net-mgmt/zabbix/files/patch-src__libs__zbxsysinfo__simple__simple.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/libs/zbxsysinfo/simple/simple.c.orig	Wed Jun 13 15:21:51 2007
-+++ ./src/libs/zbxsysinfo/simple/simple.c	Wed Jun 13 15:22:02 2007
-@@ -37,6 +37,7 @@
- 	};
- 
- #ifdef HAVE_LDAP
-+#include "ldap.h"
- 
- static int    check_ldap(char *hostname, short port, int *value_int)
- {
diff --git a/net-mgmt/zabbix/pkg-plist b/net-mgmt/zabbix/pkg-plist
index ddf09c2e0692..f8ba1d8ce89b 100644
--- a/net-mgmt/zabbix/pkg-plist
+++ b/net-mgmt/zabbix/pkg-plist
@@ -1,277 +1,364 @@
 bin/zabbix_server
 %%ETCDIR%%/zabbix_server.conf.sample
-%%DATADIR%%/create/data/data.sql
-%%DATADIR%%/create/data/images/Hub.png
-%%DATADIR%%/create/data/images/Hub_small.png
-%%DATADIR%%/create/data/images/Network.png
-%%DATADIR%%/create/data/images/Network_small.png
-%%DATADIR%%/create/data/images/Notebook.png
-%%DATADIR%%/create/data/images/Notebook_small.png
-%%DATADIR%%/create/data/images/Phone.png
-%%DATADIR%%/create/data/images/Phone_small.png
-%%DATADIR%%/create/data/images/Printer.png
-%%DATADIR%%/create/data/images/Printer_small.png
-%%DATADIR%%/create/data/images/Router.png
-%%DATADIR%%/create/data/images/Router_small.png
-%%DATADIR%%/create/data/images/Satellite.png
-%%DATADIR%%/create/data/images/Satellite_small.png
-%%DATADIR%%/create/data/images/Server.png
-%%DATADIR%%/create/data/images/Server_small.png
-%%DATADIR%%/create/data/images/UPS.png
-%%DATADIR%%/create/data/images/UPS_small.png
-%%DATADIR%%/create/data/images/Workstation.png
-%%DATADIR%%/create/data/images/Workstation_small.png
-%%DATADIR%%/create/data/images_mysql.sql
-%%DATADIR%%/create/data/images_oracle.sql
-%%DATADIR%%/create/data/images_pgsql.sql
-%%DATADIR%%/create/data/images_sqlite3.sql
-%%DATADIR%%/create/schema/Makefile
-%%DATADIR%%/create/schema/Makefile.am
-%%DATADIR%%/create/schema/Makefile.in
-%%DATADIR%%/create/schema/mysql.sql
-%%DATADIR%%/create/schema/oracle.sql
-%%DATADIR%%/create/schema/postgresql.sql
-%%DATADIR%%/create/schema/sqlite.sql
-%%DATADIR%%/dbpatches/1.4/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.4/oracle/patch.sql
-%%DATADIR%%/dbpatches/1.4/postgresql/patch.sql
-%%DATADIR%%/php/acknow.php
-%%DATADIR%%/php/actionconf.php
-%%DATADIR%%/php/actions.php
-%%DATADIR%%/php/audio/trigger_off.wav
-%%DATADIR%%/php/audio/trigger_on.wav
+%%DATADIR%%/php/styles/popupmenu.css
+%%DATADIR%%/php/styles/css_ob.css
+%%DATADIR%%/php/styles/calendar.css
+%%DATADIR%%/php/styles/css_bb.css
+%%DATADIR%%/php/styles/gmenu.css
+%%DATADIR%%/php/styles/sbox.css
+%%DATADIR%%/php/styles/link.css
+%%DATADIR%%/php/styles/p.css
+%%DATADIR%%/php/styles/ul.css
+%%DATADIR%%/php/styles/div.css
+%%DATADIR%%/php/styles/form.css
+%%DATADIR%%/php/styles/bar.css
+%%DATADIR%%/php/styles/default.css
+%%DATADIR%%/php/styles/table.css
+%%DATADIR%%/php/audio/trigger_on_warning.wav
 %%DATADIR%%/php/audio/trigger_on_average.wav
+%%DATADIR%%/php/audio/trigger_off.wav
 %%DATADIR%%/php/audio/trigger_on_disaster.wav
 %%DATADIR%%/php/audio/trigger_on_high.wav
-%%DATADIR%%/php/audio/trigger_on_warning.wav
-%%DATADIR%%/php/audit.php
-%%DATADIR%%/php/chart.php
-%%DATADIR%%/php/chart2.php
-%%DATADIR%%/php/chart3.php
-%%DATADIR%%/php/chart4.php
-%%DATADIR%%/php/chart5.php
-%%DATADIR%%/php/chart_sla.php
-%%DATADIR%%/php/charts.php
-%%DATADIR%%/php/conf/COPYING
-%%DATADIR%%/php/config.php
-%%DATADIR%%/php/create/data.sql
-%%DATADIR%%/php/create/mysql.sql
-%%DATADIR%%/php/css.css
-%%DATADIR%%/php/discovery.php
-%%DATADIR%%/php/discoveryconf.php
-%%DATADIR%%/php/events.php
-%%DATADIR%%/php/exp_imp.php
-%%DATADIR%%/php/graphs.php
-%%DATADIR%%/php/history.php
-%%DATADIR%%/php/hostprofiles.php
-%%DATADIR%%/php/hosts.php
-%%DATADIR%%/php/httpconf.php
-%%DATADIR%%/php/httpdetails.php
-%%DATADIR%%/php/httpmon.php
-%%DATADIR%%/php/image.php
-%%DATADIR%%/php/images/flash/zbxclock.swf
-%%DATADIR%%/php/images/general/closed.gif
-%%DATADIR%%/php/images/general/error_small.gif
-%%DATADIR%%/php/images/general/help.gif
-%%DATADIR%%/php/images/general/inst_completed.gif
-%%DATADIR%%/php/images/general/inst_current.gif
-%%DATADIR%%/php/images/general/inst_step.gif
-%%DATADIR%%/php/images/general/opened.gif
-%%DATADIR%%/php/images/general/sortdown.gif
-%%DATADIR%%/php/images/general/sortdown_off.gif
-%%DATADIR%%/php/images/general/sortup.gif
-%%DATADIR%%/php/images/general/sortup_off.gif
-%%DATADIR%%/php/images/general/tick.png
-%%DATADIR%%/php/images/general/zabbix.ico
-%%DATADIR%%/php/images/general/tree/I.gif
-%%DATADIR%%/php/images/general/tree/L.gif
-%%DATADIR%%/php/images/general/tree/O.gif
-%%DATADIR%%/php/images/general/tree/T.gif
-%%DATADIR%%/php/images/general/tree/X.gif
-%%DATADIR%%/php/images/general/tree/Xc.gif
-%%DATADIR%%/php/images/general/tree/Y.gif
-%%DATADIR%%/php/images/general/tree/Yc.gif
-%%DATADIR%%/php/images/general/tree/point.gif
-%%DATADIR%%/php/images/general/warning_small.gif
-%%DATADIR%%/php/images/general/zabbix.png
-%%DATADIR%%/php/images/gradients/blink1.gif
-%%DATADIR%%/php/images/gradients/blink2.gif
-%%DATADIR%%/php/images/gradients/button.gif
-%%DATADIR%%/php/images/gradients/menu_not_active.gif
-%%DATADIR%%/php/images/gradients/table_head.gif
-%%DATADIR%%/php/images/gradients/table_head2.gif
-%%DATADIR%%/php/images/sysmaps/Hub.png
-%%DATADIR%%/php/images/sysmaps/Hub_small.png
-%%DATADIR%%/php/images/sysmaps/Network.png
-%%DATADIR%%/php/images/sysmaps/Network_small.png
-%%DATADIR%%/php/images/sysmaps/Notebook.png
-%%DATADIR%%/php/images/sysmaps/Notebook_small.png
-%%DATADIR%%/php/images/sysmaps/Phone.png
-%%DATADIR%%/php/images/sysmaps/Phone_small.png
-%%DATADIR%%/php/images/sysmaps/Printer.png
-%%DATADIR%%/php/images/sysmaps/Printer_small.png
-%%DATADIR%%/php/images/sysmaps/README
-%%DATADIR%%/php/images/sysmaps/Router.png
-%%DATADIR%%/php/images/sysmaps/Router_small.png
-%%DATADIR%%/php/images/sysmaps/Satellite.png
-%%DATADIR%%/php/images/sysmaps/Satellite_small.png
-%%DATADIR%%/php/images/sysmaps/Server.png
-%%DATADIR%%/php/images/sysmaps/Server_small.png
-%%DATADIR%%/php/images/sysmaps/UPS.png
-%%DATADIR%%/php/images/sysmaps/UPS_small.png
-%%DATADIR%%/php/images/sysmaps/Workstation.png
-%%DATADIR%%/php/images/sysmaps/Workstation_small.png
-%%DATADIR%%/php/images/sysmaps/old/Hub.png
-%%DATADIR%%/php/images/sysmaps/old/Notebook.png
-%%DATADIR%%/php/images/sysmaps/old/Printer.png
-%%DATADIR%%/php/images/sysmaps/old/Router.png
-%%DATADIR%%/php/images/sysmaps/old/Server.png
-%%DATADIR%%/php/images/sysmaps/old/Workstation.png
-%%DATADIR%%/php/include/.htaccess
-%%DATADIR%%/php/include/acknow.inc.php
-%%DATADIR%%/php/include/actions.inc.php
-%%DATADIR%%/php/include/audit.inc.php
-%%DATADIR%%/php/include/classes/.htaccess
-%%DATADIR%%/php/include/classes/cbutton.inc.php
-%%DATADIR%%/php/include/classes/ccheckbox.inc.php
+%%DATADIR%%/php/audio/trigger_on.wav
+%%DATADIR%%/php/js/updater.js
+%%DATADIR%%/php/js/menu.js
+%%DATADIR%%/php/js/menu_scripts.js
+%%DATADIR%%/php/js/prototype.js
+%%DATADIR%%/php/js/calendar.js
+%%DATADIR%%/php/js/sbox.js
+%%DATADIR%%/php/js/services.js
+%%DATADIR%%/php/js/gmenu.js
+%%DATADIR%%/php/js/chkbxrange.js
+%%DATADIR%%/php/js/scrollbar.js
+%%DATADIR%%/php/js/graphs.js
+%%DATADIR%%/php/js/sbinit.js
+%%DATADIR%%/php/js/common.js
+%%DATADIR%%/php/js/ajax_req.js
+%%DATADIR%%/php/js/cookies.js
+%%DATADIR%%/php/js/blink.js
+%%DATADIR%%/php/js/tree.js
+%%DATADIR%%/php/js/url.js
+%%DATADIR%%/php/js/showhint.js
+%%DATADIR%%/php/include/locales/cn_zh.inc.php
+%%DATADIR%%/php/include/locales/lv_lv.inc.php
+%%DATADIR%%/php/include/locales/nl_nl.inc.php
+%%DATADIR%%/php/include/locales/ja_jp.inc.php
+%%DATADIR%%/php/include/locales/sp_sp.inc.php
+%%DATADIR%%/php/include/locales/ko_kr.inc.php
+%%DATADIR%%/php/include/locales/pt_br.inc.php
+%%DATADIR%%/php/include/locales/hu_hu.inc.php
+%%DATADIR%%/php/include/locales/it_it.inc.php
+%%DATADIR%%/php/include/locales/en_gb.inc.php
+%%DATADIR%%/php/include/locales/ru_ru.inc.php
+%%DATADIR%%/php/include/locales/fr_fr.inc.php
+%%DATADIR%%/php/include/locales/sv_se.inc.php
+%%DATADIR%%/php/include/locales/de_de.inc.php
+%%DATADIR%%/php/include/classes/cflashclock.mod.php
 %%DATADIR%%/php/include/classes/ccolor.inc.php
+%%DATADIR%%/php/include/classes/ctriggerinfo.mod.php
+%%DATADIR%%/php/include/classes/cldap.inc.php
+%%DATADIR%%/php/include/classes/ccheckbox.inc.php
+%%DATADIR%%/php/include/classes/ctable.inc.php
+%%DATADIR%%/php/include/classes/cvar.inc.php
+%%DATADIR%%/php/include/classes/cserverinfo.mod.php
+%%DATADIR%%/php/include/classes/cflash.inc.php
+%%DATADIR%%/php/include/classes/ctree.inc.php
+%%DATADIR%%/php/include/classes/ctableinfo.inc.php
 %%DATADIR%%/php/include/classes/ccombobox.inc.php
+%%DATADIR%%/php/include/classes/.htaccess
+%%DATADIR%%/php/include/classes/clist.inc.php
+%%DATADIR%%/php/include/classes/ctextarea.inc.php
 %%DATADIR%%/php/include/classes/cfile.inc.php
-%%DATADIR%%/php/include/classes/cflash.inc.php
-%%DATADIR%%/php/include/classes/cflashclock.mod.php
-%%DATADIR%%/php/include/classes/cform.inc.php
-%%DATADIR%%/php/include/classes/cformtable.inc.php
-%%DATADIR%%/php/include/classes/chelp.inc.php
 %%DATADIR%%/php/include/classes/chostsinfo.mod.php
-%%DATADIR%%/php/include/classes/ciframe.inc.php
-%%DATADIR%%/php/include/classes/cimg.inc.php
+%%DATADIR%%/php/include/classes/chelp.inc.php
 %%DATADIR%%/php/include/classes/clink.inc.php
-%%DATADIR%%/php/include/classes/clist.inc.php
-%%DATADIR%%/php/include/classes/cmap.inc.php
-%%DATADIR%%/php/include/classes/cpumenu.inc.php
-%%DATADIR%%/php/include/classes/cserverinfo.mod.php
-%%DATADIR%%/php/include/classes/cspan.inc.php
-%%DATADIR%%/php/include/classes/ctable.inc.php
-%%DATADIR%%/php/include/classes/ctableinfo.inc.php
-%%DATADIR%%/php/include/classes/ctag.inc.php
-%%DATADIR%%/php/include/classes/ctextarea.inc.php
 %%DATADIR%%/php/include/classes/ctextbox.inc.php
-%%DATADIR%%/php/include/classes/ctree.inc.php
-%%DATADIR%%/php/include/classes/ctriggerinfo.mod.php
-%%DATADIR%%/php/include/classes/cvar.inc.php
 %%DATADIR%%/php/include/classes/graph.inc.php
-%%DATADIR%%/php/include/config.inc.php
-%%DATADIR%%/php/include/copt.lib.php
-%%DATADIR%%/php/include/db.inc.php
-%%DATADIR%%/php/include/defines.inc.php
+%%DATADIR%%/php/include/classes/chart.inc.php
+%%DATADIR%%/php/include/classes/cspan.inc.php
+%%DATADIR%%/php/include/classes/cform.inc.php
+%%DATADIR%%/php/include/classes/ciframe.inc.php
+%%DATADIR%%/php/include/classes/cscript.inc.php
+%%DATADIR%%/php/include/classes/cpumenu.inc.php
+%%DATADIR%%/php/include/classes/pie.inc.php
+%%DATADIR%%/php/include/classes/ctag.inc.php
+%%DATADIR%%/php/include/classes/cbutton.inc.php
+%%DATADIR%%/php/include/classes/cformtable.inc.php
+%%DATADIR%%/php/include/classes/cimg.inc.php
+%%DATADIR%%/php/include/classes/cmap.inc.php
 %%DATADIR%%/php/include/discovery.inc.php
-%%DATADIR%%/php/include/events.inc.php
-%%DATADIR%%/php/include/export.inc.php
+%%DATADIR%%/php/include/page_footer.php
+%%DATADIR%%/php/include/acknow.inc.php
 %%DATADIR%%/php/include/forms.inc.php
-%%DATADIR%%/php/include/graphs.inc.php
-%%DATADIR%%/php/include/hosts.inc.php
-%%DATADIR%%/php/include/html.inc.php
-%%DATADIR%%/php/include/httptest.inc.php
-%%DATADIR%%/php/include/images.inc.php
+%%DATADIR%%/php/include/triggers.inc.php
+%%DATADIR%%/php/include/func.inc.php
+%%DATADIR%%/php/include/actions.inc.php
+%%DATADIR%%/php/include/setup.inc.php
+%%DATADIR%%/php/include/copt.lib.php
+%%DATADIR%%/php/include/screens.inc.php
+%%DATADIR%%/php/include/perm.inc.php
+%%DATADIR%%/php/include/config.inc.php
 %%DATADIR%%/php/include/import.inc.php
+%%DATADIR%%/php/include/page_header.php
+%%DATADIR%%/php/include/blocks.inc.php
+%%DATADIR%%/php/include/defines.inc.php
+%%DATADIR%%/php/include/.htaccess
+%%DATADIR%%/php/include/media.inc.php
+%%DATADIR%%/php/include/db.inc.php
 %%DATADIR%%/php/include/items.inc.php
-%%DATADIR%%/php/include/js.inc.php
-%%DATADIR%%/php/include/locales/cn_zh.inc.php
-%%DATADIR%%/php/include/locales/de_de.inc.php
-%%DATADIR%%/php/include/locales/en_gb.inc.php
-%%DATADIR%%/php/include/locales/fr_fr.inc.php
-%%DATADIR%%/php/include/locales/hu_hu.inc.php
-%%DATADIR%%/php/include/locales/it_it.inc.php
-%%DATADIR%%/php/include/locales/ja_jp.inc.php
-%%DATADIR%%/php/include/locales/lv_lv.inc.php
-%%DATADIR%%/php/include/locales/nl_nl.inc.php
-%%DATADIR%%/php/include/locales/pt_br.inc.php
-%%DATADIR%%/php/include/locales/ru_ru.inc.php
-%%DATADIR%%/php/include/locales/sp_sp.inc.php
-%%DATADIR%%/php/include/locales/sv_se.inc.php
+%%DATADIR%%/php/include/export.inc.php
 %%DATADIR%%/php/include/locales.inc.php
-%%DATADIR%%/php/include/maps.inc.php
-%%DATADIR%%/php/include/media.inc.php
-%%DATADIR%%/php/include/nodes.inc.php
-%%DATADIR%%/php/include/page_footer.php
-%%DATADIR%%/php/include/page_header.php
-%%DATADIR%%/php/include/perm.inc.php
 %%DATADIR%%/php/include/profiles.inc.php
-%%DATADIR%%/php/include/screens.inc.php
 %%DATADIR%%/php/include/services.inc.php
-%%DATADIR%%/php/include/setup.inc.php
-%%DATADIR%%/php/include/triggers.inc.php
-%%DATADIR%%/php/include/users.inc.php
+%%DATADIR%%/php/include/graphs.inc.php
+%%DATADIR%%/php/include/scripts.inc.php
 %%DATADIR%%/php/include/validate.inc.php
-%%DATADIR%%/php/index.php
-%%DATADIR%%/php/instal.php
-%%DATADIR%%/php/items.php
-%%DATADIR%%/php/js/blink.js
-%%DATADIR%%/php/js/common.js
-%%DATADIR%%/php/js/cookies.js
-%%DATADIR%%/php/js/menu.js
-%%DATADIR%%/php/js/services.js
-%%DATADIR%%/php/js/showhint.js
-%%DATADIR%%/php/js/tree.js
-%%DATADIR%%/php/latest.php
-%%DATADIR%%/php/map.php
+%%DATADIR%%/php/include/reports.inc.php
+%%DATADIR%%/php/include/maps.inc.php
+%%DATADIR%%/php/include/hosts.inc.php
+%%DATADIR%%/php/include/users.inc.php
+%%DATADIR%%/php/include/html.inc.php
+%%DATADIR%%/php/include/events.inc.php
+%%DATADIR%%/php/include/images.inc.php
+%%DATADIR%%/php/include/audit.inc.php
+%%DATADIR%%/php/include/nodes.inc.php
+%%DATADIR%%/php/include/js.inc.php
+%%DATADIR%%/php/include/httptest.inc.php
+%%DATADIR%%/php/conf/maintenance.inc.php
+%%DATADIR%%/php/conf/COPYING
+%%DATADIR%%/php/images/sysmaps/old/Notebook.png
+%%DATADIR%%/php/images/sysmaps/old/Hub.png
+%%DATADIR%%/php/images/sysmaps/old/Workstation.png
+%%DATADIR%%/php/images/sysmaps/old/Router.png
+%%DATADIR%%/php/images/sysmaps/old/Printer.png
+%%DATADIR%%/php/images/sysmaps/old/Server.png
+%%DATADIR%%/php/images/sysmaps/Notebook_small.png
+%%DATADIR%%/php/images/sysmaps/Server_small.png
+%%DATADIR%%/php/images/sysmaps/UPS_small.png
+%%DATADIR%%/php/images/sysmaps/Phone_small.png
+%%DATADIR%%/php/images/sysmaps/Server.png
+%%DATADIR%%/php/images/sysmaps/Hub_small.png
+%%DATADIR%%/php/images/sysmaps/UPS.png
+%%DATADIR%%/php/images/sysmaps/Router_small.png
+%%DATADIR%%/php/images/sysmaps/Workstation.png
+%%DATADIR%%/php/images/sysmaps/Phone.png
+%%DATADIR%%/php/images/sysmaps/README
+%%DATADIR%%/php/images/sysmaps/Workstation_small.png
+%%DATADIR%%/php/images/sysmaps/Printer_small.png
+%%DATADIR%%/php/images/sysmaps/Hub.png
+%%DATADIR%%/php/images/sysmaps/Satellite_small.png
+%%DATADIR%%/php/images/sysmaps/Router.png
+%%DATADIR%%/php/images/sysmaps/Notebook.png
+%%DATADIR%%/php/images/sysmaps/Printer.png
+%%DATADIR%%/php/images/sysmaps/Network_small.png
+%%DATADIR%%/php/images/sysmaps/Satellite.png
+%%DATADIR%%/php/images/sysmaps/Network.png
+%%DATADIR%%/php/images/gradients/table_head.gif
+%%DATADIR%%/php/images/gradients/button.gif
+%%DATADIR%%/php/images/gradients/gradient.png
+%%DATADIR%%/php/images/gradients/table_head_bb.gif
+%%DATADIR%%/php/images/gradients/blink1.gif
+%%DATADIR%%/php/images/gradients/table_head2_bb.gif
+%%DATADIR%%/php/images/gradients/menu_not_active.gif
+%%DATADIR%%/php/images/gradients/blink2.gif
+%%DATADIR%%/php/images/gradients/menu_not_active_bb.gif
+%%DATADIR%%/php/images/gradients/table_head2.gif
+%%DATADIR%%/php/images/flash/zbxclock.swf
+%%DATADIR%%/php/images/general/tree/minus.gif
+%%DATADIR%%/php/images/general/tree/pointc.gif
+%%DATADIR%%/php/images/general/tree/zero.gif
+%%DATADIR%%/php/images/general/tree/plus.gif
+%%DATADIR%%/php/images/general/tree/pointl.gif
+%%DATADIR%%/php/images/general/tree/point.gif
+%%DATADIR%%/php/images/general/bar/arrow_down.gif
+%%DATADIR%%/php/images/general/bar/arrow_r.gif
+%%DATADIR%%/php/images/general/bar/bar_bg.gif
+%%DATADIR%%/php/images/general/bar/right.gif
+%%DATADIR%%/php/images/general/bar/arrow_up.gif
+%%DATADIR%%/php/images/general/bar/bar_left.gif
+%%DATADIR%%/php/images/general/bar/cal.gif
+%%DATADIR%%/php/images/general/bar/bar_right.gif
+%%DATADIR%%/php/images/general/bar/bar_middle.gif
+%%DATADIR%%/php/images/general/bar/arrow_l.gif
+%%DATADIR%%/php/images/general/bar/bg.gif
+%%DATADIR%%/php/images/general/bar/arrow_sm.gif
+%%DATADIR%%/php/images/general/bar/left.gif
+%%DATADIR%%/php/images/general/bttn/fullscreen.png
+%%DATADIR%%/php/images/general/bttn/minus_bb.png
+%%DATADIR%%/php/images/general/bttn/arrowup.png
+%%DATADIR%%/php/images/general/bttn/fullscreen_bb.png
+%%DATADIR%%/php/images/general/bttn/arrowup_bb.png
+%%DATADIR%%/php/images/general/bttn/menu.png
+%%DATADIR%%/php/images/general/bttn/arrowdown.png
+%%DATADIR%%/php/images/general/bttn/menu_bb.png
+%%DATADIR%%/php/images/general/bttn/mute.png
+%%DATADIR%%/php/images/general/bttn/mute_bb.png
+%%DATADIR%%/php/images/general/bttn/arrowdown_bb.png
+%%DATADIR%%/php/images/general/bttn/reset.png
+%%DATADIR%%/php/images/general/bttn/plus.png
+%%DATADIR%%/php/images/general/bttn/reset_bb.png
+%%DATADIR%%/php/images/general/bttn/plus_bb.png
+%%DATADIR%%/php/images/general/bttn/help.png
+%%DATADIR%%/php/images/general/bttn/sound.png
+%%DATADIR%%/php/images/general/bttn/minus.png
+%%DATADIR%%/php/images/general/bttn/help_bb.png
+%%DATADIR%%/php/images/general/bttn/sound_bb.png
+%%DATADIR%%/php/images/general/inst_current.gif
+%%DATADIR%%/php/images/general/sortdown.gif
+%%DATADIR%%/php/images/general/error_small.gif
+%%DATADIR%%/php/images/general/chart.png
+%%DATADIR%%/php/images/general/trigg_dep.png
+%%DATADIR%%/php/images/general/sort_upw.gif
+%%DATADIR%%/php/images/general/sortup_off.gif
+%%DATADIR%%/php/images/general/zabbix.ico
+%%DATADIR%%/php/images/general/warning_small.gif
+%%DATADIR%%/php/images/general/zabbix_bb.ico
+%%DATADIR%%/php/images/general/help.gif
+%%DATADIR%%/php/images/general/sortup.gif
+%%DATADIR%%/php/images/general/inst_completed.gif
+%%DATADIR%%/php/images/general/warning16r.gif
+%%DATADIR%%/php/images/general/zabbix.png
+%%DATADIR%%/php/images/general/zabbix_bb.png
+%%DATADIR%%/php/images/general/trigg_dep.gif
+%%DATADIR%%/php/images/general/zabbix_ob.ico
+%%DATADIR%%/php/images/general/closed.gif
+%%DATADIR%%/php/images/general/sort_downw.gif
+%%DATADIR%%/php/images/general/inst_step.gif
+%%DATADIR%%/php/images/general/sortdown_off.gif
+%%DATADIR%%/php/images/general/tick.png
+%%DATADIR%%/php/images/general/opened.gif
+%%DATADIR%%/php/create/mysql.sql
+%%DATADIR%%/php/create/data.sql
+%%DATADIR%%/php/discoveryconf.php
+%%DATADIR%%/php/tr_comments.php
 %%DATADIR%%/php/maps.php
-%%DATADIR%%/php/media_types.php
-%%DATADIR%%/php/nodes.php
+%%DATADIR%%/php/users.php
 %%DATADIR%%/php/overview.php
-%%DATADIR%%/php/popup.php
-%%DATADIR%%/php/popup_gitem.php
-%%DATADIR%%/php/popup_httpstep.php
-%%DATADIR%%/php/popup_media.php
+%%DATADIR%%/php/nodes.php
+%%DATADIR%%/php/tr_events.php
+%%DATADIR%%/php/authentication.php
+%%DATADIR%%/php/queue.php
+%%DATADIR%%/php/popup_link_tr.php
+%%DATADIR%%/php/httpdetails.php
+%%DATADIR%%/php/dashboard.php
+%%DATADIR%%/php/instal.php
 %%DATADIR%%/php/popup_right.php
-%%DATADIR%%/php/popup_trexpr.php
+%%DATADIR%%/php/screens.php
+%%DATADIR%%/php/popup.php
+%%DATADIR%%/php/media_types.php
+%%DATADIR%%/php/index.php
+%%DATADIR%%/php/vtext.php
+%%DATADIR%%/php/sysmap.php
+%%DATADIR%%/php/items.php
+%%DATADIR%%/php/image.php
+%%DATADIR%%/php/chart2.php
+%%DATADIR%%/php/actionconf.php
 %%DATADIR%%/php/popup_users.php
-%%DATADIR%%/php/popup_usrgrp.php
-%%DATADIR%%/php/profile.php
-%%DATADIR%%/php/queue.php
+%%DATADIR%%/php/chart3.php
+%%DATADIR%%/php/chart4.php
+%%DATADIR%%/php/httpconf.php
+%%DATADIR%%/php/chart5.php
+%%DATADIR%%/php/scripts.php
+%%DATADIR%%/php/chart6.php
+%%DATADIR%%/php/chart7.php
+%%DATADIR%%/php/css.css
+%%DATADIR%%/php/scripts_exec.php
 %%DATADIR%%/php/report1.php
 %%DATADIR%%/php/report2.php
 %%DATADIR%%/php/report3.php
+%%DATADIR%%/php/popup_httpstep.php
 %%DATADIR%%/php/report4.php
+%%DATADIR%%/php/sysmaps.php
 %%DATADIR%%/php/report5.php
-%%DATADIR%%/php/screenconf.php
-%%DATADIR%%/php/screenedit.php
-%%DATADIR%%/php/screens.php
-%%DATADIR%%/php/services.php
+%%DATADIR%%/php/chart_sla.php
+%%DATADIR%%/php/hosts.php
+%%DATADIR%%/php/chart.php
+%%DATADIR%%/php/events.php
+%%DATADIR%%/php/popup_usrgrp.php
+%%DATADIR%%/php/warning.php
+%%DATADIR%%/php/audit.php
 %%DATADIR%%/php/services_form.php
-%%DATADIR%%/php/setup.php
+%%DATADIR%%/php/popup_trexpr.php
+%%DATADIR%%/php/discovery.php
+%%DATADIR%%/php/map.php
 %%DATADIR%%/php/srv_status.php
-%%DATADIR%%/php/sysmap.php
-%%DATADIR%%/php/sysmaps.php
-%%DATADIR%%/php/tr_comments.php
-%%DATADIR%%/php/tr_events.php
-%%DATADIR%%/php/tr_status.php
+%%DATADIR%%/php/hostprofiles.php
+%%DATADIR%%/php/acknow.php
+%%DATADIR%%/php/screenedit.php
 %%DATADIR%%/php/triggers.php
-%%DATADIR%%/php/users.php
-%%DATADIR%%/php/vtext.php
-@dirrm %%DATADIR%%/create/data/images
-@dirrm %%DATADIR%%/create/data
-@dirrm %%DATADIR%%/create/schema
-@dirrm %%DATADIR%%/create
-@dirrm %%DATADIR%%/dbpatches/1.4/mysql
-@dirrm %%DATADIR%%/dbpatches/1.4/oracle
-@dirrm %%DATADIR%%/dbpatches/1.4/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.4
-@dirrm %%DATADIR%%/dbpatches
-@dirrm %%DATADIR%%/php/audio
-@dirrm %%DATADIR%%/php/create
-@dirrm %%DATADIR%%/php/images/flash
-@dirrm %%DATADIR%%/php/images/general/tree
-@dirrm %%DATADIR%%/php/images/general
-@dirrm %%DATADIR%%/php/images/gradients
+%%DATADIR%%/php/httpmon.php
+%%DATADIR%%/php/latest.php
+%%DATADIR%%/php/profile.php
+%%DATADIR%%/php/setup.php
+%%DATADIR%%/php/exp_imp.php
+%%DATADIR%%/php/history.php
+%%DATADIR%%/php/popup_media.php
+%%DATADIR%%/php/config.php
+%%DATADIR%%/php/locales.php
+%%DATADIR%%/php/services.php
+%%DATADIR%%/php/charts.php
+%%DATADIR%%/php/graphs.php
+%%DATADIR%%/php/screenconf.php
+%%DATADIR%%/php/popup_gitem.php
+%%DATADIR%%/php/tr_status.php
+%%DATADIR%%/dbpatches/1.6/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.6/oracle/patch.sql
+%%DATADIR%%/dbpatches/1.6/postgresql/patch.sql
+%%DATADIR%%/create/data/images/Hub.png
+%%DATADIR%%/create/data/images/Hub_small.png
+%%DATADIR%%/create/data/images/Network.png
+%%DATADIR%%/create/data/images/Network_small.png
+%%DATADIR%%/create/data/images/Notebook.png
+%%DATADIR%%/create/data/images/Notebook_small.png
+%%DATADIR%%/create/data/images/Phone.png
+%%DATADIR%%/create/data/images/Phone_small.png
+%%DATADIR%%/create/data/images/Printer.png
+%%DATADIR%%/create/data/images/Printer_small.png
+%%DATADIR%%/create/data/images/Router.png
+%%DATADIR%%/create/data/images/Router_small.png
+%%DATADIR%%/create/data/images/Satellite.png
+%%DATADIR%%/create/data/images/Satellite_small.png
+%%DATADIR%%/create/data/images/Server.png
+%%DATADIR%%/create/data/images/Server_small.png
+%%DATADIR%%/create/data/images/UPS.png
+%%DATADIR%%/create/data/images/UPS_small.png
+%%DATADIR%%/create/data/images/Workstation.png
+%%DATADIR%%/create/data/images/Workstation_small.png
+%%DATADIR%%/create/data/data.sql
+%%DATADIR%%/create/data/images_oracle.sql
+%%DATADIR%%/create/data/images_pgsql.sql
+%%DATADIR%%/create/data/images_mysql.sql
+%%DATADIR%%/create/data/images_sqlite3.sql
+%%DATADIR%%/create/schema/mysql.sql
+%%DATADIR%%/create/schema/oracle.sql
+%%DATADIR%%/create/schema/postgresql.sql
+%%DATADIR%%/create/schema/sqlite.sql
+@dirrm %%DATADIR%%/php/styles
+@dirrm %%DATADIR%%/php/js
+@dirrm %%DATADIR%%/php/include/locales
+@dirrm %%DATADIR%%/php/include/classes
+@dirrm %%DATADIR%%/php/include
 @dirrm %%DATADIR%%/php/images/sysmaps/old
 @dirrm %%DATADIR%%/php/images/sysmaps
+@dirrm %%DATADIR%%/php/images/gradients
+@dirrm %%DATADIR%%/php/images/general/tree
+@dirrm %%DATADIR%%/php/images/general/bttn
+@dirrm %%DATADIR%%/php/images/general/bar
+@dirrm %%DATADIR%%/php/images/general
+@dirrm %%DATADIR%%/php/images/flash
 @dirrm %%DATADIR%%/php/images
-@dirrm %%DATADIR%%/php/include/classes
-@dirrm %%DATADIR%%/php/include/locales
-@dirrm %%DATADIR%%/php/include
-@dirrm %%DATADIR%%/php/js
+@dirrm %%DATADIR%%/php/create
+@dirrm %%DATADIR%%/php/conf
+@dirrm %%DATADIR%%/php/audio
+@dirrm %%DATADIR%%/php
+@dirrm %%DATADIR%%/dbpatches/1.6/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.6/oracle
+@dirrm %%DATADIR%%/dbpatches/1.6/mysql
+@dirrm %%DATADIR%%/dbpatches/1.6
+@dirrm %%DATADIR%%/dbpatches
+@dirrm %%DATADIR%%/create/schema
+@dirrm %%DATADIR%%/create/data/images
+@dirrm %%DATADIR%%/create/data
+@dirrm %%DATADIR%%/create
+@dirrm %%DATADIR%%/
 @dirrmtry %%ETCDIR%%
-@dirrmtry %%DATADIR%%/php/conf
-@dirrmtry %%DATADIR%%/php
-@dirrmtry %%DATADIR%%
diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile
index ea0950b25c7c..68d742b28590 100644
--- a/net-mgmt/zabbix2/Makefile
+++ b/net-mgmt/zabbix2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	1.6
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
@@ -24,7 +23,8 @@ OPTIONS=	MYSQL "Use MySQL backend" on \
 		SQLITE "Use SQLite backend" off \
 		LDAP "Support for checking LDAP servers" on \
 		IPV6 "Support for IPv6" on \
-		FPING "Use fping for pinging hosts" on
+		FPING "Use fping for pinging hosts" on \
+		JABBER "Use jabber media type" on
 
 USE_GMAKE=	yes
 USE_PHP=	gd snmp sockets pcre bcmath
@@ -32,25 +32,32 @@ USE_RC_SUBR=	zabbix_server.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-agent --enable-server \
 		--with-net-snmp=${LOCALBASE}/bin/net-snmp-config \
-		--with-curl=${LOCALBASE}/bin/curl-config \
-		--with-jabber=${LOCALBASE}
+		--with-curl=${LOCALBASE}/bin/curl-config
 MAKE_ARGS=	ARCH=freebsd
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
+.ifndef WITHOUT_JABBER
+USE_JABBER=	yes
+CONFIGURE_ARGS+=--with-jabber=${LOCALBASE}
+.endif
+
 .ifndef WITHOUT_LDAP
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls \
 		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 .endif
+
 .ifdef WITH_IPV6
 CONFIGURE_ARGS+=--enable-ipv6
 .endif
+
 .ifndef WITHOUT_FPING
 RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 .endif
+
 .ifndef WITHOUT_MYSQL
 USE_MYSQL=	yes
 USE_PHP+=	mysql
@@ -73,6 +80,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/test.*rf/s|-rf|-f|;/LDFLAGS/s|-static||;\
 		/LIBS="-lnetsnmp/s|="|="-lcrypto |;s|-lsqlite3|-lsqlite3 ${PTHREAD_LIBS}|'\
 			${WRKSRC}/configure
+
 .ifdef WITHOUT_FPING
 	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf
 .endif
diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo
index 5f9b3bac2d66..d77c2dd12e0b 100644
--- a/net-mgmt/zabbix2/distinfo
+++ b/net-mgmt/zabbix2/distinfo
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.4.5.tar.gz) = f87d73852fdab33f99beebfd16c21c63
-SHA256 (zabbix-1.4.5.tar.gz) = abde9b369960d9075605e12e915d05c04b3c81f1e3445b5d7b39919b0d1648c1
-SIZE (zabbix-1.4.5.tar.gz) = 4137972
+MD5 (zabbix-1.6.tar.gz) = 39d4c871439b1b4f0429964b4abbfc45
+SHA256 (zabbix-1.6.tar.gz) = 16d7f2f41e84c0525365d5faf62da1f5edafd5c55c4e4a451e382c24c6ffe1df
+SIZE (zabbix-1.6.tar.gz) = 6098034
diff --git a/net-mgmt/zabbix2/files/patch-src__libs__zbxsysinfo__simple__simple.c b/net-mgmt/zabbix2/files/patch-src__libs__zbxsysinfo__simple__simple.c
deleted file mode 100644
index fb6147c46d93..000000000000
--- a/net-mgmt/zabbix2/files/patch-src__libs__zbxsysinfo__simple__simple.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/libs/zbxsysinfo/simple/simple.c.orig	Wed Jun 13 15:21:51 2007
-+++ ./src/libs/zbxsysinfo/simple/simple.c	Wed Jun 13 15:22:02 2007
-@@ -37,6 +37,7 @@
- 	};
- 
- #ifdef HAVE_LDAP
-+#include "ldap.h"
- 
- static int    check_ldap(char *hostname, short port, int *value_int)
- {
diff --git a/net-mgmt/zabbix2/pkg-plist b/net-mgmt/zabbix2/pkg-plist
index ddf09c2e0692..f8ba1d8ce89b 100644
--- a/net-mgmt/zabbix2/pkg-plist
+++ b/net-mgmt/zabbix2/pkg-plist
@@ -1,277 +1,364 @@
 bin/zabbix_server
 %%ETCDIR%%/zabbix_server.conf.sample
-%%DATADIR%%/create/data/data.sql
-%%DATADIR%%/create/data/images/Hub.png
-%%DATADIR%%/create/data/images/Hub_small.png
-%%DATADIR%%/create/data/images/Network.png
-%%DATADIR%%/create/data/images/Network_small.png
-%%DATADIR%%/create/data/images/Notebook.png
-%%DATADIR%%/create/data/images/Notebook_small.png
-%%DATADIR%%/create/data/images/Phone.png
-%%DATADIR%%/create/data/images/Phone_small.png
-%%DATADIR%%/create/data/images/Printer.png
-%%DATADIR%%/create/data/images/Printer_small.png
-%%DATADIR%%/create/data/images/Router.png
-%%DATADIR%%/create/data/images/Router_small.png
-%%DATADIR%%/create/data/images/Satellite.png
-%%DATADIR%%/create/data/images/Satellite_small.png
-%%DATADIR%%/create/data/images/Server.png
-%%DATADIR%%/create/data/images/Server_small.png
-%%DATADIR%%/create/data/images/UPS.png
-%%DATADIR%%/create/data/images/UPS_small.png
-%%DATADIR%%/create/data/images/Workstation.png
-%%DATADIR%%/create/data/images/Workstation_small.png
-%%DATADIR%%/create/data/images_mysql.sql
-%%DATADIR%%/create/data/images_oracle.sql
-%%DATADIR%%/create/data/images_pgsql.sql
-%%DATADIR%%/create/data/images_sqlite3.sql
-%%DATADIR%%/create/schema/Makefile
-%%DATADIR%%/create/schema/Makefile.am
-%%DATADIR%%/create/schema/Makefile.in
-%%DATADIR%%/create/schema/mysql.sql
-%%DATADIR%%/create/schema/oracle.sql
-%%DATADIR%%/create/schema/postgresql.sql
-%%DATADIR%%/create/schema/sqlite.sql
-%%DATADIR%%/dbpatches/1.4/mysql/patch.sql
-%%DATADIR%%/dbpatches/1.4/oracle/patch.sql
-%%DATADIR%%/dbpatches/1.4/postgresql/patch.sql
-%%DATADIR%%/php/acknow.php
-%%DATADIR%%/php/actionconf.php
-%%DATADIR%%/php/actions.php
-%%DATADIR%%/php/audio/trigger_off.wav
-%%DATADIR%%/php/audio/trigger_on.wav
+%%DATADIR%%/php/styles/popupmenu.css
+%%DATADIR%%/php/styles/css_ob.css
+%%DATADIR%%/php/styles/calendar.css
+%%DATADIR%%/php/styles/css_bb.css
+%%DATADIR%%/php/styles/gmenu.css
+%%DATADIR%%/php/styles/sbox.css
+%%DATADIR%%/php/styles/link.css
+%%DATADIR%%/php/styles/p.css
+%%DATADIR%%/php/styles/ul.css
+%%DATADIR%%/php/styles/div.css
+%%DATADIR%%/php/styles/form.css
+%%DATADIR%%/php/styles/bar.css
+%%DATADIR%%/php/styles/default.css
+%%DATADIR%%/php/styles/table.css
+%%DATADIR%%/php/audio/trigger_on_warning.wav
 %%DATADIR%%/php/audio/trigger_on_average.wav
+%%DATADIR%%/php/audio/trigger_off.wav
 %%DATADIR%%/php/audio/trigger_on_disaster.wav
 %%DATADIR%%/php/audio/trigger_on_high.wav
-%%DATADIR%%/php/audio/trigger_on_warning.wav
-%%DATADIR%%/php/audit.php
-%%DATADIR%%/php/chart.php
-%%DATADIR%%/php/chart2.php
-%%DATADIR%%/php/chart3.php
-%%DATADIR%%/php/chart4.php
-%%DATADIR%%/php/chart5.php
-%%DATADIR%%/php/chart_sla.php
-%%DATADIR%%/php/charts.php
-%%DATADIR%%/php/conf/COPYING
-%%DATADIR%%/php/config.php
-%%DATADIR%%/php/create/data.sql
-%%DATADIR%%/php/create/mysql.sql
-%%DATADIR%%/php/css.css
-%%DATADIR%%/php/discovery.php
-%%DATADIR%%/php/discoveryconf.php
-%%DATADIR%%/php/events.php
-%%DATADIR%%/php/exp_imp.php
-%%DATADIR%%/php/graphs.php
-%%DATADIR%%/php/history.php
-%%DATADIR%%/php/hostprofiles.php
-%%DATADIR%%/php/hosts.php
-%%DATADIR%%/php/httpconf.php
-%%DATADIR%%/php/httpdetails.php
-%%DATADIR%%/php/httpmon.php
-%%DATADIR%%/php/image.php
-%%DATADIR%%/php/images/flash/zbxclock.swf
-%%DATADIR%%/php/images/general/closed.gif
-%%DATADIR%%/php/images/general/error_small.gif
-%%DATADIR%%/php/images/general/help.gif
-%%DATADIR%%/php/images/general/inst_completed.gif
-%%DATADIR%%/php/images/general/inst_current.gif
-%%DATADIR%%/php/images/general/inst_step.gif
-%%DATADIR%%/php/images/general/opened.gif
-%%DATADIR%%/php/images/general/sortdown.gif
-%%DATADIR%%/php/images/general/sortdown_off.gif
-%%DATADIR%%/php/images/general/sortup.gif
-%%DATADIR%%/php/images/general/sortup_off.gif
-%%DATADIR%%/php/images/general/tick.png
-%%DATADIR%%/php/images/general/zabbix.ico
-%%DATADIR%%/php/images/general/tree/I.gif
-%%DATADIR%%/php/images/general/tree/L.gif
-%%DATADIR%%/php/images/general/tree/O.gif
-%%DATADIR%%/php/images/general/tree/T.gif
-%%DATADIR%%/php/images/general/tree/X.gif
-%%DATADIR%%/php/images/general/tree/Xc.gif
-%%DATADIR%%/php/images/general/tree/Y.gif
-%%DATADIR%%/php/images/general/tree/Yc.gif
-%%DATADIR%%/php/images/general/tree/point.gif
-%%DATADIR%%/php/images/general/warning_small.gif
-%%DATADIR%%/php/images/general/zabbix.png
-%%DATADIR%%/php/images/gradients/blink1.gif
-%%DATADIR%%/php/images/gradients/blink2.gif
-%%DATADIR%%/php/images/gradients/button.gif
-%%DATADIR%%/php/images/gradients/menu_not_active.gif
-%%DATADIR%%/php/images/gradients/table_head.gif
-%%DATADIR%%/php/images/gradients/table_head2.gif
-%%DATADIR%%/php/images/sysmaps/Hub.png
-%%DATADIR%%/php/images/sysmaps/Hub_small.png
-%%DATADIR%%/php/images/sysmaps/Network.png
-%%DATADIR%%/php/images/sysmaps/Network_small.png
-%%DATADIR%%/php/images/sysmaps/Notebook.png
-%%DATADIR%%/php/images/sysmaps/Notebook_small.png
-%%DATADIR%%/php/images/sysmaps/Phone.png
-%%DATADIR%%/php/images/sysmaps/Phone_small.png
-%%DATADIR%%/php/images/sysmaps/Printer.png
-%%DATADIR%%/php/images/sysmaps/Printer_small.png
-%%DATADIR%%/php/images/sysmaps/README
-%%DATADIR%%/php/images/sysmaps/Router.png
-%%DATADIR%%/php/images/sysmaps/Router_small.png
-%%DATADIR%%/php/images/sysmaps/Satellite.png
-%%DATADIR%%/php/images/sysmaps/Satellite_small.png
-%%DATADIR%%/php/images/sysmaps/Server.png
-%%DATADIR%%/php/images/sysmaps/Server_small.png
-%%DATADIR%%/php/images/sysmaps/UPS.png
-%%DATADIR%%/php/images/sysmaps/UPS_small.png
-%%DATADIR%%/php/images/sysmaps/Workstation.png
-%%DATADIR%%/php/images/sysmaps/Workstation_small.png
-%%DATADIR%%/php/images/sysmaps/old/Hub.png
-%%DATADIR%%/php/images/sysmaps/old/Notebook.png
-%%DATADIR%%/php/images/sysmaps/old/Printer.png
-%%DATADIR%%/php/images/sysmaps/old/Router.png
-%%DATADIR%%/php/images/sysmaps/old/Server.png
-%%DATADIR%%/php/images/sysmaps/old/Workstation.png
-%%DATADIR%%/php/include/.htaccess
-%%DATADIR%%/php/include/acknow.inc.php
-%%DATADIR%%/php/include/actions.inc.php
-%%DATADIR%%/php/include/audit.inc.php
-%%DATADIR%%/php/include/classes/.htaccess
-%%DATADIR%%/php/include/classes/cbutton.inc.php
-%%DATADIR%%/php/include/classes/ccheckbox.inc.php
+%%DATADIR%%/php/audio/trigger_on.wav
+%%DATADIR%%/php/js/updater.js
+%%DATADIR%%/php/js/menu.js
+%%DATADIR%%/php/js/menu_scripts.js
+%%DATADIR%%/php/js/prototype.js
+%%DATADIR%%/php/js/calendar.js
+%%DATADIR%%/php/js/sbox.js
+%%DATADIR%%/php/js/services.js
+%%DATADIR%%/php/js/gmenu.js
+%%DATADIR%%/php/js/chkbxrange.js
+%%DATADIR%%/php/js/scrollbar.js
+%%DATADIR%%/php/js/graphs.js
+%%DATADIR%%/php/js/sbinit.js
+%%DATADIR%%/php/js/common.js
+%%DATADIR%%/php/js/ajax_req.js
+%%DATADIR%%/php/js/cookies.js
+%%DATADIR%%/php/js/blink.js
+%%DATADIR%%/php/js/tree.js
+%%DATADIR%%/php/js/url.js
+%%DATADIR%%/php/js/showhint.js
+%%DATADIR%%/php/include/locales/cn_zh.inc.php
+%%DATADIR%%/php/include/locales/lv_lv.inc.php
+%%DATADIR%%/php/include/locales/nl_nl.inc.php
+%%DATADIR%%/php/include/locales/ja_jp.inc.php
+%%DATADIR%%/php/include/locales/sp_sp.inc.php
+%%DATADIR%%/php/include/locales/ko_kr.inc.php
+%%DATADIR%%/php/include/locales/pt_br.inc.php
+%%DATADIR%%/php/include/locales/hu_hu.inc.php
+%%DATADIR%%/php/include/locales/it_it.inc.php
+%%DATADIR%%/php/include/locales/en_gb.inc.php
+%%DATADIR%%/php/include/locales/ru_ru.inc.php
+%%DATADIR%%/php/include/locales/fr_fr.inc.php
+%%DATADIR%%/php/include/locales/sv_se.inc.php
+%%DATADIR%%/php/include/locales/de_de.inc.php
+%%DATADIR%%/php/include/classes/cflashclock.mod.php
 %%DATADIR%%/php/include/classes/ccolor.inc.php
+%%DATADIR%%/php/include/classes/ctriggerinfo.mod.php
+%%DATADIR%%/php/include/classes/cldap.inc.php
+%%DATADIR%%/php/include/classes/ccheckbox.inc.php
+%%DATADIR%%/php/include/classes/ctable.inc.php
+%%DATADIR%%/php/include/classes/cvar.inc.php
+%%DATADIR%%/php/include/classes/cserverinfo.mod.php
+%%DATADIR%%/php/include/classes/cflash.inc.php
+%%DATADIR%%/php/include/classes/ctree.inc.php
+%%DATADIR%%/php/include/classes/ctableinfo.inc.php
 %%DATADIR%%/php/include/classes/ccombobox.inc.php
+%%DATADIR%%/php/include/classes/.htaccess
+%%DATADIR%%/php/include/classes/clist.inc.php
+%%DATADIR%%/php/include/classes/ctextarea.inc.php
 %%DATADIR%%/php/include/classes/cfile.inc.php
-%%DATADIR%%/php/include/classes/cflash.inc.php
-%%DATADIR%%/php/include/classes/cflashclock.mod.php
-%%DATADIR%%/php/include/classes/cform.inc.php
-%%DATADIR%%/php/include/classes/cformtable.inc.php
-%%DATADIR%%/php/include/classes/chelp.inc.php
 %%DATADIR%%/php/include/classes/chostsinfo.mod.php
-%%DATADIR%%/php/include/classes/ciframe.inc.php
-%%DATADIR%%/php/include/classes/cimg.inc.php
+%%DATADIR%%/php/include/classes/chelp.inc.php
 %%DATADIR%%/php/include/classes/clink.inc.php
-%%DATADIR%%/php/include/classes/clist.inc.php
-%%DATADIR%%/php/include/classes/cmap.inc.php
-%%DATADIR%%/php/include/classes/cpumenu.inc.php
-%%DATADIR%%/php/include/classes/cserverinfo.mod.php
-%%DATADIR%%/php/include/classes/cspan.inc.php
-%%DATADIR%%/php/include/classes/ctable.inc.php
-%%DATADIR%%/php/include/classes/ctableinfo.inc.php
-%%DATADIR%%/php/include/classes/ctag.inc.php
-%%DATADIR%%/php/include/classes/ctextarea.inc.php
 %%DATADIR%%/php/include/classes/ctextbox.inc.php
-%%DATADIR%%/php/include/classes/ctree.inc.php
-%%DATADIR%%/php/include/classes/ctriggerinfo.mod.php
-%%DATADIR%%/php/include/classes/cvar.inc.php
 %%DATADIR%%/php/include/classes/graph.inc.php
-%%DATADIR%%/php/include/config.inc.php
-%%DATADIR%%/php/include/copt.lib.php
-%%DATADIR%%/php/include/db.inc.php
-%%DATADIR%%/php/include/defines.inc.php
+%%DATADIR%%/php/include/classes/chart.inc.php
+%%DATADIR%%/php/include/classes/cspan.inc.php
+%%DATADIR%%/php/include/classes/cform.inc.php
+%%DATADIR%%/php/include/classes/ciframe.inc.php
+%%DATADIR%%/php/include/classes/cscript.inc.php
+%%DATADIR%%/php/include/classes/cpumenu.inc.php
+%%DATADIR%%/php/include/classes/pie.inc.php
+%%DATADIR%%/php/include/classes/ctag.inc.php
+%%DATADIR%%/php/include/classes/cbutton.inc.php
+%%DATADIR%%/php/include/classes/cformtable.inc.php
+%%DATADIR%%/php/include/classes/cimg.inc.php
+%%DATADIR%%/php/include/classes/cmap.inc.php
 %%DATADIR%%/php/include/discovery.inc.php
-%%DATADIR%%/php/include/events.inc.php
-%%DATADIR%%/php/include/export.inc.php
+%%DATADIR%%/php/include/page_footer.php
+%%DATADIR%%/php/include/acknow.inc.php
 %%DATADIR%%/php/include/forms.inc.php
-%%DATADIR%%/php/include/graphs.inc.php
-%%DATADIR%%/php/include/hosts.inc.php
-%%DATADIR%%/php/include/html.inc.php
-%%DATADIR%%/php/include/httptest.inc.php
-%%DATADIR%%/php/include/images.inc.php
+%%DATADIR%%/php/include/triggers.inc.php
+%%DATADIR%%/php/include/func.inc.php
+%%DATADIR%%/php/include/actions.inc.php
+%%DATADIR%%/php/include/setup.inc.php
+%%DATADIR%%/php/include/copt.lib.php
+%%DATADIR%%/php/include/screens.inc.php
+%%DATADIR%%/php/include/perm.inc.php
+%%DATADIR%%/php/include/config.inc.php
 %%DATADIR%%/php/include/import.inc.php
+%%DATADIR%%/php/include/page_header.php
+%%DATADIR%%/php/include/blocks.inc.php
+%%DATADIR%%/php/include/defines.inc.php
+%%DATADIR%%/php/include/.htaccess
+%%DATADIR%%/php/include/media.inc.php
+%%DATADIR%%/php/include/db.inc.php
 %%DATADIR%%/php/include/items.inc.php
-%%DATADIR%%/php/include/js.inc.php
-%%DATADIR%%/php/include/locales/cn_zh.inc.php
-%%DATADIR%%/php/include/locales/de_de.inc.php
-%%DATADIR%%/php/include/locales/en_gb.inc.php
-%%DATADIR%%/php/include/locales/fr_fr.inc.php
-%%DATADIR%%/php/include/locales/hu_hu.inc.php
-%%DATADIR%%/php/include/locales/it_it.inc.php
-%%DATADIR%%/php/include/locales/ja_jp.inc.php
-%%DATADIR%%/php/include/locales/lv_lv.inc.php
-%%DATADIR%%/php/include/locales/nl_nl.inc.php
-%%DATADIR%%/php/include/locales/pt_br.inc.php
-%%DATADIR%%/php/include/locales/ru_ru.inc.php
-%%DATADIR%%/php/include/locales/sp_sp.inc.php
-%%DATADIR%%/php/include/locales/sv_se.inc.php
+%%DATADIR%%/php/include/export.inc.php
 %%DATADIR%%/php/include/locales.inc.php
-%%DATADIR%%/php/include/maps.inc.php
-%%DATADIR%%/php/include/media.inc.php
-%%DATADIR%%/php/include/nodes.inc.php
-%%DATADIR%%/php/include/page_footer.php
-%%DATADIR%%/php/include/page_header.php
-%%DATADIR%%/php/include/perm.inc.php
 %%DATADIR%%/php/include/profiles.inc.php
-%%DATADIR%%/php/include/screens.inc.php
 %%DATADIR%%/php/include/services.inc.php
-%%DATADIR%%/php/include/setup.inc.php
-%%DATADIR%%/php/include/triggers.inc.php
-%%DATADIR%%/php/include/users.inc.php
+%%DATADIR%%/php/include/graphs.inc.php
+%%DATADIR%%/php/include/scripts.inc.php
 %%DATADIR%%/php/include/validate.inc.php
-%%DATADIR%%/php/index.php
-%%DATADIR%%/php/instal.php
-%%DATADIR%%/php/items.php
-%%DATADIR%%/php/js/blink.js
-%%DATADIR%%/php/js/common.js
-%%DATADIR%%/php/js/cookies.js
-%%DATADIR%%/php/js/menu.js
-%%DATADIR%%/php/js/services.js
-%%DATADIR%%/php/js/showhint.js
-%%DATADIR%%/php/js/tree.js
-%%DATADIR%%/php/latest.php
-%%DATADIR%%/php/map.php
+%%DATADIR%%/php/include/reports.inc.php
+%%DATADIR%%/php/include/maps.inc.php
+%%DATADIR%%/php/include/hosts.inc.php
+%%DATADIR%%/php/include/users.inc.php
+%%DATADIR%%/php/include/html.inc.php
+%%DATADIR%%/php/include/events.inc.php
+%%DATADIR%%/php/include/images.inc.php
+%%DATADIR%%/php/include/audit.inc.php
+%%DATADIR%%/php/include/nodes.inc.php
+%%DATADIR%%/php/include/js.inc.php
+%%DATADIR%%/php/include/httptest.inc.php
+%%DATADIR%%/php/conf/maintenance.inc.php
+%%DATADIR%%/php/conf/COPYING
+%%DATADIR%%/php/images/sysmaps/old/Notebook.png
+%%DATADIR%%/php/images/sysmaps/old/Hub.png
+%%DATADIR%%/php/images/sysmaps/old/Workstation.png
+%%DATADIR%%/php/images/sysmaps/old/Router.png
+%%DATADIR%%/php/images/sysmaps/old/Printer.png
+%%DATADIR%%/php/images/sysmaps/old/Server.png
+%%DATADIR%%/php/images/sysmaps/Notebook_small.png
+%%DATADIR%%/php/images/sysmaps/Server_small.png
+%%DATADIR%%/php/images/sysmaps/UPS_small.png
+%%DATADIR%%/php/images/sysmaps/Phone_small.png
+%%DATADIR%%/php/images/sysmaps/Server.png
+%%DATADIR%%/php/images/sysmaps/Hub_small.png
+%%DATADIR%%/php/images/sysmaps/UPS.png
+%%DATADIR%%/php/images/sysmaps/Router_small.png
+%%DATADIR%%/php/images/sysmaps/Workstation.png
+%%DATADIR%%/php/images/sysmaps/Phone.png
+%%DATADIR%%/php/images/sysmaps/README
+%%DATADIR%%/php/images/sysmaps/Workstation_small.png
+%%DATADIR%%/php/images/sysmaps/Printer_small.png
+%%DATADIR%%/php/images/sysmaps/Hub.png
+%%DATADIR%%/php/images/sysmaps/Satellite_small.png
+%%DATADIR%%/php/images/sysmaps/Router.png
+%%DATADIR%%/php/images/sysmaps/Notebook.png
+%%DATADIR%%/php/images/sysmaps/Printer.png
+%%DATADIR%%/php/images/sysmaps/Network_small.png
+%%DATADIR%%/php/images/sysmaps/Satellite.png
+%%DATADIR%%/php/images/sysmaps/Network.png
+%%DATADIR%%/php/images/gradients/table_head.gif
+%%DATADIR%%/php/images/gradients/button.gif
+%%DATADIR%%/php/images/gradients/gradient.png
+%%DATADIR%%/php/images/gradients/table_head_bb.gif
+%%DATADIR%%/php/images/gradients/blink1.gif
+%%DATADIR%%/php/images/gradients/table_head2_bb.gif
+%%DATADIR%%/php/images/gradients/menu_not_active.gif
+%%DATADIR%%/php/images/gradients/blink2.gif
+%%DATADIR%%/php/images/gradients/menu_not_active_bb.gif
+%%DATADIR%%/php/images/gradients/table_head2.gif
+%%DATADIR%%/php/images/flash/zbxclock.swf
+%%DATADIR%%/php/images/general/tree/minus.gif
+%%DATADIR%%/php/images/general/tree/pointc.gif
+%%DATADIR%%/php/images/general/tree/zero.gif
+%%DATADIR%%/php/images/general/tree/plus.gif
+%%DATADIR%%/php/images/general/tree/pointl.gif
+%%DATADIR%%/php/images/general/tree/point.gif
+%%DATADIR%%/php/images/general/bar/arrow_down.gif
+%%DATADIR%%/php/images/general/bar/arrow_r.gif
+%%DATADIR%%/php/images/general/bar/bar_bg.gif
+%%DATADIR%%/php/images/general/bar/right.gif
+%%DATADIR%%/php/images/general/bar/arrow_up.gif
+%%DATADIR%%/php/images/general/bar/bar_left.gif
+%%DATADIR%%/php/images/general/bar/cal.gif
+%%DATADIR%%/php/images/general/bar/bar_right.gif
+%%DATADIR%%/php/images/general/bar/bar_middle.gif
+%%DATADIR%%/php/images/general/bar/arrow_l.gif
+%%DATADIR%%/php/images/general/bar/bg.gif
+%%DATADIR%%/php/images/general/bar/arrow_sm.gif
+%%DATADIR%%/php/images/general/bar/left.gif
+%%DATADIR%%/php/images/general/bttn/fullscreen.png
+%%DATADIR%%/php/images/general/bttn/minus_bb.png
+%%DATADIR%%/php/images/general/bttn/arrowup.png
+%%DATADIR%%/php/images/general/bttn/fullscreen_bb.png
+%%DATADIR%%/php/images/general/bttn/arrowup_bb.png
+%%DATADIR%%/php/images/general/bttn/menu.png
+%%DATADIR%%/php/images/general/bttn/arrowdown.png
+%%DATADIR%%/php/images/general/bttn/menu_bb.png
+%%DATADIR%%/php/images/general/bttn/mute.png
+%%DATADIR%%/php/images/general/bttn/mute_bb.png
+%%DATADIR%%/php/images/general/bttn/arrowdown_bb.png
+%%DATADIR%%/php/images/general/bttn/reset.png
+%%DATADIR%%/php/images/general/bttn/plus.png
+%%DATADIR%%/php/images/general/bttn/reset_bb.png
+%%DATADIR%%/php/images/general/bttn/plus_bb.png
+%%DATADIR%%/php/images/general/bttn/help.png
+%%DATADIR%%/php/images/general/bttn/sound.png
+%%DATADIR%%/php/images/general/bttn/minus.png
+%%DATADIR%%/php/images/general/bttn/help_bb.png
+%%DATADIR%%/php/images/general/bttn/sound_bb.png
+%%DATADIR%%/php/images/general/inst_current.gif
+%%DATADIR%%/php/images/general/sortdown.gif
+%%DATADIR%%/php/images/general/error_small.gif
+%%DATADIR%%/php/images/general/chart.png
+%%DATADIR%%/php/images/general/trigg_dep.png
+%%DATADIR%%/php/images/general/sort_upw.gif
+%%DATADIR%%/php/images/general/sortup_off.gif
+%%DATADIR%%/php/images/general/zabbix.ico
+%%DATADIR%%/php/images/general/warning_small.gif
+%%DATADIR%%/php/images/general/zabbix_bb.ico
+%%DATADIR%%/php/images/general/help.gif
+%%DATADIR%%/php/images/general/sortup.gif
+%%DATADIR%%/php/images/general/inst_completed.gif
+%%DATADIR%%/php/images/general/warning16r.gif
+%%DATADIR%%/php/images/general/zabbix.png
+%%DATADIR%%/php/images/general/zabbix_bb.png
+%%DATADIR%%/php/images/general/trigg_dep.gif
+%%DATADIR%%/php/images/general/zabbix_ob.ico
+%%DATADIR%%/php/images/general/closed.gif
+%%DATADIR%%/php/images/general/sort_downw.gif
+%%DATADIR%%/php/images/general/inst_step.gif
+%%DATADIR%%/php/images/general/sortdown_off.gif
+%%DATADIR%%/php/images/general/tick.png
+%%DATADIR%%/php/images/general/opened.gif
+%%DATADIR%%/php/create/mysql.sql
+%%DATADIR%%/php/create/data.sql
+%%DATADIR%%/php/discoveryconf.php
+%%DATADIR%%/php/tr_comments.php
 %%DATADIR%%/php/maps.php
-%%DATADIR%%/php/media_types.php
-%%DATADIR%%/php/nodes.php
+%%DATADIR%%/php/users.php
 %%DATADIR%%/php/overview.php
-%%DATADIR%%/php/popup.php
-%%DATADIR%%/php/popup_gitem.php
-%%DATADIR%%/php/popup_httpstep.php
-%%DATADIR%%/php/popup_media.php
+%%DATADIR%%/php/nodes.php
+%%DATADIR%%/php/tr_events.php
+%%DATADIR%%/php/authentication.php
+%%DATADIR%%/php/queue.php
+%%DATADIR%%/php/popup_link_tr.php
+%%DATADIR%%/php/httpdetails.php
+%%DATADIR%%/php/dashboard.php
+%%DATADIR%%/php/instal.php
 %%DATADIR%%/php/popup_right.php
-%%DATADIR%%/php/popup_trexpr.php
+%%DATADIR%%/php/screens.php
+%%DATADIR%%/php/popup.php
+%%DATADIR%%/php/media_types.php
+%%DATADIR%%/php/index.php
+%%DATADIR%%/php/vtext.php
+%%DATADIR%%/php/sysmap.php
+%%DATADIR%%/php/items.php
+%%DATADIR%%/php/image.php
+%%DATADIR%%/php/chart2.php
+%%DATADIR%%/php/actionconf.php
 %%DATADIR%%/php/popup_users.php
-%%DATADIR%%/php/popup_usrgrp.php
-%%DATADIR%%/php/profile.php
-%%DATADIR%%/php/queue.php
+%%DATADIR%%/php/chart3.php
+%%DATADIR%%/php/chart4.php
+%%DATADIR%%/php/httpconf.php
+%%DATADIR%%/php/chart5.php
+%%DATADIR%%/php/scripts.php
+%%DATADIR%%/php/chart6.php
+%%DATADIR%%/php/chart7.php
+%%DATADIR%%/php/css.css
+%%DATADIR%%/php/scripts_exec.php
 %%DATADIR%%/php/report1.php
 %%DATADIR%%/php/report2.php
 %%DATADIR%%/php/report3.php
+%%DATADIR%%/php/popup_httpstep.php
 %%DATADIR%%/php/report4.php
+%%DATADIR%%/php/sysmaps.php
 %%DATADIR%%/php/report5.php
-%%DATADIR%%/php/screenconf.php
-%%DATADIR%%/php/screenedit.php
-%%DATADIR%%/php/screens.php
-%%DATADIR%%/php/services.php
+%%DATADIR%%/php/chart_sla.php
+%%DATADIR%%/php/hosts.php
+%%DATADIR%%/php/chart.php
+%%DATADIR%%/php/events.php
+%%DATADIR%%/php/popup_usrgrp.php
+%%DATADIR%%/php/warning.php
+%%DATADIR%%/php/audit.php
 %%DATADIR%%/php/services_form.php
-%%DATADIR%%/php/setup.php
+%%DATADIR%%/php/popup_trexpr.php
+%%DATADIR%%/php/discovery.php
+%%DATADIR%%/php/map.php
 %%DATADIR%%/php/srv_status.php
-%%DATADIR%%/php/sysmap.php
-%%DATADIR%%/php/sysmaps.php
-%%DATADIR%%/php/tr_comments.php
-%%DATADIR%%/php/tr_events.php
-%%DATADIR%%/php/tr_status.php
+%%DATADIR%%/php/hostprofiles.php
+%%DATADIR%%/php/acknow.php
+%%DATADIR%%/php/screenedit.php
 %%DATADIR%%/php/triggers.php
-%%DATADIR%%/php/users.php
-%%DATADIR%%/php/vtext.php
-@dirrm %%DATADIR%%/create/data/images
-@dirrm %%DATADIR%%/create/data
-@dirrm %%DATADIR%%/create/schema
-@dirrm %%DATADIR%%/create
-@dirrm %%DATADIR%%/dbpatches/1.4/mysql
-@dirrm %%DATADIR%%/dbpatches/1.4/oracle
-@dirrm %%DATADIR%%/dbpatches/1.4/postgresql
-@dirrm %%DATADIR%%/dbpatches/1.4
-@dirrm %%DATADIR%%/dbpatches
-@dirrm %%DATADIR%%/php/audio
-@dirrm %%DATADIR%%/php/create
-@dirrm %%DATADIR%%/php/images/flash
-@dirrm %%DATADIR%%/php/images/general/tree
-@dirrm %%DATADIR%%/php/images/general
-@dirrm %%DATADIR%%/php/images/gradients
+%%DATADIR%%/php/httpmon.php
+%%DATADIR%%/php/latest.php
+%%DATADIR%%/php/profile.php
+%%DATADIR%%/php/setup.php
+%%DATADIR%%/php/exp_imp.php
+%%DATADIR%%/php/history.php
+%%DATADIR%%/php/popup_media.php
+%%DATADIR%%/php/config.php
+%%DATADIR%%/php/locales.php
+%%DATADIR%%/php/services.php
+%%DATADIR%%/php/charts.php
+%%DATADIR%%/php/graphs.php
+%%DATADIR%%/php/screenconf.php
+%%DATADIR%%/php/popup_gitem.php
+%%DATADIR%%/php/tr_status.php
+%%DATADIR%%/dbpatches/1.6/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.6/oracle/patch.sql
+%%DATADIR%%/dbpatches/1.6/postgresql/patch.sql
+%%DATADIR%%/create/data/images/Hub.png
+%%DATADIR%%/create/data/images/Hub_small.png
+%%DATADIR%%/create/data/images/Network.png
+%%DATADIR%%/create/data/images/Network_small.png
+%%DATADIR%%/create/data/images/Notebook.png
+%%DATADIR%%/create/data/images/Notebook_small.png
+%%DATADIR%%/create/data/images/Phone.png
+%%DATADIR%%/create/data/images/Phone_small.png
+%%DATADIR%%/create/data/images/Printer.png
+%%DATADIR%%/create/data/images/Printer_small.png
+%%DATADIR%%/create/data/images/Router.png
+%%DATADIR%%/create/data/images/Router_small.png
+%%DATADIR%%/create/data/images/Satellite.png
+%%DATADIR%%/create/data/images/Satellite_small.png
+%%DATADIR%%/create/data/images/Server.png
+%%DATADIR%%/create/data/images/Server_small.png
+%%DATADIR%%/create/data/images/UPS.png
+%%DATADIR%%/create/data/images/UPS_small.png
+%%DATADIR%%/create/data/images/Workstation.png
+%%DATADIR%%/create/data/images/Workstation_small.png
+%%DATADIR%%/create/data/data.sql
+%%DATADIR%%/create/data/images_oracle.sql
+%%DATADIR%%/create/data/images_pgsql.sql
+%%DATADIR%%/create/data/images_mysql.sql
+%%DATADIR%%/create/data/images_sqlite3.sql
+%%DATADIR%%/create/schema/mysql.sql
+%%DATADIR%%/create/schema/oracle.sql
+%%DATADIR%%/create/schema/postgresql.sql
+%%DATADIR%%/create/schema/sqlite.sql
+@dirrm %%DATADIR%%/php/styles
+@dirrm %%DATADIR%%/php/js
+@dirrm %%DATADIR%%/php/include/locales
+@dirrm %%DATADIR%%/php/include/classes
+@dirrm %%DATADIR%%/php/include
 @dirrm %%DATADIR%%/php/images/sysmaps/old
 @dirrm %%DATADIR%%/php/images/sysmaps
+@dirrm %%DATADIR%%/php/images/gradients
+@dirrm %%DATADIR%%/php/images/general/tree
+@dirrm %%DATADIR%%/php/images/general/bttn
+@dirrm %%DATADIR%%/php/images/general/bar
+@dirrm %%DATADIR%%/php/images/general
+@dirrm %%DATADIR%%/php/images/flash
 @dirrm %%DATADIR%%/php/images
-@dirrm %%DATADIR%%/php/include/classes
-@dirrm %%DATADIR%%/php/include/locales
-@dirrm %%DATADIR%%/php/include
-@dirrm %%DATADIR%%/php/js
+@dirrm %%DATADIR%%/php/create
+@dirrm %%DATADIR%%/php/conf
+@dirrm %%DATADIR%%/php/audio
+@dirrm %%DATADIR%%/php
+@dirrm %%DATADIR%%/dbpatches/1.6/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.6/oracle
+@dirrm %%DATADIR%%/dbpatches/1.6/mysql
+@dirrm %%DATADIR%%/dbpatches/1.6
+@dirrm %%DATADIR%%/dbpatches
+@dirrm %%DATADIR%%/create/schema
+@dirrm %%DATADIR%%/create/data/images
+@dirrm %%DATADIR%%/create/data
+@dirrm %%DATADIR%%/create
+@dirrm %%DATADIR%%/
 @dirrmtry %%ETCDIR%%
-@dirrmtry %%DATADIR%%/php/conf
-@dirrmtry %%DATADIR%%/php
-@dirrmtry %%DATADIR%%