diff options
author | ed <ed@FreeBSD.org> | 2008-06-19 16:38:38 +0800 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2008-06-19 16:38:38 +0800 |
commit | aefe8320f40a6b7eeec2611708976b3b169f4578 (patch) | |
tree | b7a9b204d8534ce0e6b700b1227493d731edfd3f /net/socks5 | |
parent | f6d1d0db093c8e1360e3cc04c8a486c67b48f95c (diff) | |
download | freebsd-ports-gnome-aefe8320f40a6b7eeec2611708976b3b169f4578.tar.gz freebsd-ports-gnome-aefe8320f40a6b7eeec2611708976b3b169f4578.tar.zst freebsd-ports-gnome-aefe8320f40a6b7eeec2611708976b3b169f4578.zip |
Make net/socks5 compile again after the removal of sgtty.
The net/socks5 port includes <ttychars.h>, even though it is not needed.
This header file got removed with the sgtty interface. Also make the
port prefer <termios.h> over <sys/termios.h>
PR: 124480
Approved by: philip (mentor)
Diffstat (limited to 'net/socks5')
-rw-r--r-- | net/socks5/Makefile | 2 | ||||
-rw-r--r-- | net/socks5/files/patch-clients::ftp::domacro.c | 11 | ||||
-rw-r--r-- | net/socks5/files/patch-clients::telnet::externs.h | 16 |
3 files changed, 28 insertions, 1 deletions
diff --git a/net/socks5/Makefile b/net/socks5/Makefile index c80371a8de15..555c7b52be96 100644 --- a/net/socks5/Makefile +++ b/net/socks5/Makefile @@ -7,7 +7,7 @@ PORTNAME= socks5 PORTVERSION= 1.0.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net security MASTER_SITES= http://freeware.sgi.com/source/socks5/ DISTNAME= socks5-v1.0r11 diff --git a/net/socks5/files/patch-clients::ftp::domacro.c b/net/socks5/files/patch-clients::ftp::domacro.c new file mode 100644 index 000000000000..8aadc65eba64 --- /dev/null +++ b/net/socks5/files/patch-clients::ftp::domacro.c @@ -0,0 +1,11 @@ +--- 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 + diff --git a/net/socks5/files/patch-clients::telnet::externs.h b/net/socks5/files/patch-clients::telnet::externs.h new file mode 100644 index 000000000000..60aa990d21fe --- /dev/null +++ b/net/socks5/files/patch-clients::telnet::externs.h @@ -0,0 +1,16 @@ +--- 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 |