Wed Dec 29 09:36:38 2021 UTC ()
games/tads: sgtty considered harmful; fix broken ssp build.

PKGREVISION -> 5


(dholland)
diff -r1.19 -r1.20 pkgsrc/games/tads/Makefile
diff -r1.18 -r1.19 pkgsrc/games/tads/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/games/tads/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/games/tads/patches/patch-tads2_osunixt.c
cvs diff -r1.19 -r1.20 pkgsrc/games/tads/Makefile (expand / switch to unified diff)

--- pkgsrc/games/tads/Makefile 2020/01/26 17:31:17 1.19
+++ pkgsrc/games/tads/Makefile 2021/12/29 09:36:37 1.20
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.19 2020/01/26 17:31:17 rillig Exp $ 1# $NetBSD: Makefile,v 1.20 2021/12/29 09:36:37 dholland Exp $
2# 2#
3 3
4DISTNAME= tads23-unix 4DISTNAME= tads23-unix
5PKGNAME= tads-3.0.8 5PKGNAME= tads-3.0.8
6PKGREVISION= 4 6PKGREVISION= 5
7CATEGORIES= games 7CATEGORIES= games
8MASTER_SITES= http://www.tads.org/t3dl/ 8MASTER_SITES= http://www.tads.org/t3dl/
9DIST_SUBDIR= ${PKGNAME_NOREV}-1 9DIST_SUBDIR= ${PKGNAME_NOREV}-1
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.tads.org/ 12HOMEPAGE= https://www.tads.org/
13COMMENT= TADS compiler and interpreter 13COMMENT= TADS compiler and interpreter
14 14
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
16NO_CONFIGURE= yes 16NO_CONFIGURE= yes
17BUILD_DIRS= tads2 tads3 17BUILD_DIRS= tads2 tads3
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19MAKE_ENV+= PKGREVISION=${PKGREVISION} MAINTAINER=${MAINTAINER:Q} 19MAKE_ENV+= PKGREVISION=${PKGREVISION} MAINTAINER=${MAINTAINER:Q}
cvs diff -r1.18 -r1.19 pkgsrc/games/tads/distinfo (expand / switch to unified diff)

--- pkgsrc/games/tads/distinfo 2021/10/26 10:44:27 1.18
+++ pkgsrc/games/tads/distinfo 2021/12/29 09:36:37 1.19
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.18 2021/10/26 10:44:27 nia Exp $ 1$NetBSD: distinfo,v 1.19 2021/12/29 09:36:37 dholland Exp $
2 2
3BLAKE2s (tads-3.0.8-1/tads23-unix.tar.gz) = f2094b43926693e5889218c4fdf7c16b6d87f03166b58de3f6c212d320e480bc 3BLAKE2s (tads-3.0.8-1/tads23-unix.tar.gz) = f2094b43926693e5889218c4fdf7c16b6d87f03166b58de3f6c212d320e480bc
4SHA512 (tads-3.0.8-1/tads23-unix.tar.gz) = 6bfaa3d86b45c4dcfc501cb41ba81a66cc64d968fb5cb5b0764f637efaf45f09091a5fcd9dc82ca7db82efc9101aa71077a5c633cf31ae2b5d13940a72605e46 4SHA512 (tads-3.0.8-1/tads23-unix.tar.gz) = 6bfaa3d86b45c4dcfc501cb41ba81a66cc64d968fb5cb5b0764f637efaf45f09091a5fcd9dc82ca7db82efc9101aa71077a5c633cf31ae2b5d13940a72605e46
5Size (tads-3.0.8-1/tads23-unix.tar.gz) = 4122345 bytes 5Size (tads-3.0.8-1/tads23-unix.tar.gz) = 4122345 bytes
6SHA1 (patch-aa) = 5e8a26d5766eb2db889109c05993c3b04d527cab 6SHA1 (patch-aa) = 5e8a26d5766eb2db889109c05993c3b04d527cab
7SHA1 (patch-ab) = b8e48ff15ef5fa1834c98a5bcc6df3d732dfe062 7SHA1 (patch-ab) = 63cd160bf7a4946badd59953a81f84dc8fd7417c
8SHA1 (patch-ac) = f0c73b0fe9dcf9ec442e37faefeb78ba0fbd67d0 8SHA1 (patch-ac) = f0c73b0fe9dcf9ec442e37faefeb78ba0fbd67d0
9SHA1 (patch-tads2_osunixt.c) = 7bf4ca85ae9986eea4caff61c27845b6a309ef9f 9SHA1 (patch-tads2_osunixt.c) = 9361782101dff4fb20a4210c8d831cd7fe3b4d1a
10SHA1 (patch-tads3_tcprs.cpp) = 7f377ea541009490910259c734d577b612f264ef 10SHA1 (patch-tads3_tcprs.cpp) = 7f377ea541009490910259c734d577b612f264ef
cvs diff -r1.1.1.1 -r1.2 pkgsrc/games/tads/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/games/tads/patches/patch-ab 2003/10/05 22:09:58 1.1.1.1
+++ pkgsrc/games/tads/patches/patch-ab 2021/12/29 09:36:37 1.2
@@ -1,13 +1,36 @@ @@ -1,13 +1,36 @@
1$NetBSD: patch-ab,v 1.1.1.1 2003/10/05 22:09:58 dillo Exp $ 1$NetBSD: patch-ab,v 1.2 2021/12/29 09:36:37 dholland Exp $
2 2
3--- tads2/osunixt.h.orig Wed Sep 25 18:43:09 2002 3Don't use sgtty, or tparm.
 4
 5Don't redefine memcpy/memmove; it's completely unnecessary and breaks
 6SSP.
 7
 8--- tads2/osunixt.h.orig 2004-02-17 02:20:41.000000000 +0000
4+++ tads2/osunixt.h 9+++ tads2/osunixt.h
5@@ -89,7 +89,7 @@ Tue Nov 22 15:16:10 EST 1994 Dave Bag 10@@ -84,12 +84,12 @@ Tue Nov 22 15:16:10 EST 1994 Dave Bag
 11 * Define the following to use sgtty.h instead of termios or direct
 12 * ioctl hacking.
 13 */
 14-#if defined(NEXT) || defined(IBM_RT) || defined(FREEBSD_386) || defined(IBM_AIX) || defined(NETBSD) || defined(OPENBSD) || defined(DARWIN)
 15+#if 0
 16 #define USE_IOCTL_INSTEAD_OF_TERMIOS
6 #define USE_SGTTY 17 #define USE_SGTTY
7 #endif 18 #endif
8  19
9-#if !defined(SUN_SPARC_SUNOS) && !defined(SUN3) && !defined(ULTRIX_MIPS) && !defined(LINUX_386) && !defined(NEXT) && !defined(IBM_RT) && !defined(IBM_AIX) 20-#if !defined(SUN_SPARC_SUNOS) && !defined(SUN3) && !defined(ULTRIX_MIPS) && !defined(LINUX_386) && !defined(NEXT) && !defined(IBM_RT) && !defined(IBM_AIX)
10+#if !defined(SUN_SPARC_SUNOS) && !defined(SUN3) && !defined(ULTRIX_MIPS) && !defined(LINUX_386) && !defined(NEXT) && !defined(IBM_RT) && !defined(IBM_AIX) && !defined(__NetBSD__) 21+#if !defined(SUN_SPARC_SUNOS) && !defined(SUN3) && !defined(ULTRIX_MIPS) && !defined(LINUX_386) && !defined(NEXT) && !defined(IBM_RT) && !defined(IBM_AIX) && !defined(__NetBSD__)
11 #define HAVE_TPARM /* define if this system has the tparm routine */ 22 #define HAVE_TPARM /* define if this system has the tparm routine */
12 #endif 23 #endif
13  24
 25@@ -160,9 +160,11 @@ FILE* our_fopen(char *filename, char *fl
 26 * Some machines are missing memmove, so we use our own memcpy/memmove
 27 * routine instead.
 28 */
 29+#if !defined(__STDC__)
 30 void *our_memcpy(void *dst, const void *src, size_t size);
 31 #define memcpy our_memcpy
 32 #define memmove our_memcpy
 33+#endif
 34
 35 /* display lines on which errors occur */
 36 /* # define OS_ERRLINE 1 */
cvs diff -r1.1 -r1.2 pkgsrc/games/tads/patches/patch-tads2_osunixt.c (expand / switch to unified diff)

--- pkgsrc/games/tads/patches/patch-tads2_osunixt.c 2013/07/18 12:07:24 1.1
+++ pkgsrc/games/tads/patches/patch-tads2_osunixt.c 2021/12/29 09:36:37 1.2
@@ -1,12 +1,34 @@ @@ -1,12 +1,34 @@
1$NetBSD: patch-tads2_osunixt.c,v 1.1 2013/07/18 12:07:24 joerg Exp $ 1$NetBSD: patch-tads2_osunixt.c,v 1.2 2021/12/29 09:36:37 dholland Exp $
2 2
3--- tads2/osunixt.c.orig 2013-07-17 14:34:13.000000000 +0000 3Use standard headers. Use standard interfaces.
 4
 5--- tads2/osunixt.c.orig 2005-06-02 16:54:38.000000000 +0000
4+++ tads2/osunixt.c 6+++ tads2/osunixt.c
5@@ -32,6 +32,7 @@ 7@@ -32,6 +32,7 @@
6 #include <stddef.h> 8 #include <stddef.h>
7 #endif 9 #endif
8 #include <stdlib.h> 10 #include <stdlib.h>
9+#include <termios.h> 11+#include <termios.h>
10 #include <ctype.h> 12 #include <ctype.h>
11 #include <string.h> 13 #include <string.h>
12 #include <sys/stat.h> 14 #include <sys/stat.h>
 15@@ -993,6 +994,9 @@ t_tty(int action)
 16 t.c_lflag |= INLCR;
 17 t.c_cc[VMIN] = 1;
 18 t.c_cc[VTIME] = 0;
 19+#ifndef XTABS
 20+#define XTABS OXTABS
 21+#endif
 22 #if !defined(SGI_IRIX)
 23 t.c_oflag &= (~XTABS);
 24 #else
 25@@ -1018,7 +1022,8 @@ t_tty(int action)
 26 #ifdef USE_SGTTY
 27 ospeed = t.sg_ospeed;
 28 #else
 29- ospeed = t.c_cflag & CBAUD;
 30+ /*ospeed = t.c_cflag & CBAUD;*/
 31+ ospeed = cfgetospeed(&t);
 32 #endif
 33 if (ospeed == 0)
 34 ospeed = 11;