Enable build on SunOS if /system/lxproc is available.

5 files changed, 57 insertions, 2 deletions

diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile
index 0adb1241c9a..6bdded436c5 100644
--- a/sysutils/htop/Makefile
+++ b/sysutils/htop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/08/17 17:11:29 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/08/20 13:38:25 jperkin Exp $
 #
 
 DISTNAME=	htop-1.0.1
@@ -18,6 +18,13 @@ USE_LIBTOOL=	yes
 
 ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS" && exists(/system/lxproc)
+ONLY_FOR_PLATFORM+=	SunOS-*-*
+CONFIGURE_ARGS+=	--with-proc=/system/lxproc
+.endif
+
 CONFIGURE_ENV+=		ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
 
 .include "../../devel/ncursesw/buildlink3.mk"
diff --git a/sysutils/htop/distinfo b/sysutils/htop/distinfo
index e0a3458ecbb..624d73c52c4 100644
--- a/sysutils/htop/distinfo
+++ b/sysutils/htop/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.4 2012/03/21 18:28:40 drochner Exp $
+$NetBSD: distinfo,v 1.5 2015/08/20 13:38:25 jperkin 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
diff --git a/sysutils/htop/patches/patch-AvailableColumnsPanel.c b/sysutils/htop/patches/patch-AvailableColumnsPanel.c
new file mode 100644
index 00000000000..7a2253b82f3
--- /dev/null
+++ b/sysutils/htop/patches/patch-AvailableColumnsPanel.c
@@ -0,0 +1,15 @@
+$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;
+       }
diff --git a/sysutils/htop/patches/patch-ColumnsPanel.c b/sysutils/htop/patches/patch-ColumnsPanel.c
new file mode 100644
index 00000000000..964c808a5f7
--- /dev/null
+++ b/sysutils/htop/patches/patch-ColumnsPanel.c
@@ -0,0 +1,15 @@
+$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;
diff --git a/sysutils/htop/patches/patch-Panel.c b/sysutils/htop/patches/patch-Panel.c
new file mode 100644
index 00000000000..64df3fff10f
--- /dev/null
+++ b/sysutils/htop/patches/patch-Panel.c
@@ -0,0 +1,15 @@
+$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;