Index: head/databases/percona57-client/Makefile =================================================================== --- head/databases/percona57-client/Makefile (revision 466072) +++ head/databases/percona57-client/Makefile (revision 466073) @@ -1,55 +1,55 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME= percona -PORTREVISION?= 1 +PORTREVISION?= 0 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) LICENSE= GPLv2+ BROKEN_powerpc64= fails to configure: CMake Error at cmake/os/FreeBSD.cmake:34: Unsupported compiler! MASTERDIR= ${.CURDIR}/../percona57-server OPTIONS_EXCLUDE=TOKUDB PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql*-client-* \ mariadb*-client-* \ percona5[0-68-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql MANPAGES= comp_err.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ mysql_waitpid.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes OPTIONS_GROUP+= PLUGINS PLUGINS_DESC= Default Client Plugins OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/sasl/sasl.h:net/openldap24-sasl-client OPTIONS_DEFAULT+= SASLCLIENT OPTIONS_SUB= yes # Percona renamed the libraries, until we decide how to deal with it create some symlinks # to prevent breaking installed ports. post-install: ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.20 ${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 .include "${MASTERDIR}/Makefile" Index: head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt =================================================================== --- head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (revision 466072) +++ head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt (nonexistent) @@ -1,18 +0,0 @@ ---- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC -+++ libmysql/authentication_ldap/CMakeLists.txt -@@ -52,8 +52,10 @@ ELSE () - SET(SASL_LIBRARY "sasl2") - ENDIF () - --MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client -- auth_ldap_sasl_client.cc log_client.cc -- LINK_LIBRARIES ${SASL_LIBRARY} -- MODULE_ONLY -- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") -+IF (WITH_AUTHENTICATION_LDAP) -+ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client -+ auth_ldap_sasl_client.cc log_client.cc -+ LINK_LIBRARIES ${SASL_LIBRARY} -+ MODULE_ONLY -+ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") -+ENDIF() Property changes on: head/databases/percona57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/percona57-client/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/percona57-client/files/patch-client_CMakeLists.txt (revision 466072) +++ head/databases/percona57-client/files/patch-client_CMakeLists.txt (revision 466073) @@ -1,43 +1,44 @@ ---- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC +--- client/CMakeLists.txt.orig 2018-02-16 07:57:38 UTC +++ client/CMakeLists.txt -@@ -47,6 +47,7 @@ IF(UNIX) +@@ -48,6 +48,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc -@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS( +@@ -58,11 +59,14 @@ ADD_COMPILE_FLAGS( TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) ENDIF() +ENDIF() +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) + ADD_DEPENDENCIES(mysqltest GenError) +ENDIF() ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient) -@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport percon +@@ -80,8 +84,10 @@ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) ADD_COMPILE_FLAGS( -@@ -122,7 +128,6 @@ IF(WIN32) +@@ -124,7 +130,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( - mysql_plugin mysqlcheck mysqldump mysqlimport Index: head/databases/percona57-client/files/patch-cmake_plugin.cmake =================================================================== --- head/databases/percona57-client/files/patch-cmake_plugin.cmake (revision 466072) +++ head/databases/percona57-client/files/patch-cmake_plugin.cmake (revision 466073) @@ -1,43 +1,25 @@ --- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC +++ cmake/plugin.cmake -@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) - # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate - # an additional dependency. - # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. -- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ # -+ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. -+ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) - ENDIF() -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ SET_TARGET_PROPERTIES(${target} PROPERTIES -+ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " -+ ) -+ ENDIF() - ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) - - IF(NOT ARG_MODULE_ONLY) -@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) +@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) - INSTALL_DEBUG_TARGET(${target} - DESTINATION ${INSTALL_PLUGINDIR}/debug - COMPONENT ${INSTALL_COMPONENT}) + IF(CMAKE_BUILD_TYPE MATCHES "Debug") + INSTALL_DEBUG_TARGET(${target} + DESTINATION ${INSTALL_PLUGINDIR}/debug + COMPONENT ${INSTALL_COMPONENT}) + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files + "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") + ENDIF() # Add installed files to list for RPMs FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") + "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") # For internal testing in PB2, append collections files IF(DEFINED ENV{PB2WORKDIR}) PLUGIN_APPEND_COLLECTIONS(${plugin}) Index: head/databases/percona57-client/files/patch-configure.cmake =================================================================== --- head/databases/percona57-client/files/patch-configure.cmake (nonexistent) +++ head/databases/percona57-client/files/patch-configure.cmake (revision 466073) @@ -0,0 +1,15 @@ +--- configure.cmake.orig 2018-01-16 23:26:09 UTC ++++ configure.cmake +@@ -43,6 +43,12 @@ IF(UNIX) + ENDIF() + + ++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ SET(CMAKE_SHARED_LIBRARY_C_FLAGS ++ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%") ++ENDIF() ++ ++ + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) + ## We will be using gcc to generate .so files + ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS Property changes on: head/databases/percona57-client/files/patch-configure.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/percona57-client/pkg-plist =================================================================== --- head/databases/percona57-client/pkg-plist (revision 466072) +++ head/databases/percona57-client/pkg-plist (revision 466073) @@ -1,144 +1,143 @@ bin/mysql bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysql_config bin/mysql_config_editor bin/mysqldump bin/mysqlimport bin/mysqlpump bin/mysql_secure_installation bin/mysqlshow bin/mysqlslap bin/mysql_ssl_rsa_setup include/mysql/big_endian.h include/mysql/binary_log_types.h include/mysql/byte_order_generic.h include/mysql/byte_order_generic_x86.h include/mysql/decimal.h include/mysql/errmsg.h include/mysql/hash.h include/mysql/keycache.h include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h include/mysql/my_byteorder.h include/mysql/my_command.h include/mysql/my_compiler.h include/mysql/my_config.h include/mysql/my_dbug.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/mysql/client_authentication.h include/mysql/mysql/client_plugin.h include/mysql/mysql/client_plugin.h.pp include/mysql/mysql/com_data.h include/mysql/mysql_com.h include/mysql/mysql_com_server.h include/mysql/mysqld_ername.h include/mysql/mysqld_error.h include/mysql/mysql_embed.h include/mysql/mysql/get_password.h include/mysql/mysql/group_replication_priv.h include/mysql/mysql.h include/mysql/mysql/innodb_priv.h include/mysql/mysql/mysql_lex_string.h include/mysql/mysql/plugin_audit.h include/mysql/mysql/plugin_audit.h.pp include/mysql/mysql/plugin_auth_common.h include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth.h.pp include/mysql/mysql/plugin_ftparser.h include/mysql/mysql/plugin_ftparser.h.pp include/mysql/mysql/plugin_group_replication.h include/mysql/mysql/plugin.h include/mysql/mysql/plugin_keyring.h include/mysql/mysql/plugin_keyring.h.pp include/mysql/mysql/plugin_trace.h include/mysql/mysql/plugin_validate_password.h include/mysql/mysql/psi/mysql_file.h include/mysql/mysql/psi/mysql_idle.h include/mysql/mysql/psi/mysql_mdl.h include/mysql/mysql/psi/mysql_memory.h include/mysql/mysql/psi/mysql_ps.h include/mysql/mysql/psi/mysql_socket.h include/mysql/mysql/psi/mysql_sp.h include/mysql/mysql/psi/mysql_stage.h include/mysql/mysql/psi/mysql_statement.h include/mysql/mysql/psi/mysql_table.h include/mysql/mysql/psi/mysql_thread.h include/mysql/mysql/psi/mysql_transaction.h include/mysql/mysql/psi/psi_base.h include/mysql/mysql/psi/psi.h include/mysql/mysql/psi/psi_memory.h include/mysql/mysql/service_command.h include/mysql/mysql/service_locking.h include/mysql/mysql/service_my_plugin_log.h include/mysql/mysql/service_my_snprintf.h include/mysql/mysql/service_mysql_alloc.h include/mysql/mysql/service_mysql_keyring.h include/mysql/mysql/service_mysql_password_policy.h include/mysql/mysql/service_mysql_string.h include/mysql/mysql/service_parser.h include/mysql/mysql/service_rpl_transaction_ctx.h include/mysql/mysql/service_rpl_transaction_write_set.h include/mysql/mysql/service_rules_table.h include/mysql/mysql/service_security_context.h include/mysql/mysql/services.h include/mysql/mysql/services.h.pp include/mysql/mysql/service_srv_session.h include/mysql/mysql/service_srv_session_info.h include/mysql/mysql/service_ssl_wrapper.h include/mysql/mysql/service_thd_alloc.h include/mysql/mysql/service_thd_engine_lock.h include/mysql/mysql/service_thd_wait.h include/mysql/mysql/service_thread_scheduler.h include/mysql/mysql/thread_pool_priv.h include/mysql/mysql/thread_type.h include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/my_sys.h include/mysql/my_thread.h include/mysql/my_thread_local.h include/mysql/my_xml.h include/mysql/plugin_audit.h include/mysql/plugin_ftparser.h include/mysql/plugin_group_replication.h include/mysql/plugin.h include/mysql/plugin_keyring.h include/mysql/plugin_validate_password.h include/mysql/sql_common.h include/mysql/sql_state.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/thr_cond.h include/mysql/thr_mutex.h include/mysql/thr_rwlock.h include/mysql/typelib.h lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.20 lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.20 -lib/mysql/libmysqlservices.a lib/mysql/libperconaserverclient.a lib/mysql/libperconaserverclient.so lib/mysql/libperconaserverclient.so.20 %%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so libdata/pkgconfig/perconaserverclient.pc man/man1/comp_err.1.gz man/man1/mysql.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlcheck.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz share/aclocal/mysql.m4 Index: head/databases/percona57-server/Makefile =================================================================== --- head/databases/percona57-server/Makefile (revision 466072) +++ head/databases/percona57-server/Makefile (revision 466073) @@ -1,155 +1,155 @@ # Created by: Mark Felder # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.7.20-18 +DISTVERSION= 5.7.21-20 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ SF/boost/boost/1.59.0:boost PKGNAMESUFFIX?= 57-server DISTNAME= percona-server-${DISTVERSION} DISTFILES= percona-server-${DISTVERSION}${EXTRACT_SUFX}:percona \ boost_1_59_0${EXTRACT_SUFX}:boost MAINTAINER= feld@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE?= GPLv2+ LIB_DEPENDS= libevent.so:devel/libevent \ liblz4.so:archivers/liblz4 BROKEN_powerpc64= Does not build SLAVEDIRS= databases/percona57-client \ databases/percona57-pam-for-mysql USES= bison:build cmake:noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir DATADIR= ${LOCALBASE}/share/mysql DOCSDIR= ${LOCALBASE}/share/doc/mysql CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -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_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -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_UNIT_TESTS=0 \ -DWITH_EDITLINE=system \ -DWITH_LIBWRAP=0 \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DINSTALL_MYSQLTESTDIR=0 \ -DWITH_BOOST="${WRKDIR}/boost_1_59_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 SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} .ifdef CLIENT_ONLY # Client part USES+= libedit .elifdef PLUGIN_ONLY # For building plugins (percona-pam-for-mysql, etc) # Currently do nothing special USES+= libedit .else LIB_DEPENDS+= libcurl.so:ftp/curl # MySQL-Server part OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED 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=system OPENSSL_USES= ssl TOKUDB_DESC= TokuDB Engine (experimental) TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb USES+=mysql:57p CONFLICTS_INSTALL= mysql*-server-* \ mysqlwsrep* \ mariadb*-server-* \ percona5[0-68-9]-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin 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" # issue 220865: Currently there's no source to be built with server-side support. # But this keeps the pkg-plist not overlaping CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0 post-install: ${MKDIR} ${STAGEDIR}/var/db/mysql ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt # issue 220865: MySQL developers forgot that FreeBSD != Linux @${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \ - ${WRKSRC}/cmake/plugin.cmake + ${WRKSRC}/configure.cmake .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 .endif .include Index: head/databases/percona57-server/distinfo =================================================================== --- head/databases/percona57-server/distinfo (revision 466072) +++ head/databases/percona57-server/distinfo (revision 466073) @@ -1,5 +1,5 @@ -TIMESTAMP = 1514728385 -SHA256 (percona-server-5.7.20-18.tar.gz) = ebbdf859d571562b9c9614c29355dd73adb9021b67108edd46b67063039a28af -SIZE (percona-server-5.7.20-18.tar.gz) = 82206679 +TIMESTAMP = 1519339070 +SHA256 (percona-server-5.7.21-20.tar.gz) = 842785e9b73c606be00ea74f568615d3427362fbeed5c136d8f509f03c9d43a6 +SIZE (percona-server-5.7.21-20.tar.gz) = 82479778 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 Index: head/databases/percona57-server/files/patch-sql_sql__view.cc =================================================================== --- head/databases/percona57-server/files/patch-sql_sql__view.cc (revision 466072) +++ head/databases/percona57-server/files/patch-sql_sql__view.cc (nonexistent) @@ -1,63 +0,0 @@ ---- sql/sql_view.cc.orig 2016-11-27 19:44:54 UTC -+++ sql/sql_view.cc -@@ -773,46 +773,46 @@ static const int required_view_parameter - */ - static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, -- my_offsetof(TABLE_LIST, select_stmt), -+ static_cast(my_offsetof(TABLE_LIST, select_stmt)), - FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, -- my_offsetof(TABLE_LIST, md5), -+ static_cast(my_offsetof(TABLE_LIST, md5)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, -- my_offsetof(TABLE_LIST, updatable_view), -+ static_cast(my_offsetof(TABLE_LIST, updatable_view)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, -- my_offsetof(TABLE_LIST, algorithm), -+ static_cast(my_offsetof(TABLE_LIST, algorithm)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("definer_user")}, -- my_offsetof(TABLE_LIST, definer.user), -+ static_cast(my_offsetof(TABLE_LIST, definer.user)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, -- my_offsetof(TABLE_LIST, definer.host), -+ static_cast(my_offsetof(TABLE_LIST, definer.host)), - FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, -- my_offsetof(TABLE_LIST, view_suid), -+ static_cast(my_offsetof(TABLE_LIST, view_suid)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, -- my_offsetof(TABLE_LIST, with_check), -+ static_cast(my_offsetof(TABLE_LIST, with_check)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, -- my_offsetof(TABLE_LIST, timestamp), -+ static_cast(my_offsetof(TABLE_LIST, timestamp)), - FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, -- my_offsetof(TABLE_LIST, file_version), -+ static_cast(my_offsetof(TABLE_LIST, file_version)), - FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, -- my_offsetof(TABLE_LIST, source), -+ static_cast(my_offsetof(TABLE_LIST, source)), - FILE_OPTIONS_ESTRING}, - {{(char*) STRING_WITH_LEN("client_cs_name")}, -- my_offsetof(TABLE_LIST, view_client_cs_name), -+ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("connection_cl_name")}, -- my_offsetof(TABLE_LIST, view_connection_cl_name), -+ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), - FILE_OPTIONS_STRING}, - {{(char*) STRING_WITH_LEN("view_body_utf8")}, -- my_offsetof(TABLE_LIST, view_body_utf8), -+ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), - FILE_OPTIONS_ESTRING}, - {{NullS, 0}, 0, - FILE_OPTIONS_STRING} Property changes on: head/databases/percona57-server/files/patch-sql_sql__view.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/percona57-server/files/patch-cmake_plugin.cmake =================================================================== --- head/databases/percona57-server/files/patch-cmake_plugin.cmake (revision 466072) +++ head/databases/percona57-server/files/patch-cmake_plugin.cmake (revision 466073) @@ -1,43 +1,25 @@ --- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC +++ cmake/plugin.cmake -@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) - # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate - # an additional dependency. - # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. -- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ # -+ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. -+ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) - ENDIF() -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ SET_TARGET_PROPERTIES(${target} PROPERTIES -+ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " -+ ) -+ ENDIF() - ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) - - IF(NOT ARG_MODULE_ONLY) -@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) +@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) - INSTALL_DEBUG_TARGET(${target} - DESTINATION ${INSTALL_PLUGINDIR}/debug - COMPONENT ${INSTALL_COMPONENT}) + IF(CMAKE_BUILD_TYPE MATCHES "Debug") + INSTALL_DEBUG_TARGET(${target} + DESTINATION ${INSTALL_PLUGINDIR}/debug + COMPONENT ${INSTALL_COMPONENT}) + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files + "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") + ENDIF() # Add installed files to list for RPMs FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" - "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") + "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") # For internal testing in PB2, append collections files IF(DEFINED ENV{PB2WORKDIR}) PLUGIN_APPEND_COLLECTIONS(${plugin}) Index: head/databases/percona57-server/files/patch-configure.cmake =================================================================== --- head/databases/percona57-server/files/patch-configure.cmake (nonexistent) +++ head/databases/percona57-server/files/patch-configure.cmake (revision 466073) @@ -0,0 +1,15 @@ +--- configure.cmake.orig 2018-01-16 23:26:09 UTC ++++ configure.cmake +@@ -43,6 +43,12 @@ IF(UNIX) + ENDIF() + + ++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ SET(CMAKE_SHARED_LIBRARY_C_FLAGS ++ "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%") ++ENDIF() ++ ++ + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX) + ## We will be using gcc to generate .so files + ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS Property changes on: head/databases/percona57-server/files/patch-configure.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt (revision 466072) +++ head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt (revision 466073) @@ -1,29 +1,29 @@ ---- libmysql/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC +--- libmysql/CMakeLists.txt.orig 2018-03-09 22:41:36 UTC +++ libmysql/CMakeLists.txt -@@ -231,7 +231,7 @@ IF(WIN32) - ENDIF() - +@@ -235,7 +235,7 @@ + ADD_SUBDIRECTORY(authentication_ldap) + # Merge several convenience libraries into one big perconaserverclient --MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development) -+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS} COMPONENT Development NOINSTALL) +-MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS} COMPONENT Development SKIP_INSTALL) # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -273,7 +273,8 @@ IF(NOT DISABLE_SHARED) +@@ -271,7 +271,8 @@ # and link them together into shared library. - MERGE_LIBRARIES(libmysql SHARED ${LIBS} + MERGE_LIBRARIES_SHARED(libmysql ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) -+ COMPONENT SharedLibraries NOINSTALL) ++ COMPONENT SharedLibraries SKIP_INSTALL) +IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -329,6 +330,7 @@ ENDIF() +@@ -327,6 +328,7 @@ # to initialize api_calls[] array in api_test.c # SET(CLIENT_API_FUNCTION_LIST "") +ENDIF() FOREACH(api ${CLIENT_API_FUNCTIONS}) SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") ENDFOREACH()