diff options
30 files changed, 120 insertions, 102 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index 3ef94d6ca7c3..3b28b485b1af 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.9 -PORTREVISION?= 1 +PORTVERSION= 5.0.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.0 @@ -115,7 +115,6 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= VER=${PORTVERSION}-beta .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 4989cc739f3e..d14c9d657a4b 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c -SIZE (mysql-5.0.9-beta.tar.gz) = 18615183 +MD5 (mysql-5.0.11-beta.tar.gz) = ea8190373f7ea39e730f201161a01fa1 +SIZE (mysql-5.0.11-beta.tar.gz) = 18814262 diff --git a/databases/mysql50-server/files/patch-sql::mysqld.cc b/databases/mysql50-server/files/patch-sql::mysqld.cc index e79f985fcb69..b44e7d1e1a0e 100644 --- a/databases/mysql50-server/files/patch-sql::mysqld.cc +++ b/databases/mysql50-server/files/patch-sql::mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 -+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 -@@ -128,7 +128,7 @@ +--- 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 @@ -9,3 +9,12 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> +@@ -3177,7 +3177,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *) my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index 9f12dd17a3fb..9d4fdf66f7f1 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -10,6 +10,7 @@ bin/mysql_install_db bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +%%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index @@ -67,12 +68,7 @@ libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd -%%DATADIR%%/Description.plist -%%DATADIR%%/Info.plist -%%DATADIR%%/MySQL-shared-compat.spec -%%DATADIR%%/StartupParameters.plist -%%DATADIR%%/postinstall -%%DATADIR%%/preinstall +%%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -121,7 +117,6 @@ libexec/mysqld %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql-%%VER%%.spec %%DATADIR%%/mysql.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client index acc408a80967..227ca424c59c 100644 --- a/databases/mysql50-server/pkg-plist.client +++ b/databases/mysql50-server/pkg-plist.client @@ -45,10 +45,10 @@ include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.14 +lib/mysql/libmysqlclient.so.15 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.14 +lib/mysql/libmysqlclient_r.so.15 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index 3ef94d6ca7c3..3b28b485b1af 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.9 -PORTREVISION?= 1 +PORTVERSION= 5.0.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.0 @@ -115,7 +115,6 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= VER=${PORTVERSION}-beta .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 4989cc739f3e..d14c9d657a4b 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c -SIZE (mysql-5.0.9-beta.tar.gz) = 18615183 +MD5 (mysql-5.0.11-beta.tar.gz) = ea8190373f7ea39e730f201161a01fa1 +SIZE (mysql-5.0.11-beta.tar.gz) = 18814262 diff --git a/databases/mysql51-server/files/patch-sql::mysqld.cc b/databases/mysql51-server/files/patch-sql::mysqld.cc index e79f985fcb69..b44e7d1e1a0e 100644 --- a/databases/mysql51-server/files/patch-sql::mysqld.cc +++ b/databases/mysql51-server/files/patch-sql::mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 -+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 -@@ -128,7 +128,7 @@ +--- 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 @@ -9,3 +9,12 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> +@@ -3177,7 +3177,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *) my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index 9f12dd17a3fb..9d4fdf66f7f1 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -10,6 +10,7 @@ bin/mysql_install_db bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +%%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index @@ -67,12 +68,7 @@ libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd -%%DATADIR%%/Description.plist -%%DATADIR%%/Info.plist -%%DATADIR%%/MySQL-shared-compat.spec -%%DATADIR%%/StartupParameters.plist -%%DATADIR%%/postinstall -%%DATADIR%%/preinstall +%%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -121,7 +117,6 @@ libexec/mysqld %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql-%%VER%%.spec %%DATADIR%%/mysql.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client index acc408a80967..227ca424c59c 100644 --- a/databases/mysql51-server/pkg-plist.client +++ b/databases/mysql51-server/pkg-plist.client @@ -45,10 +45,10 @@ include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.14 +lib/mysql/libmysqlclient.so.15 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.14 +lib/mysql/libmysqlclient_r.so.15 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index 3ef94d6ca7c3..3b28b485b1af 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.9 -PORTREVISION?= 1 +PORTVERSION= 5.0.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.0 @@ -115,7 +115,6 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= VER=${PORTVERSION}-beta .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 4989cc739f3e..d14c9d657a4b 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c -SIZE (mysql-5.0.9-beta.tar.gz) = 18615183 +MD5 (mysql-5.0.11-beta.tar.gz) = ea8190373f7ea39e730f201161a01fa1 +SIZE (mysql-5.0.11-beta.tar.gz) = 18814262 diff --git a/databases/mysql54-server/files/patch-sql::mysqld.cc b/databases/mysql54-server/files/patch-sql::mysqld.cc index e79f985fcb69..b44e7d1e1a0e 100644 --- a/databases/mysql54-server/files/patch-sql::mysqld.cc +++ b/databases/mysql54-server/files/patch-sql::mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 -+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 -@@ -128,7 +128,7 @@ +--- 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 @@ -9,3 +9,12 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> +@@ -3177,7 +3177,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *) my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index 9f12dd17a3fb..9d4fdf66f7f1 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -10,6 +10,7 @@ bin/mysql_install_db bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +%%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index @@ -67,12 +68,7 @@ libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd -%%DATADIR%%/Description.plist -%%DATADIR%%/Info.plist -%%DATADIR%%/MySQL-shared-compat.spec -%%DATADIR%%/StartupParameters.plist -%%DATADIR%%/postinstall -%%DATADIR%%/preinstall +%%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -121,7 +117,6 @@ libexec/mysqld %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql-%%VER%%.spec %%DATADIR%%/mysql.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client index acc408a80967..227ca424c59c 100644 --- a/databases/mysql54-server/pkg-plist.client +++ b/databases/mysql54-server/pkg-plist.client @@ -45,10 +45,10 @@ include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.14 +lib/mysql/libmysqlclient.so.15 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.14 +lib/mysql/libmysqlclient_r.so.15 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 3ef94d6ca7c3..3b28b485b1af 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.9 -PORTREVISION?= 1 +PORTVERSION= 5.0.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.0 @@ -115,7 +115,6 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= VER=${PORTVERSION}-beta .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 4989cc739f3e..d14c9d657a4b 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c -SIZE (mysql-5.0.9-beta.tar.gz) = 18615183 +MD5 (mysql-5.0.11-beta.tar.gz) = ea8190373f7ea39e730f201161a01fa1 +SIZE (mysql-5.0.11-beta.tar.gz) = 18814262 diff --git a/databases/mysql55-server/files/patch-sql::mysqld.cc b/databases/mysql55-server/files/patch-sql::mysqld.cc index e79f985fcb69..b44e7d1e1a0e 100644 --- a/databases/mysql55-server/files/patch-sql::mysqld.cc +++ b/databases/mysql55-server/files/patch-sql::mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 -+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 -@@ -128,7 +128,7 @@ +--- 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 @@ -9,3 +9,12 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> +@@ -3177,7 +3177,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *) my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index 9f12dd17a3fb..9d4fdf66f7f1 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -10,6 +10,7 @@ bin/mysql_install_db bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +%%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index @@ -67,12 +68,7 @@ libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd -%%DATADIR%%/Description.plist -%%DATADIR%%/Info.plist -%%DATADIR%%/MySQL-shared-compat.spec -%%DATADIR%%/StartupParameters.plist -%%DATADIR%%/postinstall -%%DATADIR%%/preinstall +%%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -121,7 +117,6 @@ libexec/mysqld %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql-%%VER%%.spec %%DATADIR%%/mysql.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client index acc408a80967..227ca424c59c 100644 --- a/databases/mysql55-server/pkg-plist.client +++ b/databases/mysql55-server/pkg-plist.client @@ -45,10 +45,10 @@ include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.14 +lib/mysql/libmysqlclient.so.15 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.14 +lib/mysql/libmysqlclient_r.so.15 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 3ef94d6ca7c3..3b28b485b1af 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.9 -PORTREVISION?= 1 +PORTVERSION= 5.0.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.0 @@ -115,7 +115,6 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= VER=${PORTVERSION}-beta .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index 4989cc739f3e..d14c9d657a4b 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c -SIZE (mysql-5.0.9-beta.tar.gz) = 18615183 +MD5 (mysql-5.0.11-beta.tar.gz) = ea8190373f7ea39e730f201161a01fa1 +SIZE (mysql-5.0.11-beta.tar.gz) = 18814262 diff --git a/databases/mysql60-server/files/patch-sql::mysqld.cc b/databases/mysql60-server/files/patch-sql::mysqld.cc index e79f985fcb69..b44e7d1e1a0e 100644 --- a/databases/mysql60-server/files/patch-sql::mysqld.cc +++ b/databases/mysql60-server/files/patch-sql::mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 -+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 -@@ -128,7 +128,7 @@ +--- 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 @@ -9,3 +9,12 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> +@@ -3177,7 +3177,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *) my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index 9f12dd17a3fb..9d4fdf66f7f1 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -10,6 +10,7 @@ bin/mysql_install_db bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +%%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index @@ -67,12 +68,7 @@ libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd -%%DATADIR%%/Description.plist -%%DATADIR%%/Info.plist -%%DATADIR%%/MySQL-shared-compat.spec -%%DATADIR%%/StartupParameters.plist -%%DATADIR%%/postinstall -%%DATADIR%%/preinstall +%%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -121,7 +117,6 @@ libexec/mysqld %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql-%%VER%%.spec %%DATADIR%%/mysql.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client index acc408a80967..227ca424c59c 100644 --- a/databases/mysql60-server/pkg-plist.client +++ b/databases/mysql60-server/pkg-plist.client @@ -45,10 +45,10 @@ include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.14 +lib/mysql/libmysqlclient.so.15 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.14 +lib/mysql/libmysqlclient_r.so.15 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index 3ef94d6ca7c3..3b28b485b1af 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.9 -PORTREVISION?= 1 +PORTVERSION= 5.0.11 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.0 @@ -115,7 +115,6 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= VER=${PORTVERSION}-beta .if defined(WITH_NDB) PLIST_SUB+= NDB="" .else diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 4989cc739f3e..d14c9d657a4b 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.9-beta.tar.gz) = 8899d591d549d1d8ca61f5741bff490c -SIZE (mysql-5.0.9-beta.tar.gz) = 18615183 +MD5 (mysql-5.0.11-beta.tar.gz) = ea8190373f7ea39e730f201161a01fa1 +SIZE (mysql-5.0.11-beta.tar.gz) = 18814262 diff --git a/databases/percona55-server/files/patch-sql::mysqld.cc b/databases/percona55-server/files/patch-sql::mysqld.cc index e79f985fcb69..b44e7d1e1a0e 100644 --- a/databases/percona55-server/files/patch-sql::mysqld.cc +++ b/databases/percona55-server/files/patch-sql::mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig Tue Dec 14 13:40:36 2004 -+++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 -@@ -128,7 +128,7 @@ +--- 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 @@ -9,3 +9,12 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> +@@ -3177,7 +3177,7 @@ + init_ssl(); + + #ifdef HAVE_LIBWRAP +- libwrapName= my_progname+dirname_length(my_progname); ++ libwrapName= (char *) my_progname+dirname_length(my_progname); + openlog(libwrapName, LOG_PID, LOG_AUTH); + #endif + diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index 9f12dd17a3fb..9d4fdf66f7f1 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -10,6 +10,7 @@ bin/mysql_install_db bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +%%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index @@ -67,12 +68,7 @@ libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd -%%DATADIR%%/Description.plist -%%DATADIR%%/Info.plist -%%DATADIR%%/MySQL-shared-compat.spec -%%DATADIR%%/StartupParameters.plist -%%DATADIR%%/postinstall -%%DATADIR%%/preinstall +%%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -121,7 +117,6 @@ libexec/mysqld %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate -%%DATADIR%%/mysql-%%VER%%.spec %%DATADIR%%/mysql.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client index acc408a80967..227ca424c59c 100644 --- a/databases/percona55-server/pkg-plist.client +++ b/databases/percona55-server/pkg-plist.client @@ -45,10 +45,10 @@ include/mysql/sslopt-vars.h include/mysql/typelib.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.14 +lib/mysql/libmysqlclient.so.15 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.14 +lib/mysql/libmysqlclient_r.so.15 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql |