Index: head/databases/percona56-server/Makefile =================================================================== --- head/databases/percona56-server/Makefile (revision 388781) +++ head/databases/percona56-server/Makefile (revision 388782) @@ -1,102 +1,102 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.22-72.0 +DISTVERSION= 5.6.24-72.2 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 56-server DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona56-client -USES= bison cmake shebangfix +USES= bison cmake perl5 shebangfix OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED OPTIONS_SUB= yes FASTMTX_DESC= Replace mutexes with spinlocks INNODBMEMCACHED_DESC= InnoDB Memcached plugin INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1 DATADIR= ${PREFIX}/share/mysql CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_EDITLINE=system \ -DWITH_LIBWRAP=1 \ -DHAVE_PAM=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif .include .if ${PORT_OPTIONS:MOPENSSL} CMAKE_ARGS+= -DWITH_SSL=bundled .endif .if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 56p CONFLICTS_INSTALL= mysql*-server-* \ mariadb*-server-* \ percona5[0-57-9]-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql MANPAGES= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql .else USES+= readline .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif .include Index: head/databases/percona56-server/distinfo =================================================================== --- head/databases/percona56-server/distinfo (revision 388781) +++ head/databases/percona56-server/distinfo (revision 388782) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.6.22-72.0.tar.gz) = 24eba36d13fbdd6c29528c32dc69b6767f0bacfba37d9de6b9637fdddccb314d -SIZE (percona-server-5.6.22-72.0.tar.gz) = 34022879 +SHA256 (percona-server-5.6.24-72.2.tar.gz) = 5aa6469f3a55fe0fd1cfe315f2f9cacb0ce318620086c93821c9000d6e25c0de +SIZE (percona-server-5.6.24-72.2.tar.gz) = 34099689 Index: head/databases/percona56-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/percona56-server/files/patch-client_CMakeLists.txt (revision 388781) +++ head/databases/percona56-server/files/patch-client_CMakeLists.txt (revision 388782) @@ -1,65 +1,65 @@ ---- client/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100 -+++ client/CMakeLists.txt 2014-03-22 21:07:36.536119132 +0100 +--- client/CMakeLists.txt.orig 2015-05-06 12:38:47.000000000 +0200 ++++ client/CMakeLists.txt 2015-06-07 18:30:20.496432000 +0200 @@ -31,17 +31,20 @@ COPY_OPENSSL_DLLS(copy_openssl_client) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) TARGET_LINK_LIBRARIES(mysql perconaserverclient) IF(UNIX) - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) + TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) @@ -50,17 +53,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc ../sql/rpl_filter.cc ../sql/sql_list.cc) TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) @@ -74,6 +81,7 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) @@ -83,11 +91,6 @@ SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade - mysqlcheck - mysqldump - mysqlimport - mysqlshow - mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) Index: head/databases/percona56-server/pkg-plist =================================================================== --- head/databases/percona56-server/pkg-plist (revision 388781) +++ head/databases/percona56-server/pkg-plist (revision 388782) @@ -1,154 +1,155 @@ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_convert_table_format bin/mysql_fix_extensions bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/perror bin/replace bin/resolve_stack_dump bin/resolveip lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/audit_log.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/handlersocket.so %%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libfnv1a_udf.so lib/mysql/plugin/libfnv_udf.so %%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so lib/mysql/plugin/libmurmur_udf.so lib/mysql/plugin/mypluglib.so +lib/mysql/plugin/mysql_no_login.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/scalability_metrics.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/validate_password.so libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_zap.1.gz man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqlman.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dictionary.txt %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/innodb_memcached_config.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/my-default.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_security_commands.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/tests/suite/query_response_time/basic.result %%DATADIR%%/tests/suite/query_response_time/basic.test %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-begin.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result %%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.test %%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.result %%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.test %%DATADIR%%/tests/suite/query_response_time/query_response_time.inc %%DATADIR%%/tests/suite/query_response_time/query_response_time.result %%DATADIR%%/tests/suite/query_response_time/query_response_time.test %%DATADIR%%/tests/suite/query_response_time/suite.opt %%DATADIR%%/tests/suite/query_response_time/suite.pm %%DATADIR%%/ukrainian/errmsg.sys @dir(mysql,mysql,) /var/db/mysql