ports/110440: [cad/cider] Port spice <termios.h> fix

[Ed Schouten]

>Number:         110440
>Category:       ports
>Synopsis:       [cad/cider] Port spice <termios.h> fix
>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:   Sat Mar 17 11:40:10 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: Sun Feb 11 22:32:09 CET 2007 root at palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
The port cad/cider makes use of a lot of source code that is used by
cad/spice as well. Port the <termios.h> fix as described in 110439 to
cider as well.
>How-To-Repeat:
>Fix:
--- cad/cider/files/patch-ar	Mon Jan 24 06:00:56 2000
+++ cad/cider/files/patch-ar	Sat Mar 17 12:33:24 2007
@@ -1,6 +1,6 @@
 --- spice/common/src/include/os_bsd.h.orig	Sat Jan 29 19:14:37 1994
 +++ spice/common/src/include/os_bsd.h	Thu Jan  6 12:33:20 2000
-@@ -6,14 +6,22 @@
+@@ -6,20 +6,40 @@
   *	BSD and derivative systems
   */
  
@@ -24,8 +24,13 @@
 -#define HAS_INDEX		/* index( ) instead of strchr( )	*/
  #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
  #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
++#ifdef __FreeBSD__
++#define HAS_POSIXTTY		/* <termios.h>				*/
++#else
  #define HAS_BSDTTY		/* <sgtty.h>				*/
-@@ -22,4 +30,12 @@
++#endif
+ #define HAS_BSDDIRS		/* <sys/dir.h>				*/
+ #define HAS_BSDRUSAGE		/* getrusage( )				*/
  #define HAS_BSDRLIMIT		/* getrlimit( )				*/
  #define HAS_DUP2
  #define HAS_GETWD		/* getwd(buf)				*/
--- cad/cider/files/patch-spice-common-src-lib-cp-complete.c	Thu Jan  1 01:00:00 1970
+++ cad/cider/files/patch-spice-common-src-lib-cp-complete.c	Sat Mar 17 12:33:24 2007
@@ -0,0 +1,20 @@
+--- spice/common/src/lib/cp/complete.c	Wed Jun 19 05:55:38 1991
++++ spice/common/src/lib/cp/complete.c	Sat Mar 17 11:51:56 2007
+@@ -445,14 +445,14 @@
+     ison = on;
+ 
+     if (ison == true) {
+-	(void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf);
++    	tcgetattr(fileno(cp_in), &OS_Buf);
+ 	sbuf = OS_Buf;
+ 	sbuf.c_cc[VEOF] = 0;
+ 	sbuf.c_cc[VEOL] = ESCAPE;
+ 	sbuf.c_cc[VEOL2] = CNTRL_D;
+-	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf);
++    	tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf);
+     } else {
+-	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf);
++    	tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf);
+     }
+ 
+ #  endif
>Release-Note:
>Audit-Trail:
>Unformatted: