CVS commit: pkgsrc/chat/icb

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Aug 18 02:17:26 UTC 2020

Modified Files:
        pkgsrc/chat/icb: distinfo
        pkgsrc/chat/icb/patches: patch-ab patch-av

Log Message:
icb: fix building on modern mainstream Linux distros

Committed on the off chance someone else may want to run this on modern
Linux. Tested on Debian 9 and Fedora 29 through 32.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/chat/icb/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/chat/icb/patches/patch-ab
cvs rdiff -u -r1.5 -r1.6 pkgsrc/chat/icb/patches/patch-av

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/icb/distinfo
diff -u pkgsrc/chat/icb/distinfo:1.19 pkgsrc/chat/icb/distinfo:1.20
--- pkgsrc/chat/icb/distinfo:1.19       Tue Dec 12 07:13:01 2017
+++ pkgsrc/chat/icb/distinfo    Tue Aug 18 02:17:26 2020
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2017/12/12 07:13:01 spz Exp $
+$NetBSD: distinfo,v 1.20 2020/08/18 02:17:26 gutteridge Exp $
 
 SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8
 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf
 SHA512 (icb-5.0.9.tar.gz) = d72a30cd671242dceb98defae80780bffd2aaaddfea2bf50d0970368f2601dd203b13939d102ce9af3c8d46373addcd2bcf385a1bb8e3c3b3674c21072fd8d00
 Size (icb-5.0.9.tar.gz) = 357565 bytes
 SHA1 (patch-aa) = b82fb642c79a200aaa47b0db397c82f19fb7f9ff
-SHA1 (patch-ab) = 636e02532dc3f3f5049e9806e102de580d136177
+SHA1 (patch-ab) = 30c85ad51b12d7730e950a641fccf3f319902fcc
 SHA1 (patch-ac) = 99631dd1c526d5a07339205bad031003f6920495
 SHA1 (patch-ad) = b64e9ca73b5e56122cb82363ee9c765457bde5ca
 SHA1 (patch-ae) = c98d058cfe6177fb4807104695f96c774b11d177
@@ -25,7 +25,7 @@ SHA1 (patch-ar) = 739e982d907a5063ebd75e
 SHA1 (patch-as) = 5c42bfdc2e836fb86e814c396760040560864256
 SHA1 (patch-at) = 703abcc2415b92776241011fe893286de06da034
 SHA1 (patch-au) = 777c643d90df1ceb113b079a6fdebe32e4c0ed18
-SHA1 (patch-av) = 65e914e11087953cdd9a9b681152ca108ba64323
+SHA1 (patch-av) = f807e54b27bb8c59e8d29f70e53ebc5da5995349
 SHA1 (patch-aw) = 6dbc66a63f52244ac9b8b29346cb376b98442695
 SHA1 (patch-ax) = 6dc671de0abe01139fdaa193bd1c627b2d74cfb9
 SHA1 (patch-ay) = f8a787d5a6611890d65fa8b0411977fd5c0bc7e9

Index: pkgsrc/chat/icb/patches/patch-ab
diff -u pkgsrc/chat/icb/patches/patch-ab:1.3 pkgsrc/chat/icb/patches/patch-ab:1.4
--- pkgsrc/chat/icb/patches/patch-ab:1.3        Thu Feb 16 14:13:15 2012
+++ pkgsrc/chat/icb/patches/patch-ab    Tue Aug 18 02:17:26 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2012/02/16 14:13:15 hans Exp $
+$NetBSD: patch-ab,v 1.4 2020/08/18 02:17:26 gutteridge Exp $
 
---- tcl/tclGlob.c.orig 2008-12-16 20:18:00.000000000 -0500
-+++ tcl/tclGlob.c      2008-12-16 20:18:01.000000000 -0500
-@@ -24,18 +24,24 @@ static char rcsid[] = "$Header: /home/ag
+--- tcl/tclGlob.c.orig 1995-02-24 21:19:55.000000000 +0000
++++ tcl/tclGlob.c
+@@ -24,18 +24,26 @@ static char rcsid[] = "$Header: /home/ag
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
@@ -15,6 +15,8 @@ $NetBSD: patch-ab,v 1.3 2012/02/16 14:13
 +
 +#ifdef __sun
 +#define D_NAMLEN(d) (strlen((d)->d_name))
++#elif defined(__linux__)
++#define D_NAMLEN(d) _D_EXACT_NAMLEN((d))
 +#else
 +#define D_NAMLEN(d) ((d)->d_namlen)
 +#endif
@@ -30,7 +32,7 @@ $NetBSD: patch-ab,v 1.3 2012/02/16 14:13
  typedef struct {
      char *result;             /* Pointer to result area. */
      int totalSpace;           /* Total number of characters allocated
-@@ -298,12 +304,12 @@ DoGlob(interp, dir, rem, resPtr)
+@@ -298,12 +306,12 @@ DoGlob(interp, dir, rem, resPtr)
            if (Tcl_StringMatch(entryPtr->d_name, pattern)) {
                if (*p == 0) {
                    AppendResult(dir, entryPtr->d_name,

Index: pkgsrc/chat/icb/patches/patch-av
diff -u pkgsrc/chat/icb/patches/patch-av:1.5 pkgsrc/chat/icb/patches/patch-av:1.6
--- pkgsrc/chat/icb/patches/patch-av:1.5        Fri Jan 11 13:24:32 2013
+++ pkgsrc/chat/icb/patches/patch-av    Tue Aug 18 02:17:26 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.5 2013/01/11 13:24:32 joerg Exp $
+$NetBSD: patch-av,v 1.6 2020/08/18 02:17:26 gutteridge Exp $
 
 --- icb/unix.c.orig    1995-02-24 21:20:31.000000000 +0000
 +++ icb/unix.c
-@@ -7,20 +7,27 @@
+@@ -7,20 +7,23 @@
  #include <stdio.h>
  #include "icb.h"
  #include "externs.h"
@@ -17,11 +17,11 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  
 -#ifndef SYSV
 -
- #ifdef linux
- #include <bsd/sgtty.h>
- #else
+-#ifdef linux
+-#include <bsd/sgtty.h>
+-#else
  #include <sgtty.h>
- #endif
+-#endif
  
 +#if defined(__linux__) || defined(__NetBSD__) || defined(__sun)
 +#include <termios.h>
@@ -33,7 +33,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  #define TTYSTRUCT sgttyb
  #define stty(fd,buf) ioctl((fd),TIOCSETN,(buf))
  #define gtty(fd,buf) ioctl((fd),TIOCGETP,(buf))
-@@ -30,6 +37,7 @@
+@@ -30,6 +33,7 @@
  #define stty(fd,buf) ioctl((fd),TCSETA,(buf))
  #define gtty(fd,buf) ioctl((fd),TCGETA,(buf))
  #endif /* SYSV */
@@ -41,7 +41,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  
  char *getlogin();
  
-@@ -65,13 +73,16 @@ gettime()
+@@ -65,13 +69,16 @@ gettime()
  
  /* set line buffering for an open file pointer */
  /* output will be flushed every newline */
@@ -60,7 +60,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  }
  
  
-@@ -79,13 +90,13 @@ FILE *fp;
+@@ -79,13 +86,13 @@ FILE *fp;
  pushback(c)
  char c;
  {
@@ -77,7 +77,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  }
  
  
-@@ -94,25 +105,25 @@ char c;
+@@ -94,25 +101,25 @@ char c;
  
  getterm()
  {
@@ -111,7 +111,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
        /* get local special chars */
        if (ioctl(0, TIOCGLTC, &lt) < 0) {
                ttyinfo.redraw = '\022'; /* ^R */
-@@ -121,10 +132,10 @@ getterm()
+@@ -121,10 +128,10 @@ getterm()
                ttyinfo.redraw = lt.t_rprntc;
                ttyinfo.werase = lt.t_werasc;
        }
@@ -124,7 +124,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  
        /* get the current window size */
        getwinsize();
-@@ -134,7 +145,7 @@ getterm()
+@@ -134,7 +141,7 @@ getterm()
  
  /* set up terminal modes optimal for icb */
  
@@ -133,7 +133,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  {
        struct TTYSTRUCT tty;
  
-@@ -145,14 +156,14 @@ icbterm()
+@@ -145,14 +152,14 @@ icbterm()
        bcopy((char *)&origtty, (char *)&tty, (unsigned)sizeof(struct TTYSTRUCT));
  
        /* turn on cbreak - turn off echo */
@@ -153,7 +153,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  
        echomode = 0;
        /* set the new flags */
-@@ -165,7 +176,7 @@ icbterm()
+@@ -165,7 +172,7 @@ icbterm()
  
  /* restore term to original settings */
  
@@ -162,7 +162,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  {
        if (badttyinfo)
                return;
-@@ -206,7 +217,11 @@ char *s;
+@@ -206,7 +213,11 @@ char *s;
        struct passwd *pw;
        char login[17];
        char *p = login;
@@ -174,7 +174,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  
        /* has to start with a tilde */
        if (*s++ != '~')
-@@ -258,11 +273,11 @@ echo()
+@@ -258,11 +269,11 @@ echo()
        }
  
        /* turn on echo */
@@ -190,7 +190,7 @@ $NetBSD: patch-av,v 1.5 2013/01/11 13:24
  
        echomode = 1;
  
-@@ -287,11 +302,11 @@ noecho()
+@@ -287,11 +298,11 @@ noecho()
        }
  
        /* turn off echo */