buildlink1 -> buildlink2

2 files changed, 73 insertions, 28 deletions

diff --git a/security/ssh2/patches/patch-ae b/security/ssh2/patches/patch-ae
index fc9725994b8..077d533707c 100644
--- a/security/ssh2/patches/patch-ae
+++ b/security/ssh2/patches/patch-ae
@@ -1,18 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
+$NetBSD: patch-ae,v 1.2 2002/09/24 00:24:38 jlam Exp $
 
---- configure.in.orig	Thu May 16 10:32:33 2002
+--- configure.in.orig	Thu May 16 03:32:33 2002
 +++ configure.in
-@@ -781,9 +781,6 @@ dnl
- #                    All rights reserved
- #
- 
--# So many systems seem to need this that it is better do it here automatically.
--LIBS="-L/usr/local/lib $LIBS"
--
- # Platform-specific stuff.
- case "$target" in
-   alpha*-dec-osf*)
-@@ -1779,6 +1776,8 @@ fi
+@@ -1779,6 +1779,8 @@ fi
  if test -z "$no_libbsd"; then
    AC_CHECK_LIB(bsd, openpty)
  fi
diff --git a/security/ssh2/patches/patch-af b/security/ssh2/patches/patch-af
index 3424ec2768a..d4890bc9081 100644
--- a/security/ssh2/patches/patch-af
+++ b/security/ssh2/patches/patch-af
@@ -1,23 +1,78 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
+$NetBSD: patch-af,v 1.2 2002/09/24 00:24:38 jlam Exp $
 
---- configure.orig	Thu May 16 10:32:38 2002
+--- configure.orig	Thu May 16 03:32:38 2002
 +++ configure
-@@ -3771,9 +3771,6 @@ export CC CFLAGS
- #                    All rights reserved
- #
+@@ -1590,49 +1590,27 @@ cat >> confdefs.h <<EOF
+ EOF
+ 
+ 
+-
+-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
+-echo "configure:1596: checking for strerror in -lcposix" >&5
+-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lcposix  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1604 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char strerror();
+-
+-int main() {
+-strerror()
+-; return 0; }
++echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
++echo "configure:1595: checking for POSIXized ISC" >&5
++if test -d /etc/conf/kconfig.d &&
++  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
++then
++  echo "$ac_t""yes" 1>&6
++  ISC=yes # If later tests want to check for ISC.
++  cat >> confdefs.h <<\EOF
++#define _POSIX_SOURCE 1
+ EOF
+-if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  LIBS="$LIBS -lcposix"
++  if test "$GCC" = yes; then
++    CC="$CC -posix"
++  else
++    CC="$CC -Xp"
++  fi
+ else
+   echo "$ac_t""no" 1>&6
++  ISC=
+ fi
  
--# So many systems seem to need this that it is better do it here automatically.
--LIBS="-L/usr/local/lib $LIBS"
+-  
 -
- # Platform-specific stuff.
- case "$target" in
-   alpha*-dec-osf*)
-@@ -8224,8 +8221,49 @@ else
+ 
+ #
+ # vx_suffix is used if targeting VxWorks embedded OS
+@@ -8224,8 +8202,49 @@ else
  fi
  
  fi
 +echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-+echo "configure:8226: checking for openpty in -lutil" >&5
++echo "configure:8207: checking for openpty in -lutil" >&5
 +ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
@@ -25,7 +80,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 8234 "configure"
++#line 8215 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -36,7 +91,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
 +openpty()
 +; return 0; }
 +EOF
-+if { (eval echo configure:8245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
@@ -59,7 +114,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/06 00:48:14 seb Exp $
 +
  echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6
 -echo "configure:8229: checking for login in -lutil" >&5
-+echo "configure:8267: checking for login in -lutil" >&5
++echo "configure:8248: checking for login in -lutil" >&5
  ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6