Update to 4.1.13 release.

4 files changed, 11 insertions, 13 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 16a1f0daf8e3..7d7e8693c463 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.12
+PORTVERSION=	4.1.13
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -146,7 +146,7 @@ pre-fetch:
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in
+	@${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|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
@@ -177,7 +177,7 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/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
@@ -215,7 +215,7 @@ SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
 		mysqldumpslow mysql_explain_log mysql_tableinfo mysqld_multi
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am install-data-am|install-exec-am|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 8596a4f0956f..f40dec482498 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.12.tar.gz) = 56a6f5cacd97ae290e07bbe19f279af1
-SIZE (mysql-4.1.12.tar.gz) = 17069350
+MD5 (mysql-4.1.13.tar.gz) = 49d7a7314a2c9cf49e34777e73e66562
+SIZE (mysql-4.1.13.tar.gz) = 17137413
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in
index 40726234d2a4..8a273b2935a3 100644
--- a/databases/mysql41-server/files/patch-Makefile.in
+++ b/databases/mysql41-server/files/patch-Makefile.in
@@ -7,7 +7,7 @@
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
--			@sql_union_dirs@ scripts man tests \
+-			@sql_union_dirs@ scripts @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql41-server/files/patch-scripts::Makefile.in b/databases/mysql41-server/files/patch-scripts::Makefile.in
index 65770d41316c..b552bc1610a2 100644
--- a/databases/mysql41-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql41-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig	Fri May 13 13:33:57 2005
-+++ scripts/Makefile.in	Fri Jun  3 16:58:01 2005
-@@ -320,26 +320,7 @@
+--- scripts/Makefile.in.orig	Fri Jul 15 12:40:26 2005
++++ scripts/Makefile.in	Sat Jul 23 11:14:03 2005
+@@ -322,24 +322,7 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
@@ -21,14 +21,12 @@
 -			mysql_explain_log \
 -			mysql_tableinfo \
 -			mysqld_multi \
--			make_win_src_distribution \
--			make_win_binary_distribution \
 -			mysql_create_system_tables
 +bin_SCRIPTS =
  
  EXTRA_SCRIPTS = make_binary_distribution.sh \
  			make_sharedlib_distribution.sh \
-@@ -369,7 +350,7 @@
+@@ -369,7 +352,7 @@
  			mysqlaccess.conf \
  			mysqlbug