Update kermit to 7.0.96.beta11. Numerous changes, too many to list,

but here's a couple:

- - kermit protocol transfers default to "fast" mode
- - support for SOCKS and sun X.25 (both untested)

5 files changed, 24 insertions, 118 deletions

diff --git a/comms/kermit/patches/patch-aa b/comms/kermit/patches/patch-aa
index 4eb24ff0c4f..e76d220987d 100644
--- a/comms/kermit/patches/patch-aa
+++ b/comms/kermit/patches/patch-aa
@@ -1,14 +1,19 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:36:39 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/12/20 12:33:47 fredb Exp $
 
---- ckucmd.c.orig	Mon Nov 25 01:20:49 1996
-+++ ckucmd.c	Fri Jun 19 22:52:29 1998
-@@ -3648,6 +3648,9 @@
-   not convert \r to \n, so additional \n needed in newline function.  But
-   it is also very likely to result in unwanted blank lines.
- */
-+#ifdef SVORPOSIX
-+    if (c == CR) putchar(NL);
-+#endif /* SVORPOSIX */
+--- makefile.orig	Tue Dec  7 18:58:08 1999
++++ makefile	Fri Dec 17 07:16:10 1999
+@@ -732,10 +732,10 @@
+ #
+ WERMIT = makewhat
+ DESTDIR =
+-BINDIR = /usr/local/bin
+-MANDIR = /usr/man/manl
+-INFODIR = /usr/local/doc/kermit
+-MANEXT = l
++BINDIR = /usr/${PREFIX}/bin
++MANDIR = /usr/man/man1
++INFODIR = /usr/${PREFIX}/share/doc/kermit
++MANEXT = 1
+ ALL = $(WERMIT)
  
- #ifdef OS2
-     if (c == CR) putchar(NL);
+ all: $(ALL)
diff --git a/comms/kermit/patches/patch-ab b/comms/kermit/patches/patch-ab
deleted file mode 100644
index 1a9c9be43c9..00000000000
--- a/comms/kermit/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:40 agc Exp $
-
---- ckuusx.c.orig	Mon Nov 25 01:20:52 1996
-+++ ckuusx.c	Tue Feb 10 00:55:12 1998
-@@ -29,6 +29,7 @@
- #ifdef OS2
- #include <string.h>
- #endif /* OS2 */
-+#include <errno.h>
- 
- extern xx_strp xxstring;
- extern struct ck_p ptab[];
diff --git a/comms/kermit/patches/patch-ac b/comms/kermit/patches/patch-ac
deleted file mode 100644
index 1c61c6c922b..00000000000
--- a/comms/kermit/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.6 1999/10/06 22:26:51 tron Exp $
-
---- ckcdeb.h.orig	Mon Nov 25 01:20:48 1996
-+++ ckcdeb.h	Thu Oct  7 00:22:02 1999
-@@ -267,6 +267,9 @@
- #ifndef NOSETBUF			/* NOSETBUF is safe */
- #define NOSETBUF
- #endif /* NOSETBUF */
-+#ifndef BIGBUFOK			/* BIGBUFOK is safe (all 32bit) */
-+#define BIGBUFOK
-+#endif /* BIGBUFOK */
- #ifndef DIRENT				/* Uses <dirent.h> */
- #define DIRENT
- #endif /* DIRENT */
-@@ -908,10 +911,10 @@
- /* Now define the debug() macro. */
- #ifdef IFDEBUG
- /* Use this form to avoid function calls: */
--#define debug(a,b,c,d) if (deblog) dodebug(a,b,(char *)c,(long)d)
-+#define debug(a,b,c,d) if (deblog) dodebug(a,b,(char *)(c),(long)d)
- #else
- /* Use this form to save space: */
--#define debug(a,b,c,d) dodebug(a,b,(char *)c,(long)d)
-+#define debug(a,b,c,d) dodebug(a,b,(char *)(c),(long)d)
- #endif /* MAC */
- 
- #ifdef COMMENT
-@@ -1489,6 +1492,10 @@
- #else
- #ifdef AMIGA
- #define BPS_14K
-+#else
-+#ifdef BSD44
-+#define BPS_14K
-+#endif /* BSD44 */
- #endif /* AMIGA */
- #endif /* MAC */
- #endif /* NEXT */
-@@ -1505,6 +1512,10 @@
- #else
- #ifdef MAC
- #define BPS_28K				/* 28800 bps */
-+#else
-+#ifdef BSD44
-+#define BPS_28K
-+#endif /* BSD44 */
- #endif /* MAC */
- #endif /* NEXT */
- #endif /* NOB_28K */
diff --git a/comms/kermit/patches/patch-ad b/comms/kermit/patches/patch-ad
index fabb729d6ab..c9aae8b8720 100644
--- a/comms/kermit/patches/patch-ad
+++ b/comms/kermit/patches/patch-ad
@@ -1,37 +1,13 @@
-$NetBSD: patch-ad,v 1.5 1999/10/06 22:27:15 tron Exp $
+$NetBSD: patch-ad,v 1.6 1999/12/20 12:33:49 fredb Exp $
 
---- ckutio.c.orig	Mon Nov 25 11:20:49 1996
-+++ ckutio.c	Wed Oct  6 23:02:25 1999
-@@ -4572,6 +4572,9 @@ ttsspd(cps) int cps; {
- #endif /* MINIX */
-       case 240: s = B2400; break;
-       case 480: s = B4800; break;
-+#ifdef B7200
-+      case 720: s = B7200; break;
-+#endif
- #ifndef MINIX
-       case 888: s = B75; s2 = B1200; break; /* 888 = 75/1200 split speed */
- #endif /* MINIX */
-@@ -4918,6 +4921,10 @@ ttgspd() {				/* Get current serial devi
-       case B4800: ss = 4800L; break;
- #endif /* B4800 */
- 
-+#ifdef B7200
-+      case B7200: ss = 7200L; break;
-+#endif /* B7200 */
-+
- #ifdef B9600
-       case B9600: ss = 9600L; break;
- #endif /* B9600 */
-@@ -7174,9 +7181,9 @@ ztime(s) char **s; {
- #ifdef ATTSV				/* AT&T way */
+--- ckutio.c.orig	Tue Dec  7 18:40:00 1999
++++ ckutio.c	Thu Dec 16 06:41:46 1999
+@@ -10411,7 +10411,7 @@
  /*  extern long time(); */		/* Theoretically these should */
      char *ctime();			/* already been dcl'd in <time.h> */
+ #ifdef BSD44
 -    long clock_storage;
 +    time_t clock_storage;
-     clock_storage = time(
--#ifdef IRIX60
-+#if defined(IRIX60) || defined(__NetBSD__)
- 			 (time_t *)
  #else
- 			 (long *)
+     time_t clock_storage;
+ #endif /* BSD44 */
diff --git a/comms/kermit/patches/patch-ae b/comms/kermit/patches/patch-ae
deleted file mode 100644
index 1fd4e4c1bb1..00000000000
--- a/comms/kermit/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.3 1998/08/07 10:36:40 agc Exp $
-
---- ckufio.c.orig	Mon Nov 25 01:20:49 1996
-+++ ckufio.c	Sat Jun 20 22:37:35 1998
-@@ -2743,7 +2743,8 @@
- 
-     /* and this should have been declared always through a header file */
- #endif /* OS2 */
--    long tmx, days;
-+    time_t tmx;
-+    long days;
-     int i, n, isleapyear;
-                    /*       J  F  M  A   M   J   J   A   S   O   N   D   */
-                    /*      31 28 31 30  31  30  31  31  30  31  30  31   */