From f2f4c3cebebf6eb93065608ef94f9201a28bb2c6 Mon Sep 17 00:00:00 2001
From: Dirk Froemberg <dirk@FreeBSD.org>
Date: Mon, 18 Dec 2000 16:32:15 +0000
Subject: Upgrade to 3.23.29a.

---
 databases/mysql60-server/files/patch-ab        | 15 ++------
 databases/mysql60-server/files/patch-configure | 53 +++++++++-----------------
 2 files changed, 20 insertions(+), 48 deletions(-)

(limited to 'databases/mysql60-server/files')

diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab
index dfeb77aaa3f9..2aa8724dd21f 100644
--- a/databases/mysql60-server/files/patch-ab
+++ b/databases/mysql60-server/files/patch-ab
@@ -1,15 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Fri Sep  8 09:50:24 2000
-+++ scripts/mysql_install_db.sh	Sat Sep 23 21:13:37 2000
-@@ -21,8 +21,6 @@
-    case "$1" in
-    -*) eqvalue="`echo $1 |sed 's/[-_a-zA-Z0-9]*=//'`"
-        case "$1" in
--       -IN-RPM) IN_RPM=1
--                ;;
-        --force) force=1
-                 ;;
-        --no-defaults)     defaults="$1"; CONFIG_FILES=/nonexistent
-@@ -304,12 +302,6 @@
+--- scripts/mysql_install_db.sh.orig	Sat Dec 16 22:49:02 2000
++++ scripts/mysql_install_db.sh	Mon Dec 18 11:55:07 2000
+@@ -301,12 +301,6 @@
  END_OF_DATA
  then
    echo ""
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index d96a5e9b3620..08a7f3e6bb01 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Oct 17 22:59:41 2000
-+++ configure	Thu Oct 19 14:58:15 2000
-@@ -1069,7 +1069,7 @@
+--- configure.orig	Sat Dec 16 22:49:12 2000
++++ configure	Mon Dec 18 12:21:11 2000
+@@ -1070,7 +1070,7 @@
  PROTOCOL_VERSION=10
  DOT_FRM_VERSION=6
  # See the libtool docs for information on how to do shared lib versions.
@@ -9,7 +9,7 @@
  
  # Set all version vars based on $VERSION. How do we do this more elegant ?
  # Remember that regexps needs to quote [ and ] since this is run through m4
-@@ -2949,7 +2949,7 @@
+@@ -2950,7 +2950,7 @@
    ;;
  esac
  fi
@@ -18,9 +18,9 @@
  if test -n "$HOSTNAME"; then
    echo "$ac_t""$HOSTNAME" 1>&6
  else
-@@ -3077,35 +3077,7 @@
+@@ -3078,35 +3078,7 @@
  echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:3079: checking "how to check if pid exists"" >&5
+ echo "configure:3080: checking "how to check if pid exists"" >&5
  PS=$ac_cv_path_PS
 -# Linux style
 -if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@@ -55,16 +55,15 @@
  
  echo "$ac_t"""$FIND_PROC"" 1>&6
  
-@@ -5411,8 +5383,6 @@
+@@ -5793,7 +5765,6 @@
  #define $ac_tr_lib 1
  EOF
  
 -  LIBS="-lc_r $LIBS"
--
+ 
  else
    echo "$ac_t""no" 1>&6
- fi
-@@ -5635,28 +5605,6 @@
+@@ -6017,28 +5988,6 @@
  fi
  
  
@@ -93,7 +92,7 @@
  # Check whether --with-debug or --without-debug was given.
  if test "${with_debug+set}" = set; then
    withval="$with_debug"
-@@ -6337,10 +6285,6 @@
+@@ -6719,10 +6668,6 @@
  ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
@@ -103,8 +102,8 @@
 -fi
  mysql_cv_btype_last_arg_accept=none
  cat > conftest.$ac_ext <<EOF
- #line 6347 "configure"
-@@ -8348,10 +8292,6 @@
+ #line 6729 "configure"
+@@ -8736,10 +8681,6 @@
  ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
@@ -113,9 +112,9 @@
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat > conftest.$ac_ext <<EOF
- #line 8357 "configure"
+ #line 8745 "configure"
  #include "confdefs.h"
-@@ -8416,10 +8356,6 @@
+@@ -8804,10 +8745,6 @@
  ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
@@ -124,9 +123,9 @@
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat > conftest.$ac_ext <<EOF
- #line 8425 "configure"
+ #line 8813 "configure"
  #include "confdefs.h"
-@@ -8483,10 +8419,6 @@
+@@ -8871,10 +8808,6 @@
  ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
@@ -135,23 +134,5 @@
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat > conftest.$ac_ext <<EOF
- #line 8492 "configure"
+ #line 8880 "configure"
  #include "confdefs.h"
-@@ -8770,7 +8702,7 @@
- #include <pthread.h>
- int main() {
- pthread_attr_t thr_attr;
--pthread_attr_setscope(&thr_attr,0);
-+XXXpthread_attr_setscope(&thr_attr,0);
- ; return 0; }
- EOF
- if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -9728,7 +9660,7 @@
-     echo ""
-     echo "Configuring MIT Pthreads"
-     # We will never install so installation paths are not needed.
--    (cd mit-pthreads; sh ./configure)
-+    (cd mit-pthreads; sh ./configure ${CONFIGURE_ARGS})
-     echo "End of MIT Pthreads configuration"
-     echo ""
-   fi
-- 
cgit v1.2.3