[pkgsrc/trunk]: pkgsrc/www/ap-auth-mysql/patches Fix configure coredump on Ne...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9936b8cf10f
branches:  trunk
changeset: 508650:f9936b8cf10f
user:      ben <ben%pkgsrc.org@localhost>
date:      Thu Feb 23 01:02:21 2006 +0000

description:
Fix configure coredump on NetBSD/amd64 by making the crypt() test
include unistd.h.

diffstat:

 www/ap-auth-mysql/patches/patch-ab |  18 +++++++++++++-----
 www/ap-auth-mysql/patches/patch-ac |  26 +++++++++++++++++---------
 2 files changed, 30 insertions(+), 14 deletions(-)

diffs (121 lines):

diff -r a772e367b9f8 -r f9936b8cf10f www/ap-auth-mysql/patches/patch-ab
--- a/www/ap-auth-mysql/patches/patch-ab        Wed Feb 22 23:01:28 2006 +0000
+++ b/www/ap-auth-mysql/patches/patch-ab        Thu Feb 23 01:02:21 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/16 11:28:19 jdolecek Exp $
+$NetBSD: patch-ab,v 1.2 2006/02/23 01:02:21 ben Exp $
 
---- configure.ac.orig  2003-09-24 01:39:03.000000000 +0200
-+++ configure.ac
-@@ -84,11 +84,14 @@ AC_SUBST(build_opts, "$mysql_includes $m
+--- configure.ac.orig  2004-05-11 05:18:38.000000000 +0000
++++ configure.ac       2006-02-23 00:54:51.000000000 +0000
+@@ -137,12 +137,18 @@
  
  # Checks for header files.
  AC_CHECK_HEADERS([crypt.h])
@@ -16,9 +16,13 @@
  #include <crypt.h>
 +#endif
  #include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
  
  int main()
-@@ -101,7 +104,9 @@ AC_DEFINE(CRYPT_MD5),
+ {
+@@ -154,8 +160,13 @@
  ,,)
        AC_TRY_RUN(
  [
@@ -26,5 +30,9 @@
  #include <crypt.h>
 +#endif
  #include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
  
  int main()
+ {
diff -r a772e367b9f8 -r f9936b8cf10f www/ap-auth-mysql/patches/patch-ac
--- a/www/ap-auth-mysql/patches/patch-ac        Wed Feb 22 23:01:28 2006 +0000
+++ b/www/ap-auth-mysql/patches/patch-ac        Thu Feb 23 01:02:21 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/16 11:28:19 jdolecek Exp $
+$NetBSD: patch-ac,v 1.2 2006/02/23 01:02:21 ben Exp $
 
---- configure.orig     2004-05-11 07:19:18.000000000 +0200
-+++ configure  2004-07-16 12:40:48.000000000 +0200
+--- configure.orig     2004-05-11 05:19:18.000000000 +0000
++++ configure  2006-02-23 00:54:18.000000000 +0000
 @@ -953,7 +953,7 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
@@ -194,7 +194,7 @@
        if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&5
-@@ -3133,7 +3217,9 @@
+@@ -3133,8 +3217,13 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -202,9 +202,13 @@
  #include <crypt.h>
 +#endif
  #include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
  
  int main()
-@@ -3181,7 +3267,9 @@
+ {
+@@ -3181,8 +3270,13 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -212,9 +216,13 @@
  #include <crypt.h>
 +#endif
  #include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
  
  int main()
-@@ -3294,7 +3382,8 @@
+ {
+@@ -3294,7 +3388,8 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -224,7 +232,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3366,7 +3455,8 @@
+@@ -3366,7 +3461,8 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -234,7 +242,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4187,6 +4277,11 @@
+@@ -4187,6 +4283,11 @@
  
  
  
@@ -246,7 +254,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -4225,12 +4320,6 @@
+@@ -4225,12 +4326,6 @@
         fi;;
        esac
      done` || { (exit 1); exit 1; }