[pkgsrc/trunk]: pkgsrc Don't include termcap.h on SunOS.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8da82b70b20b
branches:  trunk
changeset: 639719:8da82b70b20b
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Sep 23 22:37:29 2014 +0000

description:
Don't include termcap.h on SunOS.

diffstat:

 chat/icb/distinfo               |    4 +-
 chat/icb/patches/patch-an       |  152 ++++++++++++++++++++-------------------
 editors/uemacs/distinfo         |    4 +-
 editors/uemacs/patches/patch-ag |   24 +++--
 4 files changed, 95 insertions(+), 89 deletions(-)

diffs (truncated from 802 to 300 lines):

diff -r 524032a1a94b -r 8da82b70b20b chat/icb/distinfo
--- a/chat/icb/distinfo Tue Sep 23 22:30:30 2014 +0000
+++ b/chat/icb/distinfo Tue Sep 23 22:37:29 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2013/01/11 13:24:32 joerg Exp $
+$NetBSD: distinfo,v 1.16 2014/09/23 22:37:29 jperkin Exp $
 
 SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8
 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf
@@ -16,7 +16,7 @@
 SHA1 (patch-ak) = 8e363cc6c5647c064d56ec75b8b627d7d9a07a72
 SHA1 (patch-al) = a47617dd948fa972d0bab604514e4a47af117c55
 SHA1 (patch-am) = b389f93a4cdb105e5dbbc5e97f642c7fff328f0d
-SHA1 (patch-an) = 4213261b8bb5638a789371ba1eb12923453741a5
+SHA1 (patch-an) = 116a5f7a692776ac8cd3c7d9c6cdb35528e9b15a
 SHA1 (patch-ao) = a798b898e3527f7a4458c6e278e86ef69bb38a53
 SHA1 (patch-ap) = 794d608ac548bc1b5c83b7bf967ed43e5cee65be
 SHA1 (patch-aq) = 78b772a2f6ec27a782b1681a61a2329992dcc741
diff -r 524032a1a94b -r 8da82b70b20b chat/icb/patches/patch-an
--- a/chat/icb/patches/patch-an Tue Sep 23 22:30:30 2014 +0000
+++ b/chat/icb/patches/patch-an Tue Sep 23 22:37:29 2014 +0000
@@ -1,13 +1,17 @@
-$NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $
+$NetBSD: patch-an,v 1.6 2014/09/23 22:37:29 jperkin Exp $
+
+Don't include termcap.h on SunOS.
 
 --- readline/readline.c.orig   1995-02-24 21:20:03.000000000 +0000
 +++ readline/readline.c
-@@ -38,17 +38,25 @@ static char *xmalloc (), *xrealloc ();
+@@ -38,17 +38,27 @@ static char *xmalloc (), *xrealloc ();
  #  endif
  #endif
  
 +#include <unistd.h>
++#ifndef __sun
 +#include <termcap.h>
++#endif
  #include <stdio.h>
  #include <sys/types.h>
  #include <fcntl.h>
@@ -28,7 +32,7 @@
  #define HAVE_BSD_SIGNALS
  /* #define USE_XON_XOFF */
  
-@@ -80,6 +88,10 @@ static char *xmalloc (), *xrealloc ();
+@@ -80,6 +90,10 @@ static char *xmalloc (), *xrealloc ();
  #  if !defined (O_NDELAY)
  #    define O_NDELAY O_NONBLOCK       /* Posix-style non-blocking i/o */
  #  endif /* O_NDELAY */
@@ -39,7 +43,7 @@
  #endif /* _POSIX_VERSION */
  
  /* Other (BSD) machines use sgtty. */
-@@ -104,7 +116,6 @@ static char *xmalloc (), *xrealloc ();
+@@ -104,7 +118,6 @@ static char *xmalloc (), *xrealloc ();
  #endif /* !NEW_TTY_DRIVER && !_POSIX_VDISABLE */
  
  #include <errno.h>
@@ -47,7 +51,7 @@
  
  #include <setjmp.h>
  #if defined (SHELL)
-@@ -133,7 +144,7 @@ struct passwd *getpwuid (), *getpwent ()
+@@ -133,7 +146,7 @@ struct passwd *getpwuid (), *getpwent ()
  #  endif /* USGr3 */
  #endif /* USG && hpux */
  
