4 files changed, 26 insertions, 17 deletions

diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile
index ca292a55ff95..2b05f46ea958 100644
--- a/net-mgmt/zabbix2/Makefile
+++ b/net-mgmt/zabbix2/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTVERSION=	1.4.5
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
-MAINTAINER=	sq@tvfaq.ru
+MAINTAINER=	d.lohansky@zsupport.ru
 COMMENT=	Application and network monitoring solution
 
 LIB_DEPENDS=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp \
diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo
index 428fbb3a61af..5f9b3bac2d66 100644
--- a/net-mgmt/zabbix2/distinfo
+++ b/net-mgmt/zabbix2/distinfo
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.4.4.tar.gz) = 2b787b88c6cbf21283c1c24657b0d130
-SHA256 (zabbix-1.4.4.tar.gz) = f6ae34288b367bcd874e9f1cb8e1b5fc1dfcfbe42eec2db5ee35b521943cd6e7
-SIZE (zabbix-1.4.4.tar.gz) = 3733956
+MD5 (zabbix-1.4.5.tar.gz) = f87d73852fdab33f99beebfd16c21c63
+SHA256 (zabbix-1.4.5.tar.gz) = abde9b369960d9075605e12e915d05c04b3c81f1e3445b5d7b39919b0d1648c1
+SIZE (zabbix-1.4.5.tar.gz) = 4137972
diff --git a/net-mgmt/zabbix2/files/patch-src_libs_zbxcomms_comms.c b/net-mgmt/zabbix2/files/patch-src_libs_zbxcomms_comms.c
deleted file mode 100644
index b3e23c432dd3..000000000000
--- a/net-mgmt/zabbix2/files/patch-src_libs_zbxcomms_comms.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libs/zbxcomms/comms.c.orig	2007-12-17 04:18:59.000000000 -0900
-+++ src/libs/zbxcomms/comms.c	2008-03-15 21:38:41.000000000 -0800
-@@ -698,7 +698,7 @@
- 
- 	for(i = 0; i < s->num_socks; i++) {
- #if !defined(_WINDOWS)
--		if(s->sockets[i] > n)
-+               if(s->sockets[i] + 1 > n)
- 			n = s->sockets[i] + 1;
- #endif
- 		if(FD_ISSET(s->sockets[i], &sock_set))
diff --git a/net-mgmt/zabbix2/pkg-plist b/net-mgmt/zabbix2/pkg-plist
index 6b3067396855..ddf09c2e0692 100644
--- a/net-mgmt/zabbix2/pkg-plist
+++ b/net-mgmt/zabbix2/pkg-plist
@@ -1,6 +1,26 @@
 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
@@ -229,6 +249,7 @@ bin/zabbix_server
 %%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