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)

10 files changed, 77 insertions, 155 deletions

diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index e0534ceebdd..dd1bf616076 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.16 1999/11/23 16:26:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 1999/12/20 12:33:45 fredb Exp $
 # $FreeBSD Id: Makefile,v 1.17 1997/11/26 23:16:51 jseger Exp
 #
 
-DISTNAME=	cku192src
-PKGNAME=        kermit-6.0.192
+DISTNAME=	cku196src
+PKGNAME=        kermit-7.0.196.beta11
 CATEGORIES=	comms
-MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/ \
-		ftp://ftp.th-darmstadt.de/pub/networking/kermit/
+MASTER_SITES=	ftp://kermit.columbia.edu/kermit/test/tar/
+#MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/ \
+#		ftp://ftp.th-darmstadt.de/pub/networking/kermit/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.columbia.edu/kermit/
@@ -14,21 +15,50 @@ HOMEPAGE=	http://www.columbia.edu/kermit/
 RESTRICTED=	"'No redistribution' copyright"
 NO_CDROM=	${RESTRICTED}
 MIRROR_DISTFILE= no
+
+ALL_TARGET=	netbsd
+BUILD_DEFS+=	KFLAGS LIBS KERMIT_SUID_UUCP
+MAKE_ENV+=	KFLAGS="${KFLAGS}" LIBS="${LIBS}"
+MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
-MANCOMPRESSED_IF_MANZ=	yes
+KFLAGS+=	-DCK_PCT_BAR -DNODEBUG -DNOOLDMODEMS
+KFLAGS+=	-DDYNAMIC -DSUNX25
+
+# XXX This needs to be tested. XXX
+#
+# Include SOCKS firewall support
+.if defined(USE_SOCKS)
+.if ${USE_SOCKS} == 4
+DEPENDS+=	socks4-2.2:../../net/socks4
+KFLAGS+=	-DSOCKS
+LIBS+=		-lsocks
+.elif ${USE_SOCKS} == 5
+DEPENDS+=	socks5-1.0.2:../../net/socks5
+KFLAGS+=	-DSOCKS -DCK_SOCKS5
+LIBS+=		-lsocks
+.endif
+.endif
 
-PLIST_SRC=	${WRKDIR}/PLIST
+# XXX The man page currently doesn't build for NetBSD XXX
+#MANCOMPRESSED_IF_MANZ=	yes
+#PLIST_SRC=		${WRKDIR}/PLIST
 
-post-install:
-	@${MKDIR} ${PREFIX}/share/examples/kermit
-	${INSTALL_DATA} ${FILESDIR}/dot.kermrc ${PREFIX}/share/examples/kermit
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	@for OPT in ${MANINSTALL} x; do \
-	  case $$OPT in \
-	    catinstall) ${ECHO} man/cat1/kermit.0 >>${PLIST_SRC};; \
-	    maninstall) ${ECHO} man/man1/kermit.1 >>${PLIST_SRC};; \
-	  esac; \
-	done
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wermit ${PREFIX}/bin/kermit
+#	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+#	@for OPT in ${MANINSTALL} x; do \
+#	  case $$OPT in \
+#	    catinstall) ${ECHO} man/cat1/kermit.0 >>${PLIST_SRC};; \
+#	    maninstall) ${ECHO} man/man1/kermit.1 >>${PLIST_SRC};; \
+#	  esac; \
+#	done
 
 .include "../../mk/bsd.pkg.mk"
+
+.if defined(KERMIT_SUID_UUCP)
+.if ${KERMIT_SUID_UUCP} == "yes" || ${KERMIT_SUID_UUCP} == "YES"
+BINOWN=			uucp
+BINMODE=		4555
+.endif
+.endif
diff --git a/comms/kermit/files/md5 b/comms/kermit/files/md5
index e8cf91a99cc..7228291bf93 100644
--- a/comms/kermit/files/md5
+++ b/comms/kermit/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:17:02 agc Exp $
+$NetBSD: md5,v 1.3 1999/12/20 12:33:47 fredb Exp $
 
-MD5 (cku192src.tar.gz) = c54feaa3389a6464003dafa16a6945d2
+MD5 (cku196src.tar.gz) = b9fcd420fed48792a7a8aab85c0e6133
diff --git a/comms/kermit/files/patch-sum b/comms/kermit/files/patch-sum
index 74b73e12bf5..72197c22573 100644
--- a/comms/kermit/files/patch-sum
+++ b/comms/kermit/files/patch-sum
@@ -1,7 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/10/06 22:27:38 tron Exp $
+$NetBSD: patch-sum,v 1.3 1999/12/20 12:33:47 fredb Exp $
 
-MD5 (patch-aa) = 015a6c86204b335df82a90f18f62d0ed
-MD5 (patch-ab) = f533d01480e4928ae17c4074743ba1b1
-MD5 (patch-ac) = a018444ee64f26d2d7bb2873829ad802
-MD5 (patch-ad) = 9087c0e3d391e399252985ecd8d0bb18
-MD5 (patch-ae) = fe5eac208c16075b2e333cb83b05413c
+MD5 (patch-aa) = afd665666940f0695cc074c9fa5528fa
+MD5 (patch-ad) = 44b8a1a548e15c6682474224d47b8fd8
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   */
diff --git a/comms/kermit/pkg/PLIST b/comms/kermit/pkg/PLIST
index cb789926514..ea3ab81b3cd 100644
--- a/comms/kermit/pkg/PLIST
+++ b/comms/kermit/pkg/PLIST
@@ -1,4 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 1999/03/06 21:24:43 kim Exp $
+@comment $NetBSD: PLIST,v 1.5 1999/12/20 12:33:50 fredb Exp $
 bin/kermit
-share/examples/kermit/dot.kermrc
-@dirrm share/examples/kermit
diff --git a/comms/kermit/scripts/configure b/comms/kermit/scripts/configure
deleted file mode 100644
index 9df7e3e82a6..00000000000
--- a/comms/kermit/scripts/configure
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: configure,v 1.2 1998/08/07 10:36:41 agc Exp $
-#
-# shuffle things around for bmake to work right
-#
-mv ${WRKDIR}/makefile  ${WRKDIR}/makefile.dist
-sed -e "s@%%PREFIX%%@${PREFIX}@" < ${FILESDIR}/Makefile.sed > ${WRKDIR}/Makefile
-cp ${FILESDIR}/dot.kermrc ${WRKDIR}