Properly check for alloca.h and use if necessary, fixing USE_SUNPRO build.

4 files changed, 47 insertions, 14 deletions

diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index 580e32c35eb..830c21cfa8f 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.19 2003/10/07 19:43:34 hubertf Exp $
+$NetBSD: distinfo,v 1.20 2003/12/16 11:22:31 sketch Exp $
 
 SHA1 (ORBit-0.5.15.tar.gz) = 1571976662311060175008d225de05e9bc2eb038
 Size (ORBit-0.5.15.tar.gz) = 1335272 bytes
 SHA1 (patch-aa) = ef745d3d279d57dbdf6380053b6b4a7e63322671
 SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422
-SHA1 (patch-ac) = c9331438d0b9565a77e8a6925608935ce8075d6d
+SHA1 (patch-ac) = 49bc73c9e6d9b369ca9f44630be75539252e3df7
 SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3
 SHA1 (patch-ae) = 95cc6f46fa2cfcd34af2e546f3d4a8d55194e5eb
 SHA1 (patch-af) = db34a280931fd2274b05f47751aab34234cab4f4
@@ -14,4 +14,5 @@ SHA1 (patch-ak) = d569014320dbea40ccdb9e369e07c984ee7bd9de
 SHA1 (patch-al) = 74fcc40377e85e29a35d60b465f51ef50e7df8fd
 SHA1 (patch-am) = f52369447d04a382d6e93a6bddaf3962a3ab6677
 SHA1 (patch-an) = fa9bb500ddcd0ec8e64b5ff1edbe0f02f5cb0f39
-SHA1 (patch-ao) = 4346486e6a3d947350b162088490692543dde2f3
+SHA1 (patch-ao) = b80bf3da551bacccd23a7a27677be8e985e6b543
+SHA1 (patch-ap) = 7efe438cc392d14c19a1453487a988a585def4ae
diff --git a/net/ORBit/patches/patch-ac b/net/ORBit/patches/patch-ac
index acf8264b156..c2faabfa601 100644
--- a/net/ORBit/patches/patch-ac
+++ b/net/ORBit/patches/patch-ac
@@ -1,8 +1,17 @@
-$NetBSD: patch-ac,v 1.12 2002/11/25 21:20:06 jlam Exp $
+$NetBSD: patch-ac,v 1.13 2003/12/16 11:22:31 sketch Exp $
 
---- configure.orig	Wed Mar 20 06:45:48 2002
-+++ configure
-@@ -8628,6 +8628,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
+--- configure.orig	2002-03-20 14:45:48.000000000 +0000
++++ configure	2003-12-15 17:52:22.568422320 +0000
+@@ -7715,7 +7715,7 @@
+ fi
+ done
+ 
+-for ac_header in stddef.h wchar.h wcstr.h wctype.h machine/types.h tcpd.h
++for ac_header in alloca.h stddef.h wchar.h wcstr.h wctype.h machine/types.h tcpd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:7721: checking for $ac_header" >&5
+@@ -8628,6 +8628,7 @@
  
  echo "$as_me:8629: checking \"whether to use TCP wrappers\"" >&5
  echo $ECHO_N "checking \"whether to use TCP wrappers\"... $ECHO_C" >&6
@@ -10,7 +19,7 @@ $NetBSD: patch-ac,v 1.12 2002/11/25 21:20:06 jlam Exp $
  LIBWRAP_PATH=""
  LIB_WRAP=""
  for I in $LDFLAGS $LIBS -L/usr/lib; do
-@@ -8639,6 +8640,10 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
+@@ -8639,6 +8640,10 @@
  		LIB_WRAP=-lwrap
  		echo "Found $THEFILE/libwrap.so" 1>&5
  		break
@@ -21,7 +30,7 @@ $NetBSD: patch-ac,v 1.12 2002/11/25 21:20:06 jlam Exp $
  	else
  		echo "From $I, checking in dir $THEFILE for libwrap.a" 1>&5
  		if test -f $THEFILE/libwrap.a; then
-@@ -8649,6 +8654,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
+@@ -8649,6 +8654,7 @@
  	fi
  	esac
  done
diff --git a/net/ORBit/patches/patch-ao b/net/ORBit/patches/patch-ao
index c4173ee0ad8..9eb47b52017 100644
--- a/net/ORBit/patches/patch-ao
+++ b/net/ORBit/patches/patch-ao
@@ -1,8 +1,17 @@
-$NetBSD: patch-ao,v 1.1 2002/11/25 21:20:06 jlam Exp $
+$NetBSD: patch-ao,v 1.2 2003/12/16 11:22:31 sketch Exp $
 
---- configure.in.orig	Wed Mar 20 06:44:16 2002
-+++ configure.in
-@@ -154,6 +154,7 @@ AC_TRY_COMPILE(
+--- configure.in.orig	2002-03-20 14:44:16.000000000 +0000
++++ configure.in	2003-12-15 17:54:00.425996281 +0000
+@@ -116,7 +116,7 @@
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h sys/machine.h sys/isa_defs.h sys/poll.h)
+-AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h tcpd.h)
++AC_CHECK_HEADERS(alloca.h stddef.h wchar.h wcstr.h wctype.h machine/types.h tcpd.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+@@ -154,6 +154,7 @@
  # Modified to prefer shared libwrap by Adam Powell
  
  AC_MSG_CHECKING("whether to use TCP wrappers")
@@ -10,7 +19,7 @@ $NetBSD: patch-ao,v 1.1 2002/11/25 21:20:06 jlam Exp $
  LIBWRAP_PATH=""
  LIB_WRAP=""
  for I in $LDFLAGS $LIBS -L/usr/lib; do
-@@ -175,6 +176,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
+@@ -175,6 +176,7 @@
  	fi
  	esac
  done
diff --git a/net/ORBit/patches/patch-ap b/net/ORBit/patches/patch-ap
new file mode 100644
index 00000000000..7f47a7e0884
--- /dev/null
+++ b/net/ORBit/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.1 2003/12/16 11:22:31 sketch Exp $
+
+--- config.h.in.orig	2002-03-20 14:14:02.000000000 +0000
++++ config.h.in	2003-12-15 17:58:49.132485462 +0000
+@@ -33,6 +33,9 @@
+ #undef HAVE_HOSTS_ACCESS
+ #undef HAVE_TCPD_H
+ 
++/* Define if you have the <alloca.h> header file. */
++#undef HAVE_ALLOCA_H
++
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif