diff options
| author | ale <ale@FreeBSD.org> | 2008-04-22 04:34:32 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2008-04-22 04:34:32 +0800 |
| commit | dca583ac390f7291405c97f6897b42d7a54e9c70 (patch) | |
| tree | f0acc025e0ace4e39aaab95e307f2db2f094d8fe | |
| parent | 4b7cba56a0c9145db7743f85b76f44267bb9091e (diff) | |
| download | freebsd-ports-gnome-dca583ac390f7291405c97f6897b42d7a54e9c70.tar.gz freebsd-ports-gnome-dca583ac390f7291405c97f6897b42d7a54e9c70.tar.zst freebsd-ports-gnome-dca583ac390f7291405c97f6897b42d7a54e9c70.zip | |
- Update to 5.1.24 release
- Fix my.cnf search path [1]
PR: ports/121900 [1]
Submitted by: Yarema <yds@CoolRat.org> [1]
20 files changed, 95 insertions, 90 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 24aabf6aa678..954319b87fd3 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.23 +PORTVERSION= 5.1.24 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -129,7 +129,6 @@ post-patch: @${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 @${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in` .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc @@ -164,7 +163,6 @@ post-patch: @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|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 post-install: ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 41af34454d24..1b7a101a6803 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.23-rc.tar.gz) = d6ca3009eee24a8e396b8f667b3bd8df -SHA256 (mysql-5.1.23-rc.tar.gz) = 713ca3fa746d99618833ed314868d294e308b38419aa4c72eb64deda97799fec -SIZE (mysql-5.1.23-rc.tar.gz) = 27263946 +MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a +SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560 +SIZE (mysql-5.1.24-rc.tar.gz) = 27501156 diff --git a/databases/mysql51-server/files/patch-mysys_default.c b/databases/mysql51-server/files/patch-mysys_default.c index 66605f0694f9..a202932767ea 100644 --- a/databases/mysql51-server/files/patch-mysys_default.c +++ b/databases/mysql51-server/files/patch-mysys_default.c @@ -1,5 +1,5 @@ ---- mysys/default.c.orig 2008-01-29 22:41:43.000000000 +0100 -+++ mysys/default.c 2008-02-14 11:03:21.000000000 +0100 +--- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200 ++++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200 @@ -623,7 +623,7 @@ { MY_STAT stat_info; @@ -9,12 +9,11 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -1102,6 +1102,8 @@ - bzero((char *) default_directories, sizeof(default_directories)); - ADD_DIRECTORY("/etc/"); - ADD_DIRECTORY("/etc/mysql/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/mysql/"); +@@ -1105,6 +1105,7 @@ #ifdef DEFAULT_SYSCONFDIR if (DEFAULT_SYSCONFDIR != "") ADD_DIRECTORY(DEFAULT_SYSCONFDIR); ++ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/"); + #endif + ADD_COMMON_DIRECTORIES(); + ADD_DIRECTORY("~/"); diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 78edbfb25588..e37f1604c53f 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -61,10 +61,6 @@ bin/resolveip %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h -lib/mysql/ha_example.a -lib/mysql/ha_example.la -lib/mysql/ha_example.so -lib/mysql/ha_example.so.0 lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a @@ -76,10 +72,15 @@ lib/mysql/libmysys.a %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a +lib/mysql/plugin/ha_example.a +lib/mysql/plugin/ha_example.la +lib/mysql/plugin/ha_example.so +lib/mysql/plugin/ha_example.so.0 libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd +%%DATADIR%%/ChangeLog %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README @@ -107,6 +108,9 @@ libexec/mysqld %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/config.huge.ini +%%DATADIR%%/config.medium.ini +%%DATADIR%%/config.small.ini %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 24aabf6aa678..954319b87fd3 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.23 +PORTVERSION= 5.1.24 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -129,7 +129,6 @@ post-patch: @${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 @${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in` .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc @@ -164,7 +163,6 @@ post-patch: @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|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 post-install: ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 41af34454d24..1b7a101a6803 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.23-rc.tar.gz) = d6ca3009eee24a8e396b8f667b3bd8df -SHA256 (mysql-5.1.23-rc.tar.gz) = 713ca3fa746d99618833ed314868d294e308b38419aa4c72eb64deda97799fec -SIZE (mysql-5.1.23-rc.tar.gz) = 27263946 +MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a +SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560 +SIZE (mysql-5.1.24-rc.tar.gz) = 27501156 diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c index 66605f0694f9..a202932767ea 100644 --- a/databases/mysql54-server/files/patch-mysys_default.c +++ b/databases/mysql54-server/files/patch-mysys_default.c @@ -1,5 +1,5 @@ ---- mysys/default.c.orig 2008-01-29 22:41:43.000000000 +0100 -+++ mysys/default.c 2008-02-14 11:03:21.000000000 +0100 +--- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200 ++++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200 @@ -623,7 +623,7 @@ { MY_STAT stat_info; @@ -9,12 +9,11 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -1102,6 +1102,8 @@ - bzero((char *) default_directories, sizeof(default_directories)); - ADD_DIRECTORY("/etc/"); - ADD_DIRECTORY("/etc/mysql/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/mysql/"); +@@ -1105,6 +1105,7 @@ #ifdef DEFAULT_SYSCONFDIR if (DEFAULT_SYSCONFDIR != "") ADD_DIRECTORY(DEFAULT_SYSCONFDIR); ++ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/"); + #endif + ADD_COMMON_DIRECTORIES(); + ADD_DIRECTORY("~/"); diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 78edbfb25588..e37f1604c53f 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -61,10 +61,6 @@ bin/resolveip %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h -lib/mysql/ha_example.a -lib/mysql/ha_example.la -lib/mysql/ha_example.so -lib/mysql/ha_example.so.0 lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a @@ -76,10 +72,15 @@ lib/mysql/libmysys.a %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a +lib/mysql/plugin/ha_example.a +lib/mysql/plugin/ha_example.la +lib/mysql/plugin/ha_example.so +lib/mysql/plugin/ha_example.so.0 libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd +%%DATADIR%%/ChangeLog %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README @@ -107,6 +108,9 @@ libexec/mysqld %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/config.huge.ini +%%DATADIR%%/config.medium.ini +%%DATADIR%%/config.small.ini %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 24aabf6aa678..954319b87fd3 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.23 +PORTVERSION= 5.1.24 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -129,7 +129,6 @@ post-patch: @${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 @${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in` .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc @@ -164,7 +163,6 @@ post-patch: @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|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 post-install: ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 41af34454d24..1b7a101a6803 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.23-rc.tar.gz) = d6ca3009eee24a8e396b8f667b3bd8df -SHA256 (mysql-5.1.23-rc.tar.gz) = 713ca3fa746d99618833ed314868d294e308b38419aa4c72eb64deda97799fec -SIZE (mysql-5.1.23-rc.tar.gz) = 27263946 +MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a +SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560 +SIZE (mysql-5.1.24-rc.tar.gz) = 27501156 diff --git a/databases/mysql55-server/files/patch-mysys_default.c b/databases/mysql55-server/files/patch-mysys_default.c index 66605f0694f9..a202932767ea 100644 --- a/databases/mysql55-server/files/patch-mysys_default.c +++ b/databases/mysql55-server/files/patch-mysys_default.c @@ -1,5 +1,5 @@ ---- mysys/default.c.orig 2008-01-29 22:41:43.000000000 +0100 -+++ mysys/default.c 2008-02-14 11:03:21.000000000 +0100 +--- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200 ++++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200 @@ -623,7 +623,7 @@ { MY_STAT stat_info; @@ -9,12 +9,11 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -1102,6 +1102,8 @@ - bzero((char *) default_directories, sizeof(default_directories)); - ADD_DIRECTORY("/etc/"); - ADD_DIRECTORY("/etc/mysql/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/mysql/"); +@@ -1105,6 +1105,7 @@ #ifdef DEFAULT_SYSCONFDIR if (DEFAULT_SYSCONFDIR != "") ADD_DIRECTORY(DEFAULT_SYSCONFDIR); ++ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/"); + #endif + ADD_COMMON_DIRECTORIES(); + ADD_DIRECTORY("~/"); diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 78edbfb25588..e37f1604c53f 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -61,10 +61,6 @@ bin/resolveip %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h -lib/mysql/ha_example.a -lib/mysql/ha_example.la -lib/mysql/ha_example.so -lib/mysql/ha_example.so.0 lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a @@ -76,10 +72,15 @@ lib/mysql/libmysys.a %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a +lib/mysql/plugin/ha_example.a +lib/mysql/plugin/ha_example.la +lib/mysql/plugin/ha_example.so +lib/mysql/plugin/ha_example.so.0 libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd +%%DATADIR%%/ChangeLog %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README @@ -107,6 +108,9 @@ libexec/mysqld %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/config.huge.ini +%%DATADIR%%/config.medium.ini +%%DATADIR%%/config.small.ini %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 24aabf6aa678..954319b87fd3 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.23 +PORTVERSION= 5.1.24 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -129,7 +129,6 @@ post-patch: @${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 @${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in` .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc @@ -164,7 +163,6 @@ post-patch: @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|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 post-install: ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index 41af34454d24..1b7a101a6803 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.23-rc.tar.gz) = d6ca3009eee24a8e396b8f667b3bd8df -SHA256 (mysql-5.1.23-rc.tar.gz) = 713ca3fa746d99618833ed314868d294e308b38419aa4c72eb64deda97799fec -SIZE (mysql-5.1.23-rc.tar.gz) = 27263946 +MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a +SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560 +SIZE (mysql-5.1.24-rc.tar.gz) = 27501156 diff --git a/databases/mysql60-server/files/patch-mysys_default.c b/databases/mysql60-server/files/patch-mysys_default.c index 66605f0694f9..a202932767ea 100644 --- a/databases/mysql60-server/files/patch-mysys_default.c +++ b/databases/mysql60-server/files/patch-mysys_default.c @@ -1,5 +1,5 @@ ---- mysys/default.c.orig 2008-01-29 22:41:43.000000000 +0100 -+++ mysys/default.c 2008-02-14 11:03:21.000000000 +0100 +--- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200 ++++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200 @@ -623,7 +623,7 @@ { MY_STAT stat_info; @@ -9,12 +9,11 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -1102,6 +1102,8 @@ - bzero((char *) default_directories, sizeof(default_directories)); - ADD_DIRECTORY("/etc/"); - ADD_DIRECTORY("/etc/mysql/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/mysql/"); +@@ -1105,6 +1105,7 @@ #ifdef DEFAULT_SYSCONFDIR if (DEFAULT_SYSCONFDIR != "") ADD_DIRECTORY(DEFAULT_SYSCONFDIR); ++ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/"); + #endif + ADD_COMMON_DIRECTORIES(); + ADD_DIRECTORY("~/"); diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 78edbfb25588..e37f1604c53f 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -61,10 +61,6 @@ bin/resolveip %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h -lib/mysql/ha_example.a -lib/mysql/ha_example.la -lib/mysql/ha_example.so -lib/mysql/ha_example.so.0 lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a @@ -76,10 +72,15 @@ lib/mysql/libmysys.a %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a +lib/mysql/plugin/ha_example.a +lib/mysql/plugin/ha_example.la +lib/mysql/plugin/ha_example.so +lib/mysql/plugin/ha_example.so.0 libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd +%%DATADIR%%/ChangeLog %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README @@ -107,6 +108,9 @@ libexec/mysqld %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/config.huge.ini +%%DATADIR%%/config.medium.ini +%%DATADIR%%/config.small.ini %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 24aabf6aa678..954319b87fd3 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 5.1.23 +PORTVERSION= 5.1.24 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -129,7 +129,6 @@ post-patch: @${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 @${REINPLACE_CMD} -e "/^AM_CXXFLAGS/s|=.*|+= \$$(NDB_CXXFLAGS)|" `${FIND} ${WRKSRC}/storage/ndb -name Makefile.in` .if defined(WITH_PROC_SCOPE_PTH) @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc @@ -164,7 +163,6 @@ post-patch: @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g;s|man8_MANS =|man8_MANS = ${MAN8}|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 post-install: ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 41af34454d24..1b7a101a6803 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,3 +1,3 @@ -MD5 (mysql-5.1.23-rc.tar.gz) = d6ca3009eee24a8e396b8f667b3bd8df -SHA256 (mysql-5.1.23-rc.tar.gz) = 713ca3fa746d99618833ed314868d294e308b38419aa4c72eb64deda97799fec -SIZE (mysql-5.1.23-rc.tar.gz) = 27263946 +MD5 (mysql-5.1.24-rc.tar.gz) = 5f75d7593af35be125fa3fc21509337a +SHA256 (mysql-5.1.24-rc.tar.gz) = 2e94942604bf8b4546be27b138991b2974ccc6a508866ae53f51a451c2cad560 +SIZE (mysql-5.1.24-rc.tar.gz) = 27501156 diff --git a/databases/percona55-server/files/patch-mysys_default.c b/databases/percona55-server/files/patch-mysys_default.c index 66605f0694f9..a202932767ea 100644 --- a/databases/percona55-server/files/patch-mysys_default.c +++ b/databases/percona55-server/files/patch-mysys_default.c @@ -1,5 +1,5 @@ ---- mysys/default.c.orig 2008-01-29 22:41:43.000000000 +0100 -+++ mysys/default.c 2008-02-14 11:03:21.000000000 +0100 +--- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200 ++++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200 @@ -623,7 +623,7 @@ { MY_STAT stat_info; @@ -9,12 +9,11 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -1102,6 +1102,8 @@ - bzero((char *) default_directories, sizeof(default_directories)); - ADD_DIRECTORY("/etc/"); - ADD_DIRECTORY("/etc/mysql/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/"); -+ ADD_DIRECTORY("%%PREFIX%%/etc/mysql/"); +@@ -1105,6 +1105,7 @@ #ifdef DEFAULT_SYSCONFDIR if (DEFAULT_SYSCONFDIR != "") ADD_DIRECTORY(DEFAULT_SYSCONFDIR); ++ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/"); + #endif + ADD_COMMON_DIRECTORIES(); + ADD_DIRECTORY("~/"); diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 78edbfb25588..e37f1604c53f 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -61,10 +61,6 @@ bin/resolveip %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h -lib/mysql/ha_example.a -lib/mysql/ha_example.la -lib/mysql/ha_example.so -lib/mysql/ha_example.so.0 lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a @@ -76,10 +72,15 @@ lib/mysql/libmysys.a %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a +lib/mysql/plugin/ha_example.a +lib/mysql/plugin/ha_example.la +lib/mysql/plugin/ha_example.so +lib/mysql/plugin/ha_example.so.0 libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd +%%DATADIR%%/ChangeLog %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README @@ -107,6 +108,9 @@ libexec/mysqld %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/config.huge.ini +%%DATADIR%%/config.medium.ini +%%DATADIR%%/config.small.ini %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys |