diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-01-03 21:03:45 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-01-03 21:03:45 +0000 |
| commit | 54de702975249859053de781e0844dd66718124f (patch) | |
| tree | a1da437fc257bef1eea3c1a469049bc18618e463 /lang/logo | |
| parent | - Use termios instead of sgtty (diff) | |
- Use termios instead of sgtty
PR: 119100
Submitted by: Ed Schouten <ed@fxq.nl>
Notes
Notes:
svn path=/head/; revision=204953
Diffstat (limited to 'lang/logo')
| -rw-r--r-- | lang/logo/Makefile | 4 | ||||
| -rw-r--r-- | lang/logo/files/patch-term.c | 55 |
2 files changed, 57 insertions, 2 deletions
diff --git a/lang/logo/Makefile b/lang/logo/Makefile index ec0216eb09c7..1873df877707 100644 --- a/lang/logo/Makefile +++ b/lang/logo/Makefile @@ -7,7 +7,7 @@ PORTNAME= ucblogo PORTVERSION= 5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.cs.berkeley.edu/~bh/downloads/ DISTNAME= ${PORTNAME} @@ -27,7 +27,7 @@ BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XLIB= yes -USE_AUTOTOOLS= autoconf:261 +USE_AUTOTOOLS= autoconf:261 MAKEFILE= makefile HAS_CONFIGURE= yes diff --git a/lang/logo/files/patch-term.c b/lang/logo/files/patch-term.c index b2cae1cc935a..d5661529ec08 100644 --- a/lang/logo/files/patch-term.c +++ b/lang/logo/files/patch-term.c @@ -1,5 +1,27 @@ --- term.c.orig 2007-12-04 15:42:55.000000000 +0300 +++ term.c 2007-12-04 15:43:04.000000000 +0300 +@@ -30,8 +30,8 @@ + #include <console.h> + #endif + +-#ifdef HAVE_TERMIO_H +-#include <termio.h> ++#if 1 ++#include <termios.h> + #else + #ifdef HAVE_SGTTY_H + #include <sgtty.h> +@@ -71,8 +71,8 @@ + char so_arr[40]; + char se_arr[40]; + +-#ifdef HAVE_TERMIO_H +-struct termio tty_cooked, tty_cbreak; ++#if 1 ++struct termios tty_cooked, tty_cbreak; + #else + #ifdef HAVE_SGTTY_H + struct sgttyb tty_cooked, tty_cbreak; @@ -85,7 +85,7 @@ char *termcap_ptr; @@ -9,3 +31,36 @@ *termcap_ptr++ = ch; return 0; } +@@ -125,8 +125,8 @@ + #endif /* WIN32 */ + #else + if (interactive) { +-#ifdef HAVE_TERMIO_H +- ioctl(0,TCGETA,(char *)(&tty_cooked)); ++#if 1 ++ tcgetattr(0, &tty_cooked); + tty_cbreak = tty_cooked; + tty_cbreak.c_cc[VMIN] = '\01'; + tty_cbreak.c_cc[VTIME] = '\0'; +@@ -181,8 +181,8 @@ + void charmode_on() { + #ifdef unix + if ((readstream == stdin) && interactive && !tty_charmode) { +-#ifdef HAVE_TERMIO_H +- ioctl(0,TCSETA,(char *)(&tty_cbreak)); ++#if 1 ++ tcsetattr(0, TCSANOW, &tty_cbreak); + #else /* !HAVE_TERMIO_H */ + ioctl(0,TIOCSETP,(char *)(&tty_cbreak)); + #endif /* HAVE_TERMIO_H */ +@@ -197,8 +197,8 @@ + void charmode_off() { + #ifdef unix + if (tty_charmode) { +-#ifdef HAVE_TERMIO_H +- ioctl(0,TCSETA,(char *)(&tty_cooked)); ++#if 1 ++ tcsetattr(0, TCSANOW, &tty_cooked); + #else /* !HAVE_TERMIO_H */ + ioctl(0,TIOCSETP,(char *)(&tty_cooked)); + #endif /* HAVE_TERMIO_H */ |