diff options
| author | stas <stas@FreeBSD.org> | 2008-06-14 22:14:58 +0800 |
|---|---|---|
| committer | stas <stas@FreeBSD.org> | 2008-06-14 22:14:58 +0800 |
| commit | 10f45124f4469016331fb3a83d68860f4cebc7ba (patch) | |
| tree | 7ed71aa5400c6d4c6ffae2ec7208083970a79315 /math | |
| parent | 4c0be958702ce15307554ef16ddd2d8294d26b77 (diff) | |
| download | freebsd-ports-gnome-10f45124f4469016331fb3a83d68860f4cebc7ba.tar.gz freebsd-ports-gnome-10f45124f4469016331fb3a83d68860f4cebc7ba.tar.zst freebsd-ports-gnome-10f45124f4469016331fb3a83d68860f4cebc7ba.zip | |
- Eliminate sgtty dependency.
- Bump PORTREVISION.
PR: ports/124460
Submitted by: ed@
Diffstat (limited to 'math')
| -rw-r--r-- | math/calctool/Makefile | 2 | ||||
| -rw-r--r-- | math/calctool/files/patch-aa | 22 | ||||
| -rw-r--r-- | math/calctool/files/patch-tty.c | 47 |
3 files changed, 48 insertions, 23 deletions
diff --git a/math/calctool/Makefile b/math/calctool/Makefile index 072c30586723..636dd159f770 100644 --- a/math/calctool/Makefile +++ b/math/calctool/Makefile @@ -7,7 +7,7 @@ PORTNAME= calctool PORTVERSION= 2.4.13 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nsayer diff --git a/math/calctool/files/patch-aa b/math/calctool/files/patch-aa deleted file mode 100644 index 2815917e35c2..000000000000 --- a/math/calctool/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -*** tty.c.orig Wed Dec 4 12:43:55 1996 ---- tty.c Wed Dec 4 12:45:33 1996 -*************** -*** 1,5 **** -- /*LINTLIBRARY*/ -- - /* @(#)tty.c 1.14 90/02/06 - * - * These are the dumb tty dependent graphics routines used by calctool. ---- 1,3 ---- -*************** -*** 21,26 **** ---- 19,26 ---- - #include <sys/types.h> - #include <sys/ioctl.h> - #include <sys/time.h> -+ #include <sys/termios.h> -+ #include <sys/ioctl_compat.h> - #include "calctool.h" - #include "color.h" - #include "extern.h" - diff --git a/math/calctool/files/patch-tty.c b/math/calctool/files/patch-tty.c new file mode 100644 index 000000000000..54c9920a8c90 --- /dev/null +++ b/math/calctool/files/patch-tty.c @@ -0,0 +1,47 @@ +--- tty.c.orig 2008-06-14 18:05:30.000000000 +0400 ++++ tty.c 2008-06-14 18:08:25.000000000 +0400 +@@ -18,6 +18,7 @@ + #include <stdio.h> + #include <strings.h> + #include <signal.h> ++#include <termios.h> + #include <sys/types.h> + #include <sys/ioctl.h> + #include <sys/time.h> +@@ -30,7 +31,7 @@ + char *getenv(), *tgetstr(), *tgoto() ; + int destroy_frame(), outc() ; + +-struct sgttyb in_new, in_old ; ++struct termios in_new, in_old ; + + + SIGRET +@@ -90,7 +91,7 @@ + } + do_move(0, 0) ; + SIGNAL(SIGINT, SIG_IGN) ; +- IOCTL(0, TIOCSETP, &in_old) ; ++ tcsetattr(0, TCSANOW, &in_old) ; + exit(0) ; + } + +@@ -315,11 +316,14 @@ + + SIGNAL(SIGINT, cleanup) ; + +- IOCTL(0, TIOCGETP, &in_old) ; /* Setup standard input. */ ++ tcgetattr(0, &in_old) ; /* Setup standard input. */ + in_new = in_old ; +- in_new.sg_flags |= RAW ; +- in_new.sg_flags &= ~(ECHO | CRMOD) ; +- IOCTL(0, TIOCSETP, &in_new) ; ++ in_new.c_iflag |= IGNBRK; ++ in_new.c_iflag &= ~ICRNL; ++ in_new.c_lflag &= ~(ECHOCTL|ISIG|ICANON|IEXTEN); ++ in_new.c_oflag &= ~ONLCR; ++ in_new.c_lflag &= ~ECHO; ++ tcsetattr(0, TCSANOW, &in_new) ; + + setbuf(stdout, (char *) NULL) ; + |