From 9cf77d560c241ec58e993976ff8cd331872ba284 Mon Sep 17 00:00:00 2001
From: edwin <edwin@FreeBSD.org>
Date: Wed, 8 Oct 2003 08:44:54 +0000
Subject: Make port buildable on -STABLE

---
 net/tsocks/files/patch-configure | 28 +++++++++++++++++++++++-----
 net/tsocks/files/patch-parser.c  | 10 ++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 net/tsocks/files/patch-parser.c

(limited to 'net/tsocks')

diff --git a/net/tsocks/files/patch-configure b/net/tsocks/files/patch-configure
index f0c0d10..275f2c3 100644
--- a/net/tsocks/files/patch-configure
+++ b/net/tsocks/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Sep  6 00:45:57 2003
-+++ configure	Sat Sep  6 00:46:07 2003
+--- configure.orig	Mon Jul 15 15:51:08 2002
++++ configure	Wed Oct  8 01:42:17 2003
 @@ -1836,14 +1836,14 @@
  SIMPLELIBS=${LIBS}
  LIBS=
@@ -27,12 +27,30 @@
  
  else
    echo "$ac_t""no" 1>&6
-@@ -2228,7 +2228,7 @@
+@@ -2151,6 +2151,7 @@
+ #line 2152 "configure"
+ #include "confdefs.h"
+ 
++      #include <sys/types.h>
+       #include <sys/socket.h>
+       int connect($testproto);
+     
+@@ -2227,14 +2228,16 @@
+ 
  echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6
  echo "configure:2230: checking for correct poll prototype" >&5
- PROTO=
+-PROTO=
 -for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 
-+for testproto in 'struct pollfd fds[], nfds_t nfds, int timeout'
++PROTO1="struct pollfd fds[], nfds_t nfds, int timeout"
++PROTO2="struct pollfd *fds, unsigned int nfds, int timeout"
++for PROTO in "$PROTO1" "$PROTO2"
  do
    if test "${PROTO}" = ""; then
      cat > conftest.$ac_ext <<EOF
+ #line 2236 "configure"
+ #include "confdefs.h"
+ 
++      #include <sys/types.h>
+       #include <sys/poll.h>
+       int poll($testproto);
+     
diff --git a/net/tsocks/files/patch-parser.c b/net/tsocks/files/patch-parser.c
new file mode 100644
index 0000000..0807761
--- /dev/null
+++ b/net/tsocks/files/patch-parser.c
@@ -0,0 +1,10 @@
+--- parser.c.orig	Wed Oct  8 01:43:48 2003
++++ parser.c	Wed Oct  8 01:43:58 2003
+@@ -4,6 +4,7 @@
+ 
+ */
+ 
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
-- 
cgit v1.1