From a1ba0ebcfbfc336060baddd2344652992224e2aa Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 19 Aug 2012 22:44:08 +0000
Subject: - Update to 2.0.2 - Remove proc.c patch as it has been fixed upstream
 (ZBX-3897) - Add build dependency to pkgconfig

PR:		ports/170700
Submitted by:	Pakhom <pakhom706@gmail.com> (maintainer)
Approved by:	eadler (mentor)
---
 net-mgmt/zabbix2-server/Makefile                   |  3 +-
 net-mgmt/zabbix2-server/distinfo                   |  4 +-
 .../patch-src_libs_zbxsysinfo_freebsd__proc.c      | 98 ----------------------
 3 files changed, 4 insertions(+), 101 deletions(-)
 delete mode 100644 net-mgmt/zabbix2-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c

(limited to 'net-mgmt/zabbix2-server')

diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 48b356e333d6..f9bfb2c99a15 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zabbix2
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
@@ -36,6 +36,7 @@ USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
 .endif
 
 USE_ICONV=	yes
+USE_PKGCONFIG=	build
 
 USERS=		zabbix
 GROUPS=		zabbix
diff --git a/net-mgmt/zabbix2-server/distinfo b/net-mgmt/zabbix2-server/distinfo
index 75dbaa1500ee..87c5603e0dea 100644
--- a/net-mgmt/zabbix2-server/distinfo
+++ b/net-mgmt/zabbix2-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zabbix-2.0.0.tar.gz) = 52cc4b8a8624d53ff4591ebf86a92c19230964d46d39e5cccf7b8648fb2ecf4d
-SIZE (zabbix-2.0.0.tar.gz) = 12091622
+SHA256 (zabbix-2.0.2.tar.gz) = 2db56e4fc291f5469584844703f6815fe739c3b33b4c2d5854285a780650cfbb
+SIZE (zabbix-2.0.2.tar.gz) = 12070505
diff --git a/net-mgmt/zabbix2-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c b/net-mgmt/zabbix2-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c
deleted file mode 100644
index fe686e0eb785..000000000000
--- a/net-mgmt/zabbix2-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c
+++ /dev/null
@@ -1,98 +0,0 @@
---- src/libs/zbxsysinfo/freebsd/proc.c.orig	2011-12-28 03:27:42.000000000 -0600
-+++ src/libs/zbxsysinfo/freebsd/proc.c	2012-04-25 21:54:13.877489156 -0500
-@@ -36,17 +36,13 @@
- #	define ZBX_PROC_PID	ki_pid
- #	define ZBX_PROC_COMM	ki_comm
- #	define ZBX_PROC_STAT	ki_stat
--#	define ZBX_PROC_TSIZE	ki_tsize
--#	define ZBX_PROC_DSIZE	ki_dsize
--#	define ZBX_PROC_SSIZE	ki_ssize
-+#	define ZBX_PROC_VSIZE	ki_size
- #else
- #	define ZBX_COMMLEN	MAXCOMLEN
- #	define ZBX_PROC_PID	kp_proc.p_pid
- #	define ZBX_PROC_COMM	kp_proc.p_comm
- #	define ZBX_PROC_STAT	kp_proc.p_stat
--#	define ZBX_PROC_TSIZE	kp_eproc.e_vm.vm_tsize
--#	define ZBX_PROC_DSIZE	kp_eproc.e_vm.vm_dsize
--#	define ZBX_PROC_SSIZE	kp_eproc.e_vm.vm_ssize
-+#	define ZBX_PROC_VSIZE	kp_eproc.e_vm.vm_map.size
- #endif
- 
- static char	*get_commandline(struct kinfo_proc *proc)
-@@ -97,7 +93,7 @@
- 	char	procname[MAX_STRING_LEN],
- 		buffer[MAX_STRING_LEN],
- 		proccomm[MAX_STRING_LEN], *args;
--	int	do_task, pagesize, count, i,
-+	int	do_task, count, i,
- 		proc_ok, comm_ok,
- 		mib[4], mibs;
- 
-@@ -152,8 +148,6 @@
- 	if (0 != get_param(param, 4, proccomm, sizeof(proccomm)))
- 		*proccomm = '\0';
- 
--	pagesize = getpagesize();
--
- 	mib[0] = CTL_KERN;
- 	mib[1] = KERN_PROC;
- 	if (NULL != usrinfo)
-@@ -164,7 +158,11 @@
- 	}
- 	else
- 	{
-+#if(__FreeBSD_version > 500000)
-+		mib[2] = KERN_PROC_PROC;
-+#else
- 		mib[2] = KERN_PROC_ALL;
-+#endif
- 		mib[3] = 0;
- 		mibs = 3;
- 	}
-@@ -184,11 +182,6 @@
- 
- 	for (i = 0; i < count; i++)
- 	{
--#if(__FreeBSD_version > 500000)
--		if (proc[i].ki_flag & P_KTHREAD)	/* skip a system thread */
--			continue;
--#endif
--
- 		proc_ok = 0;
- 		comm_ok = 0;
- 		if (*procname == '\0' || 0 == strcmp(procname, proc[i].ZBX_PROC_COMM))
-@@ -205,8 +198,7 @@
- 
- 		if (proc_ok && comm_ok)
- 		{
--			value = proc[i].ZBX_PROC_TSIZE + proc[i].ZBX_PROC_DSIZE + proc[i].ZBX_PROC_SSIZE;
--			value *= pagesize;
-+			value = proc[i].ZBX_PROC_VSIZE; /* vsize is bytes not pages */
- 
- 			if (0 == proccount++)
- 				memsize = value;
-@@ -306,7 +298,11 @@
- 	}
- 	else
- 	{
-+#if(__FreeBSD_version > 500000)
-+		mib[2] = KERN_PROC_PROC;
-+#else
- 		mib[2] = KERN_PROC_ALL;
-+#endif
- 		mib[3] = 0;
- 		mibs = 3;
- 	}
-@@ -326,11 +322,6 @@
- 
- 	for (i = 0; i < count; i++)
- 	{
--#if(__FreeBSD_version > 500000)
--		if (proc[i].ki_flag & P_KTHREAD)	/* skip a system thread */
--			continue;
--#endif
--
- 		proc_ok = 0;
- 		stat_ok = 0;
- 		comm_ok = 0;
\ No newline at end of file
-- 
cgit v1.2.3