summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-03-23 16:37:46 +0000
committerjoerg <joerg@pkgsrc.org>2006-03-23 16:37:46 +0000
commita3aaed88134c73ebeaf3d9612d66599fbeb602db (patch)
tree7f10f430e93ad3c7a23f89507ef5f17ac9e956f5
parentbeffc83a5b71f5468535a0ee9b3ac798eae46398 (diff)
downloadpkgsrc-a3aaed88134c73ebeaf3d9612d66599fbeb602db.tar.gz
Include <sys/types.h> before <sys/socket.h> for DragonFly.
Detect poll correctly on DragonFly.
-rw-r--r--net/tsocks/distinfo4
-rw-r--r--net/tsocks/patches/patch-ab16
2 files changed, 14 insertions, 6 deletions
diff --git a/net/tsocks/distinfo b/net/tsocks/distinfo
index c83738a8b32..d572667556a 100644
--- a/net/tsocks/distinfo
+++ b/net/tsocks/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/08/04 10:22:21 drochner Exp $
+$NetBSD: distinfo,v 1.5 2006/03/23 16:37:46 joerg Exp $
SHA1 (tsocks-1.8beta5.tar.gz) = 489f88c5df999ba21b27cdaa7836d9426d062aec
RMD160 (tsocks-1.8beta5.tar.gz) = 12e3eeeafaf7f3be21dd8901da38d5890659b09e
Size (tsocks-1.8beta5.tar.gz) = 83928 bytes
SHA1 (patch-aa) = a789618746a8666d2dc476f8b8ac975209892723
-SHA1 (patch-ab) = f99624c5bde722ba588dfb1b2ff12f6f276bd263
+SHA1 (patch-ab) = 01f621f9b59d87b5305ea8b451b1bf1aab590700
SHA1 (patch-ac) = 3e5c38ca7ea7c0a499e1ed42dca406b8d5769333
diff --git a/net/tsocks/patches/patch-ab b/net/tsocks/patches/patch-ab
index a6622212f2e..58ddf38ebf7 100644
--- a/net/tsocks/patches/patch-ab
+++ b/net/tsocks/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2005/08/04 10:22:21 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2006/03/23 16:37:46 joerg Exp $
---- configure.orig 2002-07-16 00:51:08.000000000 +0200
+--- configure.orig 2002-07-15 22:51:08.000000000 +0000
+++ configure
@@ -538,7 +538,6 @@ fi
@@ -64,12 +64,20 @@ $NetBSD: patch-ab,v 1.3 2005/08/04 10:22:21 drochner Exp $
cat >> confdefs.h <<EOF
#define LIBC "${LIBC}"
-@@ -2228,7 +2235,7 @@ EOF
+@@ -2151,6 +2158,7 @@ do
+ #line 2152 "configure"
+ #include "confdefs.h"
+
++ #include <sys/types.h>
+ #include <sys/socket.h>
+ int connect($testproto);
+
+@@ -2228,7 +2236,7 @@ EOF
echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6
echo "configure:2230: checking for correct poll prototype" >&5
PROTO=
-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout'
-+for testproto in 'struct pollfd *ufds, nfds_t nfds, int timeout'
++for testproto in 'struct pollfd *ufds, nfds_t nfds, int timeout' 'struct pollfd *ufds, unsigned int nfds, int timeout'
do
if test "${PROTO}" = ""; then
cat > conftest.$ac_ext <<EOF