games/tads: sgtty considered harmful; fix broken ssp build.

PKGREVISION -> 5

4 files changed, 55 insertions, 10 deletions

diff --git a/games/tads/Makefile b/games/tads/Makefile
index d6600727128..5638ad16a95 100644
--- a/games/tads/Makefile
+++ b/games/tads/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2020/01/26 17:31:17 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/29 09:36:37 dholland Exp $
 #
 
 DISTNAME=	tads23-unix
 PKGNAME=	tads-3.0.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.tads.org/t3dl/
 DIST_SUBDIR=	${PKGNAME_NOREV}-1
diff --git a/games/tads/distinfo b/games/tads/distinfo
index cb578c27a55..53cab7d0b53 100644
--- a/games/tads/distinfo
+++ b/games/tads/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 10:44:27 nia Exp $
+$NetBSD: distinfo,v 1.19 2021/12/29 09:36:37 dholland Exp $
 
 BLAKE2s (tads-3.0.8-1/tads23-unix.tar.gz) = f2094b43926693e5889218c4fdf7c16b6d87f03166b58de3f6c212d320e480bc
 SHA512 (tads-3.0.8-1/tads23-unix.tar.gz) = 6bfaa3d86b45c4dcfc501cb41ba81a66cc64d968fb5cb5b0764f637efaf45f09091a5fcd9dc82ca7db82efc9101aa71077a5c633cf31ae2b5d13940a72605e46
 Size (tads-3.0.8-1/tads23-unix.tar.gz) = 4122345 bytes
 SHA1 (patch-aa) = 5e8a26d5766eb2db889109c05993c3b04d527cab
-SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062
+SHA1 (patch-ab) = 63cd160bf7a4946badd59953a81f84dc8fd7417c
 SHA1 (patch-ac) = f0c73b0fe9dcf9ec442e37faefeb78ba0fbd67d0
-SHA1 (patch-tads2_osunixt.c) = 7bf4ca85ae9986eea4caff61c27845b6a309ef9f
+SHA1 (patch-tads2_osunixt.c) = 9361782101dff4fb20a4210c8d831cd7fe3b4d1a
 SHA1 (patch-tads3_tcprs.cpp) = 7f377ea541009490910259c734d577b612f264ef
diff --git a/games/tads/patches/patch-ab b/games/tads/patches/patch-ab
index 6014cde763e..966f07fee17 100644
--- a/games/tads/patches/patch-ab
+++ b/games/tads/patches/patch-ab
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
+$NetBSD: patch-ab,v 1.2 2021/12/29 09:36:37 dholland Exp $
 
---- tads2/osunixt.h.orig	Wed Sep 25 18:43:09 2002
+Don't use sgtty, or tparm.
+
+Don't redefine memcpy/memmove; it's completely unnecessary and breaks
+SSP.
+
+--- tads2/osunixt.h.orig	2004-02-17 02:20:41.000000000 +0000
 +++ tads2/osunixt.h
-@@ -89,7 +89,7 @@ Tue Nov 22 15:16:10 EST 1994    Dave Bag
+@@ -84,12 +84,12 @@ Tue Nov 22 15:16:10 EST 1994    Dave Bag
+  * Define the following to use sgtty.h instead of termios or direct
+  * ioctl hacking.
+  */
+-#if defined(NEXT) || defined(IBM_RT) || defined(FREEBSD_386) || defined(IBM_AIX) || defined(NETBSD) || defined(OPENBSD) || defined(DARWIN)
++#if 0
+ #define USE_IOCTL_INSTEAD_OF_TERMIOS
  #define USE_SGTTY
  #endif
  
@@ -11,3 +22,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $
  #define HAVE_TPARM      /* define if this system has the tparm routine */
  #endif
  
+@@ -160,9 +160,11 @@ FILE* our_fopen(char *filename, char *fl
+  * Some machines are missing memmove, so we use our own memcpy/memmove 
+  * routine instead.
+  */
++#if !defined(__STDC__)
+ void *our_memcpy(void *dst, const void *src, size_t size); 
+ #define memcpy our_memcpy
+ #define memmove our_memcpy
++#endif
+ 
+ /* display lines on which errors occur */
+ /* #  define OS_ERRLINE 1 */
diff --git a/games/tads/patches/patch-tads2_osunixt.c b/games/tads/patches/patch-tads2_osunixt.c
index 5e0703b7214..ede5f9024ba 100644
--- a/games/tads/patches/patch-tads2_osunixt.c
+++ b/games/tads/patches/patch-tads2_osunixt.c
@@ -1,6 +1,8 @@
-$NetBSD: patch-tads2_osunixt.c,v 1.1 2013/07/18 12:07:24 joerg Exp $
+$NetBSD: patch-tads2_osunixt.c,v 1.2 2021/12/29 09:36:37 dholland Exp $
 
---- tads2/osunixt.c.orig	2013-07-17 14:34:13.000000000 +0000
+Use standard headers. Use standard interfaces.
+
+--- tads2/osunixt.c.orig	2005-06-02 16:54:38.000000000 +0000
 +++ tads2/osunixt.c
 @@ -32,6 +32,7 @@
  #include <stddef.h>
@@ -10,3 +12,23 @@ $NetBSD: patch-tads2_osunixt.c,v 1.1 2013/07/18 12:07:24 joerg Exp $
  #include <ctype.h>
  #include <string.h>
  #include <sys/stat.h>
+@@ -993,6 +994,9 @@ t_tty(int action)
+         t.c_lflag |= INLCR;
+         t.c_cc[VMIN] = 1;
+         t.c_cc[VTIME] = 0;
++#ifndef XTABS
++#define XTABS OXTABS
++#endif
+ #if !defined(SGI_IRIX)
+         t.c_oflag &= (~XTABS);
+ #else
+@@ -1018,7 +1022,8 @@ t_tty(int action)
+ #ifdef  USE_SGTTY
+     ospeed = t.sg_ospeed;
+ #else   
+-    ospeed = t.c_cflag & CBAUD;
++    /*ospeed = t.c_cflag & CBAUD;*/
++    ospeed = cfgetospeed(&t);
+ #endif
+     if (ospeed == 0)
+         ospeed = 11;