Import of pkgsrc-2016Q3

sysutils/htop/Makefile

@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.10 2015/08/20 13:38:25 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.14 2016/07/22 05:45:05 wiz Exp $
 
-DISTNAME=	htop-1.0.1
-PKGREVISION=	1
+DISTNAME=	htop-2.0.2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=htop/}
+MASTER_SITES=	http://hisham.hm/htop/releases/${PKGVERSION_NOREV}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://htop.sourceforge.net/
+HOMEPAGE=	http://hisham.hm/htop/
 COMMENT=	Enhanced version of top utility
 LICENSE=	gnu-gpl-v2
 
+USE_TOOLS+=	automake aclocal autoheader autoconf
 GNU_CONFIGURE=	yes
 USE_NCURSES=	yes # uses ncurses mouse definitions
 
 USE_LIBTOOL=	yes
 
-ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
+#ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
+
+pre-configure:
+	set -e; cd ${WRKSRC}; \
+	aclocal; \
+	autoconf; \
+	automake
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,8 +30,10 @@ ONLY_FOR_PLATFORM+=	SunOS-*-*
 CONFIGURE_ARGS+=	--with-proc=/system/lxproc
 .endif
 
+REPLACE_PYTHON+=	scripts/MakeHeader.py
 CONFIGURE_ENV+=		ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
 
+.include "../../lang/python/application.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

sysutils/htop/distinfo

@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/08/20 13:38:25 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2016/07/22 05:30:58 maya Exp $
 
-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-AvailableColumnsPanel.c) = 0aa40dd4f126a81ff6ad869362486eeb256a2163
-SHA1 (patch-CRT.c) = 6e139b71c64b8ef9b7ef53a08863cd814eb0657e
-SHA1 (patch-ColumnsPanel.c) = 7b7c569aacab0e667b6435f980d0daedbd914e34
-SHA1 (patch-Makefile.am) = eec58f8097488b6aeafabdba5bbc4bb478ffacc8
-SHA1 (patch-Panel.c) = b19e324d5e1bda07d8cd609a5d584637102ca465
+SHA1 (htop-2.0.2.tar.gz) = 201f793f13dce2448e36047079875b9bd5bba75a
+RMD160 (htop-2.0.2.tar.gz) = af17b9f7e1744e2db4d6a28c95cdfb9536343786
+SHA512 (htop-2.0.2.tar.gz) = 1c9bf71a36c56b301667aa6d03756fc757fbcb63e848d9581d10db3df6193cdeb00e55ceb6e2392794ac03ea034b04459a8fe550b3ac2318cd86263a74c78cda
+Size (htop-2.0.2.tar.gz) = 476364 bytes
+SHA1 (patch-configure.ac) = 87557f0b0027462f244cd0c9e14739d10bbfc010

sysutils/htop/patches/patch-AvailableColumnsPanel.c

@@ -1,15 +0,0 @@
-$NetBSD: patch-AvailableColumnsPanel.c,v 1.1 2015/08/20 13:38:25 jperkin Exp $
-
-Restrict to ASCII characters.
-
---- AvailableColumnsPanel.c.orig	2011-12-26 21:51:00.000000000 +0000
-+++ AvailableColumnsPanel.c
-@@ -55,7 +55,7 @@ static HandlerResult AvailableColumnsPan
-       }
-       default:
-       {
--         if (isalpha(ch))
-+         if (isascii(ch) && isalpha(ch))
-             result = Panel_selectByTyping(super, ch);
-          break;
-       }

sysutils/htop/patches/patch-CRT.c

@@ -1,14 +0,0 @@
-$NetBSD: patch-CRT.c,v 1.2 2012/03/21 18:28:40 drochner Exp $
-
---- CRT.c.orig	2011-12-26 21:52:55.000000000 +0000
-+++ CRT.c
-@@ -120,7 +120,9 @@ int CRT_cursorX = 0;
- 
- char* CRT_termType;
- 
-+#ifdef HAVE_EXECINFO_H
- void *backtraceArray[128];
-+#endif
- 
- static void CRT_handleSIGSEGV(int sgn) {
-    (void) sgn;

sysutils/htop/patches/patch-ColumnsPanel.c

@@ -1,15 +0,0 @@
-$NetBSD: patch-ColumnsPanel.c,v 1.1 2015/08/20 13:38:25 jperkin Exp $
-
-Restrict to ASCII characters.
-
---- ColumnsPanel.c.orig	2011-12-26 21:53:10.000000000 +0000
-+++ ColumnsPanel.c
-@@ -70,7 +70,7 @@ static HandlerResult ColumnsPanel_eventH
-       }
-       default:
-       {
--         if (isalpha(ch))
-+         if (isascii(ch) && isalpha(ch))
-             result = Panel_selectByTyping(super, ch);
-          if (result == BREAK_LOOP)
-             result = IGNORED;

sysutils/htop/patches/patch-Makefile.am

@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.2 2012/03/21 18:28:40 drochner Exp $
-
---- 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

sysutils/htop/patches/patch-Panel.c

@@ -1,15 +0,0 @@
-$NetBSD: patch-Panel.c,v 1.1 2015/08/20 13:38:25 jperkin Exp $
-
-Restrict to ASCII characters.
-
---- Panel.c.orig	2012-02-02 23:45:01.000000000 +0000
-+++ Panel.c
-@@ -417,7 +417,7 @@ HandlerResult Panel_selectByTyping(Panel
-    if (!this->eventHandlerBuffer)
-       this->eventHandlerBuffer = calloc(100, 1);
- 
--   if (isalnum(ch)) {
-+   if (isascii(ch) && isalnum(ch)) {
-       int len = strlen(this->eventHandlerBuffer);
-       if (len < 99) {
-          this->eventHandlerBuffer[len] = ch;

sysutils/htop/patches/patch-configure.ac

@@ -0,0 +1,24 @@
+$NetBSD: patch-configure.ac,v 1.5 2016/07/22 05:30:58 maya Exp $
+
+Add minimal NetBSD support.
+
+--- configure.ac.orig	2016-07-21 19:54:31.000000000 +0000
++++ configure.ac
+@@ -31,7 +31,7 @@ LT_INIT([disable-shared static])
+ # Checks for platform.
+ # ----------------------------------------------------------------------
+ case "$target_os" in
+-linux*|gnu*)
++linux*|gnu*|*solaris*|*netbsd*)
+    my_htop_platform=linux
+    ;;
+ freebsd*|kfreebsd*)
+@@ -266,6 +266,8 @@ AM_CONDITIONAL([HTOP_LINUX], [test "$my_
+ AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd])
+ AM_CONDITIONAL([HTOP_OPENBSD], [test "$my_htop_platform" = openbsd])
+ AM_CONDITIONAL([HTOP_DARWIN], [test "$my_htop_platform" = darwin])
++AM_CONDITIONAL([HTOP_NETBSD], [test "$my_htop_platform" = netbsd])
++AM_CONDITIONAL([HTOP_SOLARIS], [test "$my_htop_platform" = solaris])
+ AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported])
+ AC_SUBST(my_htop_platform)
+ AC_CONFIG_FILES([Makefile htop.1])