Update to 6.0.6 alpha release.

7 files changed, 47 insertions, 23 deletions

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 44e745ddbd82..81c3a26ee727 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	6.0.5
+PORTVERSION=	6.0.6
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 93933f8670bb..f8beaf5df076 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-6.0.5-alpha.tar.gz) = 8e637e3c0c9d10645a9f188094bf6709
-SHA256 (mysql-6.0.5-alpha.tar.gz) = 0834a1c731905b10fdc5099ef395dd38b38b0a2ee28eb725cf4614f50ecf84ce
-SIZE (mysql-6.0.5-alpha.tar.gz) = 29979599
+MD5 (mysql-6.0.6-alpha.tar.gz) = 10d9ce0d30c13bf5a81a643c397aabef
+SHA256 (mysql-6.0.6-alpha.tar.gz) = 108a1b48afe7f36f0e01c5d52508b8a110c6a5d15df6a5260740eeb3a76540c6
+SIZE (mysql-6.0.6-alpha.tar.gz) = 28824919
diff --git a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_Makefile.in
index 232d2c3852c2..647752da23a2 100644
--- a/databases/mysql60-server/files/patch-extra_yassl_Makefile.in
+++ b/databases/mysql60-server/files/patch-extra_yassl_Makefile.in
@@ -1,11 +1,11 @@
---- extra/yassl/Makefile.in.orig	Thu Oct 26 14:02:58 2006
-+++ extra/yassl/Makefile.in	Tue Nov  7 08:17:34 2006
-@@ -351,7 +351,7 @@
+--- extra/yassl/Makefile.in.orig	2008-08-12 17:34:32.000000000 +0200
++++ extra/yassl/Makefile.in	2008-08-27 12:27:58.000000000 +0200
+@@ -387,7 +387,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -SUBDIRS = taocrypt src testsuite
 +SUBDIRS = taocrypt src
- EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj \
- 	     CMakeLists.txt
+ EXTRA_DIST = CMakeLists.txt
+ all: all-recursive
  
diff --git a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in
index bca462d08cba..8ee80d82e840 100644
--- a/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in
+++ b/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in
@@ -1,11 +1,11 @@
---- extra/yassl/taocrypt/Makefile.in.orig	Thu Oct 26 14:02:59 2006
-+++ extra/yassl/taocrypt/Makefile.in	Tue Nov  7 08:18:38 2006
-@@ -351,7 +351,7 @@
+--- extra/yassl/taocrypt/Makefile.in.orig	2008-08-12 17:34:32.000000000 +0200
++++ extra/yassl/taocrypt/Makefile.in	2008-08-27 12:33:51.000000000 +0200
+@@ -387,7 +387,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -SUBDIRS = src test benchmark
 +SUBDIRS = src
- EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt $(wildcard mySTL/*.hpp)
+ EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
  all: all-recursive
  
diff --git a/databases/mysql60-server/files/patch-mysys_default.c b/databases/mysql60-server/files/patch-mysys_default.c
index a202932767ea..d73f7097a391 100644
--- a/databases/mysql60-server/files/patch-mysys_default.c
+++ b/databases/mysql60-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	2008-04-08 13:23:13.000000000 +0200
-+++ mysys/default.c	2008-04-21 19:20:44.000000000 +0200
-@@ -623,7 +623,7 @@
+--- mysys/default.c.orig	2008-08-12 17:31:37.000000000 +0200
++++ mysys/default.c	2008-08-27 12:38:14.000000000 +0200
+@@ -638,7 +638,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,14 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -1105,6 +1105,7 @@
- #ifdef DEFAULT_SYSCONFDIR
+@@ -1091,7 +1091,10 @@
+ 
+ #if defined(DEFAULT_SYSCONFDIR)
    if (DEFAULT_SYSCONFDIR != "")
-     ADD_DIRECTORY(DEFAULT_SYSCONFDIR);
-+    ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/");
++  {
+     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "mysql", dirs);
++  }
+ #endif /* DEFAULT_SYSCONFDIR */
+ 
  #endif
-   ADD_COMMON_DIRECTORIES();
-   ADD_DIRECTORY("~/");
diff --git a/databases/mysql60-server/files/patch-storage_maria_Makefile.in b/databases/mysql60-server/files/patch-storage_maria_Makefile.in
new file mode 100644
index 000000000000..cddfb294b23f
--- /dev/null
+++ b/databases/mysql60-server/files/patch-storage_maria_Makefile.in
@@ -0,0 +1,11 @@
+--- storage/maria/Makefile.in.orig	2008-08-27 14:50:26.000000000 +0200
++++ storage/maria/Makefile.in	2008-08-27 14:50:44.000000000 +0200
+@@ -512,7 +512,7 @@
+ LDADD = 
+ 
+ # "." is needed first because tests in unittest need libmaria
+-SUBDIRS = . unittest
++SUBDIRS = .
+ EXTRA_DIST = ma_test_all.sh ma_test_all.res ma_test_big.sh \
+ 			ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery
+ 
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 3700a8a5d249..b4f9615e156e 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -1,5 +1,10 @@
 @stopdaemon mysql-server
 bin/innochecksum
+bin/maria_chk
+bin/maria_dump_log
+bin/maria_ftdump
+bin/maria_pack
+bin/maria_read_log
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
@@ -19,7 +24,6 @@ bin/mysqld_safe
 %%NDB%%bin/ndb_print_backup_file
 %%NDB%%bin/ndb_print_schema_file
 %%NDB%%bin/ndb_print_sys_file
-%%NDB%%bin/ndb_redo_log_reader
 %%NDB%%bin/ndb_restore
 %%NDB%%bin/ndb_select_all
 %%NDB%%bin/ndb_select_count
@@ -27,6 +31,7 @@ bin/mysqld_safe
 %%NDB%%bin/ndb_size.pl
 %%NDB%%bin/ndb_test_platform
 %%NDB%%bin/ndb_waiter
+%%NDB%%bin/ndbd_redo_log_reader
 bin/perror
 bin/replace
 bin/resolve_stack_dump
@@ -65,6 +70,7 @@ bin/resolveip
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
+lib/mysql/libmaria.a
 lib/mysql/libmyisam.a
 lib/mysql/libmyisammrg.a
 lib/mysql/libmystrings.a
@@ -82,6 +88,7 @@ libexec/mysqld
 %%NDB%%libexec/ndb_cpcd
 %%NDB%%libexec/ndb_mgmd
 %%NDB%%libexec/ndbd
+%%DATADIR%%/ChangeLog
 %%DATADIR%%/binary-configure
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
@@ -126,6 +133,9 @@ libexec/mysqld
 %%DATADIR%%/italian/errmsg.sys
 %%DATADIR%%/japanese/errmsg.sys
 %%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/ma_test_all
+%%DATADIR%%/ma_test_all.res
+%%DATADIR%%/ma_test_recovery
 %%DATADIR%%/mi_test_all
 %%DATADIR%%/mi_test_all.res
 %%DATADIR%%/my-huge.cnf