update to 1.0.1

changes:
-UI improvements, UTF-8/wcurses support
-Performance improvements
-XDG compliance
-bugfixes

7 files changed, 20 insertions, 88 deletions

diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index a352871008d..120376683bc 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2011/12/10 14:36:38 cheusov Exp $
+# $NetBSD: Makefile,v 1.7 2012/03/21 18:28:40 drochner Exp $
 #
 
-DISTNAME=	htop-0.9
+DISTNAME=	htop-1.0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=htop/}
 
@@ -15,16 +15,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_NCURSES=	yes # uses ncurses mouse definitions
 
-USE_TOOLS+=	autoreconf autoconf automake
 USE_LIBTOOL=	yes
 
 ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
 
 CONFIGURE_ENV+=		ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
 
-pre-configure:
-	set -e; cd ${WRKSRC}; autoreconf --force --install
-
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/htop/distinfo b/sysutils/htop/distinfo
index a31d57c2a16..e0a3458ecbb 100644
--- a/sysutils/htop/distinfo
+++ b/sysutils/htop/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.3 2011/08/06 16:36:41 cheusov Exp $
+$NetBSD: distinfo,v 1.4 2012/03/21 18:28:40 drochner Exp $
 
-SHA1 (htop-0.9.tar.gz) = d755bff386c260c06162d50113794722e98e9200
-RMD160 (htop-0.9.tar.gz) = ac0ef275e8ad5a27e5f35fa03800b15ef0966cfe
-Size (htop-0.9.tar.gz) = 418767 bytes
-SHA1 (patch-CRT.c) = 6e5a1269a7b424a855bb2d801c80cad149d3f42e
-SHA1 (patch-CRT.h) = fff1471f4292bee7c50098e9098339f11ebe9782
-SHA1 (patch-Makefile.am) = e5daf2fb4c54eb0c58e3cd2b3a6ecfbf4aa0c03d
-SHA1 (patch-configure.ac) = cdd87caa668092c3f37037fef968a42a54098250
-SHA1 (patch-htop.c) = 4ae97a04a7d6661fc138b78cae98ea31d8c6fe01
+SHA1 (htop-1.0.1.tar.gz) = bad226ec887a2b7ea5042879ed18e067812d030e
+RMD160 (htop-1.0.1.tar.gz) = c13d438438c5ab8c15c056f7064ae6edb26ec8d9
+Size (htop-1.0.1.tar.gz) = 384683 bytes
+SHA1 (patch-CRT.c) = 6e139b71c64b8ef9b7ef53a08863cd814eb0657e
+SHA1 (patch-Makefile.am) = eec58f8097488b6aeafabdba5bbc4bb478ffacc8
diff --git a/sysutils/htop/patches/patch-CRT.c b/sysutils/htop/patches/patch-CRT.c
index 6d3d27d2cc0..736b0988639 100644
--- a/sysutils/htop/patches/patch-CRT.c
+++ b/sysutils/htop/patches/patch-CRT.c
@@ -1,18 +1,8 @@
-$NetBSD: patch-CRT.c,v 1.1 2011/08/06 16:36:41 cheusov Exp $
+$NetBSD: patch-CRT.c,v 1.2 2012/03/21 18:28:40 drochner Exp $
 
---- CRT.c.orig	2010-11-23 15:56:32.000000000 +0000
+--- CRT.c.orig	2011-12-26 21:52:55.000000000 +0000
 +++ 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"
- 
-@@ -118,7 +120,9 @@ int CRT_colors[LAST_COLORELEMENT] = { 0 
+@@ -120,7 +120,9 @@ int CRT_cursorX = 0;
  
  char* CRT_termType;
  
@@ -22,15 +12,3 @@ $NetBSD: patch-CRT.c,v 1.1 2011/08/06 16:36:41 cheusov Exp $
  
  static void CRT_handleSIGSEGV(int sgn) {
     (void) sgn;
-@@ -128,9 +132,11 @@ static void CRT_handleSIGSEGV(int sgn) {
-    #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
-    abort();
- }
- 
diff --git a/sysutils/htop/patches/patch-CRT.h b/sysutils/htop/patches/patch-CRT.h
deleted file mode 100644
index 88c19fa5905..00000000000
--- a/sysutils/htop/patches/patch-CRT.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-CRT.h,v 1.1 2011/08/06 16:36:41 cheusov Exp $
-
---- CRT.h.orig	2010-11-23 15:56:32.000000000 +0000
-+++ 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"
- 
diff --git a/sysutils/htop/patches/patch-Makefile.am b/sysutils/htop/patches/patch-Makefile.am
index 39fc64788b1..1f7631cd28c 100644
--- a/sysutils/htop/patches/patch-Makefile.am
+++ b/sysutils/htop/patches/patch-Makefile.am
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.am,v 1.1 2011/08/06 16:36:41 cheusov Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2012/03/21 18:28:40 drochner Exp $
 
---- Makefile.am.orig	2010-11-23 15:56:32.000000000 +0000
-+++ Makefile.am
-@@ -55,8 +55,8 @@ hardened-debug:
- debuglite:
- 	$(MAKE) all CFLAGS="-ggdb -DDEBUGLITE"
+--- Makefile.in.orig	2011-12-26 22:11:41.000000000 +0000
++++ Makefile.in
+@@ -42,8 +42,8 @@ profile:
+ debug:
+ 	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DDEBUG"
  
 -.c.h:
 -	scripts/MakeHeader.py $<
 +#.c.h:
 +#	scripts/MakeHeader.py $<
  
- 
- 
+ cppcheck:
+ 	cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS
diff --git a/sysutils/htop/patches/patch-configure.ac b/sysutils/htop/patches/patch-configure.ac
deleted file mode 100644
index 985c313ee5d..00000000000
--- a/sysutils/htop/patches/patch-configure.ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2011/08/06 16:36:41 cheusov Exp $
-
---- configure.ac.orig	2010-11-23 15:56:32.000000000 +0000
-+++ 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
diff --git a/sysutils/htop/patches/patch-htop.c b/sysutils/htop/patches/patch-htop.c
deleted file mode 100644
index ccf506c19b4..00000000000
--- a/sysutils/htop/patches/patch-htop.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-htop.c,v 1.1 2011/08/06 16:36:41 cheusov Exp $
-
---- htop.c.orig	2010-11-24 18:45:38.000000000 +0000
-+++ htop.c
-@@ -272,7 +272,7 @@ int main(int argc, char** argv) {
-       setlocale(LC_CTYPE, getenv("LC_ALL"));
- 
-    /* Parse arguments */
--   while ((opt = getopt_long_only(argc, argv, "hvCs:d:u:", long_opts, &opti))) {
-+   while ((opt = getopt_long(argc, argv, "hvCs:d:u:", long_opts, &opti))) {
-       if (opt == EOF) break;
-       switch (opt) {
-          case 'h':