Upgrade to 3.23.37.

6 files changed, 37 insertions, 33 deletions

diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 6745c34a1774..afaead438ac5 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	${MASTERPORTNAME}
-PORTVERSION=	3.23.36
+PORTVERSION=	3.23.37
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index dd7ee39a6dce..dfc451bb8772 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.23.36.tar.gz) = f1a5e8fb00e56f808880886dbfe5906f
+MD5 (mysql-3.23.37.tar.gz) = c7ab650f3e48e4c5012357cd54d73c0d
diff --git a/databases/mysql40-server/files/patch-Makefile.in b/databases/mysql40-server/files/patch-Makefile.in
index 7a7ba5097039..bed75f614ccc 100644
--- a/databases/mysql40-server/files/patch-Makefile.in
+++ b/databases/mysql40-server/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Sep  8 10:00:29 2000
-+++ Makefile.in	Sat Sep 23 21:26:18 2000
-@@ -172,8 +172,12 @@
+--- Makefile.in.orig	Wed Apr 18 10:54:42 2001
++++ Makefile.in	Sat Apr 21 13:00:23 2001
+@@ -181,8 +181,12 @@
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE README 			COPYING COPYING.LIB MIRRORS
  
@@ -9,8 +9,8 @@
 +.if defined(CLIENT_ONLY)
 +SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
 +.else
-+SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files
++SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts support-files
 +.endif
  
  # Relink after clean
- CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources
+ CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources linked_include_sources
diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af
index 7cde1a7119d4..9c4a0b951402 100644
--- a/databases/mysql40-server/files/patch-af
+++ b/databases/mysql40-server/files/patch-af
@@ -1,6 +1,6 @@
---- scripts/safe_mysqld.sh.orig	Mon Mar 12 00:18:24 2001
-+++ scripts/safe_mysqld.sh	Mon Mar 12 07:36:07 2001
-@@ -64,30 +64,9 @@
+--- scripts/safe_mysqld.sh.orig	Thu Apr 19 10:11:02 2001
++++ scripts/safe_mysqld.sh	Thu Apr 19 15:15:54 2001
+@@ -73,30 +73,9 @@
    done
  }
  
@@ -12,7 +12,7 @@
 -  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
 -  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -  DATADIR=$MY_BASEDIR_VERSION/data
--  if test -z "defaults"
+-  if test -z "$defaults"
 -  then
 -    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
 -  fi
@@ -34,7 +34,7 @@
  
  MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
  MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
-@@ -224,34 +203,6 @@
+@@ -240,34 +219,6 @@
    if test ! -f $pid_file		# This is removed if normal shutdown
    then
      break
diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure
index 80d804d05274..e108e12815aa 100644
--- a/databases/mysql40-server/files/patch-configure
+++ b/databases/mysql40-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Dec 16 22:49:12 2000
-+++ configure	Mon Dec 18 12:21:11 2000
-@@ -2950,7 +2950,7 @@
+--- configure.orig	Thu Apr 19 15:18:13 2001
++++ configure	Thu Apr 19 15:22:18 2001
+@@ -2983,7 +2983,7 @@
    ;;
  esac
  fi
@@ -9,9 +9,9 @@
  if test -n "$HOSTNAME"; then
    echo "$ac_t""$HOSTNAME" 1>&6
  else
-@@ -3078,35 +3078,7 @@
+@@ -3117,38 +3117,7 @@
  echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:3080: checking "how to check if pid exists"" >&5
+ echo "configure:3119: 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
@@ -38,6 +38,9 @@
 -    *darwin*)
 -      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
 -      ;;
+-    *cygwin*)
+-      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"
+-      ;;
 -    *)
 -      { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
 -  esac
@@ -46,7 +49,7 @@
  
  echo "$ac_t"""$FIND_PROC"" 1>&6
  
-@@ -5793,7 +5765,6 @@
+@@ -5911,7 +5880,6 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -54,7 +57,7 @@
  
  else
    echo "$ac_t""no" 1>&6
-@@ -6017,28 +5988,6 @@
+@@ -6143,28 +6111,6 @@
  fi
  
  
@@ -83,7 +86,7 @@
  # Check whether --with-debug or --without-debug was given.
  if test "${with_debug+set}" = set; then
    withval="$with_debug"
-@@ -6719,10 +6668,6 @@
+@@ -6845,10 +6791,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
  
@@ -93,37 +96,37 @@
 -fi
  mysql_cv_btype_last_arg_accept=none
  cat > conftest.$ac_ext <<EOF
- #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
- 
--if test "$ac_cv_prog_gxx" = "yes"
+ #line 6855 "configure"
+@@ -8924,10 +8866,6 @@
+ #do not treat warnings as errors if we are linking agaist other libc
+ #this is to work around gcc not being permissive on non-system includes
+ #with respect to ANSI C++
+-if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" 
 -then
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat > conftest.$ac_ext <<EOF
- #line 8745 "configure"
+ #line 8933 "configure"
  #include "confdefs.h"
-@@ -8804,10 +8745,6 @@
+@@ -8992,10 +8930,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
  
--if test "$ac_cv_prog_gxx" = "yes"
+-if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
 -then
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat > conftest.$ac_ext <<EOF
- #line 8813 "configure"
+ #line 9001 "configure"
  #include "confdefs.h"
-@@ -8871,10 +8808,6 @@
+@@ -9059,10 +8993,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
  
--if test "$ac_cv_prog_gxx" = "yes"
+-if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
 -then
 -  CXXFLAGS="$CXXFLAGS -Werror"
 -fi
  cat > conftest.$ac_ext <<EOF
- #line 8880 "configure"
+ #line 9068 "configure"
  #include "confdefs.h"
diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index 3236412561c5..a7b41ba566b1 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -142,6 +142,7 @@ share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
 share/mysql/mysql-%%MYSQL_VERSION%%.spec
 share/mysql/mysql-log-rotate
+share/mysql/mysql-max-%%MYSQL_VERSION%%.spec
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt