From owner-svn-ports-head@freebsd.org Mon Dec 31 17:04:36 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 578A6143A136; Mon, 31 Dec 2018 17:04:36 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EE6E373C42; Mon, 31 Dec 2018 17:04:35 +0000 (UTC) (envelope-from fernape@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BF69CD857; Mon, 31 Dec 2018 17:04:35 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBVH4ZI6060697; Mon, 31 Dec 2018 17:04:35 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBVH4Zvm060695; Mon, 31 Dec 2018 17:04:35 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201812311704.wBVH4Zvm060695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Mon, 31 Dec 2018 17:04:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488803 - in head/sysutils/xosview: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/sysutils/xosview: . files X-SVN-Commit-Revision: 488803 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EE6E373C42 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.94)[-0.936,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 31 Dec 2018 17:04:36 -0000 Author: fernape Date: Mon Dec 31 17:04:34 2018 New Revision: 488803 URL: https://svnweb.freebsd.org/changeset/ports/488803 Log: sysutils/xosview: update to 1.21 No info for this new release. While here: * Remove BROKEN_* since this builds fine in 12 or greater. * Simplify patch since some changes where merged upstream: https://github.com/hills/xosview/pull/11 PR: 234526 Reported by: freebsd@oldach.net Modified: head/sysutils/xosview/Makefile head/sysutils/xosview/distinfo head/sysutils/xosview/files/patch-bsd_kernel.cc Modified: head/sysutils/xosview/Makefile ============================================================================== --- head/sysutils/xosview/Makefile Mon Dec 31 16:46:35 2018 (r488802) +++ head/sysutils/xosview/Makefile Mon Dec 31 17:04:34 2018 (r488803) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xosview -DISTVERSION= 1.20 +DISTVERSION= 1.21 CATEGORIES= sysutils MAINTAINER= otacilio.neto@bsd.com.br @@ -11,8 +11,6 @@ COMMENT= Graphical performance meter LICENSE= BSD4CLAUSE GPLv2 LICENSE_COMB= multi -BROKEN_FreeBSD_12= Due to changes in sys/vmmeter.h (r328134) -BROKEN_FreeBSD_13= Due to changes in sys/vmmeter.h (r328134) ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= uses x86-specific hardware resources Modified: head/sysutils/xosview/distinfo ============================================================================== --- head/sysutils/xosview/distinfo Mon Dec 31 16:46:35 2018 (r488802) +++ head/sysutils/xosview/distinfo Mon Dec 31 17:04:34 2018 (r488803) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533352666 -SHA256 (hills-xosview-1.20_GH0.tar.gz) = 1af6e984ca4d67139143307983a843eb8fcec78b960979180719ddc01417562a -SIZE (hills-xosview-1.20_GH0.tar.gz) = 147425 +TIMESTAMP = 1546270995 +SHA256 (hills-xosview-1.21_GH0.tar.gz) = 7b7e2964526baf40c9bd59a6f414c42487187f6eaf1882c6d12ced4c80e7bbd5 +SIZE (hills-xosview-1.21_GH0.tar.gz) = 147486 Modified: head/sysutils/xosview/files/patch-bsd_kernel.cc ============================================================================== --- head/sysutils/xosview/files/patch-bsd_kernel.cc Mon Dec 31 16:46:35 2018 (r488802) +++ head/sysutils/xosview/files/patch-bsd_kernel.cc Mon Dec 31 17:04:34 2018 (r488803) @@ -1,6 +1,6 @@ ---- bsd/kernel.cc.orig 2017-11-04 15:05:59 UTC +--- bsd/kernel.cc.orig 2018-09-12 13:52:23 UTC +++ bsd/kernel.cc -@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVM +@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVMEXP2 }; static int mib_uvm[2] = { CTL_VM, VM_UVMEXP }; #endif #else @@ -10,31 +10,7 @@ #include #endif -@@ -320,7 +323,22 @@ BSDGetPageStats(uint64_t *meminfo, uint6 - pageinfo[1] = (uint64_t)uvm.pgswapout; - } - #else /* HAVE_UVM */ -- struct vmmeter vm; -+ /* -+ * Temporal patch from: -+ * https://github.com/hills/xosview/commit/0b4861c9fed2dc8450edf2dff7988ebd784a520b.patch -+ */ -+ struct vmmeter_fbsd { -+ u_int v_active_count; -+ u_int v_inactive_count; -+ u_int v_wire_count; -+ u_int v_cache_count; -+ u_int v_free_count; -+ u_int v_page_size; -+ u_int v_vnodepgsin; -+ u_int v_vnodepgsout; -+ u_int v_swappgsin; -+ u_int v_swappgsout; -+ } vm; - #if defined(XOSVIEW_FREEBSD) - size_t size = sizeof(unsigned int); - #define GET_VM_STATS(name) \ -@@ -328,7 +346,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6 +@@ -339,7 +342,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); @@ -44,7 +20,7 @@ GET_VM_STATS(v_free_count); GET_VM_STATS(v_page_size); GET_VM_STATS(v_vnodepgsin); -@@ -350,7 +370,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6 +@@ -361,7 +366,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; @@ -54,12 +30,3 @@ 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; -@@ -654,7 +676,7 @@ DevStat_Init(void) { - - uint64_t - DevStat_Get(uint64_t *read_bytes, uint64_t *write_bytes) { -- register int dn; -+ int dn; - long double busy_seconds; - uint64_t reads, writes, total_bytes = 0; - struct devinfo *tmp_dinfo;