From c5a2a5f5317aa4296d23d33865e4ce51a0a47410 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 19 Jan 2012 16:13:36 +0000
Subject: [PATCH] htop: Bump to v1.0

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>

SVN-Revision: 29810
---
 admin/htop/Makefile                          |  8 ++-
 admin/htop/patches/001-uClibc-friendly.patch | 52 --------------------
 2 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 admin/htop/patches/001-uClibc-friendly.patch

diff --git a/admin/htop/Makefile b/admin/htop/Makefile
index 9a33d1147..fa78f0b0c 100644
--- a/admin/htop/Makefile
+++ b/admin/htop/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=htop
-PKG_VERSION:=0.9
+PKG_VERSION:=1.0
 PKG_RELEASE:=1
 
 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,10 @@ define Package/htop/description
  see all processes and their full command lines.
 endef
 
+CONFIGURE_ARGS += \
+	--disable-native-affinity \
+	--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 ff9b5b139..000000000
--- 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.30.2