Re-arrange "configure", so as to re-order the linker flags, rather than

add extra ones, all so "libtool" doesn't drop the first "-lcrypt".

2 files changed, 114 insertions, 8 deletions

diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 361e60c1143..537d17732a6 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2003/02/18 01:13:22 fredb Exp $
+$NetBSD: distinfo,v 1.9 2003/02/18 04:40:04 fredb Exp $
 
 SHA1 (netatalk-1.6.0.tar.gz) = f3be966dd1bcf2f1f66501f59e3a2743558c58ac
 Size (netatalk-1.6.0.tar.gz) = 827737 bytes
-SHA1 (patch-aa) = fbdba9ed7161605ba8b0df48d4858eea6fc17a38
+SHA1 (patch-aa) = 0b3264847c47de30fe6d79b65c9ddcd8fac631f5
 SHA1 (patch-ab) = b54f506b2db7fd53393cffb9d05cd688e63a50c3
 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index 1234f3fe7db..82d7f533450 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,15 +1,121 @@
-$NetBSD: patch-aa,v 1.8 2003/02/18 01:13:23 fredb Exp $
+$NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $
 
---- configure.orig	Mon Feb 17 17:33:00 2003
+--- configure.orig	Mon Nov 25 21:08:45 2002
 +++ configure
-@@ -13620,6 +13620,11 @@ echo "${ECHO_T}no" >&6
+@@ -7792,59 +7792,6 @@ _ACEOF
+ fi
  
  
+-echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
+-echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypt_main+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypt  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-
+-
+-int
+-main ()
+-{
+-main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_crypt_main=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_crypt_main=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
+-if test $ac_cv_lib_crypt_main = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCRYPT 1
+-_ACEOF
+-
+-  LIBS="-lcrypt $LIBS"
+-
+-fi
+-
+-
+ echo "$as_me:$LINENO: checking for main in -ld" >&5
+ echo $ECHO_N "checking for main in -ld... $ECHO_C" >&6
+ if test "${ac_cv_lib_d_main+set}" = set; then
+@@ -13619,7 +13566,57 @@ echo "${ECHO_T}no" >&6
+ 	fi
  
-+# On NetBSD, be sure to use crypt() in libcrypt, rather than libcrypto,
-+# to support non-DES passwords.
-+if test x"$this_os" = "xnetbsd"; then
+ 
++echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
++echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
++if test "${ac_cv_lib_crypt_main+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypt  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++#include "confdefs.h"
++
+ 
++int
++main ()
++{
++main ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_crypt_main=yes
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++ac_cv_lib_crypt_main=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
++if test $ac_cv_lib_crypt_main = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBCRYPT 1
++_ACEOF
++
 +  LIBS="-lcrypt $LIBS"
++
 +fi