From owner-svn-ports-head@freebsd.org Sat Dec 24 12:27:44 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CC08C8E7FB; Sat, 24 Dec 2016 12:27:44 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E031822B; Sat, 24 Dec 2016 12:27:43 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBOCRhXM011527; Sat, 24 Dec 2016 12:27:43 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBOCRhmm011526; Sat, 24 Dec 2016 12:27:43 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201612241227.uBOCRhmm011526@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 24 Dec 2016 12:27:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429331 - head/devel/sigar/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Dec 2016 12:27:44 -0000 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;