Updating to zabbix version 4.0.4.

Pkgsrc changes:
 * Add comments to a couple of patches which didn't have them.
 * Adapt one diff

Upstream changes:

Changes for 4.0.4

4.0.4rc3 was released as 4.0.4 without any changes

------------------------------------------------------------
Changes for 4.0.4rc3

Bug fixes:
..F....... [ZBX-15412] fixed Name column overlaps the Application
	 column in the Template view (vasilijs)

------------------------------------------------------------
Changes for 4.0.4rc2

Bug fixes:
..F....... [ZBXNEXT-4872] reverted SVG graph timeline changes to
	previous state (miks)

------------------------------------------------------------
Changes for 4.0.4rc1

New features:
..F....... [ZBXNEXT-4872] reworked SVG graph x-axis timeline (miks)
..F....... [ZBXNEXT-4873] implemented single dot datasets to be drawn
	as points in line vector graphs (miks)
...G...... [ZBX-14876] added a new optional parameter <regex_excl_dir>
	to items vfs.dir.size[] and vfs.dir.count[] (viktors)

Bug fixes:
..F....... [ZBX-15577] fixed restricted user access to the host name
	when callin g host_screen (vasilijs)
A......... [ZBX-13335] fixed low performance with linkage of items and
	item prot otypes to a lot of hosts (Sasha)
..F....... [ZBX-15435] fixed "Undefined index" errors in the "Problems"
	widget with multiple active maintenances which part of these
	are inaccessible (Sasha)
.......PS. [ZBX-15417] changed vmware collector to perform datastore
	configuration refresh only when directly monitoring ESXi version
	lower than v6.0 (MVekslers)
A......... [ZBX-14896] fixed low performance of the SQL statement when
	link temp late to many hosts (Sasha)
A......... [ZBX-15220] fixed displaying of last value for values received
	in the same second (Sasha)
........S. [ZBX-15451] fixed event correlation when "Event tag pair"
	condition is used and tag contains special characters (asitals)
........S. [ZBX-15460] reset agent availability when host status changes,
	e.g., when host gets disabled (asitals)
........S. [ZBX-15331] updated LLD item creation/updating error messages
	(asitals)
..F....... [ZBX-15465] removed html non-breaking space from visiblity
	checkbox labels (miks)
..F....... [ZBX-15307] fixed upper level maps positioning in Monitoring
	Map screen (talbergs)
...G...PS. [ZBX-15428] improved regular expression performance by studying
	compiled pattern (vso)
...G...PS. [ZBX-11761] added warnings in case of TLS identity mismatch
	(akozlovs)
A......... [ZBX-15373] fixed removal of trigger when deleting discovered
	item; fixed removal of dependent child items when removing master
	item (vmurzins)
A......... [ZBX-14613] fixed hostgroup.delete and host.delete API methods
	to validate maintenance constraint (talbergs)
..F....... [ZBX-14863] fixed authentication settings form of LDAP anonymous
	binding (gcalenko)
..F....... [ZBX-15374] fixed SQL and PHP errors on chart3.php page (Sasha)
...G...... [ZBX-15301] fixed monotonous lag behind in Windows
	"system.localtime" (MVekslers)
..F....... [ZBX-15377] fixed error messages for arrays in GET parameters (Sasha)
A......... [ZBX-15369] fixed "Undefined index: label" in map.update()
	method (Sasha)
..F....... [ZBX-15376] fixed "Undefined index: refresh" on several pages
	with disabled guest user (Sasha)
..F....... [ZBX-15375] fixed web scenario step name can consist only of
	whitespaces (agriscenko)
..F....... [ZBX-15375] fixed undefined index on Web scenario configuration
	page (Sasha)
..F....... [ZBX-15372] fixed SQL and PHP errors on "Slide shows" page when
	enter slides.php witout GET parameters (Sasha)
A......... [ZBX-15359] fixed undefined index in maintenance.create and
	maintenance.update API calls (Sasha)
A......... [ZBX-15358] fixed undefined index in configuration.import API
	call without one or several rules (Sasha)
A......... [ZBX-15355] fixed undefined index in configuration.import API
	call (Sasha)
A......... [ZBX-14926] fixed empty "inventory" property being returned by
	API if inventory mode is disabled (agriscenko)
