ports/124480: [Patch] net/socks5: don't include ttychars.h

[Ed Schouten]

>Number:         124480
>Category:       ports
>Synopsis:       [Patch] net/socks5: don't include ttychars.h
>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:   Wed Jun 11 12:30:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ed Schouten
>Release:        FreeBSD 6.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD palm.hoeg.nl 6.3-STABLE FreeBSD 6.3-STABLE #0: Wed Jun 4 08:56:01 CEST 2008 ed at palm.hoeg.nl:/usr/obj/usr/src/sys/PALM i386
>Description:
The net/socsk5 port includes <sys/ttychars.h>. This header file is about
to go away, which means we must apply the following patch to keep it
working. While there, also change the faulty <sys/termios.h> to
<termios.h>.
>How-To-Repeat:
>Fix:
Place the following patch in the `files' directory:

--- clients/ftp/domacro.c
+++ clients/ftp/domacro.c
@@ -42,7 +42,7 @@
 #include <errno.h>
 #include <ctype.h>
 
-#if !defined(SCO) && !defined(_SEQUENT_) && !defined(linux)
+#if !defined(SCO) && !defined(_SEQUENT_) && !defined(linux) && !defined(__FreeBSD__)
 #include <sys/ttychars.h>
 #endif
 
--- clients/telnet/externs.h
+++ clients/telnet/externs.h
@@ -92,10 +92,10 @@
 #   include <termio.h>
 #  endif
 # else
-#  ifdef HAVE_SYS_TERMIOS_H
-#   include <sys/termios.h>
-#elif defined(HAVE_TERMIOS_H)
+#  ifdef HAVE_TERMIOS_H
 #   include <termios.h>
+#elif defined(HAVE_SYS_TERMIOS_H)
+#   include <sys/termios.h>
 #  endif
 # endif
 #endif
>Release-Note:
>Audit-Trail:
>Unformatted: