Include <sys/types.h> before including <sys/socket.h> in thest for IPv6

support.  Fix suggested in pkg/12199 by Olaf Seibert
<rhialto@polderland.nl>.

3 files changed, 32 insertions, 14 deletions

diff --git a/www/php4/files/patch-sum b/www/php4/files/patch-sum
index 2ff44930b40..244412be2f0 100644
--- a/www/php4/files/patch-sum
+++ b/www/php4/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.8 2001/02/12 04:14:28 jlam Exp $
+$NetBSD: patch-sum,v 1.9 2001/03/13 21:34:02 jlam Exp $
 
-MD5 (patch-aa) = 511e161c09ffe0d7935026e72d9ab4a7
-MD5 (patch-ab) = a3f5c28ef7a4b2df351ab4f22e78762c
-MD5 (patch-ad) = bef4f5e16a927892db85ba59aa860163
-MD5 (patch-ae) = 496c420d0067a985139375ee634cbbd4
-MD5 (patch-af) = cb061c65724b0f99f4bf588ea6c42c8a
-MD5 (patch-ag) = cfdb5d217d14800be1c4f603f062f919
+SHA1 (patch-aa) = edbfea1d308910442c11e84a5bd04c00144170e7
+SHA1 (patch-ab) = a0d4fd0ec05ec70467c5a65b63e1beeb94a935ca
+SHA1 (patch-ad) = ec8f71932b33046b74c9c7c1091b3cc3c131be1b
+SHA1 (patch-ae) = e8a2ed7a684faf0f439ff3c26cce88c2d9b9aebc
+SHA1 (patch-af) = e6b2995d5ede074f73d69a93ab361519811268df
+SHA1 (patch-ag) = c5f04ef52b9d44cd0a4251d3074e4dbc668987e7
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa
index 7feb7e0330d..e4981103204 100644
--- a/www/php4/patches/patch-aa
+++ b/www/php4/patches/patch-aa
@@ -1,8 +1,18 @@
-$NetBSD: patch-aa,v 1.4 2000/12/25 21:03:47 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2001/03/13 21:34:03 jlam Exp $
 
---- configure.in.orig	Mon Dec 18 23:32:10 2000
+--- configure.in.orig	Thu Jan 11 13:18:18 2001
 +++ configure.in
-@@ -837,10 +837,6 @@
+@@ -340,7 +340,8 @@
+ 
+ dnl Check for IPv6 support
+ AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
+-[AC_TRY_COMPILE([#include <sys/socket.h>
++[AC_TRY_COMPILE([#include <sys/types.h>
++#include <sys/socket.h>
+ #include <netinet/in.h>], [struct sockaddr_in6 s; int i=AF_INET6; s],
+   ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)])
+ if test "$ac_cv_ipv6_support" = yes; then
+@@ -837,10 +838,6 @@
      PHP_CONFIGURE_PART(Configuring shared libtool)
      $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
      SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index 92e1433a93a..6e613cc0764 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2001/02/12 04:14:28 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2001/03/13 21:34:03 jlam Exp $
 
 --- configure.orig	Thu Jan 11 13:39:29 2001
 +++ configure
-@@ -40176,6 +40176,7 @@
+@@ -6336,6 +6336,7 @@
+   cat > conftest.$ac_ext <<EOF
+ #line 6338 "configure"
+ #include "confdefs.h"
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ int main() {
+@@ -40176,6 +40177,7 @@
  fi
  
  
@@ -10,7 +18,7 @@ $NetBSD: patch-ab,v 1.4 2001/02/12 04:14:28 jlam Exp $
  echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
  echo "configure:40181: checking for pam_start in -lpam" >&5
  ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
-@@ -40220,6 +40221,8 @@
+@@ -40220,6 +40222,8 @@
  else
    echo "$ac_t""no" 1>&6
  fi
@@ -19,7 +27,7 @@ $NetBSD: patch-ab,v 1.4 2001/02/12 04:14:28 jlam Exp $
   
  
  for ac_func in getcwd getwd
-@@ -47325,9 +47328,6 @@
+@@ -47325,9 +47329,6 @@
  
      $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
      SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'