10 files changed, 163 insertions, 160 deletions

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index ccc596133774..67b1d94224c7 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,24 +1,27 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
+# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 # $FreeBSD$
 
 PORTNAME=	mysql
-PKGNAMESUFFIX=	56-client
+PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
 
-MASTERDIR=	${.CURDIR}/../mysql56-server
+LICENSE+=	LGPL21
+
+MASTERDIR=	${.CURDIR}/../mysql57-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
-			mariadb*-client-* \
-			percona*-client-*
+CONFLICTS_INSTALL=	mysql5.[0-57-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
+CMAKE_ARGS+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
+		-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
+		-DWITHOUT_SERVER=1 \
+		-DWITH_SYSTEMD=0
 
-USE_LDCONFIG=	${PREFIX}/lib/mysql
+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 \
diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt
index e8efec8c25a5..4e9091fae53e 100644
--- a/databases/mysql57-client/files/patch-CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-07-18 15:48:39.000000000 +0000
-+++ CMakeLists.txt	2014-08-04 13:56:19.445692503 +0000
-@@ -492,8 +492,8 @@
+--- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
++++ CMakeLists.txt
+@@ -569,8 +569,8 @@ ENDIF()
  
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(client)
@@ -10,16 +10,12 @@
  
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
-@@ -560,18 +560,17 @@
+@@ -639,14 +639,13 @@ ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
 -ADD_SUBDIRECTORY(packaging/solaris)
  
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
- SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- 
  IF(UNIX)
 -  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
  ENDIF()
@@ -30,10 +26,11 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -597,5 +596,6 @@
+@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
 +ENDIF()
  
  INCLUDE(CPack)
+ 
diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt
index f3a7372b69f7..5b0e752138e7 100644
--- a/databases/mysql57-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-client_CMakeLists.txt
@@ -1,27 +1,28 @@
---- client/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
-+++ client/CMakeLists.txt	2013-02-13 10:36:50.000000000 +0100
-@@ -39,9 +39,11 @@
-   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
+--- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
++++ client/CMakeLists.txt
+@@ -121,6 +121,7 @@ IF(UNIX)
+   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
  ENDIF(UNIX)
  
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ IF(NOT WITHOUT_SERVER)
+   MYSQL_ADD_EXECUTABLE(mysql_upgrade
+     upgrade/program.cc
+@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(
+ TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
+ ENDIF()
 +ENDIF()
  
- 
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -53,15 +55,19 @@
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
- 
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 +ENDIF()
  
+ ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
+ TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
+@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
  
@@ -31,13 +32,23 @@
 +ENDIF()
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -82,8 +88,6 @@
+ ADD_COMPILE_FLAGS(
+@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
+ TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
+ TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
++ENDIF()
+ 
+ IF(UNIX AND NOT WITHOUT_SERVER)
+   MYSQL_ADD_EXECUTABLE(mysql_install_db
+@@ -196,7 +204,6 @@ IF(WIN32)
  ENDIF(WIN32)
  
  SET_TARGET_PROPERTIES (
--  mysql_plugin 
--  mysql_upgrade
+-  mysql_plugin
    mysqlcheck
    mysqldump
    mysqlimport
diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt
index bd078ede4a7c..185a6f785e69 100644
--- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-extra_CMakeLists.txt
@@ -1,6 +1,14 @@
---- extra/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
-+++ extra/CMakeLists.txt	2013-02-13 11:02:40.000000000 +0100
-@@ -60,6 +60,7 @@
+--- extra/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
++++ extra/CMakeLists.txt
+@@ -45,6 +45,7 @@ ENDIF()
+ 
+ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
+                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
++                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
+                    COMMAND comp_err
+                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
+                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
+@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
  ENDIF()
  
  
@@ -8,18 +16,18 @@
  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
  TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
  SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -96,11 +97,14 @@
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
+@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
+   ADD_DEPENDENCIES(innochecksum GenError)
  ENDIF()
 +ENDIF()
  
- IF(UNIX)
 +IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
+ IF(UNIX)
+   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
    TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
+ ENDIF()
 +ENDIF()
  
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
+ # In published release builds on Solaris, we need to bundle gcc source.
+ # PB2 will take care of putting it in extra/ when needed
diff --git a/databases/mysql57-client/files/patch-include_myisam.h b/databases/mysql57-client/files/patch-include_myisam.h
index 450645400dd5..7a9ab13220ea 100644
--- a/databases/mysql57-client/files/patch-include_myisam.h
+++ b/databases/mysql57-client/files/patch-include_myisam.h
@@ -1,6 +1,6 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
+--- include/myisam.h.orig	2015-11-29 19:16:24 UTC
++++ include/myisam.h
+@@ -45,7 +45,7 @@ extern "C" {
    The following defines can be increased if necessary.
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
  */
diff --git a/databases/mysql57-client/files/patch-man_CMakeLists.txt b/databases/mysql57-client/files/patch-man_CMakeLists.txt
index 0f79f3e2403d..617676556213 100644
--- a/databases/mysql57-client/files/patch-man_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-man_CMakeLists.txt
@@ -1,13 +1,15 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
-@@ -15,10 +15,6 @@
+--- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
++++ man/CMakeLists.txt
+@@ -14,11 +14,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  
  # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
+-FILE(GLOB MAN1_FILES *.1)
 -FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
 -FILE(GLOB MAN1_NDB ndb*.1)
 -FILE(GLOB MAN8_FILES *.8)
 -FILE(GLOB MAN8_NDB ndb*.8)
++FILE(GLOB MAN1_FILES 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)
  IF(MAN1_FILES)
    IF(MAN1_EXCLUDE)
      LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
index 0235dc2f305f..7bbaae22bbcf 100644
--- a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
@@ -1,54 +1,38 @@
---- scripts/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt	2013-02-13 14:14:11.000000000 +0100
-@@ -71,6 +71,7 @@
- )
+--- scripts/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
++++ scripts/CMakeLists.txt
+@@ -43,6 +43,7 @@ ELSE()
+   MESSAGE(FATAL_ERROR "Cannot concatenate files")
  ENDIF()
  
 +IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
+ # 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
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
+   ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
  )
 +ENDIF()
  
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -139,6 +141,7 @@
- SET(HOSTNAME "hostname")
- SET(MYSQLD_USER "mysql")
- 
-+IF(FALSE)
- # Required for mysqlbug until autotools are deprecated, once done remove these
- # and expand default cmake variables
- SET(CC ${CMAKE_C_COMPILER})
-@@ -175,6 +178,7 @@
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
+ # 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)
    )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -199,6 +203,7 @@
-   SET(localstatedir ${MYSQL_DATADIR})
  ENDIF()
  
 +IF(FALSE)
  IF(UNIX)
-   SET(EXT)
- ELSE()
-@@ -213,6 +218,7 @@
-   DESTINATION ${DEST}
-   COMPONENT Server
-   )
+  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)
+   COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
+ )
+ ENDIF()
 +ENDIF()
  
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -264,6 +270,8 @@
+ IF(NOT WITHOUT_SERVER)
+   INSTALL(FILES
+@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " ) 
@@ -57,37 +41,24 @@
          ELSE()
            SET(${var} "${${var}}-l${lib} " ) 
          ENDIF()
-@@ -316,17 +324,9 @@
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
--    mysql_fix_extensions
--    mysql_setpermission
--    mysql_zap
-     mysqlaccess
-     mysqlaccess.conf
--    mysql_convert_table_format
-     mysql_find_rows
--    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-@@ -350,6 +350,7 @@
-      )
-   ENDFOREACH()
+@@ -430,19 +436,7 @@ ELSE()
+   # On Unix, most of the files end up in the bin directory
+   SET(mysql_config_COMPONENT COMPONENT Development)
  
-+IF(FALSE)
-   # Input files with pl.in extension - drop the extension completely
-   SET(PLIN_FILES mysql_secure_installation)
-   FOREACH(file ${PLIN_FILES})
-@@ -362,6 +363,7 @@
-     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
-   ENDFOREACH()
- ENDIF()
-+ENDIF()
+-  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)
  
- # Install libgcc as  mylibgcc.a
- IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
+   SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
+   STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
index 33803dc525b9..29eb39c02628 100644
--- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
-+++ support-files/CMakeLists.txt	2013-02-13 11:13:32.000000000 +0100
-@@ -44,14 +44,17 @@
+--- support-files/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
++++ support-files/CMakeLists.txt
+@@ -44,14 +44,17 @@ ELSE()
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
  ENDIF()
  
@@ -15,10 +15,10 @@
  IF(UNIX)
    SET(prefix ${CMAKE_INSTALL_PREFIX})
 +IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
+   FOREACH(script  mysqld_multi.server mysql-log-rotate)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                     ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -68,8 +71,10 @@
+@@ -68,8 +71,10 @@ IF(UNIX)
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
@@ -27,9 +27,9 @@
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
 +IF(FALSE)
    CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
    
-@@ -94,3 +99,4 @@
+   SET(bindir ${prefix}/${INSTALL_BINDIR})
+@@ -84,3 +89,4 @@ IF(UNIX)
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  ENDIF()
diff --git a/databases/mysql57-client/pkg-message b/databases/mysql57-client/pkg-message
index 2cf54a1cf930..0e53a2bace9c 100644
--- a/databases/mysql57-client/pkg-message
+++ b/databases/mysql57-client/pkg-message
@@ -1,15 +1,6 @@
 * * * * * * * * * * * * * * * * * * * * * * * *
 