A......... [ZBX-15354] fixed undefined index in API calls without "auth"
	parameter (Sasha)
...G...PS. [ZBX-15399] fixed IPv4 connections not being accepted when
	IPv6 mask is used (akozlovs)
A......... [ZBX-14331] fixed error allowing users to change type of a
	host interface that already has items attached (gcalenko)
..F....... [ZBX-15254] fixed incorrect matching string highlight in
	multiselect autocomplete box (ashubin, vasilijs)
..F....... [ZBX-15136] fixed displaying 'Plain text' on the dashboard
	as html (vasilijs)
........S. [ZBX-15313] fixed unit suffix support in calculated item
	expressions (kalimulin)
.......PS. [ZBX-15224] fixed failed query errors when receiving non
	UTF-8 history values (vso)
A.F....... [ZBX-14592] fixed calculation of SLA and availability report
	when problem has negative duration (miks)
..F....... [ZBX-13804] fixed generic popup form submission (miks)
A......... [ZBX-15156] fixed undefined offset error in host screen with
	web item (talbergs)
A......... [ZBX-14980] fixed problem with filter by itemids and hostids
	in history.get (vasilijs, vmurzins)
...G...... [ZBX-14624] fixed agent collector not releasing connection
	to missing/removed disk devices (Andris, yurii)
........S. [ZBX-15279] fixed handling of LLD processing errors that should
	have resulted in not supported LLD rule state (wiper)
........S. [ZBX-15241] fixed escaping regexp symbols in preprocessing
	output parameter when creating item by LLD (asitals)
..F....... [ZBX-14604] fixed displaying of the graph name on screens (miks)
..F....... [ZBXNEXT-4588] renamed 'display options' tab to 'displaying
	options'; fixed multiple layout issues, footnote in hint-box, field
	value handling, calculation of mouse position, multiple issues
	related with Y axis and problem styling (miks)
..F....... [ZBX-15159] fixed existing context menu closing when new one is
	opened (miks)
..F....... [ZBX-15233] renamed fuzzytime() function description in
	dropdown list (Ivo)
...G...... [ZBX-12801] excluded zabbix_sender.dll from MS Windows builds
	with TLS (viktors)
..F....... [ZBXNEXT-4883] fixed when trigger in problem state hides all
	dependent triggers in history view (vasilijs)
...G...... [ZBX-15260] improved misleading warning message when agent fails
	to find log file during processing logrt[] item (asitals)
.........T [ZBX-15258] fixed update interval of "Zabbix queue" item in
	server's template to be consistent with proxy template, added
	missing units in proxy template (asitals)
...G...... [ZBX-15225] improved handling of timeouts in "vfs.dir.size"
	and "vfs.dir.count" items on Windows agent (asitals)

5 files changed, 17 insertions, 14 deletions

diff --git a/sysutils/zabbix/Makefile b/sysutils/zabbix/Makefile
index 7b11b319639..d5d646b1f75 100644
--- a/sysutils/zabbix/Makefile
+++ b/sysutils/zabbix/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2018/12/18 13:27:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2019/02/07 12:36:25 he Exp $
 
-PKGREVISION= 2
 .include "Makefile.common"
 
 COMMENT=	Enterprise-class Monitoring Solution for Everyone
diff --git a/sysutils/zabbix/Makefile.common b/sysutils/zabbix/Makefile.common
index a7d554ab83e..bb7f7c03f6e 100644
--- a/sysutils/zabbix/Makefile.common
+++ b/sysutils/zabbix/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.11 2018/12/26 23:38:48 he Exp $
+# $NetBSD: Makefile.common,v 1.12 2019/02/07 12:36:25 he Exp $
 # used by sysutils/zabbix/Makefile
 # used by sysutils/zabbix-frontend/Makefile
 
-DISTNAME=	zabbix-4.0.3
+DISTNAME=	zabbix-4.0.4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zabbix/}
 
diff --git a/sysutils/zabbix/distinfo b/sysutils/zabbix/distinfo
index 5d1e322ec2b..502abbc2aed 100644
--- a/sysutils/zabbix/distinfo
+++ b/sysutils/zabbix/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2018/12/26 23:38:48 he Exp $
+$NetBSD: distinfo,v 1.14 2019/02/07 12:36:25 he Exp $
 
-SHA1 (zabbix-4.0.3.tar.gz) = b5ef06f539df7940fb672a9facafa18453f3e457
-RMD160 (zabbix-4.0.3.tar.gz) = 2cc2462c7e1cf9e109f44ef9239b92f6b71fe8de
-SHA512 (zabbix-4.0.3.tar.gz) = ee8feec85a01c7617d3420529afa59550982c3c51173f8de484a8833099d33cccb84fa4e82f7199bc0ed8af687eb206ae50e4853b824bfbe784f67964cc15e37
-Size (zabbix-4.0.3.tar.gz) = 18019170 bytes
-SHA1 (patch-frontends_php_locale_add__new__language.sh) = c187e2b4ae8dd9e409f5c32469cb7b0f02647d8b
-SHA1 (patch-frontends_php_locale_make__mo.sh) = 2f0aaa63e80fcd5d4fa8c507fd764f80070b7864
+SHA1 (zabbix-4.0.4.tar.gz) = 7eaa270d17ab0a02d00f2c9491e8807cdc027c44
+RMD160 (zabbix-4.0.4.tar.gz) = 5df95ab3f18c64fb6c452420b5bb23e9523758d2
+SHA512 (zabbix-4.0.4.tar.gz) = cf07c6dc3ea4b3722790d6db9219b81be7cb06cc11925a335b38bc3a7ad3fc395b45f6ba77edaf41eed545796ed2979c7b2f3b11b67fa6f39b76b58320642adb
+Size (zabbix-4.0.4.tar.gz) = 18045463 bytes
+SHA1 (patch-frontends_php_locale_add__new__language.sh) = 71be94363ee58490d2ee3ef4bc6b800cfc99e90a
+SHA1 (patch-frontends_php_locale_make__mo.sh) = c44c8996ffc5c1fa31eebaa766edb430e03004de
 SHA1 (patch-src_zabbix__agent_Makefile.in) = 55149e2969d0e6e54c537750ca1bde11c9b690d7
 SHA1 (patch-src_zabbix__proxy_Makefile.in) = 2e7dbe6e8554bbe2c1cb1074a308661ae44bb977
 SHA1 (patch-src_zabbix__server_Makefile.in) = bfcb02e8450df163a038adbae83a7e17fda0a9a9
diff --git a/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh b/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh
index a68ee46150a..f561702d8c4 100644
--- a/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh
+++ b/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh
@@ -1,4 +1,6 @@
-$NetBSD: patch-frontends_php_locale_add__new__language.sh,v 1.1 2017/07/03 13:04:01 joerg Exp $
+$NetBSD: patch-frontends_php_locale_add__new__language.sh,v 1.2 2019/02/07 12:36:25 he Exp $
+
+Fix bash scripts to use normal shell constructs.
 
 --- frontends/php/locale/add_new_language.sh.orig	2017-05-05 14:50:32.000000000 +0000
 +++ frontends/php/locale/add_new_language.sh
diff --git a/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh b/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh
index 98c699edfec..5ab6ee98862 100644
--- a/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh
+++ b/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh
@@ -1,4 +1,6 @@
-$NetBSD: patch-frontends_php_locale_make__mo.sh,v 1.1 2017/07/03 13:04:01 joerg Exp $
+$NetBSD: patch-frontends_php_locale_make__mo.sh,v 1.2 2019/02/07 12:36:25 he Exp $
+
+Make script runnable with non-bash bourne shell.
 
 --- frontends/php/locale/make_mo.sh.orig	2017-05-05 14:50:27.000000000 +0000
 +++ frontends/php/locale/make_mo.sh
@@ -7,6 +9,6 @@ $NetBSD: patch-frontends_php_locale_make__mo.sh,v 1.1 2017/07/03 13:04:01 joerg
  
 -while read pofile; do
 +find $(dirname $0) -type f ! -wholename '*/.svn*' -name '*.po' | while read pofile; do
-         msgfmt --use-fuzzy -c -o ${pofile%po}mo $pofile
+         msgfmt --use-fuzzy -c -o ${pofile%po}mo $pofile || exit $?
 -done < <(find $(dirname $0) -type f ! -wholename '*/.svn*' -name '*.po')
 +done