svn commit: r309926 - in head/net-mgmt/zabbix-server: . files

[Ruslan Mahmatkhanov]

Author: rm
Date: Fri Jan  4 11:14:36 2013
New Revision: 309926
URL: http://svnweb.freebsd.org/changeset/ports/309926

Log:
  - update to 1.8.15
  - update patch to reflect changes in zabbix source
  - update CONFLICTS to include zabbix 2.x
  
  PR:		171931
  Submitted by:	Frank Wall <fw at moov.de>
  Approved by:	maintainer timeout (3 month+)

Modified:
  head/net-mgmt/zabbix-server/Makefile
  head/net-mgmt/zabbix-server/distinfo
  head/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c

Modified: head/net-mgmt/zabbix-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix-server/Makefile	Fri Jan  4 10:47:28 2013	(r309925)
+++ head/net-mgmt/zabbix-server/Makefile	Fri Jan  4 11:14:36 2013	(r309926)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	zabbix-server
-# Date created:		2009-12-09
-# Whom:			Jim Riggs <ports at christianserving.org>
-#
+# Created by: Jim Riggs <ports at christianserving.org>
 # $FreeBSD$
-#
 
 PORTNAME=	zabbix
-PORTVERSION=	1.8.13
+PORTVERSION=	1.8.15
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -20,7 +16,7 @@ LICENSE=	GPLv2
 CONFLICTS=	${PKGBASE}-1.[0-6]*
 
 .if ${PKGNAMESUFFIX} != "-agent"
-CONFLICTS+=	${PORTNAME}-1.[0-6]*
+CONFLICTS+=	${PORTNAME}-[1-2].[0-6]*
 .endif
 
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}

Modified: head/net-mgmt/zabbix-server/distinfo
==============================================================================
--- head/net-mgmt/zabbix-server/distinfo	Fri Jan  4 10:47:28 2013	(r309925)
+++ head/net-mgmt/zabbix-server/distinfo	Fri Jan  4 11:14:36 2013	(r309926)
@@ -1,2 +1,2 @@
-SHA256 (zabbix-1.8.13.tar.gz) = ac4497cde031b793e492e874b091d109da7d5410c4ba55f54cad0749ae47e667
-SIZE (zabbix-1.8.13.tar.gz) = 4235482
+SHA256 (zabbix-1.8.15.tar.gz) = 6ee4014dec29652ceba472f8973b267047e5d0599a729e24a266b26dbad7a80c
+SIZE (zabbix-1.8.15.tar.gz) = 4241782

Modified: head/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c
==============================================================================
--- head/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c	Fri Jan  4 10:47:28 2013	(r309925)
+++ head/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c	Fri Jan  4 11:14:36 2013	(r309926)
@@ -38,30 +38,6 @@
  	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)
@@ -72,27 +48,3 @@
  
  			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