upgrade to 3.21.33

40 files changed, 320 insertions, 280 deletions

diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql322-server/distinfo b/databases/mysql322-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql322-server/distinfo
+++ b/databases/mysql322-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql322-server/files/patch-ab b/databases/mysql322-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql322-server/files/patch-ab
+++ b/databases/mysql322-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql323-server/distinfo b/databases/mysql323-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql323-server/distinfo
+++ b/databases/mysql323-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql323-server/files/patch-ab b/databases/mysql323-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql323-server/files/patch-ab
+++ b/databases/mysql323-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql40-server/files/patch-ab b/databases/mysql40-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql40-server/files/patch-ab
+++ b/databases/mysql40-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql41-server/files/patch-ab b/databases/mysql41-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql41-server/files/patch-ab
+++ b/databases/mysql41-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql50-server/files/patch-ab b/databases/mysql50-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql50-server/files/patch-ab
+++ b/databases/mysql50-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql51-server/files/patch-ab
+++ b/databases/mysql51-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql54-server/files/patch-ab
+++ b/databases/mysql54-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql55-server/files/patch-ab b/databases/mysql55-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql55-server/files/patch-ab
+++ b/databases/mysql55-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/mysql60-server/files/patch-ab b/databases/mysql60-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/mysql60-server/files/patch-ab
+++ b/databases/mysql60-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 5d5a8e406d1f..5f3eae05a630 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -1,15 +1,16 @@
 # ports collection makefile for:	mySQL
-# Version required:			v3.21.29-gamma
-# Date created:				26 Jan 1998
+# Version required:			v3.21.33
+# Date created:				14 Aug 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.20 1998/03/29 01:31:41 steve Exp $
+# $Id: Makefile,v 1.21 1998/04/29 01:10:01 jseger Exp $
 #
 
-DISTNAME=	mysql-3.21.29-gamma
-PKGNAME=	mysql-3.21.29g
+DISTNAME=	mysql-3.21.33
+PKGNAME=	mysql-3.21.33
 CATEGORIES=	databases
-MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
+MASTER_SITES=	http://www.buoy.com/mysql/Downloads/ \
+		http://mysql.bluep.com/Downloads/ \
 		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
 		http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.21/ \
 		http://www.tcx.se/Downloads/MySQL-3.21/
@@ -38,7 +39,7 @@ pre-install:
 post-install:
 	${MKDIR} ${PREFIX}/share/mysql/mysql
 	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
-	${PREFIX}/bin/mysql_install_db
+	${WRKSRC}/scripts/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index 536c0d59322e..be2d2172b84c 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.21.29-gamma.tar.gz) = dd50b4201b96a7e23a29b8710d088157
+MD5 (mysql-3.21.33.tar.gz) = 64672bebf05fa95f9772303d3b86e40b
diff --git a/databases/percona55-server/files/patch-ab b/databases/percona55-server/files/patch-ab
index f939b2e2cbe6..6f41ac6a3549 100644
--- a/databases/percona55-server/files/patch-ab
+++ b/databases/percona55-server/files/patch-ab
@@ -1,6 +1,6 @@
---- scripts/mysql_install_db.sh.orig	Tue Feb 17 13:18:22 1998
-+++ scripts/mysql_install_db.sh	Thu Mar  5 11:16:28 1998
-@@ -3,24 +3,12 @@
+--- scripts/mysql_install_db.sh.orig	Mon Jun 29 17:30:30 1998
++++ scripts/mysql_install_db.sh	Fri Aug 14 17:30:19 1998
+@@ -3,7 +3,6 @@
  # For a more info consult the file COPYRIGHT distributed with this file
  
  # This scripts creates the privilige tables db, host, user in mysql
@@ -8,24 +8,26 @@
  #
  # All arguments to this script is passed to safe_mysqld
  
+@@ -27,18 +26,9 @@
+ 
  if test ! -x @bindir@/mysqladmin
  then
-   echo "Can't execute @bindir@/mysqladmin"
 -  if test "@localstatedir@" = "./data"
 -  then
+-    echo "Can't execute @bindir@/mysqladmin"
 -    echo "You should be in the distribution directory when executing this script"
+-    echo "Please go to the directory where you unpacked this distribution"
+-    echo "and start this script with 'scripts/mysql_install_db'"
+-    exit 1
 -  else
--    echo "You should do a 'make install' before executing this script"
+     echo "Didn't find @bindir@/mysqladmin"
+     echo "You should do a 'make install' before executing this script"
+     exit 1
 -  fi
--  exit 1
--fi
--if test ! -d "./data"
--then
--  echo "You should be in the distribution directory when executing this script"
-   exit 1
  fi
  
-@@ -78,10 +66,7 @@
+ if test -f @localstatedir@/mysql/db.ISM
+@@ -105,10 +95,7 @@
  
  # copy the definition files
  #
@@ -37,7 +39,7 @@
  
  @bindir@/mysql mysql <<END_OF_DATA
  # Create tables from the .frm files
-@@ -122,11 +107,7 @@
+@@ -149,11 +136,7 @@
    echo
    echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
    echo