diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2006-08-06 19:43:47 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2006-08-06 19:43:47 +0000 |
commit | cf48b90ff60674a9a5b0b741c656051ab853f479 (patch) | |
tree | dccfd9d8a4557cdf1edade109d0091cf7b8dff50 /databases | |
parent | eb2c4e06a905addd8ef8034b6f95f8d235913528 (diff) | |
download | ports-cf48b90ff60674a9a5b0b741c656051ab853f479.tar.gz ports-cf48b90ff60674a9a5b0b741c656051ab853f479.zip |
Notes
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mysql50-server/Makefile | 4 | ||||
-rw-r--r-- | databases/mysql50-server/distinfo | 6 | ||||
-rw-r--r-- | databases/mysql50-server/files/patch-scripts::Makefile.in | 12 | ||||
-rw-r--r-- | databases/mysql50-server/files/patch-sql::mysqld.cc | 9 | ||||
-rw-r--r-- | databases/mysql50-server/pkg-plist | 2 | ||||
-rw-r--r-- | databases/mysql50-server/pkg-plist.client | 1 |
6 files changed, 13 insertions, 21 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 35c6f528ebb1..9a98a36c2a12 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.22 +PORTVERSION= 5.0.24 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -151,7 +151,7 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @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_upgrade mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in + @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade_shell 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|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 diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 8232f4065bd9..1e82d3b7ffb0 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.0.22.tar.gz) = b0533dce52a3147234e588f51affbcab -SHA256 (mysql-5.0.22.tar.gz) = e744e64b8bd8c0c51969d68e5a502f5c4708ed0eda41fdf7a4d27344116af75f -SIZE (mysql-5.0.22.tar.gz) = 19542405 +MD5 (mysql-5.0.24.tar.gz) = df7026f7d5daf7fbcf5e684c534cec15 +SHA256 (mysql-5.0.24.tar.gz) = 6a7bc19c7f102e145bf341a5dbf1e74018b2657c47f37b570cc7a9096040e4c6 +SIZE (mysql-5.0.24.tar.gz) = 19974920 diff --git a/databases/mysql50-server/files/patch-scripts::Makefile.in b/databases/mysql50-server/files/patch-scripts::Makefile.in index 81d5185703dc..1a485aa32471 100644 --- a/databases/mysql50-server/files/patch-scripts::Makefile.in +++ b/databases/mysql50-server/files/patch-scripts::Makefile.in @@ -1,7 +1,7 @@ ---- scripts/Makefile.in.orig Sat Mar 4 21:36:58 2006 -+++ scripts/Makefile.in Thu Mar 16 08:22:23 2006 -@@ -344,25 +344,7 @@ - yassl_libs_with_path = @yassl_libs_with_path@ +--- scripts/Makefile.in.orig Thu Jul 27 20:53:32 2006 ++++ scripts/Makefile.in Sun Aug 6 20:28:13 2006 +@@ -351,25 +351,7 @@ + yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -bin_SCRIPTS = @server_scripts@ \ @@ -20,14 +20,14 @@ - mysqldumpslow \ - mysql_explain_log \ - mysql_tableinfo \ -- mysql_upgrade \ +- mysql_upgrade_shell \ - mysqld_multi \ - mysql_create_system_tables +bin_SCRIPTS = noinst_SCRIPTS = make_binary_distribution \ make_sharedlib_distribution \ -@@ -396,7 +378,7 @@ +@@ -403,7 +385,7 @@ mysqlaccess.conf \ mysqlbug diff --git a/databases/mysql50-server/files/patch-sql::mysqld.cc b/databases/mysql50-server/files/patch-sql::mysqld.cc index b44e7d1e1a0e..4feed825cb11 100644 --- a/databases/mysql50-server/files/patch-sql::mysqld.cc +++ b/databases/mysql50-server/files/patch-sql::mysqld.cc @@ -1,14 +1,5 @@ --- sql/mysqld.cc.orig Sat Aug 6 03:39:41 2005 +++ sql/mysqld.cc Sun Aug 28 20:41:38 2005 -@@ -121,7 +121,7 @@ - #endif /* __WIN__ */ - - #ifdef HAVE_LIBWRAP --#include <tcpd.h> -+#include "mytcpd.h" - #include <syslog.h> - #ifdef NEED_SYS_SYSLOG_H - #include <sys/syslog.h> @@ -3177,7 +3177,7 @@ init_ssl(); diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index e26fa0ffa37f..29380181a6c9 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -9,7 +9,7 @@ bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db bin/mysql_tzinfo_to_sql -bin/mysql_upgrade +bin/mysql_upgrade_shell bin/mysql_waitpid bin/mysqld_safe %%NDB%%bin/ndb_config diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client index 2eb163408b02..006ef6a35bd3 100644 --- a/databases/mysql50-server/pkg-plist.client +++ b/databases/mysql50-server/pkg-plist.client @@ -1,6 +1,7 @@ bin/mysql bin/mysql_config bin/mysql_fix_privilege_tables +bin/mysql_upgrade bin/mysqladmin bin/mysqlbinlog bin/mysqlbug |