ports/173450: [MAINTAINER] sysutils/htop: Update to 1.0.2

[Hung-Yi Chen]

>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 at 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 <time.h>
  #include <assert.h>
@@ -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: