svn commit: r429331 - head/devel/sigar/files

[Antoine Brodin]

Author: antoine
Date: Sat Dec 24 12:27:42 2016
New Revision: 429331
URL: https://svnweb.freebsd.org/changeset/ports/429331

Log:
  Unbreak build on head: v_cache_count was removed from struct vmmeter in
  base r309017 as it was no longer used (always zero).
  
  Reported by:	pkg-fallout

Modified:
  head/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c

Modified: head/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c
==============================================================================
--- head/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c	Sat Dec 24 12:19:11 2016	(r429330)
+++ head/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c	Sat Dec 24 12:27:42 2016	(r429331)
@@ -1,9 +1,12 @@
 --- src/os/darwin/darwin_sigar.c.orig	2014-11-17 21:46:20 UTC
 +++ src/os/darwin/darwin_sigar.c
-@@ -400,8 +400,10 @@ static int sigar_vmstat(sigar_t *sigar, 
+@@ -399,9 +399,13 @@ static int sigar_vmstat(sigar_t *sigar, 
+     GET_VM_STATS(vm, v_active_count, 0);
      GET_VM_STATS(vm, v_inactive_target, 0);
      GET_VM_STATS(vm, v_inactive_count, 1);
++#if (__FreeBSD_version < 1200016 )
      GET_VM_STATS(vm, v_cache_count, 1);
++#endif
 +#if (__FreeBSD_version < 1100079 )
      GET_VM_STATS(vm, v_cache_min, 0);
      GET_VM_STATS(vm, v_cache_max, 0);
@@ -11,3 +14,15 @@
      GET_VM_STATS(vm, v_pageout_free_min, 0);
      GET_VM_STATS(vm, v_interrupt_free_min, 0);
      GET_VM_STATS(vm, v_forks, 0);
+@@ -479,7 +483,11 @@ int sigar_mem_get(sigar_t *sigar, sigar_
+     kern *= sigar->pagesize;
+ #elif defined(__FreeBSD__)
+     if ((status = sigar_vmstat(sigar, &vmstat)) == SIGAR_OK) {
++#if (__FreeBSD_version < 1200016 )
+         kern = vmstat.v_cache_count + vmstat.v_inactive_count;
++#else
++        kern = vmstat.v_inactive_count;
++#endif
+         kern *= sigar->pagesize;
+         mem->free = vmstat.v_free_count;
+         mem->free *= sigar->pagesize;