Fix build on systems which lack BSD termcap.

2 files changed, 14 insertions, 12 deletions

diff --git a/sysutils/psmisc/distinfo b/sysutils/psmisc/distinfo
index 94cb6c686ce..4dce5e248ea 100644
--- a/sysutils/psmisc/distinfo
+++ b/sysutils/psmisc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/12/13 09:58:58 jperkin Exp $
+$NetBSD: distinfo,v 1.6 2014/09/23 22:18:21 jperkin Exp $
 
 SHA1 (psmisc-20.1.tar.gz) = e969a2f539b181c372b0f82bbbd430c4d57d5d6b
 RMD160 (psmisc-20.1.tar.gz) = 48698ad9f431c881bcb42394f5c912ef91b84d2b
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = 4aadacec85e2234c010aad2db5fa9fe469562f4f
 SHA1 (patch-ac) = 9f9a7c7c5155345a1045aee70a2dd65a25ec7219
 SHA1 (patch-ad) = 6e2886ca59160d161d334e276675f187f138db7c
 SHA1 (patch-ae) = 484305118582c575f8c4827783aa3d5f57b25b5d
-SHA1 (patch-af) = 28a9417dda852ad5b76ad44774f1aeb3d66e2791
+SHA1 (patch-af) = c89f887f572cb7bf22ff05fc6b76eca7fcb34337
 SHA1 (patch-ag) = a03a4a0c0dbf065e2b2785cee8f23579a11ae13f
diff --git a/sysutils/psmisc/patches/patch-af b/sysutils/psmisc/patches/patch-af
index 27a27def985..f5c785b9893 100644
--- a/sysutils/psmisc/patches/patch-af
+++ b/sysutils/psmisc/patches/patch-af
@@ -1,18 +1,20 @@
-$NetBSD: patch-af,v 1.5 2013/12/13 09:58:58 jperkin Exp $
+$NetBSD: patch-af,v 1.6 2014/09/23 22:18:21 jperkin Exp $
 
 Need limits.h for PATH_MAX
 
 --- src/pstree.c.orig	2000-12-18 05:59:23.000000000 +0000
 +++ src/pstree.c
-@@ -15,6 +15,7 @@
+@@ -15,19 +15,22 @@
  #include <getopt.h>
  #include <pwd.h>
  #include <dirent.h>
 +#include <limits.h>
  #include <termios.h>
++#ifdef HAVE_TERMCAP_H
  #include <termcap.h>
++#endif
  #include <sys/types.h>
-@@ -22,12 +23,12 @@
+ #include <sys/stat.h>
  #include <sys/ioctl.h>
  
  #include "comm.h"
@@ -26,7 +28,7 @@ Need limits.h for PATH_MAX
  
  /* UTF-8 defines by Johan Myreen */
  #define UTF_V	"\342\224\202\277"	/* Vertical line drawing char */
-@@ -303,6 +304,7 @@ dump_tree (PROC * current, int level, in
+@@ -303,6 +306,7 @@ dump_tree (PROC * current, int level, in
    const struct passwd *pw;
    int lvl, i, add, offset, len, swapped, info, count, comm_len, first;
    const char *tmp, *here;
@@ -34,7 +36,7 @@ Need limits.h for PATH_MAX
    char comm_tmp[5];
  
    if (!current)
-@@ -327,7 +329,8 @@ dump_tree (PROC * current, int level, in
+@@ -327,7 +331,8 @@ dump_tree (PROC * current, int level, in
        add = out_int (rep) + 2;
        out_string ("*[");
      }
@@ -44,7 +46,7 @@ Need limits.h for PATH_MAX
      tputs (tmp, 1, putchar);
    if ((swapped = print_args) && current->argc < 0)
      out_char ('(');
-@@ -366,7 +369,8 @@ dump_tree (PROC * current, int level, in
+@@ -366,7 +371,8 @@ dump_tree (PROC * current, int level, in
      }
    if (info || swapped)
      out_char (')');
@@ -54,7 +56,7 @@ Need limits.h for PATH_MAX
      tputs (tmp, 1, putchar);
    if (print_args)
      {
-@@ -504,7 +508,7 @@ read_proc (void)
+@@ -504,7 +510,7 @@ read_proc (void)
    while ((de = readdir (dir)) != NULL)
      if ((pid = atoi (de->d_name)) != 0)
        {
@@ -63,7 +65,7 @@ Need limits.h for PATH_MAX
  	if ((file = fopen (path, "r")) != NULL)
  	  {
  	    empty = 0;
-@@ -513,6 +517,10 @@ read_proc (void)
+@@ -513,6 +519,10 @@ read_proc (void)
  		perror (path);
  		exit (1);
  	      }
@@ -74,7 +76,7 @@ Need limits.h for PATH_MAX
              fread(readbuf, BUFSIZ, 1, file) ;
              if (ferror(file) == 0) 
              {
-@@ -532,11 +540,12 @@ read_proc (void)
+@@ -532,11 +542,12 @@ read_proc (void)
  		(file, "%d (%s) %c %d", &dummy, comm, (char *) &dummy,
  		 &ppid) == 4)
  	      */
@@ -88,7 +90,7 @@ Need limits.h for PATH_MAX
  		    if ((fd = open (path, O_RDONLY)) < 0)
  		      {
  			perror (path);
-@@ -641,7 +650,11 @@ main (int argc, char **argv)
+@@ -641,7 +652,11 @@ main (int argc, char **argv)
      switch (c)
        {
        case 'a':