diff options
-rw-r--r-- | databases/mysql50-server/Makefile | 22 | ||||
-rw-r--r-- | databases/mysql50-server/distinfo | 5 | ||||
-rw-r--r-- | databases/mysql50-server/files/patch-man::Makefile.in | 20 | ||||
-rw-r--r-- | databases/mysql51-server/Makefile | 22 | ||||
-rw-r--r-- | databases/mysql51-server/distinfo | 5 | ||||
-rw-r--r-- | databases/mysql51-server/files/patch-man::Makefile.in | 20 | ||||
-rw-r--r-- | databases/mysql54-server/Makefile | 22 | ||||
-rw-r--r-- | databases/mysql54-server/distinfo | 5 | ||||
-rw-r--r-- | databases/mysql54-server/files/patch-man::Makefile.in | 20 | ||||
-rw-r--r-- | databases/mysql55-server/Makefile | 22 | ||||
-rw-r--r-- | databases/mysql55-server/distinfo | 5 | ||||
-rw-r--r-- | databases/mysql55-server/files/patch-man::Makefile.in | 20 | ||||
-rw-r--r-- | databases/mysql60-server/Makefile | 22 | ||||
-rw-r--r-- | databases/mysql60-server/distinfo | 5 | ||||
-rw-r--r-- | databases/mysql60-server/files/patch-man::Makefile.in | 20 | ||||
-rw-r--r-- | databases/percona55-server/Makefile | 22 | ||||
-rw-r--r-- | databases/percona55-server/distinfo | 5 | ||||
-rw-r--r-- | databases/percona55-server/files/patch-man::Makefile.in | 20 |
18 files changed, 156 insertions, 126 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index dc5a429dac7c..ca108d3006e5 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.15 +PORTVERSION= 5.0.16 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -60,6 +60,9 @@ CONFIGURE_ARGS+=--without-innodb .if defined(WITH_ARCHIVE) CONFIGURE_ARGS+=--with-archive-storage-engine .endif +.if defined(WITH_FEDERATED) +CONFIGURE_ARGS+=--with-federated-storage-engine +.endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-ndbcluster .endif @@ -122,8 +125,8 @@ PLIST_SUB+= NDB="" PLIST_SUB+= NDB="@comment " .endif -MAN1= mysqld.1 \ - mysqld_safe.1 perror.1 replace.1 +MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ + mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql @@ -144,6 +147,7 @@ pre-fetch: @${ECHO} " (use it if you need even more speed)." @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine." + @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine." @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster." @${ECHO} "" @@ -152,7 +156,7 @@ post-patch: @${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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -172,7 +176,8 @@ LATEST_LINK= mysql50-client CONFLICTS= mysql-client-3.* mysql-client-4.* -MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 +MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ + mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -185,7 +190,7 @@ post-patch: @${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 @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @@ -211,7 +216,8 @@ LATEST_LINK= mysql50-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* -MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1 +MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ + mysqld_multi.1 mysql_fix_privilege_tables.1 SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ @@ -222,7 +228,7 @@ post-patch: @${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 + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif # Common part diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index f42ed050e333..9c7cfcf0f9b1 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,2 +1,3 @@ -MD5 (mysql-5.0.15.tar.gz) = b19e03de0ec348552b4bfac2e215f335 -SIZE (mysql-5.0.15.tar.gz) = 18813065 +MD5 (mysql-5.0.16.tar.gz) = ecf2ae1d782a8d129af940c15a44f477 +SHA256 (mysql-5.0.16.tar.gz) = 6705e1a7426c6d233f523129ce900d084623bc0020be751aa8d30d84e7040349 +SIZE (mysql-5.0.16.tar.gz) = 19031670 diff --git a/databases/mysql50-server/files/patch-man::Makefile.in b/databases/mysql50-server/files/patch-man::Makefile.in index 0f83c2ae8cad..35f0e88ddc3d 100644 --- a/databases/mysql50-server/files/patch-man::Makefile.in +++ b/databases/mysql50-server/files/patch-man::Makefile.in @@ -1,13 +1,11 @@ ---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005 -+++ man/Makefile.in Wed Apr 6 13:10:42 2005 -@@ -333,9 +333,7 @@ - tools_dirs = @tools_dirs@ - uname_prog = @uname_prog@ +--- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 ++++ man/Makefile.in Sun Nov 27 00:09:03 2005 +@@ -338,7 +338,7 @@ + yassl_libs = @yassl_libs@ + yassl_libs_with_path = @yassl_libs_with_path@ zlib_dir = @zlib_dir@ --man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = +-man1_MANS = @man1_files@ ++man1_MANS = + EXTRA_DIST = $(man1_MANS) + all: all-am - EXTRA_DIST = mysql.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index dc5a429dac7c..ca108d3006e5 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.15 +PORTVERSION= 5.0.16 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -60,6 +60,9 @@ CONFIGURE_ARGS+=--without-innodb .if defined(WITH_ARCHIVE) CONFIGURE_ARGS+=--with-archive-storage-engine .endif +.if defined(WITH_FEDERATED) +CONFIGURE_ARGS+=--with-federated-storage-engine +.endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-ndbcluster .endif @@ -122,8 +125,8 @@ PLIST_SUB+= NDB="" PLIST_SUB+= NDB="@comment " .endif -MAN1= mysqld.1 \ - mysqld_safe.1 perror.1 replace.1 +MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ + mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql @@ -144,6 +147,7 @@ pre-fetch: @${ECHO} " (use it if you need even more speed)." @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine." + @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine." @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster." @${ECHO} "" @@ -152,7 +156,7 @@ post-patch: @${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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -172,7 +176,8 @@ LATEST_LINK= mysql50-client CONFLICTS= mysql-client-3.* mysql-client-4.* -MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 +MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ + mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -185,7 +190,7 @@ post-patch: @${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 @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @@ -211,7 +216,8 @@ LATEST_LINK= mysql50-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* -MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1 +MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ + mysqld_multi.1 mysql_fix_privilege_tables.1 SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ @@ -222,7 +228,7 @@ post-patch: @${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 + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif # Common part diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index f42ed050e333..9c7cfcf0f9b1 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,2 +1,3 @@ -MD5 (mysql-5.0.15.tar.gz) = b19e03de0ec348552b4bfac2e215f335 -SIZE (mysql-5.0.15.tar.gz) = 18813065 +MD5 (mysql-5.0.16.tar.gz) = ecf2ae1d782a8d129af940c15a44f477 +SHA256 (mysql-5.0.16.tar.gz) = 6705e1a7426c6d233f523129ce900d084623bc0020be751aa8d30d84e7040349 +SIZE (mysql-5.0.16.tar.gz) = 19031670 diff --git a/databases/mysql51-server/files/patch-man::Makefile.in b/databases/mysql51-server/files/patch-man::Makefile.in index 0f83c2ae8cad..35f0e88ddc3d 100644 --- a/databases/mysql51-server/files/patch-man::Makefile.in +++ b/databases/mysql51-server/files/patch-man::Makefile.in @@ -1,13 +1,11 @@ ---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005 -+++ man/Makefile.in Wed Apr 6 13:10:42 2005 -@@ -333,9 +333,7 @@ - tools_dirs = @tools_dirs@ - uname_prog = @uname_prog@ +--- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 ++++ man/Makefile.in Sun Nov 27 00:09:03 2005 +@@ -338,7 +338,7 @@ + yassl_libs = @yassl_libs@ + yassl_libs_with_path = @yassl_libs_with_path@ zlib_dir = @zlib_dir@ --man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = +-man1_MANS = @man1_files@ ++man1_MANS = + EXTRA_DIST = $(man1_MANS) + all: all-am - EXTRA_DIST = mysql.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index dc5a429dac7c..ca108d3006e5 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.15 +PORTVERSION= 5.0.16 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -60,6 +60,9 @@ CONFIGURE_ARGS+=--without-innodb .if defined(WITH_ARCHIVE) CONFIGURE_ARGS+=--with-archive-storage-engine .endif +.if defined(WITH_FEDERATED) +CONFIGURE_ARGS+=--with-federated-storage-engine +.endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-ndbcluster .endif @@ -122,8 +125,8 @@ PLIST_SUB+= NDB="" PLIST_SUB+= NDB="@comment " .endif -MAN1= mysqld.1 \ - mysqld_safe.1 perror.1 replace.1 +MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ + mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql @@ -144,6 +147,7 @@ pre-fetch: @${ECHO} " (use it if you need even more speed)." @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine." + @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine." @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster." @${ECHO} "" @@ -152,7 +156,7 @@ post-patch: @${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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -172,7 +176,8 @@ LATEST_LINK= mysql50-client CONFLICTS= mysql-client-3.* mysql-client-4.* -MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 +MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ + mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -185,7 +190,7 @@ post-patch: @${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 @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @@ -211,7 +216,8 @@ LATEST_LINK= mysql50-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* -MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1 +MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ + mysqld_multi.1 mysql_fix_privilege_tables.1 SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ @@ -222,7 +228,7 @@ post-patch: @${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 + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif # Common part diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index f42ed050e333..9c7cfcf0f9b1 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1,2 +1,3 @@ -MD5 (mysql-5.0.15.tar.gz) = b19e03de0ec348552b4bfac2e215f335 -SIZE (mysql-5.0.15.tar.gz) = 18813065 +MD5 (mysql-5.0.16.tar.gz) = ecf2ae1d782a8d129af940c15a44f477 +SHA256 (mysql-5.0.16.tar.gz) = 6705e1a7426c6d233f523129ce900d084623bc0020be751aa8d30d84e7040349 +SIZE (mysql-5.0.16.tar.gz) = 19031670 diff --git a/databases/mysql54-server/files/patch-man::Makefile.in b/databases/mysql54-server/files/patch-man::Makefile.in index 0f83c2ae8cad..35f0e88ddc3d 100644 --- a/databases/mysql54-server/files/patch-man::Makefile.in +++ b/databases/mysql54-server/files/patch-man::Makefile.in @@ -1,13 +1,11 @@ ---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005 -+++ man/Makefile.in Wed Apr 6 13:10:42 2005 -@@ -333,9 +333,7 @@ - tools_dirs = @tools_dirs@ - uname_prog = @uname_prog@ +--- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 ++++ man/Makefile.in Sun Nov 27 00:09:03 2005 +@@ -338,7 +338,7 @@ + yassl_libs = @yassl_libs@ + yassl_libs_with_path = @yassl_libs_with_path@ zlib_dir = @zlib_dir@ --man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = +-man1_MANS = @man1_files@ ++man1_MANS = + EXTRA_DIST = $(man1_MANS) + all: all-am - EXTRA_DIST = mysql.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index dc5a429dac7c..ca108d3006e5 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.15 +PORTVERSION= 5.0.16 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -60,6 +60,9 @@ CONFIGURE_ARGS+=--without-innodb .if defined(WITH_ARCHIVE) CONFIGURE_ARGS+=--with-archive-storage-engine .endif +.if defined(WITH_FEDERATED) +CONFIGURE_ARGS+=--with-federated-storage-engine +.endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-ndbcluster .endif @@ -122,8 +125,8 @@ PLIST_SUB+= NDB="" PLIST_SUB+= NDB="@comment " .endif -MAN1= mysqld.1 \ - mysqld_safe.1 perror.1 replace.1 +MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ + mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql @@ -144,6 +147,7 @@ pre-fetch: @${ECHO} " (use it if you need even more speed)." @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine." + @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine." @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster." @${ECHO} "" @@ -152,7 +156,7 @@ post-patch: @${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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -172,7 +176,8 @@ LATEST_LINK= mysql50-client CONFLICTS= mysql-client-3.* mysql-client-4.* -MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 +MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ + mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -185,7 +190,7 @@ post-patch: @${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 @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @@ -211,7 +216,8 @@ LATEST_LINK= mysql50-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* -MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1 +MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ + mysqld_multi.1 mysql_fix_privilege_tables.1 SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ @@ -222,7 +228,7 @@ post-patch: @${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 + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif # Common part diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index f42ed050e333..9c7cfcf0f9b1 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,3 @@ -MD5 (mysql-5.0.15.tar.gz) = b19e03de0ec348552b4bfac2e215f335 -SIZE (mysql-5.0.15.tar.gz) = 18813065 +MD5 (mysql-5.0.16.tar.gz) = ecf2ae1d782a8d129af940c15a44f477 +SHA256 (mysql-5.0.16.tar.gz) = 6705e1a7426c6d233f523129ce900d084623bc0020be751aa8d30d84e7040349 +SIZE (mysql-5.0.16.tar.gz) = 19031670 diff --git a/databases/mysql55-server/files/patch-man::Makefile.in b/databases/mysql55-server/files/patch-man::Makefile.in index 0f83c2ae8cad..35f0e88ddc3d 100644 --- a/databases/mysql55-server/files/patch-man::Makefile.in +++ b/databases/mysql55-server/files/patch-man::Makefile.in @@ -1,13 +1,11 @@ ---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005 -+++ man/Makefile.in Wed Apr 6 13:10:42 2005 -@@ -333,9 +333,7 @@ - tools_dirs = @tools_dirs@ - uname_prog = @uname_prog@ +--- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 ++++ man/Makefile.in Sun Nov 27 00:09:03 2005 +@@ -338,7 +338,7 @@ + yassl_libs = @yassl_libs@ + yassl_libs_with_path = @yassl_libs_with_path@ zlib_dir = @zlib_dir@ --man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = +-man1_MANS = @man1_files@ ++man1_MANS = + EXTRA_DIST = $(man1_MANS) + all: all-am - EXTRA_DIST = mysql.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index dc5a429dac7c..ca108d3006e5 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.15 +PORTVERSION= 5.0.16 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -60,6 +60,9 @@ CONFIGURE_ARGS+=--without-innodb .if defined(WITH_ARCHIVE) CONFIGURE_ARGS+=--with-archive-storage-engine .endif +.if defined(WITH_FEDERATED) +CONFIGURE_ARGS+=--with-federated-storage-engine +.endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-ndbcluster .endif @@ -122,8 +125,8 @@ PLIST_SUB+= NDB="" PLIST_SUB+= NDB="@comment " .endif -MAN1= mysqld.1 \ - mysqld_safe.1 perror.1 replace.1 +MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ + mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql @@ -144,6 +147,7 @@ pre-fetch: @${ECHO} " (use it if you need even more speed)." @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine." + @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine." @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster." @${ECHO} "" @@ -152,7 +156,7 @@ post-patch: @${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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -172,7 +176,8 @@ LATEST_LINK= mysql50-client CONFLICTS= mysql-client-3.* mysql-client-4.* -MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 +MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ + mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -185,7 +190,7 @@ post-patch: @${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 @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @@ -211,7 +216,8 @@ LATEST_LINK= mysql50-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* -MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1 +MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ + mysqld_multi.1 mysql_fix_privilege_tables.1 SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ @@ -222,7 +228,7 @@ post-patch: @${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 + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif # Common part diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index f42ed050e333..9c7cfcf0f9b1 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1,2 +1,3 @@ -MD5 (mysql-5.0.15.tar.gz) = b19e03de0ec348552b4bfac2e215f335 -SIZE (mysql-5.0.15.tar.gz) = 18813065 +MD5 (mysql-5.0.16.tar.gz) = ecf2ae1d782a8d129af940c15a44f477 +SHA256 (mysql-5.0.16.tar.gz) = 6705e1a7426c6d233f523129ce900d084623bc0020be751aa8d30d84e7040349 +SIZE (mysql-5.0.16.tar.gz) = 19031670 diff --git a/databases/mysql60-server/files/patch-man::Makefile.in b/databases/mysql60-server/files/patch-man::Makefile.in index 0f83c2ae8cad..35f0e88ddc3d 100644 --- a/databases/mysql60-server/files/patch-man::Makefile.in +++ b/databases/mysql60-server/files/patch-man::Makefile.in @@ -1,13 +1,11 @@ ---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005 -+++ man/Makefile.in Wed Apr 6 13:10:42 2005 -@@ -333,9 +333,7 @@ - tools_dirs = @tools_dirs@ - uname_prog = @uname_prog@ +--- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 ++++ man/Makefile.in Sun Nov 27 00:09:03 2005 +@@ -338,7 +338,7 @@ + yassl_libs = @yassl_libs@ + yassl_libs_with_path = @yassl_libs_with_path@ zlib_dir = @zlib_dir@ --man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = +-man1_MANS = @man1_files@ ++man1_MANS = + EXTRA_DIST = $(man1_MANS) + all: all-am - EXTRA_DIST = mysql.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index dc5a429dac7c..ca108d3006e5 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.15 +PORTVERSION= 5.0.16 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -60,6 +60,9 @@ CONFIGURE_ARGS+=--without-innodb .if defined(WITH_ARCHIVE) CONFIGURE_ARGS+=--with-archive-storage-engine .endif +.if defined(WITH_FEDERATED) +CONFIGURE_ARGS+=--with-federated-storage-engine +.endif .if defined(WITH_NDB) CONFIGURE_ARGS+=--with-ndbcluster .endif @@ -122,8 +125,8 @@ PLIST_SUB+= NDB="" PLIST_SUB+= NDB="@comment " .endif -MAN1= mysqld.1 \ - mysqld_safe.1 perror.1 replace.1 +MAN1= myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \ + mysqld_safe.1 mysql.server.1 perror.1 replace.1 INFO= mysql @@ -144,6 +147,7 @@ pre-fetch: @${ECHO} " (use it if you need even more speed)." @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler." @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine." + @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine." @${ECHO} " WITH_NDB=yes Enable support for NDB Cluster." @${ECHO} "" @@ -152,7 +156,7 @@ post-patch: @${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|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c @@ -172,7 +176,8 @@ LATEST_LINK= mysql50-client CONFLICTS= mysql-client-3.* mysql-client-4.* -MAN1= mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1 +MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \ + mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/mysql @@ -185,7 +190,7 @@ post-patch: @${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 @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/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 @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c .if defined(WITH_PROC_SCOPE_PTH) @@ -211,7 +216,8 @@ LATEST_LINK= mysql50-scripts CONFLICTS= mysql-scripts-3.* mysql-scripts-4.* -MAN1= mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1 +MAN1= msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \ + mysqld_multi.1 mysql_fix_privilege_tables.1 SCRIPTS= msql2mysql mysql_fix_extensions mysql_setpermission \ mysql_secure_installation mysql_zap mysqlaccess \ @@ -222,7 +228,7 @@ post-patch: @${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 + @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in .endif .endif # Common part diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index f42ed050e333..9c7cfcf0f9b1 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,3 @@ -MD5 (mysql-5.0.15.tar.gz) = b19e03de0ec348552b4bfac2e215f335 -SIZE (mysql-5.0.15.tar.gz) = 18813065 +MD5 (mysql-5.0.16.tar.gz) = ecf2ae1d782a8d129af940c15a44f477 +SHA256 (mysql-5.0.16.tar.gz) = 6705e1a7426c6d233f523129ce900d084623bc0020be751aa8d30d84e7040349 +SIZE (mysql-5.0.16.tar.gz) = 19031670 diff --git a/databases/percona55-server/files/patch-man::Makefile.in b/databases/percona55-server/files/patch-man::Makefile.in index 0f83c2ae8cad..35f0e88ddc3d 100644 --- a/databases/percona55-server/files/patch-man::Makefile.in +++ b/databases/percona55-server/files/patch-man::Makefile.in @@ -1,13 +1,11 @@ ---- man/Makefile.in.orig Tue Mar 22 20:27:16 2005 -+++ man/Makefile.in Wed Apr 6 13:10:42 2005 -@@ -333,9 +333,7 @@ - tools_dirs = @tools_dirs@ - uname_prog = @uname_prog@ +--- man/Makefile.in.orig Sun Nov 27 00:09:54 2005 ++++ man/Makefile.in Sun Nov 27 00:09:03 2005 +@@ -338,7 +338,7 @@ + yassl_libs = @yassl_libs@ + yassl_libs_with_path = @yassl_libs_with_path@ zlib_dir = @zlib_dir@ --man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 \ -- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \ -- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1 -+man_MANS = +-man1_MANS = @man1_files@ ++man1_MANS = + EXTRA_DIST = $(man1_MANS) + all: all-am - EXTRA_DIST = mysql.1.in mysql_zap.1.in \ - mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \ |