Upgrade to 3.22.23b.

50 files changed, 190 insertions, 190 deletions

diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql322-server/distinfo
+++ b/databases/mysql322-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql322-server/files/patch-af b/databases/mysql322-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql322-server/files/patch-af
+++ b/databases/mysql322-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql322-server/pkg-plist
+++ b/databases/mysql322-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql323-server/distinfo
+++ b/databases/mysql323-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql323-server/files/patch-af b/databases/mysql323-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql323-server/files/patch-af
+++ b/databases/mysql323-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql40-server/files/patch-af b/databases/mysql40-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql40-server/files/patch-af
+++ b/databases/mysql40-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql41-server/files/patch-af b/databases/mysql41-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql41-server/files/patch-af
+++ b/databases/mysql41-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql50-server/files/patch-af b/databases/mysql50-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql50-server/files/patch-af
+++ b/databases/mysql50-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql51-server/files/patch-af
+++ b/databases/mysql51-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql54-server/files/patch-af b/databases/mysql54-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql54-server/files/patch-af
+++ b/databases/mysql54-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql55-server/files/patch-af b/databases/mysql55-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql55-server/files/patch-af
+++ b/databases/mysql55-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/mysql60-server/files/patch-af b/databases/mysql60-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/mysql60-server/files/patch-af
+++ b/databases/mysql60-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 2046ef3e2a4c..eb2df2ff3742 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -1,12 +1,12 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.22
+# Version required:			v3.22.23b
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.52 1999/06/05 19:00:17 mharo Exp $
+# $Id: Makefile,v 1.53 1999/06/05 22:28:27 mharo Exp $
 #
 
-DISTNAME=	mysql-3.22.22
+DISTNAME=	mysql-3.22.23b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.digex.net/pub/database/mysql/Downloads/MySQL-3.22/ \
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index ced1007d387b..468aca2ebf4a 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.22.tar.gz) = 1a0eedbe7cda20845ec2e767b96ade5c
+MD5 (mysql-3.22.23b.tar.gz) = 453c1cebc9897c71c6cd70f833731888
diff --git a/databases/percona55-server/files/patch-af b/databases/percona55-server/files/patch-af
index c9dfae350bef..2593da4d1c64 100644
--- a/databases/percona55-server/files/patch-af
+++ b/databases/percona55-server/files/patch-af
@@ -1,5 +1,5 @@
---- scripts/safe_mysqld.sh.orig	Fri Nov 27 00:37:54 1998
-+++ scripts/safe_mysqld.sh	Wed Dec 23 23:45:24 1998
+--- scripts/safe_mysqld.sh.orig	Fri May 14 11:11:46 1999
++++ scripts/safe_mysqld.sh	Tue Jun  8 11:14:02 1999
 @@ -12,33 +12,9 @@
  
  trap '' 1 2 3 15			# we shouldn't let anyone kill us
@@ -8,25 +8,25 @@
 -if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./bin/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data is
+-  MY_BASEDIR_VERSION=`pwd`		# Where bin, share and data are
 -  DATADIR=$MY_BASEDIR_VERSION/data	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
 -# Check if this is a 'moved install directory'
 -elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
 - -x ./libexec/mysqld
 -then
--  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var is
+-  MY_BASEDIR_VERSION=`pwd`		# Where libexec, share and var are
 -  DATADIR=$MY_BASEDIR_VERSION/var	# Where the databases are
--  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
 -else
 -  MY_BASEDIR_VERSION=@prefix@
 -  DATADIR=@localstatedir@
 -  ledir=@libexecdir@
 -  if test ! -x $ledir/mysqld
 -  then
--    echo "The file $ledir/mysqld doesn't exists or is not executable"
+-    echo "The file $ledir/mysqld doesn't exist or is not executable"
 -    echo "Please do a cd to the mysql installation directory and restart"
--    echo "this scrift from there as follows:"
+-    echo "this script from there as follows:"
 -    echo "./bin/safe_mysqld".
 -    exit 1;
 -  fi
@@ -44,11 +44,11 @@
 -  fi
 -  if @IS_LINUX@
 -  then
--    # Test if one proces was hanging.
+-    # Test if one process was hanging.
 -    # This is only a fix for Linux (running as base 3 mysqld processes)
 -    # but should work for the rest of the servers.
 -    # The only thing is ps x => redhat 5 gives warnings when using ps -x.
--    # kill -9 is used or the proces won't react on the kill.
+-    # kill -9 is used or the process won't react on the kill.
 -    numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
 -    echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
 -    I=1
@@ -62,7 +62,7 @@
 -	#    echo "TEST $I - $T **"
 -	if kill -9 $T
 -	then
--	  echo "mysqld proces hanging, pid $T - killed" | tee -a $err_log
+-	  echo "mysqld process hanging, pid $T - killed" | tee -a $err_log
 -	else 
 -	  break
 -	fi
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index c647c5cff847..9a57fde27ae0 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -68,7 +68,7 @@ share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.22.spec
+share/mysql/mysql-3.22.23b.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys