summaryrefslogtreecommitdiff
path: root/package/htop
diff options
context:
space:
mode:
Diffstat (limited to 'package/htop')
-rw-r--r--package/htop/Makefile9
-rw-r--r--package/htop/patches/patch-configure_ac10
-rw-r--r--package/htop/patches/patch-crt_c30
-rw-r--r--package/htop/patches/patch-crt_h12
4 files changed, 5 insertions, 56 deletions
diff --git a/package/htop/Makefile b/package/htop/Makefile
index aa9bbfce3..b0bfaa905 100644
--- a/package/htop/Makefile
+++ b/package/htop/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= htop
-PKG_VERSION:= 0.9
+PKG_VERSION:= 1.0.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 7c5507f35f363f3f40183a2ba3c561f8
+PKG_MD5SUM:= 0d01cca8df3349c74569cefebbd9919e
PKG_DESCR:= graphical process manager
PKG_SECTION:= utils
PKG_DEPENDS:= libncurses
@@ -18,8 +18,9 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,HTOP,htop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ARGS += ac_cv_file__proc_stat=yes \
- ac_cv_file__proc_meminfo=yes
+CONFIGURE_ENV+= ac_cv_file__proc_stat=yes \
+ ac_cv_file__proc_meminfo=yes
+CONFIGURE_ARGS+= --disable-unicode
htop-install:
$(INSTALL_DIR) $(IDIR_HTOP)/usr/bin
diff --git a/package/htop/patches/patch-configure_ac b/package/htop/patches/patch-configure_ac
deleted file mode 100644
index 642939235..000000000
--- a/package/htop/patches/patch-configure_ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- htop-0.9.orig/configure.ac 2011-05-31 14:26:38.000000000 +0200
-+++ htop-0.9/configure.ac 2011-05-31 14:27:56.000000000 +0200
-@@ -25,6 +25,7 @@
- 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
diff --git a/package/htop/patches/patch-crt_c b/package/htop/patches/patch-crt_c
deleted file mode 100644
index b88d2a1de..000000000
--- a/package/htop/patches/patch-crt_c
+++ /dev/null
@@ -1,30 +0,0 @@
---- htop-0.9.orig/CRT.c 2010-11-23 16:56:32.000000000 +0100
-+++ htop-0.9/CRT.c 2011-05-31 14:30:06.000000000 +0200
-@@ -11,7 +11,9 @@
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-
- #include "String.h"
-
-@@ -125,12 +127,14 @@
- 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();
- }
-
diff --git a/package/htop/patches/patch-crt_h b/package/htop/patches/patch-crt_h
deleted file mode 100644
index 17968fb69..000000000
--- a/package/htop/patches/patch-crt_h
+++ /dev/null
@@ -1,12 +0,0 @@
---- htop-0.9.orig/CRT.h 2010-11-23 16:56:32.000000000 +0100
-+++ htop-0.9/CRT.h 2011-05-31 14:30:32.000000000 +0200
-@@ -14,7 +14,9 @@
- #include <signal.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
-+#endif
-
- #include "String.h"
-