-Please be aware the database client is vulnerable
-to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
-You may find more information at the following URL:
-
-http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
-
-Although this database client is not listed as
-"affected", it is vulnerable and will not be 
-receiving a patch. Please take note of this when
-deploying this software.
+This is the mysql CLIENT without the server.
+for complete server and client, please install databases/mysql57-server
 
 * * * * * * * * * * * * * * * * * * * * * * * *
-
diff --git a/databases/mysql57-client/pkg-plist b/databases/mysql57-client/pkg-plist
index d890a7d2a08f..c27500c1bf15 100644
--- a/databases/mysql57-client/pkg-plist
+++ b/databases/mysql57-client/pkg-plist
@@ -1,22 +1,18 @@
-bin/msql2mysql
 bin/mysql
 bin/mysql_config
 bin/mysql_config_editor
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqlaccess.conf
+bin/mysql_ssl_rsa_setup
 bin/mysqladmin
 bin/mysqlbinlog
 bin/mysqlcheck
 bin/mysqldump
 bin/mysqlimport
+bin/mysqlpump
 bin/mysqlshow
 bin/mysqlslap
 include/mysql/big_endian.h
 include/mysql/byte_order_generic.h
 include/mysql/byte_order_generic_x86.h
-include/mysql/byte_order_generic_x86_64.h
 include/mysql/decimal.h
 include/mysql/errmsg.h
 include/mysql/hash.h
@@ -25,8 +21,8 @@ include/mysql/little_endian.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
 include/mysql/my_alloc.h
-include/mysql/my_attribute.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
@@ -34,16 +30,19 @@ include/mysql/my_dir.h
 include/mysql/my_getopt.h
 include/mysql/my_global.h
 include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
 include/mysql/my_sys.h
+include/mysql/my_thread.h
+include/mysql/my_thread_local.h
 include/mysql/my_xml.h
 include/mysql/mysql.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/get_password.h
+include/mysql/mysql/group_replication_priv.h
 include/mysql/mysql/innodb_priv.h
+include/mysql/mysql/mysql_lex_string.h
 include/mysql/mysql/plugin.h
 include/mysql/mysql/plugin_audit.h
 include/mysql/mysql/plugin_audit.h.pp
@@ -52,23 +51,46 @@ include/mysql/mysql/plugin_auth.h.pp
 include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysql/plugin_ftparser.h
 include/mysql/mysql/plugin_ftparser.h.pp
+include/mysql/mysql/plugin_group_replication.h
+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.h
+include/mysql/mysql/psi/psi_base.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_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/service_srv_session.h
+include/mysql/mysql/service_srv_session_info.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/services.h
+include/mysql/mysql/services.h.pp
 include/mysql/mysql/thread_pool_priv.h
+include/mysql/mysql/thread_type.h
 include/mysql/mysql_com.h
 include/mysql/mysql_com_server.h
 include/mysql/mysql_embed.h
@@ -79,28 +101,26 @@ include/mysql/mysqld_error.h
 include/mysql/plugin.h
 include/mysql/plugin_audit.h
 include/mysql/plugin_ftparser.h
+include/mysql/plugin_group_replication.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.a
 lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.18
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.18
+lib/mysql/libmysqlclient.so.20
 lib/mysql/libmysqlservices.a
+libdata/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1.gz
-man/man1/msql2mysql.1.gz
 man/man1/mysql.1.gz
 man/man1/mysql_config.1.gz
 man/man1/mysql_config_editor.1.gz
-man/man1/mysql_find_rows.1.gz
-man/man1/mysql_waitpid.1.gz
-man/man1/mysqlaccess.1.gz
 man/man1/mysqladmin.1.gz
 man/man1/mysqlbinlog.1.gz
 man/man1/mysqlcheck.1.gz