@@ -56,7 +60,7 @@
  #  include <dirent.h>
  #  define direct dirent
  #  if defined (_POSIX_VERSION)
-@@ -204,10 +215,13 @@ extern char *index ();
+@@ -204,10 +217,13 @@ extern char *index ();
  extern char *getenv ();
  extern char *tilde_expand ();
  
@@ -72,7 +76,7 @@
  
  #if defined (VOID_SIGHANDLER)
  #  define sighandler void
-@@ -280,7 +294,7 @@ static jmp_buf readline_top_level;
+@@ -280,7 +296,7 @@ static jmp_buf readline_top_level;
  static FILE *in_stream, *out_stream;
  
  /* The names of the streams that we do input and output to. */
@@ -81,7 +85,7 @@
  
  /* Non-zero means echo characters as they are read. */
  int readline_echoing_p = 1;
-@@ -335,6 +349,8 @@ static int stricmp (), strnicmp ();
+@@ -335,6 +351,8 @@ static int stricmp (), strnicmp ();
  /* Non-zero means to save keys that we dispatch on in a kbd macro. */
  static int defining_kbd_macro = 0;
  
@@ -90,7 +94,7 @@
  
  /* **************************************************************** */
  /*                                                                */
-@@ -744,7 +760,7 @@ rl_unget_char (key)
+@@ -744,7 +762,7 @@ rl_unget_char (key)
  
  /* If a character is available to be read, then read it
     and stuff it into IBUFFER.  Otherwise, just return. */
@@ -99,7 +103,7 @@
  {
    int tty = fileno (in_stream);
    register int tem, result = -1;
-@@ -861,7 +877,7 @@ rl_dispatch (key, map)
+@@ -861,7 +879,7 @@ rl_dispatch (key, map)
        }
        else
        ding ();
@@ -108,7 +112,7 @@
      }
  
    switch (map[key].type)
-@@ -876,7 +892,7 @@ rl_dispatch (key, map)
+@@ -876,7 +894,7 @@ rl_dispatch (key, map)
            if (func == rl_do_lowercase_version)
              {
                rl_dispatch (to_lower (key), map);
@@ -117,7 +121,7 @@
              }
  
            (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
-@@ -890,7 +906,7 @@ rl_dispatch (key, map)
+@@ -890,7 +908,7 @@ rl_dispatch (key, map)
        else
          {
            rl_abort ();
@@ -126,7 +130,7 @@
          }
        }
        break;
-@@ -907,7 +923,7 @@ rl_dispatch (key, map)
+@@ -907,7 +925,7 @@ rl_dispatch (key, map)
        else
        {
          rl_abort ();
@@ -135,7 +139,7 @@
        }
        break;
  
-@@ -918,10 +934,11 @@ rl_dispatch (key, map)
+@@ -918,10 +936,11 @@ rl_dispatch (key, map)
  
          macro = savestring ((char *)map[key].function);
          with_macro_input (macro);
@@ -148,7 +152,7 @@
  }
  
  
-@@ -1152,6 +1169,8 @@ readline_initialize_everything ()
+@@ -1152,6 +1171,8 @@ readline_initialize_everything ()
  {
    /* Find out if we are running in Emacs. */
    running_in_emacs = getenv ("EMACS");
@@ -157,7 +161,7 @@
  
    /* Allocate data structures. */
    if (!rl_line_buffer)
-@@ -1320,7 +1339,7 @@ rl_universal_argument ()
+@@ -1320,7 +1341,7 @@ rl_universal_argument ()
    rl_digit_loop ();
  }
  
@@ -166,7 +170,7 @@
  {
    int key, c;
    while (1)
-@@ -1450,7 +1469,7 @@ static void output_character_function ()
+@@ -1450,7 +1471,7 @@ static void output_character_function ()
  static int compare_strings ();
  
  /* Basic redisplay algorithm. */
@@ -175,7 +179,7 @@
  {
    register int in, out, c, linenum;
    register char *line = invisible_line;
-@@ -1677,10 +1696,8 @@ new:    eddie> Oh, my little buggy says to 
+@@ -1677,10 +1698,8 @@ new:    eddie> Oh, my little buggy says to
     no differences, as well as for end of line additions must be handeled.
  
     Could be made even smarter, but this works well enough */
@@ -188,7 +192,7 @@
  {
    register char *ofd, *ols, *oe, *nfd, *nls, *ne;
    int lendiff, wsatend;
-@@ -1872,8 +1889,7 @@ move_cursor_relative (new, data)
+@@ -1872,8 +1891,7 @@ move_cursor_relative (new, data)
  }
  
  /* PWP: move the cursor up or down. */
@@ -198,7 +202,7 @@
  {
    void output_character_function ();
    register int delta, i;
-@@ -2018,8 +2034,7 @@ rl_reset_terminal (terminal_name)
+@@ -2018,8 +2036,7 @@ rl_reset_terminal (terminal_name)
    init_terminal_io (terminal_name);
  }
  
@@ -208,7 +212,7 @@
  {
    extern char *tgetstr ();
    char *term, *buffer;
-@@ -2158,9 +2173,8 @@ output_some_chars (string, count)
+@@ -2158,9 +2175,8 @@ output_some_chars (string, count)
  }
  
  /* Delete COUNT characters from the display line. */
@@ -220,7 +224,7 @@
  {
    if (count > screenwidth)
      return;
-@@ -2505,7 +2519,11 @@ rl_prep_terminal ()
+@@ -2505,7 +2521,11 @@ rl_prep_terminal ()
  
    tio.c_lflag &= ~(ICANON | ECHO);
  
@@ -233,7 +237,7 @@
      eof_char = otio.c_cc[VEOF];
  
  #if defined (USE_XON_XOFF)
-@@ -2637,7 +2655,7 @@ alphabetic (c)
+@@ -2637,7 +2657,7 @@ alphabetic (c)
      return (1);
  
    if (allow_pathname_alphabetic_chars)
@@ -242,7 +246,7 @@
    else
      return (0);
  }
-@@ -2845,12 +2863,13 @@ rl_forward (count)
+@@ -2845,12 +2865,13 @@ rl_forward (count)
  #endif /* VI_MODE */
          {
            ding ();
@@ -257,7 +261,7 @@
  }
  
  /* Move backward COUNT characters. */
-@@ -2865,12 +2884,13 @@ rl_backward (count)
+@@ -2865,12 +2886,13 @@ rl_backward (count)
        if (!rl_point)
          {
            ding ();
@@ -272,7 +276,7 @@
  }
  
  /* Move to the beginning of the line. */
-@@ -2894,13 +2914,13 @@ rl_forward_word (count)
+@@ -2894,13 +2916,13 @@ rl_forward_word (count)
    if (count < 0)
      {
        rl_backward_word (-count);
@@ -288,7 +292,7 @@
  
        /* If we are not in a word, move forward until we are in one.
         Then, move forward until we hit a non-alphabetic character. */
-@@ -2913,7 +2933,7 @@ rl_forward_word (count)
+@@ -2913,7 +2935,7 @@ rl_forward_word (count)
              if (alphabetic (c)) break;
            }
        }
@@ -297,7 +301,7 @@
        while (++rl_point < rl_end)
        {
          c = the_line[rl_point];
-@@ -2921,6 +2941,7 @@ rl_forward_word (count)
+@@ -2921,6 +2943,7 @@ rl_forward_word (count)
        }
        --count;
      }
@@ -305,7 +309,7 @@
  }
  
  /* Move backward a word.  We do what Emacs does. */
-@@ -2932,13 +2953,13 @@ rl_backward_word (count)
+@@ -2932,13 +2955,13 @@ rl_backward_word (count)
    if (count < 0)
      {
        rl_forward_word (-count);
@@ -321,7 +325,7 @@
  
        /* Like rl_forward_word (), except that we look at the characters
         just before point. */
-@@ -2962,6 +2983,7 @@ rl_backward_word (count)
+@@ -2962,6 +2985,7 @@ rl_backward_word (count)
        }
        --count;
      }
@@ -329,7 +333,7 @@
  }
  
  /* Clear the current line.  Numeric argument to C-l does this. */
-@@ -2990,7 +3012,7 @@ rl_clear_screen ()
+@@ -2990,7 +3014,7 @@ rl_clear_screen ()
    if (rl_explicit_arg)