Index: branches/2016Q3/databases/percona56-server/Makefile =================================================================== --- branches/2016Q3/databases/percona56-server/Makefile (revision 421983) +++ branches/2016Q3/databases/percona56-server/Makefile (revision 421984) @@ -1,104 +1,112 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.29-76.2 +DISTVERSION= 5.6.32-78.0 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) BROKEN_powerpc64= Does not build SLAVEDIRS= databases/percona56-client USES= bison cmake perl5 shebangfix OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED -OPTIONS_SUB= yes +OPTIONS_SUB= yes FASTMTX_DESC= Replace mutexes with spinlocks -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 -INNODBMEMCACHED_DESC= InnoDB Memcached plugin -INNODBMEMCACHED_CMAKE_ON=-DWITH_INNODB_MEMCACHED=1 -OPENSSL_CMAKE_ON= -DWITH_SSL=bundled +FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +INNODBMEMCACHED_DESC= InnoDB Memcached plugin +INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1 +OPENSSL_CMAKE_ON= -DWITH_SSL=bundled TOKUDB_DESC= TokuDB Engine (experimental) -TOKUDB_CMAKE_ON=-DUSE_CTAGS=0 -TOKUDB_VARS= ONLY_FOR_ARCHS="amd64" \ - ONLY_FOR_ARCHS_REASON="TokuDB engine does not compile on ${ARCH}" +TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb 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 - # MySQL-Server part .if !defined(CLIENT_ONLY) -USE_MYSQL= yes -WANT_MYSQL_VER= 56p +USES+=mysql: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+= libedit .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif + +.if ${PORT_OPTIONS:MTOKUDB} +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON= TokuDB not supported on 32-bit platforms, see \ + https://github.com/percona/PerconaFT/blob/master/README.md + +.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 1000000 +IGNORE= unsupported on FreeBSD 9 or older +.endif + +.endif + .include Index: branches/2016Q3/databases/percona56-server/distinfo =================================================================== --- branches/2016Q3/databases/percona56-server/distinfo (revision 421983) +++ branches/2016Q3/databases/percona56-server/distinfo (revision 421984) @@ -1,2 +1,3 @@ -SHA256 (percona-server-5.6.29-76.2.tar.gz) = 23217feafc92222f313aeeb6e1806d110c35e50cf0b5f74510a9f8babe22e4b9 -SIZE (percona-server-5.6.29-76.2.tar.gz) = 55032788 +TIMESTAMP = 1472237462 +SHA256 (percona-server-5.6.32-78.0.tar.gz) = b3f9191dd8660ba4f825c5fa8fa470e66417335ad8455e31bbc2d5f2cac1a923 +SIZE (percona-server-5.6.32-78.0.tar.gz) = 55120585 Index: branches/2016Q3/databases/percona56-server/files/extrapatch-tokudb =================================================================== --- branches/2016Q3/databases/percona56-server/files/extrapatch-tokudb (revision 421983) +++ branches/2016Q3/databases/percona56-server/files/extrapatch-tokudb (revision 421984) @@ -1,62 +1,92 @@ --- storage/tokudb/CMakeLists.txt.orig 2016-03-03 15:32:33.000000000 +0200 +++ storage/tokudb/CMakeLists.txt 2016-03-08 10:13:58.000000000 +0200 @@ -1,6 +1,6 @@ SET(TOKUDB_VERSION 5.6.29-76.2) # PerconaFT only supports x86-64 and cmake-2.8.9+ -IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND +IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" AND NOT CMAKE_VERSION VERSION_LESS "2.8.9") CHECK_CXX_SOURCE_COMPILES( " @@ -118,5 +118,5 @@ tokudb_thread.cc) MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++) -SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") -SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") +SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ") +SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ") --- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig 2016-03-03 15:31:53.000000000 +0200 +++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt 2016-03-10 11:13:23.772664272 +0200 @@ -69,7 +69,7 @@ endif () endfunction(add_space_separated_property) -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG") if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") endif () --- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig 2016-03-03 15:31:53.000000000 +0200 +++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc 2016-03-08 10:40:07.000000000 +0200 @@ -85,7 +85,7 @@ if (oflag & O_CREAT) { va_list ap; va_start(ap, oflag); - mode_t mode = va_arg(ap, mode_t); + mode_t mode = va_arg(ap, int); va_end(ap); the_manager.lock_file_op(); fd = call_real_open(file, oflag, mode); --- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig 2016-03-03 15:31:53.000000000 +0200 +++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc 2016-03-08 10:37:19.000000000 +0200 @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include "source_file.h" --- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig 2016-03-03 15:31:53.000000000 +0200 +++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc 2016-03-08 10:38:58.000000000 +0200 @@ -104,7 +104,7 @@ if (oflag & O_CREAT) { va_list op; va_start(op, oflag); - mode_t mode = va_arg(op, mode_t); + mode_t mode = va_arg(op, int); va_end(op); return real_open(file, oflag, mode); } else { +--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2016-06-30 13:35:08.000000000 +0200 ++++ storage/tokudb/PerconaFT/CMakeLists.txt 2016-07-29 23:07:37.871068000 +0200 +@@ -82,7 +82,7 @@ + + install( + FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS +- DESTINATION . ++ DESTINATION ${INSTALL_DOCDIR} + COMPONENT tokukv_misc + ) + +--- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2016-07-29 23:30:26.557847000 +0200 ++++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt 2016-07-29 23:30:32.695950000 +0200 +@@ -1,6 +1,6 @@ + set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "") + +-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh + out=$1; shift + exec \"$@\" >$out") + +@@ -8,7 +8,7 @@ + set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h" +- COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $ ++ COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $ + DEPENDS make_tdb) + add_custom_target(install_tdb_h DEPENDS + "${CMAKE_CURRENT_BINARY_DIR}/db.h") Index: branches/2016Q3/databases/percona56-server/pkg-plist =================================================================== --- branches/2016Q3/databases/percona56-server/pkg-plist (revision 421983) +++ branches/2016Q3/databases/percona56-server/pkg-plist (revision 421984) @@ -1,164 +1,170 @@ 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 %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump +%%TOKUDB%%include/backup.h %%TOKUDB%%lib/mysql/libHotBackup.so 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 %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so 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/test_udf_services.so %%TOKUDB%%lib/mysql/plugin/tokudb_backup.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 +%%TOKUDB%%share/doc/mysql/COPYING.AGPLv3 +%%TOKUDB%%share/doc/mysql/COPYING.GPLv2 +%%TOKUDB%%share/doc/mysql/PATENTS +%%TOKUDB%%share/doc/mysql/README.md %%TOKUDB%%share/doc/mysql/README_tokudb_backup %%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/bug1453277-master.opt %%DATADIR%%/tests/suite/query_response_time/bug1453277.result %%DATADIR%%/tests/suite/query_response_time/bug1453277.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 Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 421983) +++ branches/2016Q3 (revision 421984) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r419995,420978