diff options
| author | dholland <dholland@pkgsrc.org> | 2015-11-07 21:47:07 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2015-11-07 21:47:07 +0000 |
| commit | 78e73b87e697a22e7f793899a044496d4d06fe39 (patch) | |
| tree | 55b73a5579d0c5cf6588d0cd340358fac61693a8 /chat/i2cb | |
| parent | 48362d4fd1c316046934abdcf1d3c51bb08471c5 (diff) | |
| download | pkgsrc-78e73b87e697a22e7f793899a044496d4d06fe39.tar.gz | |
If we're going to use <termios.h>, which is reasonable, don't also use
<sgtty.h>. Hi joerg...
Diffstat (limited to 'chat/i2cb')
| -rw-r--r-- | chat/i2cb/distinfo | 4 | ||||
| -rw-r--r-- | chat/i2cb/patches/patch-aw | 41 |
2 files changed, 41 insertions, 4 deletions
diff --git a/chat/i2cb/distinfo b/chat/i2cb/distinfo index 396abe2d5f6..d2e24c36890 100644 --- a/chat/i2cb/distinfo +++ b/chat/i2cb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2015/11/03 01:20:19 agc Exp $ +$NetBSD: distinfo,v 1.17 2015/11/07 21:47:07 dholland Exp $ SHA1 (i2cb-6.0_ALPHA.tar.gz) = 6d2ddd234403fe33426ece3fd4de4104cf1a6257 RMD160 (i2cb-6.0_ALPHA.tar.gz) = 2c0683c20939fe5709fa08b6e335cbee2574ecd8 @@ -26,7 +26,7 @@ SHA1 (patch-as) = 04caba156b07ef94552227b434ed51b83123b078 SHA1 (patch-at) = 3f296af5201612777491b3c95d44a1840bc5c8e0 SHA1 (patch-au) = 591bae1fcfe43ba86ec29c5ca53322bad5b572e7 SHA1 (patch-av) = 3ebe9872953147e9694f36e76584482167d2f34a -SHA1 (patch-aw) = 27e6c09d15f7f0ece6337c6c14d66de2424a4068 +SHA1 (patch-aw) = 4027f62aed11ef66d7bbe226ccd1bf7806ecaf57 SHA1 (patch-ax) = 610a34662113e800fa7455422b170312ef92fe4d SHA1 (patch-ay) = 442fdc77dfe58676c17212d4343ffba42ce44b8b SHA1 (patch-az) = 7e0cd06b7085bbbf451bedf406564f30c82a5aaf diff --git a/chat/i2cb/patches/patch-aw b/chat/i2cb/patches/patch-aw index b72d435caf0..7d92f9a13e4 100644 --- a/chat/i2cb/patches/patch-aw +++ b/chat/i2cb/patches/patch-aw @@ -1,4 +1,8 @@ -$NetBSD: patch-aw,v 1.3 2013/08/31 14:45:43 joerg Exp $ +$NetBSD: patch-aw,v 1.4 2015/11/07 21:47:07 dholland Exp $ + +- Use standard headers. +- Throw out a raft of legacy sgtty/termio logic. +- Don't fail if NAME_MAX is missing. --- src/unix.c.orig 2000-03-15 22:13:29.000000000 +0000 +++ src/unix.c @@ -18,7 +22,40 @@ $NetBSD: patch-aw,v 1.3 2013/08/31 14:45:43 joerg Exp $ #include <time.h> #include <unistd.h> #include "icb.h" -@@ -235,7 +238,11 @@ tildexpand (char *s) +@@ -32,32 +35,10 @@ void noecho (void); + #undef stty + #undef gtty + +-#if defined(__linux__) +-#include <termios.h> +-#include <sys/ioctl.h> + #define TTYSTRUCT termios + #define stty(fd,buf) tcgetattr((fd), (buf)) + #define gtty(fd,buf) tcsetattr((fd), TCSANOW, (buf)) + #define SYSV +-#else +-#ifndef SYSV +- +-#ifdef linux +-#include <bsd/sgtty.h> +-#else +-#include <sgtty.h> +-#endif +- +-#define TTYSTRUCT sgttyb +-#define stty(fd,buf) ioctl((fd),TIOCSETN,(buf)) +-#define gtty(fd,buf) ioctl((fd),TIOCGETP,(buf)) +-#else /* SYSV */ +-#include <termio.h> +-#define TTYSTRUCT termio +-#define stty(fd,buf) ioctl((fd),TCSETA,(buf)) +-#define gtty(fd,buf) ioctl((fd),TCGETA,(buf)) +-#endif /* SYSV */ +-#endif /* __linux__ */ + + char *getlogin(); + +@@ -235,7 +216,11 @@ tildexpand (char *s) struct passwd *pw; char login[17]; char *p = login; |