Update to 5.1.17 release.

30 files changed, 190 insertions, 100 deletions

diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 54b2ef0c6e40..88112498a6bb 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.16
+PORTVERSION=	5.1.17
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -140,8 +140,8 @@ pre-fetch:
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ storage @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.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-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
@@ -188,6 +188,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index bc0b3b346e85..8e32b91063a2 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.16-beta.tar.gz) = fb6fd4d26335245f679572f65c299762
-SHA256 (mysql-5.1.16-beta.tar.gz) = 1d86deaf644c237eef40ce95d6bbd00f5c5645b5bbb750c96894e2fe1600b356
-SIZE (mysql-5.1.16-beta.tar.gz) = 22468089
+MD5 (mysql-5.1.17-beta.tar.gz) = 9b4db997883f5d9e1c1d4efbe6f112d2
+SHA256 (mysql-5.1.17-beta.tar.gz) = a3c49507f92a191ec0dfd5a2c85ddb819b24de1d5c08046e2fe527a2a394a8ba
+SIZE (mysql-5.1.17-beta.tar.gz) = 22646581
diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts::Makefile.in
index 42e5e507112c..03f2e5e10008 100644
--- a/databases/mysql51-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql51-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig	Thu Oct 26 14:03:08 2006
-+++ scripts/Makefile.in	Tue Nov  7 08:23:48 2006
-@@ -371,22 +371,7 @@
+--- scripts/Makefile.in.orig	Wed Apr  4 15:18:49 2007
++++ scripts/Makefile.in	Wed Apr 18 07:47:33 2007
+@@ -381,21 +381,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -18,18 +18,21 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi \
--			mysql_create_system_tables
+-			mysqld_multi
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution
-@@ -416,7 +401,7 @@
- 			mysqlbug \
- 			make_win_bin_dist
+@@ -425,11 +411,7 @@
+ 			make_win_bin_dist \
+ 			mysql_system_tables_fix.sql
  
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+-dist_pkgdata_DATA = fill_help_tables.sql \
+-			mysql_fix_privilege_tables.sql \
+-			mysql_system_tables.sql \
+-			mysql_system_tables_data.sql \
+-			mysql_test_data_timezone.sql
 +dist_pkgdata_DATA =
  
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
+ CLEANFILES = @server_scripts@ \
+ 			make_binary_distribution \
diff --git a/databases/mysql51-server/files/patch-support-files_Makefile.in b/databases/mysql51-server/files/patch-support-files_Makefile.in
new file mode 100644
index 000000000000..2d6ef213f891
--- /dev/null
+++ b/databases/mysql51-server/files/patch-support-files_Makefile.in
@@ -0,0 +1,11 @@
+--- support-files/Makefile.in.orig	Thu Apr 19 09:31:48 2007
++++ support-files/Makefile.in	Thu Apr 19 09:33:03 2007
+@@ -419,7 +419,7 @@
+ 
+ pkgdata_SCRIPTS = mysql.server
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = mysql.m4
++aclocal_DATA =
+ noinst_DATA = mysql-@VERSION@.spec \
+ 			MySQL-shared-compat.spec
+ 
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 6913e7dcbbb2..dba505d28403 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -1,11 +1,10 @@
-@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
+@stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
@@ -128,6 +127,8 @@ libexec/mysqld
 %%DATADIR%%/my-large.cnf
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client
index 857870c78dba..bfae5f4f2395 100644
--- a/databases/mysql51-server/pkg-plist.client
+++ b/databases/mysql51-server/pkg-plist.client
@@ -25,7 +25,6 @@ include/mysql/my_list.h
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h
 include/mysql/mysql.h
@@ -54,6 +53,7 @@ lib/mysql/libmysqlclient_r.so.15
 %%ZLIB%%lib/mysql/libz.la
 %%ZLIB%%lib/mysql/libz.so
 %%ZLIB%%lib/mysql/libz.so.3
+share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 54b2ef0c6e40..88112498a6bb 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.16
+PORTVERSION=	5.1.17
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -140,8 +140,8 @@ pre-fetch:
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ storage @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.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-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
@@ -188,6 +188,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo
index bc0b3b346e85..8e32b91063a2 100644
--- a/databases/mysql54-server/distinfo
+++ b/databases/mysql54-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.16-beta.tar.gz) = fb6fd4d26335245f679572f65c299762
-SHA256 (mysql-5.1.16-beta.tar.gz) = 1d86deaf644c237eef40ce95d6bbd00f5c5645b5bbb750c96894e2fe1600b356
-SIZE (mysql-5.1.16-beta.tar.gz) = 22468089
+MD5 (mysql-5.1.17-beta.tar.gz) = 9b4db997883f5d9e1c1d4efbe6f112d2
+SHA256 (mysql-5.1.17-beta.tar.gz) = a3c49507f92a191ec0dfd5a2c85ddb819b24de1d5c08046e2fe527a2a394a8ba
+SIZE (mysql-5.1.17-beta.tar.gz) = 22646581
diff --git a/databases/mysql54-server/files/patch-scripts::Makefile.in b/databases/mysql54-server/files/patch-scripts::Makefile.in
index 42e5e507112c..03f2e5e10008 100644
--- a/databases/mysql54-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql54-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig	Thu Oct 26 14:03:08 2006
-+++ scripts/Makefile.in	Tue Nov  7 08:23:48 2006
-@@ -371,22 +371,7 @@
+--- scripts/Makefile.in.orig	Wed Apr  4 15:18:49 2007
++++ scripts/Makefile.in	Wed Apr 18 07:47:33 2007
+@@ -381,21 +381,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -18,18 +18,21 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi \
--			mysql_create_system_tables
+-			mysqld_multi
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution
-@@ -416,7 +401,7 @@
- 			mysqlbug \
- 			make_win_bin_dist
+@@ -425,11 +411,7 @@
+ 			make_win_bin_dist \
+ 			mysql_system_tables_fix.sql
  
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+-dist_pkgdata_DATA = fill_help_tables.sql \
+-			mysql_fix_privilege_tables.sql \
+-			mysql_system_tables.sql \
+-			mysql_system_tables_data.sql \
+-			mysql_test_data_timezone.sql
 +dist_pkgdata_DATA =
  
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
+ CLEANFILES = @server_scripts@ \
+ 			make_binary_distribution \
diff --git a/databases/mysql54-server/files/patch-support-files_Makefile.in b/databases/mysql54-server/files/patch-support-files_Makefile.in
new file mode 100644
index 000000000000..2d6ef213f891
--- /dev/null
+++ b/databases/mysql54-server/files/patch-support-files_Makefile.in
@@ -0,0 +1,11 @@
+--- support-files/Makefile.in.orig	Thu Apr 19 09:31:48 2007
++++ support-files/Makefile.in	Thu Apr 19 09:33:03 2007
+@@ -419,7 +419,7 @@
+ 
+ pkgdata_SCRIPTS = mysql.server
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = mysql.m4
++aclocal_DATA =
+ noinst_DATA = mysql-@VERSION@.spec \
+ 			MySQL-shared-compat.spec
+ 
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index 6913e7dcbbb2..dba505d28403 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -1,11 +1,10 @@
-@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
+@stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
@@ -128,6 +127,8 @@ libexec/mysqld
 %%DATADIR%%/my-large.cnf
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client
index 857870c78dba..bfae5f4f2395 100644
--- a/databases/mysql54-server/pkg-plist.client
+++ b/databases/mysql54-server/pkg-plist.client
@@ -25,7 +25,6 @@ include/mysql/my_list.h
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h
 include/mysql/mysql.h
@@ -54,6 +53,7 @@ lib/mysql/libmysqlclient_r.so.15
 %%ZLIB%%lib/mysql/libz.la
 %%ZLIB%%lib/mysql/libz.so
 %%ZLIB%%lib/mysql/libz.so.3
+share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 54b2ef0c6e40..88112498a6bb 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.16
+PORTVERSION=	5.1.17
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -140,8 +140,8 @@ pre-fetch:
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ storage @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.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-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
@@ -188,6 +188,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
index bc0b3b346e85..8e32b91063a2 100644
--- a/databases/mysql55-server/distinfo
+++ b/databases/mysql55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.16-beta.tar.gz) = fb6fd4d26335245f679572f65c299762
-SHA256 (mysql-5.1.16-beta.tar.gz) = 1d86deaf644c237eef40ce95d6bbd00f5c5645b5bbb750c96894e2fe1600b356
-SIZE (mysql-5.1.16-beta.tar.gz) = 22468089
+MD5 (mysql-5.1.17-beta.tar.gz) = 9b4db997883f5d9e1c1d4efbe6f112d2
+SHA256 (mysql-5.1.17-beta.tar.gz) = a3c49507f92a191ec0dfd5a2c85ddb819b24de1d5c08046e2fe527a2a394a8ba
+SIZE (mysql-5.1.17-beta.tar.gz) = 22646581
diff --git a/databases/mysql55-server/files/patch-scripts::Makefile.in b/databases/mysql55-server/files/patch-scripts::Makefile.in
index 42e5e507112c..03f2e5e10008 100644
--- a/databases/mysql55-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql55-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig	Thu Oct 26 14:03:08 2006
-+++ scripts/Makefile.in	Tue Nov  7 08:23:48 2006
-@@ -371,22 +371,7 @@
+--- scripts/Makefile.in.orig	Wed Apr  4 15:18:49 2007
++++ scripts/Makefile.in	Wed Apr 18 07:47:33 2007
+@@ -381,21 +381,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -18,18 +18,21 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi \
--			mysql_create_system_tables
+-			mysqld_multi
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution
-@@ -416,7 +401,7 @@
- 			mysqlbug \
- 			make_win_bin_dist
+@@ -425,11 +411,7 @@
+ 			make_win_bin_dist \
+ 			mysql_system_tables_fix.sql
  
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+-dist_pkgdata_DATA = fill_help_tables.sql \
+-			mysql_fix_privilege_tables.sql \
+-			mysql_system_tables.sql \
+-			mysql_system_tables_data.sql \
+-			mysql_test_data_timezone.sql
 +dist_pkgdata_DATA =
  
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
+ CLEANFILES = @server_scripts@ \
+ 			make_binary_distribution \
diff --git a/databases/mysql55-server/files/patch-support-files_Makefile.in b/databases/mysql55-server/files/patch-support-files_Makefile.in
new file mode 100644
index 000000000000..2d6ef213f891
--- /dev/null
+++ b/databases/mysql55-server/files/patch-support-files_Makefile.in
@@ -0,0 +1,11 @@
+--- support-files/Makefile.in.orig	Thu Apr 19 09:31:48 2007
++++ support-files/Makefile.in	Thu Apr 19 09:33:03 2007
+@@ -419,7 +419,7 @@
+ 
+ pkgdata_SCRIPTS = mysql.server
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = mysql.m4
++aclocal_DATA =
+ noinst_DATA = mysql-@VERSION@.spec \
+ 			MySQL-shared-compat.spec
+ 
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index 6913e7dcbbb2..dba505d28403 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -1,11 +1,10 @@
-@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
+@stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
@@ -128,6 +127,8 @@ libexec/mysqld
 %%DATADIR%%/my-large.cnf
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client
index 857870c78dba..bfae5f4f2395 100644
--- a/databases/mysql55-server/pkg-plist.client
+++ b/databases/mysql55-server/pkg-plist.client
@@ -25,7 +25,6 @@ include/mysql/my_list.h
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h
 include/mysql/mysql.h
@@ -54,6 +53,7 @@ lib/mysql/libmysqlclient_r.so.15
 %%ZLIB%%lib/mysql/libz.la
 %%ZLIB%%lib/mysql/libz.so
 %%ZLIB%%lib/mysql/libz.so.3
+share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 54b2ef0c6e40..88112498a6bb 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.16
+PORTVERSION=	5.1.17
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -140,8 +140,8 @@ pre-fetch:
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ storage @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.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-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
@@ -188,6 +188,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo
index bc0b3b346e85..8e32b91063a2 100644
--- a/databases/mysql60-server/distinfo
+++ b/databases/mysql60-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.16-beta.tar.gz) = fb6fd4d26335245f679572f65c299762
-SHA256 (mysql-5.1.16-beta.tar.gz) = 1d86deaf644c237eef40ce95d6bbd00f5c5645b5bbb750c96894e2fe1600b356
-SIZE (mysql-5.1.16-beta.tar.gz) = 22468089
+MD5 (mysql-5.1.17-beta.tar.gz) = 9b4db997883f5d9e1c1d4efbe6f112d2
+SHA256 (mysql-5.1.17-beta.tar.gz) = a3c49507f92a191ec0dfd5a2c85ddb819b24de1d5c08046e2fe527a2a394a8ba
+SIZE (mysql-5.1.17-beta.tar.gz) = 22646581
diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in
index 42e5e507112c..03f2e5e10008 100644
--- a/databases/mysql60-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql60-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig	Thu Oct 26 14:03:08 2006
-+++ scripts/Makefile.in	Tue Nov  7 08:23:48 2006
-@@ -371,22 +371,7 @@
+--- scripts/Makefile.in.orig	Wed Apr  4 15:18:49 2007
++++ scripts/Makefile.in	Wed Apr 18 07:47:33 2007
+@@ -381,21 +381,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -18,18 +18,21 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi \
--			mysql_create_system_tables
+-			mysqld_multi
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution
-@@ -416,7 +401,7 @@
- 			mysqlbug \
- 			make_win_bin_dist
+@@ -425,11 +411,7 @@
+ 			make_win_bin_dist \
+ 			mysql_system_tables_fix.sql
  
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+-dist_pkgdata_DATA = fill_help_tables.sql \
+-			mysql_fix_privilege_tables.sql \
+-			mysql_system_tables.sql \
+-			mysql_system_tables_data.sql \
+-			mysql_test_data_timezone.sql
 +dist_pkgdata_DATA =
  
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
+ CLEANFILES = @server_scripts@ \
+ 			make_binary_distribution \
diff --git a/databases/mysql60-server/files/patch-support-files_Makefile.in b/databases/mysql60-server/files/patch-support-files_Makefile.in
new file mode 100644
index 000000000000..2d6ef213f891
--- /dev/null
+++ b/databases/mysql60-server/files/patch-support-files_Makefile.in
@@ -0,0 +1,11 @@
+--- support-files/Makefile.in.orig	Thu Apr 19 09:31:48 2007
++++ support-files/Makefile.in	Thu Apr 19 09:33:03 2007
+@@ -419,7 +419,7 @@
+ 
+ pkgdata_SCRIPTS = mysql.server
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = mysql.m4
++aclocal_DATA =
+ noinst_DATA = mysql-@VERSION@.spec \
+ 			MySQL-shared-compat.spec
+ 
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 6913e7dcbbb2..dba505d28403 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -1,11 +1,10 @@
-@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
+@stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
@@ -128,6 +127,8 @@ libexec/mysqld
 %%DATADIR%%/my-large.cnf
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index 857870c78dba..bfae5f4f2395 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -25,7 +25,6 @@ include/mysql/my_list.h
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h
 include/mysql/mysql.h
@@ -54,6 +53,7 @@ lib/mysql/libmysqlclient_r.so.15
 %%ZLIB%%lib/mysql/libz.la
 %%ZLIB%%lib/mysql/libz.so
 %%ZLIB%%lib/mysql/libz.so.3
+share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 54b2ef0c6e40..88112498a6bb 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.16
+PORTVERSION=	5.1.17
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -140,8 +140,8 @@ pre-fetch:
 post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ storage @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
-	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.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-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
@@ -188,6 +188,9 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/
+
 .else
 # MySQL-Scripts part
 USE_MYSQL=	yes
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index bc0b3b346e85..8e32b91063a2 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.16-beta.tar.gz) = fb6fd4d26335245f679572f65c299762
-SHA256 (mysql-5.1.16-beta.tar.gz) = 1d86deaf644c237eef40ce95d6bbd00f5c5645b5bbb750c96894e2fe1600b356
-SIZE (mysql-5.1.16-beta.tar.gz) = 22468089
+MD5 (mysql-5.1.17-beta.tar.gz) = 9b4db997883f5d9e1c1d4efbe6f112d2
+SHA256 (mysql-5.1.17-beta.tar.gz) = a3c49507f92a191ec0dfd5a2c85ddb819b24de1d5c08046e2fe527a2a394a8ba
+SIZE (mysql-5.1.17-beta.tar.gz) = 22646581
diff --git a/databases/percona55-server/files/patch-scripts::Makefile.in b/databases/percona55-server/files/patch-scripts::Makefile.in
index 42e5e507112c..03f2e5e10008 100644
--- a/databases/percona55-server/files/patch-scripts::Makefile.in
+++ b/databases/percona55-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig	Thu Oct 26 14:03:08 2006
-+++ scripts/Makefile.in	Tue Nov  7 08:23:48 2006
-@@ -371,22 +371,7 @@
+--- scripts/Makefile.in.orig	Wed Apr  4 15:18:49 2007
++++ scripts/Makefile.in	Wed Apr 18 07:47:33 2007
+@@ -381,21 +381,7 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -18,18 +18,21 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi \
--			mysql_create_system_tables
+-			mysqld_multi
 +bin_SCRIPTS =
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution
-@@ -416,7 +401,7 @@
- 			mysqlbug \
- 			make_win_bin_dist
+@@ -425,11 +411,7 @@
+ 			make_win_bin_dist \
+ 			mysql_system_tables_fix.sql
  
--dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
+-dist_pkgdata_DATA = fill_help_tables.sql \
+-			mysql_fix_privilege_tables.sql \
+-			mysql_system_tables.sql \
+-			mysql_system_tables_data.sql \
+-			mysql_test_data_timezone.sql
 +dist_pkgdata_DATA =
  
- # mysqlbug should be distributed built so that people can report build
- # failures with it.
+ CLEANFILES = @server_scripts@ \
+ 			make_binary_distribution \
diff --git a/databases/percona55-server/files/patch-support-files_Makefile.in b/databases/percona55-server/files/patch-support-files_Makefile.in
new file mode 100644
index 000000000000..2d6ef213f891
--- /dev/null
+++ b/databases/percona55-server/files/patch-support-files_Makefile.in
@@ -0,0 +1,11 @@
+--- support-files/Makefile.in.orig	Thu Apr 19 09:31:48 2007
++++ support-files/Makefile.in	Thu Apr 19 09:33:03 2007
+@@ -419,7 +419,7 @@
+ 
+ pkgdata_SCRIPTS = mysql.server
+ aclocaldir = $(datadir)/aclocal
+-aclocal_DATA = mysql.m4
++aclocal_DATA =
+ noinst_DATA = mysql-@VERSION@.spec \
+ 			MySQL-shared-compat.spec
+ 
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index 6913e7dcbbb2..dba505d28403 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -1,11 +1,10 @@
-@unexec %D/etc/rc.d/mysql-server.sh stop > /dev/null 2>&1 || true
+@stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_create_system_tables
 bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
@@ -128,6 +127,8 @@ libexec/mysqld
 %%DATADIR%%/my-large.cnf
 %%DATADIR%%/my-medium.cnf
 %%DATADIR%%/my-small.cnf
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql-log-rotate
 %%DATADIR%%/mysql.server
 %%DATADIR%%/ndb-config-2-node.ini
diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client
index 857870c78dba..bfae5f4f2395 100644
--- a/databases/percona55-server/pkg-plist.client
+++ b/databases/percona55-server/pkg-plist.client
@@ -25,7 +25,6 @@ include/mysql/my_list.h
 include/mysql/my_net.h
 include/mysql/my_no_pthread.h
 include/mysql/my_pthread.h
-include/mysql/my_semaphore.h
 include/mysql/my_sys.h
 include/mysql/my_xml.h
 include/mysql/mysql.h
@@ -54,6 +53,7 @@ lib/mysql/libmysqlclient_r.so.15
 %%ZLIB%%lib/mysql/libz.la
 %%ZLIB%%lib/mysql/libz.so
 %%ZLIB%%lib/mysql/libz.so.3
+share/aclocal/mysql.m4
 %%DATADIR%%/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql