ports/113330: japanese/typist: don't make use of sgtty

[Ed Schouten]

>Number:         113330
>Category:       ports
>Synopsis:       japanese/typist: don't make use of sgtty
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 04 13:20:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Ed Schouten
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD palm.hoeg.nl 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Apr 20 13:44:49 CEST 2007 root at palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
The japanese/typist port still makes use of the sgtty interface, though
it can easily be ported to termios, thanks to the termio bits that are
already present in its source code. Make it use termios, so it works
without COMPAT_43TTY.
>How-To-Repeat:
>Fix:
Apply the following patch:

--- japanese/typist/files/patch-aa	Sun Oct 19 12:10:53 2003
+++ japanese/typist/files/patch-aa	Mon Jun  4 10:38:19 2007
@@ -22,7 +22,7 @@
  MAB=
  
 -CFLAGS=$(DEBUG) $(MAB) -DTERMIO
-+CFLAGS+=$(DEBUG) $(MAB) -DLESSONDIR=\"$(LESSONDIR)\" -DKEYTYPE=\"j\"
++CFLAGS+=$(DEBUG) $(MAB) -DTERMIO -DLESSONDIR=\"$(LESSONDIR)\" -DKEYTYPE=\"j\"
  # -DKEYTYPE=\"e\"
  # -DLESSONDIR=\"$(LESSONDIR)\"
  # -DVANISHCHAR
--- japanese/typist/files/patch-src-screen.c	Thu Jan  1 01:00:00 1970
+++ japanese/typist/files/patch-src-screen.c	Mon Jun  4 10:38:19 2007
@@ -0,0 +1,24 @@
+--- screen.c	Wed May 21 04:38:05 1997
++++ screen.c	Mon Jun  4 10:36:47 2007
+@@ -127,7 +127,7 @@
+ #define  MIN_HEIGHT	24
+ 
+ #ifdef TERMIO
+-# include <termio.h>
++# include <termios.h>
+ #else
+ # include <sgtty.h>
+ #endif
+@@ -177,9 +177,9 @@
+ 	int sw;
+ {
+ 	static int	firsttime = 1;
+-	struct termio *s;
+-	static struct termio save_term;
+-	static struct termio raw_term;
++	struct termios *s;
++	static struct termios save_term;
++	static struct termios raw_term;
+ 
+ 	if (sw) {
+ 		s = &raw_term;
>Release-Note:
>Audit-Trail:
>Unformatted: