From: Tim Yardley <lst@openwrt.org>
Date: Thu, 20 Sep 2007 15:46:39 +0000 (+0000)
Subject: htop 0.6.6 and refreshed patches
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8eb60356cdf5b5a1bd5254ba7d0b116d4e5f7e8a;p=openwrt%2Fsvn-archive%2Fpackages.git

htop 0.6.6 and refreshed patches

SVN-Revision: 8878
---

diff --git a/admin/htop/Makefile b/admin/htop/Makefile
index 3c90dfe86..394a7b84c 100644
--- a/admin/htop/Makefile
+++ b/admin/htop/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=htop
-PKG_VERSION:=0.6.5
+PKG_VERSION:=0.6.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/htop
-PKG_MD5SUM:=180aa7c9db7106ed1197b1e408660a0e
+PKG_MD5SUM:=12c8e6e97bd50a4e0a4730d23675fc7b
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/admin/htop/patches/001_remove_proc_check.patch b/admin/htop/patches/001_remove_proc_check.patch
index e0e6ed613..664b29a52 100644
--- a/admin/htop/patches/001_remove_proc_check.patch
+++ b/admin/htop/patches/001_remove_proc_check.patch
@@ -1,14 +1,16 @@
-diff -purN htop-0.6.5_org/configure htop-0.6.5/configure
---- htop-0.6.5_org/configure	2007-04-18 15:38:08.000000000 -0400
-+++ htop-0.6.5/configure	2007-04-18 17:53:18.000000000 -0400
-@@ -5286,59 +5286,6 @@ _ACEOF
+Index: htop-0.6.6/configure
+===================================================================
+--- htop-0.6.6.orig/configure	2007-09-20 10:45:31.000000000 -0500
++++ htop-0.6.6/configure	2007-09-20 10:45:31.000000000 -0500
+@@ -6207,62 +6207,6 @@
  
- fi;
+ fi
  
+-
 -as_ac_File=`echo "ac_cv_file_$PROCDIR/stat" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $PROCDIR/stat" >&5
--echo $ECHO_N "checking for $PROCDIR/stat... $ECHO_C" >&6
--if eval "test \"\${$as_ac_File+set}\" = set"; then
+-{ echo "$as_me:$LINENO: checking for $PROCDIR/stat" >&5
+-echo $ECHO_N "checking for $PROCDIR/stat... $ECHO_C" >&6; }
+-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  test "$cross_compiling" = yes &&
@@ -21,8 +23,9 @@ diff -purN htop-0.6.5_org/configure htop-0.6.5/configure
 -  eval "$as_ac_File=no"
 -fi
 -fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-ac_res=`eval echo '${'$as_ac_File'}'`
+-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
 -if test `eval echo '${'$as_ac_File'}'` = yes; then
 -  :
 -else
@@ -32,9 +35,9 @@ diff -purN htop-0.6.5_org/configure htop-0.6.5/configure
 -fi
 -
 -as_ac_File=`echo "ac_cv_file_$PROCDIR/meminfo" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $PROCDIR/meminfo" >&5
--echo $ECHO_N "checking for $PROCDIR/meminfo... $ECHO_C" >&6
--if eval "test \"\${$as_ac_File+set}\" = set"; then
+-{ echo "$as_me:$LINENO: checking for $PROCDIR/meminfo" >&5
+-echo $ECHO_N "checking for $PROCDIR/meminfo... $ECHO_C" >&6; }
+-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  test "$cross_compiling" = yes &&
@@ -47,8 +50,9 @@ diff -purN htop-0.6.5_org/configure htop-0.6.5/configure
 -  eval "$as_ac_File=no"
 -fi
 -fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+-ac_res=`eval echo '${'$as_ac_File'}'`
+-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
 -if test `eval echo '${'$as_ac_File'}'` = yes; then
 -  :
 -else
@@ -58,6 +62,6 @@ diff -purN htop-0.6.5_org/configure htop-0.6.5/configure
 -fi
 -
 -
-           ac_config_files="$ac_config_files Makefile"
+ ac_config_files="$ac_config_files Makefile"
  
  cat >confcache <<\_ACEOF