Mon Nov 9 07:18:34 2015 UTC ()
Use termios unconditionally; forget about legacy sysv termio and legacy
bsd sgtty.h.


(dholland)
diff -r1.27 -r1.28 pkgsrc/lang/ucblogo/Makefile
diff -r1.11 -r1.12 pkgsrc/lang/ucblogo/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/ucblogo/patches/patch-term.c
cvs diff -r1.27 -r1.28 pkgsrc/lang/ucblogo/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ucblogo/Makefile 2015/11/09 07:17:37 1.27
+++ pkgsrc/lang/ucblogo/Makefile 2015/11/09 07:18:34 1.28
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.27 2015/11/09 07:17:37 dholland Exp $ 1# $NetBSD: Makefile,v 1.28 2015/11/09 07:18:34 dholland Exp $
2 2
3DISTNAME= ucblogo 3DISTNAME= ucblogo
4PKGNAME= ${DISTNAME}-6.0 4PKGNAME= ${DISTNAME}-6.0
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= http://www.cs.berkeley.edu/~bh/downloads/ 7MASTER_SITES= http://www.cs.berkeley.edu/~bh/downloads/
7# Not at GNU mirrors yet 8# Not at GNU mirrors yet
8# ${MASTER_SITE_GNU:=non-gnu/ucblogo/} 9# ${MASTER_SITE_GNU:=non-gnu/ucblogo/}
9DIST_SUBDIR= ${PKGNAME_NOREV} 10DIST_SUBDIR= ${PKGNAME_NOREV}
10 11
11MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://http.cs.berkeley.edu/~bh/logo.html 13HOMEPAGE= http://http.cs.berkeley.edu/~bh/logo.html
13COMMENT= Brian Harvey's logo language interpreter 14COMMENT= Brian Harvey's logo language interpreter
14 15
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
16 17
17MAKE_FILE= makefile 18MAKE_FILE= makefile
cvs diff -r1.11 -r1.12 pkgsrc/lang/ucblogo/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/ucblogo/distinfo 2015/11/06 20:33:21 1.11
+++ pkgsrc/lang/ucblogo/distinfo 2015/11/09 07:18:34 1.12
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.11 2015/11/06 20:33:21 joerg Exp $ 1$NetBSD: distinfo,v 1.12 2015/11/09 07:18:34 dholland Exp $
2 2
3SHA1 (ucblogo-6.0/ucblogo.tar.gz) = ad62c689c264b1aeb7bd58dd9c08ca602bade8f1 3SHA1 (ucblogo-6.0/ucblogo.tar.gz) = ad62c689c264b1aeb7bd58dd9c08ca602bade8f1
4RMD160 (ucblogo-6.0/ucblogo.tar.gz) = 7cd9ec8eeff00fb3440f5036d57a9b29383ab310 4RMD160 (ucblogo-6.0/ucblogo.tar.gz) = 7cd9ec8eeff00fb3440f5036d57a9b29383ab310
5SHA512 (ucblogo-6.0/ucblogo.tar.gz) = 7ca0313d9ea8680a282757df52263b4eb165e46c1368b6693b2d10dbf53cbe4b63849c4233145768553cf999c0b642de95639083d156aede6edecbc93d072c10 5SHA512 (ucblogo-6.0/ucblogo.tar.gz) = 7ca0313d9ea8680a282757df52263b4eb165e46c1368b6693b2d10dbf53cbe4b63849c4233145768553cf999c0b642de95639083d156aede6edecbc93d072c10
6Size (ucblogo-6.0/ucblogo.tar.gz) = 6694879 bytes 6Size (ucblogo-6.0/ucblogo.tar.gz) = 6694879 bytes
7SHA1 (patch-aa) = 54cefcc2821247706675cf2466ef4f1452c9968f 7SHA1 (patch-aa) = 54cefcc2821247706675cf2466ef4f1452c9968f
8SHA1 (patch-configure) = 329c31aed56a37b53383a3e7421fd9f429468f6c 8SHA1 (patch-configure) = 329c31aed56a37b53383a3e7421fd9f429468f6c
9SHA1 (patch-docs_makefile) = 1c0efb2ee37dc535b3aabbf0a7ce02e40bc6ac52 9SHA1 (patch-docs_makefile) = 1c0efb2ee37dc535b3aabbf0a7ce02e40bc6ac52
10SHA1 (patch-graphics.c) = 232ed36d7e1dd058ada493040acd467c96257dd3 10SHA1 (patch-graphics.c) = 232ed36d7e1dd058ada493040acd467c96257dd3
11SHA1 (patch-intern.c) = 2ed10c027fbea3410585838629477a0e085c1e83 11SHA1 (patch-intern.c) = 2ed10c027fbea3410585838629477a0e085c1e83
12SHA1 (patch-makehelp.c) = e236bbf271337d6f45474c071f2ea26f14b09744 12SHA1 (patch-makehelp.c) = e236bbf271337d6f45474c071f2ea26f14b09744
13SHA1 (patch-print.c) = d988911dddb5a27228366b607a4acd442facef42 13SHA1 (patch-print.c) = d988911dddb5a27228366b607a4acd442facef42
14SHA1 (patch-term.c) = 621b4a5a02e0e6c150d8655957f945a81177cb08 14SHA1 (patch-term.c) = 5b0c41497e2c6e282385bd395101f638a247b83a
15SHA1 (patch-wrksp.c) = cca5b7192d359355cbf14d0f44047ff5bc77cba4 15SHA1 (patch-wrksp.c) = cca5b7192d359355cbf14d0f44047ff5bc77cba4
16SHA1 (patch-xgraphics.c) = e12f2ff10f990b4d9d00041db970de87ec41684d 16SHA1 (patch-xgraphics.c) = e12f2ff10f990b4d9d00041db970de87ec41684d
17SHA1 (patch-xgraphics.h) = 3b4c6a74cd328241dd2ea8c601879bd24911570d 17SHA1 (patch-xgraphics.h) = 3b4c6a74cd328241dd2ea8c601879bd24911570d
cvs diff -r1.1 -r1.2 pkgsrc/lang/ucblogo/patches/Attic/patch-term.c (expand / switch to unified diff)

--- pkgsrc/lang/ucblogo/patches/Attic/patch-term.c 2013/07/18 12:05:09 1.1
+++ pkgsrc/lang/ucblogo/patches/Attic/patch-term.c 2015/11/09 07:18:34 1.2
@@ -1,14 +1,105 @@ @@ -1,14 +1,105 @@
1$NetBSD: patch-term.c,v 1.1 2013/07/18 12:05:09 joerg Exp $ 1$NetBSD: patch-term.c,v 1.2 2015/11/09 07:18:34 dholland Exp $
2 2
3--- term.c.orig 2002-10-03 16:54:33.000000000 +0000 3- unconditionally use termios, not legacy termio or sgtty.h
 4- unconditionally include term.h for termcap stuff
 5
 6--- term.c.orig 2008-09-14 04:57:09.000000000 +0000
4+++ term.c 7+++ term.c
5@@ -53,6 +53,9 @@ 8@@ -30,26 +30,11 @@
 9 #include <console.h>
 10 #endif
 11
 12-#ifdef HAVE_TERMIO_H
 13-#ifdef HAVE_WX
 14-#include <termios.h>
 15-#else
 16-#include <termio.h>
 17-#endif
 18-#else
 19-#ifdef HAVE_SGTTY_H
 20-#include <sgtty.h>
 21-#endif
 22-#endif
 23-
 24 #undef TRUE
 25 #undef FALSE
 26
 27 #ifdef HAVE_TERMCAP_H
 28 #include <termcap.h>
 29-#ifdef HAVE_SGTTY_H
 30-#include <sgtty.h>
 31-#endif
 32 #else
 33 #ifdef HAVE_TERMLIB_H
 34 #include <termlib.h>
 35@@ -60,6 +45,9 @@
6 #endif 36 #endif
7 #endif 37 #endif
8  38
9+#include <term.h> 39+#include <term.h>
10+#include <termios.h> 40+#include <termios.h>
11+ 41+
12 #undef TRUE 42 #undef TRUE
13 #undef FALSE 43 #undef FALSE
14  44
 45@@ -78,13 +66,7 @@ char cm_arr[40];
 46 char so_arr[40];
 47 char se_arr[40];
 48
 49-#ifdef HAVE_TERMIO_H
 50-struct termio tty_cooked, tty_cbreak;
 51-#else
 52-#ifdef HAVE_SGTTY_H
 53-struct sgttyb tty_cooked, tty_cbreak;
 54-#endif
 55-#endif
 56+struct termios tty_cooked, tty_cbreak;
 57
 58 int interactive, tty_charmode;
 59
 60@@ -132,18 +114,11 @@ void term_init(void) {
 61 #endif /* WIN32 */
 62 #else
 63 if (interactive) {
 64-#ifdef HAVE_TERMIO_H
 65- ioctl(0,TCGETA,(char *)(&tty_cooked));
 66+ tcgetattr(0, &tty_cooked);
 67 tty_cbreak = tty_cooked;
 68 tty_cbreak.c_cc[VMIN] = '\01';
 69 tty_cbreak.c_cc[VTIME] = '\0';
 70 tty_cbreak.c_lflag &= ~(ECHO|ICANON);
 71-#else
 72- ioctl(0,TIOCGETP,(char *)(&tty_cooked));
 73- tty_cbreak = tty_cooked;
 74- tty_cbreak.sg_flags |= CBREAK;
 75- tty_cbreak.sg_flags &= ~ECHO;
 76-#endif
 77 }
 78 tty_charmode = 0;
 79 tgetent(bp, getenv("TERM"));
 80@@ -188,11 +163,7 @@ void term_init(void) {
 81 void charmode_on() {
 82 #ifdef unix
 83 if ((readstream == stdin) && interactive && !tty_charmode) {
 84-#ifdef HAVE_TERMIO_H
 85- ioctl(0,TCSETA,(char *)(&tty_cbreak));
 86-#else /* !HAVE_TERMIO_H */
 87- ioctl(0,TIOCSETP,(char *)(&tty_cbreak));
 88-#endif /* HAVE_TERMIO_H */
 89+ tcsetattr(0, TCSANOW, &tty_cbreak);
 90 tty_charmode++;
 91 }
 92 #endif /* unix */
 93@@ -204,11 +175,7 @@ void charmode_on() {
 94 void charmode_off() {
 95 #ifdef unix
 96 if (tty_charmode) {
 97-#ifdef HAVE_TERMIO_H
 98- ioctl(0,TCSETA,(char *)(&tty_cooked));
 99-#else /* !HAVE_TERMIO_H */
 100- ioctl(0,TIOCSETP,(char *)(&tty_cooked));
 101-#endif /* HAVE_TERMIO_H */
 102+ tcsetattr(0, TCSANOW, &tty_cooked);
 103 tty_charmode = 0;
 104 }
 105 #endif /* unix */