From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 7 19:00:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0EF38E6F for ; Wed, 7 Nov 2012 19:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id D599B8FC19 for ; Wed, 7 Nov 2012 19:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA7J008v062643 for ; Wed, 7 Nov 2012 19:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA7J00I5062642; Wed, 7 Nov 2012 19:00:00 GMT (envelope-from gnats) Resent-Date: Wed, 7 Nov 2012 19:00:00 GMT Resent-Message-Id: <201211071900.qA7J00I5062642@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Hung-Yi Chen Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D5CD9B80 for ; Wed, 7 Nov 2012 18:53:35 +0000 (UTC) (envelope-from gaod@cse.tw) Received: from cse.tw (cse.tw [140.138.145.234]) by mx1.freebsd.org (Postfix) with ESMTP id 9D3398FC15 for ; Wed, 7 Nov 2012 18:53:35 +0000 (UTC) Received: from cse.tw (localhost [127.0.0.1]) by cse.tw (Postfix) with ESMTP id EFE1A187C431 for ; Thu, 8 Nov 2012 02:53:54 +0800 (CST) Received: (from gaod@localhost) by cse.tw (8.14.5/8.14.5/Submit) id qA7IrsT6011869; Thu, 8 Nov 2012 02:53:54 +0800 (CST) (envelope-from gaod) Message-Id: <201211071853.qA7IrsT6011869@cse.tw> Date: Thu, 8 Nov 2012 02:53:54 +0800 (CST) From: Hung-Yi Chen To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/173450: [MAINTAINER] sysutils/htop: Update to 1.0.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Hung-Yi Chen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Nov 2012 19:00:01 -0000 >Number: 173450 >Category: ports >Synopsis: [MAINTAINER] sysutils/htop: Update to 1.0.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Nov 07 19:00:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Hung-Yi Chen >Release: FreeBSD 9.0-RELEASE-p3 amd64 >Organization: >Environment: System: FreeBSD cse.tw 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update to 1.0.2. >How-To-Repeat: >Fix: --- htop.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 307141) +++ Makefile (working copy) @@ -6,8 +6,8 @@ # PORTNAME= htop -PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTVERSION= 1.0.2 +#PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF Index: distinfo =================================================================== --- distinfo (revision 307141) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (htop-1.0.1.tar.gz) = 07db2cbe02835f9e186b9610ecc3beca330a5c9beadb3b6069dd0a10561506f2 -SIZE (htop-1.0.1.tar.gz) = 384683 +SHA256 (htop-1.0.2.tar.gz) = ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1 +SIZE (htop-1.0.2.tar.gz) = 388499 Index: files/patch-ProcessList.c =================================================================== --- files/patch-ProcessList.c (revision 307141) +++ files/patch-ProcessList.c (working copy) @@ -1,5 +1,5 @@ ---- ProcessList.c.orig 2012-02-03 01:45:11.000000000 +0200 -+++ ProcessList.c 2012-05-16 17:39:50.000000000 +0300 +--- ProcessList.c.orig 2012-10-20 08:41:15.000000000 +0800 ++++ ProcessList.c 2012-11-08 02:41:19.000000000 +0800 @@ -25,6 +25,19 @@ #include #include @@ -20,7 +20,7 @@ /*{ #include "Vector.h" #include "Hashtable.h" -@@ -749,11 +762,13 @@ +@@ -764,13 +777,15 @@ void ProcessList_scan(ProcessList* this) { unsigned long long int usertime, nicetime, systemtime, systemalltime, idlealltime, idletime, totaltime, virtalltime; @@ -29,21 +29,23 @@ + FILE* file = NULL; - FILE* file = fopen(PROCMEMINFOFILE, "r"); -+ #ifndef __FreeBSD__ ++#ifndef __FreeBSD__ + unsigned long long int swapFree = 0; + file = fopen(PROCMEMINFOFILE, "r"); - assert(file != NULL); + if (file == NULL) { + CRT_fatalError("Cannot open " PROCMEMINFOFILE); + } - int cpus = this->cpuCount; { char buffer[128]; while (fgets(buffer, 128, file)) { -@@ -788,6 +803,33 @@ +@@ -805,6 +820,33 @@ this->usedMem = this->totalMem - this->freeMem; this->usedSwap = this->totalSwap - swapFree; fclose(file); -+ #endif ++#endif + -+ #ifdef __FreeBSD__ ++#ifdef __FreeBSD__ + kvm_t *kd = NULL; + struct kvm_swap kvmswapinfo[1]; + size_t len = 0; @@ -67,7 +69,7 @@ + SYSCTLBYNAME("vm.stats.vm.v_active_count", this->usedMem, len); + this->usedMem = this->usedMem * PAGE_SIZE / KB + this->cachedMem + this->buffersMem; + this->freeMem = this->totalMem - this->usedMem; -+ #endif ++#endif file = fopen(PROCSTATFILE, "r"); - assert(file != NULL); + if (file == NULL) { --- htop.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: