Index: head/databases/mysql57-client/Makefile =================================================================== --- head/databases/mysql57-client/Makefile (revision 508219) +++ head/databases/mysql57-client/Makefile (revision 508220) @@ -1,49 +1,49 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mysql57-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \ mysql[0-46-9][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ -DWITH_NDBCLUSTER=1 USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ mysql_waitpid.1 mysqlaccess.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 # issue 166367: adding symlinks for back-compatibility with ${lib}_r post-install: @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so @${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 .include "${MASTERDIR}/Makefile" Index: head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt (revision 508219) +++ head/databases/mysql57-client/files/patch-scripts_CMakeLists.txt (revision 508220) @@ -1,64 +1,64 @@ ---- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ scripts/CMakeLists.txt -@@ -43,6 +43,7 @@ ELSE() +--- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400 ++++ scripts/CMakeLists.txt 2019-08-01 10:59:24.177559000 -0400 +@@ -46,6 +46,7 @@ MESSAGE(FATAL_ERROR "Cannot concatenate files") ENDIF() +IF(FALSE) # Build mysql_fix_privilege_tables.c ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c -@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs +@@ -66,6 +67,7 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h ) +ENDIF() # If we do not have performance schema compiled in then sys will not work, # so only create an empty sys database with an auto-generated file, -@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER) +@@ -146,6 +148,7 @@ ) ENDIF() +IF(FALSE) IF(UNIX) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -150,6 +153,7 @@ IF(UNIX) +@@ -153,6 +156,7 @@ COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution ) ENDIF() +ENDIF() IF(NOT WITHOUT_SERVER) INSTALL(FILES -@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -326,6 +330,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) ++ SET(${var} "${${var}}-pthread " ) ELSE() - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -430,19 +436,7 @@ ELSE() +@@ -411,19 +417,7 @@ # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) - IF(WITH_SYSTEMD) - SET(BIN_SCRIPTS - mysql_config - mysqldumpslow - ) - ELSE() - SET(BIN_SCRIPTS - mysql_config - mysqldumpslow - mysqld_multi - mysqld_safe - ) - ENDIF() + SET(BIN_SCRIPTS mysql_config) SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") Index: head/databases/mysql57-server/Makefile =================================================================== --- head/databases/mysql57-server/Makefile (revision 508219) +++ head/databases/mysql57-server/Makefile (revision 508220) @@ -1,184 +1,184 @@ # Created by: Mahdi Mokhtari # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.26 -PORTREVISION?= 5 +PORTVERSION= 5.7.27 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server DISTNAME= ${PORTNAME}-boost-${PORTVERSION} MAINTAINER= mmokhi@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} SLAVEDIRS= databases/mysql57-client USES= bison:build cmake:noninja compiler:c11 compiler:c++11-lib \ cpe libedit localbase perl5 shebangfix ssl USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libcurl.so:ftp/curl \ libevent.so:devel/libevent \ liblz4.so:archivers/liblz4 \ libprotobuf.so:devel/protobuf CMAKE_BUILD_TYPE= Release CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKSRC}/boost" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DWITH_PROTOBUF=system \ -DWITH_CURL=system \ -DINSTALL_MYSQLTESTDIR=0 \ -DWITH_DEBUG=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} OPTIONS_SUB= YES # MySQL-Server part .if !defined(CLIENT_ONLY) USES+= mysql:57 CONFLICTS_INSTALL= mysql5[0-68-9]-server-* \ mysql[0-46-9][0-9]-server-* \ mysqlwsrep* \ mariadb[0-9][0-9]-server-* \ percona[0-9][0-9]-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql USE_CXXSTD= c++11 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= 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" OPTIONS_GROUP+= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES FEATURES_DESC= Default features knobs OPTIONS_GROUP_FEATURES= PERFSCHM PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+= FEDER="" # 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 .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .if ${SSL_DEFAULT} == base CMAKE_ARGS+= -DWITH_SSL=system .else CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} .endif .if ${CHOSEN_COMPILER_TYPE} == gcc CXXFLAGS+= -fpermissive .endif post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt # issue 220865: MySQL developers forgot that FreeBSD != Linux @${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \ ${WRKSRC}/configure.cmake .if !defined(CLIENT_ONLY) post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif .include Index: head/databases/mysql57-server/distinfo =================================================================== --- head/databases/mysql57-server/distinfo (revision 508219) +++ head/databases/mysql57-server/distinfo (revision 508220) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556318914 -SHA256 (mysql-boost-5.7.26.tar.gz) = effca6d3aceebc286a9fb046257330d125cc2f4def87081c286bfc4df3d974d1 -SIZE (mysql-boost-5.7.26.tar.gz) = 51098338 +TIMESTAMP = 1565043969 +SHA256 (mysql-boost-5.7.27.tar.gz) = 036ab46a8a1216cfc1e87374bd1cba12e2208c02cf328a31851be7e1c7f57a2b +SIZE (mysql-boost-5.7.27.tar.gz) = 51436383 Index: head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt (revision 508219) +++ head/databases/mysql57-server/files/patch-scripts_CMakeLists.txt (revision 508220) @@ -1,36 +1,36 @@ ---- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC -+++ scripts/CMakeLists.txt -@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +--- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400 ++++ scripts/CMakeLists.txt 2019-08-01 10:10:16.206052000 -0400 +@@ -326,6 +326,8 @@ GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) ++ SET(${var} "${${var}}-pthread " ) ELSE() - SET(${var} "${${var}}-l${lib} " ) + SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -430,14 +432,13 @@ ELSE() +@@ -411,14 +413,13 @@ # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) + IF(WITH_SYSTEMD) SET(BIN_SCRIPTS - mysql_config mysqldumpslow ) ELSE() SET(BIN_SCRIPTS - mysql_config mysqldumpslow mysqld_multi mysqld_safe -@@ -471,7 +472,7 @@ ELSE() +@@ -452,7 +453,7 @@ FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) + ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)