diff options
| author | rm <rm@FreeBSD.org> | 2013-01-04 19:14:36 +0800 |
|---|---|---|
| committer | rm <rm@FreeBSD.org> | 2013-01-04 19:14:36 +0800 |
| commit | 83ee25894a709236f5cb3ceb615e0d16d8ee8934 (patch) | |
| tree | db5a9b3d5d635f316f16707d6aad1bb7b6026354 | |
| parent | 0a67054bbf4d3ae7ea64b470a509b5a553767cdc (diff) | |
| download | freebsd-ports-gnome-83ee25894a709236f5cb3ceb615e0d16d8ee8934.tar.gz freebsd-ports-gnome-83ee25894a709236f5cb3ceb615e0d16d8ee8934.tar.zst freebsd-ports-gnome-83ee25894a709236f5cb3ceb615e0d16d8ee8934.zip | |
- 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@moov.de>
Approved by: maintainer timeout (3 month+)
| -rw-r--r-- | net-mgmt/zabbix-server/Makefile | 10 | ||||
| -rw-r--r-- | net-mgmt/zabbix-server/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c | 48 |
3 files changed, 5 insertions, 57 deletions
diff --git a/net-mgmt/zabbix-server/Makefile b/net-mgmt/zabbix-server/Makefile index 2fd7cd2d697b..76e99fc6633f 100644 --- a/net-mgmt/zabbix-server/Makefile +++ b/net-mgmt/zabbix-server/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: zabbix-server -# Date created: 2009-12-09 -# Whom: Jim Riggs <ports@christianserving.org> -# +# Created by: Jim Riggs <ports@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/^-//} diff --git a/net-mgmt/zabbix-server/distinfo b/net-mgmt/zabbix-server/distinfo index 9d1bb6b81705..c1eaf8f2e99a 100644 --- a/net-mgmt/zabbix-server/distinfo +++ b/net-mgmt/zabbix-server/distinfo @@ -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 diff --git a/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c b/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c index fe686e0eb785..eb11eddd7f6d 100644 --- a/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c +++ b/net-mgmt/zabbix-server/files/patch-src_libs_zbxsysinfo_freebsd__proc.c @@ -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 |