Update to 6.0.11 release and add new manpages.

5 files changed, 27 insertions, 23 deletions

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index e21869dc8e24..1666d8b69b84 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	6.0.10
+PORTVERSION=	6.0.11
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -105,9 +105,11 @@ PLIST_SUB+=	NDB=""
 PLIST_SUB+=	NDB="@comment "
 .endif
 
-MAN1=		myisamchk.1 myisamlog.1 myisampack.1 \
-		my_print_defaults.1 mysql_tzinfo_to_sql.1 \
-		mysqld_safe.1 mysql.server.1 perror.1 replace.1
+MAN1=		innochecksum.1 myisamchk.1 myisamlog.1 myisampack.1 \
+		my_print_defaults.1 myisam_ftdump.1 mysql_client_test_embedded.1 \
+		mysql_install_db.1 mysql_tzinfo_to_sql.1 \
+		mysql_waitpid.1 mysqld_safe.1 mysqltest_embedded.1 mysql.server.1 \
+		perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 INFO=		mysql
 
@@ -163,8 +165,9 @@ LATEST_LINK=	mysql60-client
 
 CONFLICTS=	mysql-client-3.* mysql-client-4.* mysql-client-5.*
 
-MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
+MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
+		mysqlbackup.1 mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
+		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
@@ -173,7 +176,7 @@ CONFIGURE_ARGS+=--without-server
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include sql-common scripts strings regex mysys dbug extra libmysql libmysql_r client @man_dirs@|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLTLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
@@ -195,8 +198,10 @@ LATEST_LINK=	mysql60-scripts
 
 CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.* mysql-scripts-5.*
 
-MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
-		mysqld_multi.1 mysql_fix_privilege_tables.1
+MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
+		mysql_fix_extensions.1 mysql_secure_installation.1 \
+		mysql_setpermission.1 mysql_zap.1 mysqlaccess.1 \
+		mysqldumpslow.1 mysqlhotcopy.1 mysqld_multi.1
 
 SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
 		mysql_secure_installation mysql_zap mysqlaccess \
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index 2b68096b86ac..c083be6105f3 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-6.0.10-alpha.tar.gz) = ebcefbaca78299f5820794350d0025d5
-SHA256 (mysql-6.0.10-alpha.tar.gz) = cde94d6d8c516f11a49599010059da7d4732d2fa2a33d5a7c3eea0ca1ca16b71
-SIZE (mysql-6.0.10-alpha.tar.gz) = 35997799
+MD5 (mysql-6.0.11-alpha.tar.gz) = 516b0695b97102508811f2c4d6e8e683
+SHA256 (mysql-6.0.11-alpha.tar.gz) = 94164a295b7f020edd7b95ae236e196b69e3c27e782a864ec2c6f5f9cec1ecac
+SIZE (mysql-6.0.11-alpha.tar.gz) = 37677862
diff --git a/databases/mysql60-server/files/patch-mysys_default.c b/databases/mysql60-server/files/patch-mysys_default.c
index 4e5a0804e06e..69b1463ce4a8 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-08-12 17:31:37.000000000 +0200
-+++ mysys/default.c	2008-08-27 12:38:14.000000000 +0200
-@@ -638,7 +638,7 @@
+--- mysys/default.c.orig	2009-05-11 14:50:54.000000000 +0200
++++ mysys/default.c	2009-05-19 07:45:53.000000000 +0200
+@@ -679,7 +679,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,10 +9,10 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -1091,7 +1091,10 @@
+@@ -1128,7 +1128,10 @@
  
  #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR != "")
+   if (DEFAULT_SYSCONFDIR[0])
 +  {
      errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
 +    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in
index 7881ee6f48dc..173330ec2faf 100644
--- a/databases/mysql60-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql60-server/files/patch-scripts::Makefile.in
@@ -1,13 +1,12 @@
---- scripts/Makefile.in.orig	Tue May  8 11:42:25 2007
-+++ scripts/Makefile.in	Thu May 17 09:30:48 2007
-@@ -399,21 +399,7 @@
+--- scripts/Makefile.in.orig	2009-05-11 15:02:29.000000000 +0200
++++ scripts/Makefile.in	2009-05-19 07:51:39.000000000 +0200
+@@ -424,20 +424,7 @@
  BUILT_SOURCES = mysql_fix_privilege_tables.sql \
  		mysql_fix_privilege_tables_sql.c
  
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
--			mysql_fix_privilege_tables \
 -			mysql_fix_extensions \
 -			mysql_setpermission \
 -			mysql_secure_installation \
@@ -23,7 +22,7 @@
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution
-@@ -445,11 +431,7 @@
+@@ -471,11 +458,7 @@
  			mysql_system_tables_fix.sql \
  			CMakeLists.txt
  
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index 76ee7f4d68a9..7e405e176044 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -1,8 +1,8 @@
 bin/mysql
 bin/mysql_config
-bin/mysql_fix_privilege_tables
 bin/mysql_upgrade
 bin/mysqladmin
+bin/mysqlbackup
 bin/mysqlbinlog
 bin/mysqlbug
 bin/mysqlcheck