Check for socklen_t in the configure script and define a preprocessor

symbol accordingly.

3 files changed, 83 insertions, 12 deletions

diff --git a/devel/mit-pthreads/patches/patch-aj b/devel/mit-pthreads/patches/patch-aj
index 49771cd5a5a..bb763e2f804 100644
--- a/devel/mit-pthreads/patches/patch-aj
+++ b/devel/mit-pthreads/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.2 1998/12/28 22:22:00 bad Exp $
+$NetBSD: patch-aj,v 1.3 1999/04/08 19:44:59 bad Exp $
 
 --- config/configure.orig	Wed Nov 13 22:03:02 1996
-+++ config/configure	Sun Dec 27 17:37:18 1998
++++ config/configure	Sat Mar 20 22:32:37 1999
 @@ -1049,6 +1049,17 @@
  name=$host_cpu-$host_os
  
@@ -56,11 +56,10 @@ $NetBSD: patch-aj,v 1.2 1998/12/28 22:22:00 bad Exp $
  	sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
      name=sparc-sunos-4.1.3
      sysincludes=netbsd-1.0
-@@ -1111,6 +1144,17 @@
-         sysincludes=bsdi-2.0
+@@ -1112,6 +1145,17 @@
          syscall=i386-bsdi-2.0
          except="fork lseek sigsuspend"
-+		;;
+ 		;;
 +    i386-*-netbsd1.3[H-Z])
 +	name=i386-netbsd-1.3
 +	sysincludes=netbsd-1.1
@@ -71,6 +70,47 @@ $NetBSD: patch-aj,v 1.2 1998/12/28 22:22:00 bad Exp $
 +        name=i386-netbsd-1.3
 +        sysincludes=netbsd-1.1
 +        except="fork lseek ftruncate pipe sigsuspend sigprocmask fstat"
- 		;;
++		;;
      i386-*-netbsd1.1* | i386-*-netbsd1.2*)
  	name=i386-netbsd-1.0
+ 	sysincludes=netbsd-1.1
+@@ -1697,6 +1741,39 @@
+ if test $pthreads_cv_timespec_in_time = yes ; then
+   cat >> confdefs.h <<\EOF
+ #define _OS_HAS_TIMESPEC 1
++EOF
++
++fi
++
++echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
++if eval "test \"`echo '$''{'pthreads_cv_socklen_t'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1678 "configure"
++#include "confdefs.h"
++#include <sys/types.h>
++#include <sys/socket.h>
++int main() { return 0; }
++int t() {
++socklen_t foo;
++; return 0; }
++EOF
++if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  rm -rf conftest*
++  pthreads_cv_socklen_t=yes
++else
++  rm -rf conftest*
++  pthreads_cv_socklen_t=no
++fi
++rm -f conftest*
++
++fi
++
++echo "$ac_t""$pthreads_cv_socklen_t" 1>&6
++if test $pthreads_cv_socklen_t = yes ; then
++  cat >> confdefs.h <<\EOF
++#define _OS_HAS_SOCKLEN_T 1
+ EOF
+ 
+ fi
diff --git a/devel/mit-pthreads/patches/patch-ak b/devel/mit-pthreads/patches/patch-ak
index 066ed45a9e6..65fedefa7b8 100644
--- a/devel/mit-pthreads/patches/patch-ak
+++ b/devel/mit-pthreads/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.2 1998/12/28 22:22:00 bad Exp $
+$NetBSD: patch-ak,v 1.3 1999/04/08 19:44:36 bad Exp $
 
 --- config/configure.in.orig	Wed Nov 13 22:03:08 1996
-+++ config/configure.in	Mon Dec 28 22:16:39 1998
++++ config/configure.in	Sat Mar 20 22:25:37 1999
 @@ -124,6 +124,17 @@
  name=$host_cpu-$host_os
  
@@ -56,11 +56,10 @@ $NetBSD: patch-ak,v 1.2 1998/12/28 22:22:00 bad Exp $
  	sparc-*-netbsd1.0A | sparc-*-netbsd1.1* | sparc-*-netbsd1.2*)
      name=sparc-sunos-4.1.3
      sysincludes=netbsd-1.0
-@@ -177,6 +210,17 @@
-         sysincludes=bsdi-2.0
+@@ -178,6 +211,17 @@
          syscall=i386-bsdi-2.0
          except="fork lseek sigsuspend"
-+		;;
+ 		;;
 +    i386-*-netbsd1.3[H-Z])
 +	name=i386-netbsd-1.3
 +	sysincludes=netbsd-1.1
@@ -71,6 +70,24 @@ $NetBSD: patch-ak,v 1.2 1998/12/28 22:22:00 bad Exp $
 +        name=i386-netbsd-1.3
 +        sysincludes=netbsd-1.1
 +        except="fork lseek ftruncate pipe sigsuspend sigprocmask fstat"
- 		;;
++		;;
      i386-*-netbsd1.1* | i386-*-netbsd1.2*)
  	name=i386-netbsd-1.0
+ 	sysincludes=netbsd-1.1
+@@ -305,6 +349,16 @@
+ if test $pthreads_cv_timespec_in_time = yes ; then
+   AC_DEFINE(_OS_HAS_TIMESPEC)
+ fi
++
++dnl	socklen_t
++AC_CACHE_VAL(pthreads_cv_socklen_t,
++  AC_TRY_COMPILE([#include <sys/types.h>
++#include <sys/socket.h>], [socklen_t foo;],
++	pthreads_cv_socklen_t=yes, pthreads_cv_socklen_t=no))
++AC_MSG_RESULT($pthreads_cv_socklen_t)
++if test $pthreads_cv_socklen_t = yes ; then
++  AC_DEFINE(_OS_HAS_SOCKLEN_T)
++fi
+ 
+ 
+ dnl
diff --git a/devel/mit-pthreads/patches/patch-bi b/devel/mit-pthreads/patches/patch-bi
new file mode 100644
index 00000000000..50b0c057620
--- /dev/null
+++ b/devel/mit-pthreads/patches/patch-bi
@@ -0,0 +1,14 @@
+$NetBSD: patch-bi,v 1.1 1999/04/08 19:44:36 bad Exp $
+
+--- config/config.h.in.orig	Fri Mar 22 05:30:04 1996
++++ config/config.h.in	Sat Mar 20 22:22:28 1999
+@@ -15,6 +15,9 @@
+ /* Does the OS already support struct timespec */
+ #undef _OS_HAS_TIMESPEC
+ 
++/* Does the OS need socklen_t for the socket syscalls? */
++#undef _OS_HAS_SOCKLEN_T
++
+ /* For networking code: an integral type the size of an IP address (4
+    octets).  Determined by examining return values from certain
+    functions.  */