ports/171931: [PATCH] net-mgmt/zabbix-server: update to 1.8.15

[Frank Wall]

>Number:         171931
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/zabbix-server: update to 1.8.15
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 24 22:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Frank Wall
>Release:        8.3-RELEASE-p3
>Organization:
>Environment:
FreeBSD XXX 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #0: Tue Jun 12 00:39:29 UTC 2012     root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
- update to Zabbix 1.8.15
- update patch to reflect changes in zabbix source
- update CONFLICHTS to include Zabbix 2.x
>How-To-Repeat:

>Fix:
apply the patch

Patch attached with submission follows:

--- net-mgmt/zabbix-server/Makefile.orig	2012-05-12 15:55:28.000000000 +0200
+++ net-mgmt/zabbix-server/Makefile	2012-09-24 20:48:43.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 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 +20,7 @@
 CONFLICTS=	${PKGBASE}-1.[0-6]*
 
 .if ${PKGNAMESUFFIX} != "-agent"
-CONFLICTS+=	${PORTNAME}-1.[0-6]*
+CONFLICTS+=	${PORTNAME}-[1-2].[0-6]*
 .endif
 
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
--- net-mgmt/zabbix-server/distinfo.orig	2012-05-12 15:55:28.000000000 +0200
+++ net-mgmt/zabbix-server/distinfo	2012-09-24 20:49:01.000000000 +0200
@@ -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
--- net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c.orig	2012-05-12 15:55:28.000000000 +0200
+++ net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c	2012-09-25 00:37:04.000000000 +0200
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted: