Update to Zabbix version 2.4.7. A few patches were adopted upstream. See ChangeLog for complete list of changes.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Thu Apr 21 16:36:47 2016 +0200
Changeset:	d7bd464ca00104f82f35b818a0c7ccaeb2ab1c31

Modified Files:
	zabbix/Makefile.common
	zabbix/distinfo
Removed Files:
	zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_cpu.c
	zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_diskspace.c
	zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_memory.c

Log Message:
Update to Zabbix version 2.4.7.
A few patches were adopted upstream.
See ChangeLog for complete list of changes.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d7bd464ca00104f82f35b818a0c7ccaeb2ab1c31

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zabbix/Makefile.common                                  |  3 +--
 zabbix/distinfo                                         | 10 ++++------
 zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_cpu.c   | 17 -----------------
 .../patch-src_libs_zbxsysinfo_netbsd_diskspace.c        | 17 -----------------
 .../patches/patch-src_libs_zbxsysinfo_netbsd_memory.c   | 17 -----------------
 5 files changed, 5 insertions(+), 59 deletions(-)

diffs:
diff --git a/zabbix/Makefile.common b/zabbix/Makefile.common
index 6be8070..b766653 100644
--- a/zabbix/Makefile.common
+++ b/zabbix/Makefile.common
@@ -4,9 +4,8 @@
 # used by wip/zabbix-server-pgsql/Makefile
 # used by wip/zabbix-server-mysql/Makefile
 
-VER=			2.4.4
+VER=			2.4.7
 DISTNAME=		zabbix-${VER}
-PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zabbix/}
 
diff --git a/zabbix/distinfo b/zabbix/distinfo
index 4e7d2f4..187443e 100644
--- a/zabbix/distinfo
+++ b/zabbix/distinfo
@@ -1,11 +1,9 @@
 $NetBSD: distinfo,v 1.12 2015/09/16 12:56:59 heidnes Exp $
 
-SHA1 (zabbix-2.4.4.tar.gz) = 505b274fe17d83bd5099cf71cd3d38a4d3d8d88b
-RMD160 (zabbix-2.4.4.tar.gz) = 27b92992a008f3cd37dd264d46c2f1ed3392f2fe
-Size (zabbix-2.4.4.tar.gz) = 14844586 bytes
-SHA1 (patch-src_libs_zbxsysinfo_netbsd_cpu.c) = 38353bc15b528259a3b2c0ce2ae52fcacb00bf9d
-SHA1 (patch-src_libs_zbxsysinfo_netbsd_diskspace.c) = 186cdcb367e68b1c9f5250ac2b94c75b8731da40
-SHA1 (patch-src_libs_zbxsysinfo_netbsd_memory.c) = 466c2d17a49fd0cc37dd5bc905485d2856beb160
+SHA1 (zabbix-2.4.7.tar.gz) = 9090472e5f78fd828bf89d5558ceedd60db74443
+RMD160 (zabbix-2.4.7.tar.gz) = f935c44faf0ae98a04d2deb895fbf1ca825204f1
+SHA512 (zabbix-2.4.7.tar.gz) = 81860dfab38241e939a5cced50527fd16d35ec7b82232b2e0a4f17c90c1fc8ffb9bb95891ec27bb87445e5f81fba066dccc6b1a8833a4af4f483532f83d6172a
+Size (zabbix-2.4.7.tar.gz) = 15012768 bytes
 SHA1 (patch-src_zabbix__agent_Makefile.in) = 8b366776f72e189234cebbb4e9c4cba62750790b
 SHA1 (patch-src_zabbix__agent_zabbix__agentd.c) = 959bc02cd67167001c11ba532be1e4f0971144b8
 SHA1 (patch-src_zabbix__proxy_Makefile.in) = 7b3fe51b7f21656c1453de5f948568e6d0d0d3d8
diff --git a/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_cpu.c b/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_cpu.c
deleted file mode 100644
index 7c2d7ec..0000000
--- a/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_cpu.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_libs_zbxsysinfo_netbsd_cpu.c,v 1.1 2015/09/16 12:56:59 heidnes Exp $
-
-Add some more includes to make this build on netbsd-7.
-
---- src/libs/zbxsysinfo/netbsd/cpu.c.orig	2015-02-23 12:28:14.000000000 +0000
-+++ src/libs/zbxsysinfo/netbsd/cpu.c
-@@ -24,6 +24,10 @@
- #include "zbxalgo.h"
- #include "zbxjson.h"
- 
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <uvm/uvm_extern.h>
-+
- static int	get_cpu_num()
- {
- #ifdef HAVE_FUNCTION_SYSCTL_HW_NCPU	/* NetBSD 3.1 i386; NetBSD 4.0 i386 */
diff --git a/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_diskspace.c b/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_diskspace.c
deleted file mode 100644
index 825733d..0000000
--- a/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_diskspace.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_libs_zbxsysinfo_netbsd_diskspace.c,v 1.1 2015/08/20 11:43:12 heidnes Exp $
-
-Fix an obvious error in VFS_FS_SIZE; don't always
-return SYSINFO_RET_FAIL(!), but instead return the
-return value of the helper function we ended up calling.
-
---- src/libs/zbxsysinfo/netbsd/diskspace.c.orig	2015-02-23 12:28:14.000000000 +0000
-+++ src/libs/zbxsysinfo/netbsd/diskspace.c
-@@ -183,7 +183,7 @@ int	VFS_FS_SIZE(AGENT_REQUEST *request, 
- 		return SYSINFO_RET_FAIL;
- 	}
- 
--	return SYSINFO_RET_FAIL;
-+	return ret;
- }
- 
- int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result)
diff --git a/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_memory.c b/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_memory.c
deleted file mode 100644
index c649e9c..0000000
--- a/zabbix/patches/patch-src_libs_zbxsysinfo_netbsd_memory.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_libs_zbxsysinfo_netbsd_memory.c,v 1.1 2015/09/16 12:56:59 heidnes Exp $
-
-Add some more includes to make this build on netbsd-7.
-
---- src/libs/zbxsysinfo/netbsd/memory.c.orig	2015-02-23 12:28:14.000000000 +0000
-+++ src/libs/zbxsysinfo/netbsd/memory.c
-@@ -21,6 +21,10 @@
- #include "sysinfo.h"
- #include "log.h"
- 
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <uvm/uvm_extern.h>
-+
- static int			mib[] = {CTL_VM, VM_UVMEXP2};
- static size_t			len;
- static struct uvmexp_sysctl	uvm;