1 files changed, 16 insertions, 69 deletions
diff --git a/net/ztelnet/files/patch-an b/net/ztelnet/files/patch-an
index 985077342f0e..1b79ce8fb918 100644
--- a/net/ztelnet/files/patch-an
+++ b/net/ztelnet/files/patch-an
@@ -1,72 +1,19 @@
-diff -uNr ../ztelnet/telnet/sys_bsd.c ./telnet/sys_bsd.c
---- ../ztelnet/telnet/sys_bsd.c	Tue Sep 19 23:35:50 1995
-+++ ./telnet/sys_bsd.c	Wed Dec  3 02:35:18 1997
-@@ -43,13 +43,16 @@
- #include "externs.h"
- #include "types.h"
- 
--/* PMS: BYPMS is added */
--#if	defined(CRAY) || (defined(USE_TERMIO) && !defined(SYSV_TERMIO)) || defined(BYPMS)
-+#if	defined(CRAY) || (defined(USE_TERMIO) && !defined(SYSV_TERMIO))
- #define	SIG_FUNC_RET	void
- #else
- #define	SIG_FUNC_RET	int
- #endif
- 
-+#ifdef  SIGINFO
-+extern SIG_FUNC_RET ayt_status();
-+#endif
-+
- int
- 	tout,			/* Output file descriptor */
- 	tin,			/* Input file descriptor */
-@@ -65,16 +68,9 @@
- # define old_tc ottyb
- 
- #else	/* USE_TERMIO */
--
--#ifdef BYPMS
--struct	termios old_tc = { 0 };
--extern struct termios new_tc;
--#else
- struct	termio old_tc = { 0 };
- extern struct termio new_tc;
--#endif /* PMS */
- 
+diff -uNr --exclude=*.orig work.old/ztelnet/telnet/main.c work/ztelnet/telnet/main.c
+--- work.old/ztelnet/telnet/main.c	Wed Sep 20 05:54:56 1995
++++ work/ztelnet/telnet/main.c	Tue Jun 20 22:58:32 2000
+@@ -132,7 +132,6 @@
+ 		case 'S':
+ 		    {
+ #ifdef	HAS_GETTOS
 -#ifndef BYPMS
- # ifndef	TCSANOW
- #  ifdef TCSETS
- #   define	TCSANOW		TCSETS
-@@ -100,7 +96,6 @@
- #  endif
- # endif /* TCSANOW */
- #endif	/* USE_TERMIO */
--#endif /* PMS */
- 
- static fd_set ibits, obits, xbits;
- 
-@@ -166,11 +161,11 @@
-  *	1	Do add this character
-  */
+ 			extern int tos;
  
-+void xmitAO(), xmitEL(), xmitEC(), intp(), sendbrk();
-     int
- TerminalSpecialChars(c)
-     int	c;
- {
--    void xmitAO(), xmitEL(), xmitEC(), intp(), sendbrk();
- 
-     if (c == termIntChar) {
- 	intp();
-@@ -382,11 +377,7 @@
-     struct sgttyb sb;
-     int lmode;
- #else	/* USE_TERMIO */
--#ifdef BYPMS
--    struct termios tmp_tc;
--#else
-     struct termio tmp_tc;
+ 			if ((tos = parsetos(optarg, "tcp")) < 0)
+@@ -140,7 +139,6 @@
+ 					prompt, ": Bad TOS argument '",
+ 					optarg,
+ 					"; will try to use default TOS");
 -#endif /* PMS */
- #endif	/* USE_TERMIO */
-     int onoff;
-     int old;
+ #else
+ 			fprintf(stderr,
+ 			   "%s: Warning: -S ignored, no parsetos() support.\n",