5 files changed, 19 insertions, 18 deletions

diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index b94887871310..522c564af7d8 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.0.41
+PORTVERSION=	5.0.45
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -138,7 +138,7 @@ pre-fetch:
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ scripts @sql_server_dirs@ @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_upgrade_shell|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
@@ -173,7 +173,7 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include strings mysys dbug extra regex libmysql_r libmysql client scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include scripts strings mysys dbug extra regex libmysql_r libmysql client @man_dirs@|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/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 = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo
index bfa515ec8469..e9ad3647b25e 100644
--- a/databases/mysql50-server/distinfo
+++ b/databases/mysql50-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.0.41.tar.gz) = b45cd6c89e35dfc1cdbe1a1f782aefbf
-SHA256 (mysql-5.0.41.tar.gz) = 08c27246ca9b9cf69567aea63b8fd7aef33769e369f9acf1636634097dc47775
-SIZE (mysql-5.0.41.tar.gz) = 24083795
+MD5 (mysql-5.0.45.tar.gz) = a2a1c5a82bb22b45ab76a8ecab94e10d
+SHA256 (mysql-5.0.45.tar.gz) = e4443d8dc859ed53bd9f3bef143ce30c7f5dee66a02748e9a003136be25e0060
+SIZE (mysql-5.0.45.tar.gz) = 24433261
diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in
index 01dcfa676ad2..3086b959a062 100644
--- a/databases/mysql50-server/files/patch-Makefile.in
+++ b/databases/mysql50-server/files/patch-Makefile.in
@@ -5,12 +5,12 @@
  			README COPYING EXCEPTIONS-CLIENT
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
--			@readline_topdir@ sql-common \
+-			@readline_topdir@ sql-common scripts \
 -			@thread_dirs@ pstack \
--			@sql_union_dirs@ scripts @man_dirs@ tests \
+-			@sql_union_dirs@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @tools_dirs@
 +SUBDIRS =
  
  DIST_SUBDIRS = . include @docs_dirs@ zlib \
- 			@readline_topdir@ sql-common \
+ 			@readline_topdir@ sql-common scripts \
diff --git a/databases/mysql50-server/files/patch-scripts::Makefile.in b/databases/mysql50-server/files/patch-scripts::Makefile.in
index 9b3e2df3d458..0c6f9a18a6d1 100644
--- a/databases/mysql50-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql50-server/files/patch-scripts::Makefile.in
@@ -1,9 +1,9 @@
---- scripts/Makefile.in.orig	Wed May  2 16:43:17 2007
-+++ scripts/Makefile.in	Thu May 17 11:11:40 2007
-@@ -355,24 +355,7 @@
- yassl_libs = @yassl_libs@
- yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
- zlib_dir = @zlib_dir@
+--- scripts/Makefile.in.orig	Wed Jul  4 15:10:00 2007
++++ scripts/Makefile.in	Thu Jul 12 08:27:29 2007
+@@ -377,24 +377,7 @@
+ BUILT_SOURCES = mysql_fix_privilege_tables.sql \
+ 		mysql_fix_privilege_tables_sql.c
+ 
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
@@ -26,9 +26,9 @@
  
  noinst_SCRIPTS = make_binary_distribution \
  			make_sharedlib_distribution \
-@@ -407,11 +390,7 @@
- 			make_win_bin_dist \
- 			mysql_system_tables_fix.sql
+@@ -431,11 +414,7 @@
+ 			mysql_system_tables_fix.sql \
+ 			CMakeLists.txt
  
 -dist_pkgdata_DATA = fill_help_tables.sql \
 -			mysql_fix_privilege_tables.sql \
diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client
index d884a19c94ab..194121870d3f 100644
--- a/databases/mysql50-server/pkg-plist.client
+++ b/databases/mysql50-server/pkg-plist.client
@@ -18,6 +18,7 @@ include/mysql/keycache.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
+include/mysql/my_attribute.h
 include/mysql/my_config.h
 include/mysql/my_dbug.h
 include/mysql/my_dir.h