Upgrade to 3.22.11-beta.

Submitted by:	Alec Wolman <wolman@cs.washington.edu>

4 files changed, 37 insertions, 47 deletions

diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 08e67c4712df..adea1fdd4ee9 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -1,13 +1,13 @@
 # ports collection makefile for:	MySQL
-# Version required:			v3.22.6-alpha
+# Version required:			v3.22.11-beta
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.34 1998/12/11 23:33:47 billf Exp $
+# $Id: Makefile,v 1.33 1998/12/01 02:56:08 asami Exp $
 #
 
-DISTNAME=	mysql-3.22.10-beta
-PKGNAME=	mysql-3.22.10b
+DISTNAME=	mysql-3.22.11-beta
+PKGNAME=	mysql-3.22.11b
 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/ \
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/My
 		ftp://ftp.plig.net/pub/mysql/Downloads/MySQL-3.22/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.22/
 
-MAINTAINER=	ibex@physik.TU-Berlin.DE
+MAINTAINER=	dirk@FreeBSD.ORG
 
 MANUAL_PACKAGE_BUILD=	incompatible with mysql321
 NO_LATEST_LINK=	yes
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index 0406b878e0d9..2caea3458add 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.10-beta.tar.gz) = 64ab811e0b5bc50733eb7941b784830d
+MD5 (mysql-3.22.11-beta.tar.gz) = ba011245e1d3ea03eb7e9f01657e1a59
diff --git a/databases/mysql54-server/files/patch-ab b/databases/mysql54-server/files/patch-ab
index 004634cad72a..bd7b2aff7375 100644
--- a/databases/mysql54-server/files/patch-ab
+++ b/databases/mysql54-server/files/patch-ab
@@ -1,43 +1,29 @@
---- scripts/mysql_install_db.sh.orig	Wed Nov  4 21:25:07 1998
-+++ scripts/mysql_install_db.sh	Tue Nov 10 16:54:46 1998
-@@ -11,7 +11,7 @@
+--- scripts/mysql_install_db.sh.orig	Sun Nov 22 04:57:20 1998
++++ scripts/mysql_install_db.sh	Sun Dec  6 23:58:49 1998
+@@ -10,8 +10,8 @@
+ 
  mdata=@localstatedir@/mysql
  
- # Are we are doing a rpm install?
+-# Are we are doing a rpm install?
 -if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
-+if test "$1" = "-IN-RPM"; then shift; fi
++# pretend we're doing an RPM install
++IN_RPM=1
  
  if test ! -x @libexecdir@/mysqld
  then
-@@ -26,8 +26,6 @@
-   fi
- fi
- 
--# On IRIX hostname is in /usr/bsd so add this to the path
--PATH=$PATH:/usr/bsd
+@@ -31,12 +31,9 @@
  hostname=`hostname`		# Install this too in the user table
  
  # Create database directories mysql & test
-@@ -149,22 +147,9 @@
- END_OF_DATA
- then
-   echo ""
--  if test -z "$IN_RPM"
--  then
--    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
--    echo "to the right place for your system"
--    echo
--  fi
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
-   echo "See the manual for instructions."
-   echo
--  if test -z "$IN_RPM"
--  then
--    echo "You can test the MySQL demon with the benchmarks in the 'bench'"
--    echo "directory:"
--    echo "cd bench ; run-all-tests"
--    echo
--  fi
-   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
-   echo
-   echo "The latest information about MySQL is available on the web at http://www.tcx.se"
+-if test -z "$IN_RPM"
+-then
+-  if test ! -d @localstatedir@; then mkdir @localstatedir@; fi
+-  if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi
+-  if test ! -d @localstatedir@/test; then mkdir @localstatedir@/test; fi
+-fi
++if test ! -d @localstatedir@; then mkdir @localstatedir@; fi
++if test ! -d @localstatedir@/mysql; then mkdir @localstatedir@/mysql; fi
++if test ! -d @localstatedir@/test; then mkdir @localstatedir@/test; fi
+ 
+ # Initialize variables
+ c_d="" i_d=""
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index bd06b2ff47f8..b93c0dc373d1 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -1,14 +1,11 @@
-bin/add_file_priv
-bin/add_func_table
-bin/add_long_password
 bin/comp_err
 bin/isamchk
 bin/isamlog
-bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
+bin/mysql_fix_privilege_tables
 bin/mysql_install_db
-bin/mysql_setpermisson
+bin/mysql_setpermission
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
@@ -40,7 +37,7 @@ lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.4.1
+lib/mysql/libmysqlclient.so.5
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
@@ -66,8 +63,11 @@ share/mysql/hungarian/errmsg.sys
 share/mysql/hungarian/errmsg.txt
 share/mysql/italian/errmsg.sys
 share/mysql/italian/errmsg.txt
+share/mysql/japanese/errmsg.sys
+share/mysql/japanese/errmsg.txt
+share/mysql/make_binary_distribution
 share/mysql/my-example.cnf
-share/mysql/mysql-3.22.10-beta.spec
+share/mysql/mysql-3.22.11-beta.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
@@ -80,6 +80,8 @@ share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/slovak/errmsg.sys
+share/mysql/slovak/errmsg.txt
 share/mysql/spanish/errmsg.sys
 share/mysql/spanish/errmsg.txt
 share/mysql/swedish/errmsg.sys
@@ -94,12 +96,14 @@ share/mysql/swedish/errmsg.txt
 @dirrm share/mysql/german
 @dirrm share/mysql/hungarian
 @dirrm share/mysql/italian
+@dirrm share/mysql/japanese
 @dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
 @dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
 @dirrm share/mysql/russian
+@dirrm share/mysql/slovak
 @dirrm share/mysql/spanish
 @dirrm share/mysql/swedish
 @dirrm share/mysql