From dd92d23e7ef4aa677eab2683c5e848758db3bfa9 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 4 Feb 2012 17:26:46 +0000
Subject: [PATCH] [packages_10.03.2] htop: merge r29810, r29819, r29840

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30029 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 admin/htop/Makefile                          | 13 ++++---
 admin/htop/patches/001-uClibc-friendly.patch | 52 ----------------------------
 2 files changed, 9 insertions(+), 56 deletions(-)
 delete mode 100644 admin/htop/patches/001-uClibc-friendly.patch

diff --git a/admin/htop/Makefile b/admin/htop/Makefile
index 9a33d11..da14404 100644
--- a/admin/htop/Makefile
+++ b/admin/htop/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=htop
-PKG_VERSION:=0.9
-PKG_RELEASE:=1
+PKG_VERSION:=1.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=7c5507f35f363f3f40183a2ba3c561f8
+PKG_MD5SUM:=325112ca7947ea1f6d6441f631e00384
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -34,6 +34,11 @@ define Package/htop/description
  see all processes and their full command lines.
 endef
 
+CONFIGURE_ARGS += \
+	--disable-native-affinity \
+	--disable-unicode \
+	--enable-hwloc
+
 CONFIGURE_VARS += \
 	ac_cv_file__proc_stat=yes \
 	ac_cv_file__proc_meminfo=yes \
diff --git a/admin/htop/patches/001-uClibc-friendly.patch b/admin/htop/patches/001-uClibc-friendly.patch
deleted file mode 100644
index ff9b5b1..0000000
--- a/admin/htop/patches/001-uClibc-friendly.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/CRT.c
-+++ b/CRT.c
-@@ -11,7 +11,9 @@ in the source distribution for its full
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
- 
- #include "String.h"
- 
-@@ -125,12 +127,14 @@ static void CRT_handleSIGSEGV(int sgn) {
-    CRT_done();
-    #if __linux
-    fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n");
--   #else
--   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
--   #endif
-+   #ifdef HAVE_EXECINFO_H
-    size_t size = backtrace(backtraceArray, sizeof(backtraceArray));
-    fprintf(stderr, "Backtrace: \n");
-    backtrace_symbols_fd(backtraceArray, size, 2);
-+   #endif
-+   #else
-+   fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n");
-+   #endif
-    abort();
- }
- 
---- a/CRT.h
-+++ b/CRT.h
-@@ -14,7 +14,9 @@ in the source distribution for its full
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
- 
- #include "String.h"
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,6 +25,7 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[
-   missing_headers="$missing_headers $ac_header"
- ])
-+AC_CHECK_HEADERS([execinfo.h],[:],[:])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
-- 
2.11.0