From owner-svn-ports-all@freebsd.org Thu Jul 6 01:43:38 2017 Return-Path: Delivered-To: svn-ports-all@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 48E9DD98CE8; Thu, 6 Jul 2017 01:43:38 +0000 (UTC) (envelope-from junovitch@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 24FA679DF5; Thu, 6 Jul 2017 01:43:38 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v661hbsj022007; Thu, 6 Jul 2017 01:43:37 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v661haHj022003; Thu, 6 Jul 2017 01:43:36 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201707060143.v661haHj022003@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Thu, 6 Jul 2017 01:43:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r445119 - in branches/2017Q3/sysutils/xosview: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: junovitch X-SVN-Commit-Paths: in branches/2017Q3/sysutils/xosview: . files X-SVN-Commit-Revision: 445119 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2017 01:43:38 -0000 Author: junovitch Date: Thu Jul 6 01:43:36 2017 New Revision: 445119 URL: https://svnweb.freebsd.org/changeset/ports/445119 Log: MFH: r444892 Update to 1.19, Fix build error on FreeBSD 12 PR: 220426 Submitted by: otacilio.neto@bsd.com.br (maintainer) Approved by: ports-secteam (with hat) Added: branches/2017Q3/sysutils/xosview/files/patch-bsd_kernel.cc - copied unchanged from r444892, head/sysutils/xosview/files/patch-bsd_kernel.cc Deleted: branches/2017Q3/sysutils/xosview/files/patch-bsd-kernel.cc Modified: branches/2017Q3/sysutils/xosview/Makefile branches/2017Q3/sysutils/xosview/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/sysutils/xosview/Makefile ============================================================================== --- branches/2017Q3/sysutils/xosview/Makefile Thu Jul 6 01:43:07 2017 (r445118) +++ branches/2017Q3/sysutils/xosview/Makefile Thu Jul 6 01:43:36 2017 (r445119) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xosview -PORTVERSION= 1.17 -PORTREVISION= 1 +PORTVERSION= 1.19 CATEGORIES= sysutils MAINTAINER= otacilio.neto@bsd.com.br Modified: branches/2017Q3/sysutils/xosview/distinfo ============================================================================== --- branches/2017Q3/sysutils/xosview/distinfo Thu Jul 6 01:43:07 2017 (r445118) +++ branches/2017Q3/sysutils/xosview/distinfo Thu Jul 6 01:43:36 2017 (r445119) @@ -1,2 +1,3 @@ -SHA256 (hills-xosview-1.17_GH0.tar.gz) = a5a84cbcee21805922781d3532cf5c4436331f031fa39e741a699f83ad5ddda9 -SIZE (hills-xosview-1.17_GH0.tar.gz) = 144327 +TIMESTAMP = 1498958595 +SHA256 (hills-xosview-1.19_GH0.tar.gz) = 4bf31738c49f950b1f8b9574e9c850b3cb7448c5d600b560bd24a55ae4497a16 +SIZE (hills-xosview-1.19_GH0.tar.gz) = 144229 Copied: branches/2017Q3/sysutils/xosview/files/patch-bsd_kernel.cc (from r444892, head/sysutils/xosview/files/patch-bsd_kernel.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/sysutils/xosview/files/patch-bsd_kernel.cc Thu Jul 6 01:43:36 2017 (r445119, copy of r444892, head/sysutils/xosview/files/patch-bsd_kernel.cc) @@ -0,0 +1,32 @@ +--- bsd/kernel.cc.orig 2017-07-02 01:38:15 UTC ++++ bsd/kernel.cc +@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVMEXP2 }; + static int mib_uvm[2] = { CTL_VM, VM_UVMEXP }; + #endif + #else ++#if defined(XOSVIEW_FREEBSD) ++#define _WANT_VMMETER ++#endif + #include + #endif + +@@ -328,7 +331,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo) + GET_VM_STATS(v_active_count); + GET_VM_STATS(v_inactive_count); + GET_VM_STATS(v_wire_count); ++#if __FreeBSD_version < 1200017 + GET_VM_STATS(v_cache_count); ++#endif + GET_VM_STATS(v_free_count); + GET_VM_STATS(v_page_size); + GET_VM_STATS(v_vnodepgsin); +@@ -350,7 +355,9 @@ BSDGetPageStats(uint64_t *meminfo, uint64_t *pageinfo) + meminfo[0] = (uint64_t)vm.v_active_count * vm.v_page_size; + meminfo[1] = (uint64_t)vm.v_inactive_count * vm.v_page_size; + meminfo[2] = (uint64_t)vm.v_wire_count * vm.v_page_size; ++#if __FreeBSD_version < 1200017 + meminfo[3] = (uint64_t)vm.v_cache_count * vm.v_page_size; ++#endif + meminfo[4] = (uint64_t)vm.v_free_count * vm.v_page_size; + #else /* XOSVIEW_DFBSD */ + meminfo[0] = (uint64_t)vms.v_active_count * vms.v_page_size;