Index: databases/mysql57-client/Makefile
===================================================================
--- databases/mysql57-client/Makefile	(revision 413338)
+++ databases/mysql57-client/Makefile	(working copy)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION?=	4
 PKGNAMESUFFIX=	57-client
 
 COMMENT=	Multithreaded SQL database (client)
@@ -15,12 +14,12 @@
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-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-*
+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+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
-		-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
-		-DWITHOUT_SERVER=1 \
-		-DWITH_SYSTEMD=0
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
@@ -30,7 +29,7 @@
 
 CLIENT_ONLY=	yes
 
-# issue 166367: adding symlinks for back-compatibility with $(lib)_r
+# 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
Index: databases/mysql57-client/files/patch-CMakeLists.txt
===================================================================
--- databases/mysql57-client/files/patch-CMakeLists.txt	(revision 413338)
+++ databases/mysql57-client/files/patch-CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ CMakeLists.txt
-@@ -569,8 +569,8 @@ ENDIF()
+@@ -606,8 +606,8 @@ ENDIF()
  
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(client)
@@ -10,7 +10,7 @@
  
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
-@@ -639,14 +639,13 @@ ELSE()
+@@ -676,14 +676,13 @@ ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
  ADD_SUBDIRECTORY(packaging/WiX)
@@ -26,7 +26,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
Index: databases/mysql57-client/files/patch-client_CMakeLists.txt
===================================================================
--- databases/mysql57-client/files/patch-client_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-client/files/patch-client_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ client/CMakeLists.txt
-@@ -121,6 +121,7 @@ IF(UNIX)
+@@ -47,6 +47,7 @@ IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
  ENDIF(UNIX)
  
@@ -8,7 +8,7 @@
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
      upgrade/program.cc
-@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(
+@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
  TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
  ENDIF()
@@ -22,7 +22,7 @@
  
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
-@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
  
@@ -33,7 +33,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
-@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
  
@@ -44,7 +44,7 @@
  
  IF(UNIX AND NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -196,7 +204,6 @@ IF(WIN32)
+@@ -122,7 +130,6 @@ IF(WIN32)
  ENDIF(WIN32)
  
  SET_TARGET_PROPERTIES (
Index: databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
===================================================================
--- databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake	(revision 413338)
+++ databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake	(working copy)
@@ -1,4 +1,4 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2015-11-29 19:16:24 UTC
+--- cmake/build_configurations/compiler_options.cmake.orig	2016-03-28 18:06:12 UTC
 +++ cmake/build_configurations/compiler_options.cmake
 @@ -28,7 +28,7 @@ IF(UNIX)  
  
Index: databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
===================================================================
--- databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake	(revision 413338)
+++ databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake	(working copy)
@@ -1,4 +1,4 @@
---- cmake/os/DragonFly.cmake.orig	2015-12-17 10:53:10 UTC
+--- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
 +++ cmake/os/DragonFly.cmake
 @@ -0,0 +1,24 @@
 +INCLUDE(CheckCSourceRuns)
Index: databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h
===================================================================
--- databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h	(revision 413338)
+++ databases/mysql57-client/files/patch-cmd-line-utils_libedit_chartype.h	(working copy)
@@ -1,4 +1,4 @@
---- cmd-line-utils/libedit/chartype.h.orig	2015-11-29 19:16:24 UTC
+--- cmd-line-utils/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
 +++ cmd-line-utils/libedit/chartype.h
 @@ -49,7 +49,7 @@
    TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
Index: databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c
===================================================================
--- databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c	(revision 413338)
+++ databases/mysql57-client/files/patch-cmd-line-utils_libedit_vi.c	(working copy)
@@ -1,4 +1,4 @@
---- cmd-line-utils/libedit/vi.c.orig	2015-11-29 19:16:24 UTC
+--- cmd-line-utils/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
 +++ cmd-line-utils/libedit/vi.c
 @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
   * NB: posix implies that we should enter insert mode, however
Index: databases/mysql57-client/files/patch-extra_CMakeLists.txt
===================================================================
--- databases/mysql57-client/files/patch-extra_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-client/files/patch-extra_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- extra/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- extra/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ extra/CMakeLists.txt
 @@ -45,6 +45,7 @@ ENDIF()
  
Index: databases/mysql57-client/files/patch-include_CMakeLists.txt
===================================================================
--- databases/mysql57-client/files/patch-include_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-client/files/patch-include_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ include/CMakeLists.txt
-@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
+@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
  
  SET(HEADERS 
    ${HEADERS_ABI} 
@@ -8,4 +8,3 @@
    my_dbug.h 
    m_string.h
    my_sys.h 
-
Index: databases/mysql57-client/files/patch-include_my__compare.h
===================================================================
--- databases/mysql57-client/files/patch-include_my__compare.h	(revision 413338)
+++ databases/mysql57-client/files/patch-include_my__compare.h	(working copy)
@@ -1,4 +1,4 @@
---- include/my_compare.h.orig	2015-11-29 19:16:24 UTC
+--- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
 +++ include/my_compare.h
 @@ -40,7 +40,7 @@ extern "C" {
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
Index: databases/mysql57-client/files/patch-include_myisam.h
===================================================================
--- databases/mysql57-client/files/patch-include_myisam.h	(revision 413338)
+++ databases/mysql57-client/files/patch-include_myisam.h	(working copy)
@@ -1,4 +1,4 @@
---- include/myisam.h.orig	2015-11-29 19:16:24 UTC
+--- include/myisam.h.orig	2016-03-28 18:06:12 UTC
 +++ include/myisam.h
 @@ -45,7 +45,7 @@ extern "C" {
    The following defines can be increased if necessary.
Index: databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
===================================================================
--- databases/mysql57-client/files/patch-libmysql_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-client/files/patch-libmysql_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- libmysql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ libmysql/CMakeLists.txt
 @@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
      COMPONENT SharedLibraries)
Index: databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
===================================================================
--- databases/mysql57-client/files/patch-mysys__ssl_my__default.cc	(revision 413338)
+++ databases/mysql57-client/files/patch-mysys__ssl_my__default.cc	(working copy)
@@ -1,4 +1,4 @@
---- mysys_ssl/my_default.cc.orig	2015-11-29 19:16:24 UTC
+--- mysys_ssl/my_default.cc.orig	2016-03-28 18:06:12 UTC
 +++ mysys_ssl/my_default.cc
 @@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
  
Index: databases/mysql57-client/files/patch-scripts_CMakeLists.txt
===================================================================
--- databases/mysql57-client/files/patch-scripts_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-client/files/patch-scripts_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- scripts/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ scripts/CMakeLists.txt
 @@ -43,6 +43,7 @@ ELSE()
    MESSAGE(FATAL_ERROR "Cannot concatenate files")
Index: databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
===================================================================
--- databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c	(revision 413338)
+++ databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c	(working copy)
@@ -1,4 +1,4 @@
---- storage/myisam/mi_dynrec.c.orig	2015-12-14 07:39:39 UTC
+--- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
 +++ storage/myisam/mi_dynrec.c
 @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
      DBUG_RETURN(1);
Index: databases/mysql57-client/files/patch-support-files_CMakeLists.txt
===================================================================
--- databases/mysql57-client/files/patch-support-files_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-client/files/patch-support-files_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- support-files/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ support-files/CMakeLists.txt
 @@ -44,14 +44,17 @@ ELSE()
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
@@ -18,7 +18,7 @@
    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 @@ IF(UNIX)
+@@ -68,9 +71,11 @@ IF(UNIX)
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
    ENDIF()
@@ -25,11 +25,12 @@
 +ENDIF()
  
    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)
-   
    SET(bindir ${prefix}/${INSTALL_BINDIR})
-@@ -84,3 +89,4 @@ IF(UNIX)
+   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
+   SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
+@@ -83,3 +88,4 @@ IF(UNIX)
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
  ENDIF()
Index: databases/mysql57-client/pkg-plist
===================================================================
--- databases/mysql57-client/pkg-plist	(revision 413338)
+++ databases/mysql57-client/pkg-plist	(working copy)
@@ -53,6 +53,8 @@
 include/mysql/mysql/plugin_ftparser.h
 include/mysql/mysql/plugin_ftparser.h.pp
 include/mysql/mysql/plugin_group_replication.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
@@ -75,6 +77,7 @@
 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
@@ -84,6 +87,7 @@
 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_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
@@ -103,6 +107,7 @@
 include/mysql/plugin_audit.h
 include/mysql/plugin_ftparser.h
 include/mysql/plugin_group_replication.h
+include/mysql/plugin_keyring.h
 include/mysql/plugin_validate_password.h
 include/mysql/sql_common.h
 include/mysql/sql_state.h
Index: databases/mysql57-server/Makefile
===================================================================
--- databases/mysql57-server/Makefile	(revision 413338)
+++ databases/mysql57-server/Makefile	(working copy)
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTVERSION=	5.7.10
-PORTREVISION?=	4
+PORTVERSION=	5.7.12
 CATEGORIES=	databases ipv6
-MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
+MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost
+DISTNAME=	${PORTNAME}-boost-${PORTVERSION}
 
 MAINTAINER=	mokhi64@gmail.com
 COMMENT=	Multithreaded SQL database (server)
@@ -14,35 +13,50 @@
 
 LICENSE=	GPLv2
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 SLAVEDIRS=	databases/mysql57-client
-USES=		cmake:outsource shebangfix
+USES=		bison:build cmake:outsource compiler:c11 compiler:c++11-lib cpe libedit perl5 shebangfix
 
-OPTIONS_RADIO=		SSL
-OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
-OPTIONS_DEFAULT+=	OPENSSL
-NO_OPTIONS_SORT=	yes
+USE_OPENSSL=	yes
+USE_PERL5=	run
 
-BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
-WITHOUT_SSL_DESC=	No SSL/TLS support
+MY_DBDIR=	/var/db/mysql
+MY_SECDIR=	/var/db/mysql_secure
+MY_TMPDIR=	/var/db/mysql_tmpdir
 
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2 \
+		liblz4.so:${PORTSDIR}/archivers/liblz4
+
+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" \
 		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
 		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
+		-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" \
-		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
-		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
-		-DWITH_INNODB_EXTRA_DEBUG=0
+		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
+		-DSYSCONFDIR="${ETCDIR}" \
+		-DWITH_BOOST="${WRKSRC}/boost" \
+		-DWITH_EDITLINE=system \
+		-DWITH_LIBEVENT=system \
+		-DWITH_LZ4=system \
+		-DWITH_ZLIB=system \
+		-DWITH_PIC=1
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
@@ -50,24 +64,28 @@
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
-OPENSSL_USE=		OPENSSL=yes
-WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
+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}
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	57
 
-USES+=		bison:build cpe perl5
-USE_PERL5=	run
+CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
+			mysql[0-46-9][0-9]-server-* \
+			mariadb[0-9][0-9]-server-* \
+			percona[0-9][0-9]-server-*
 
-CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
-			mysql[0-46-9][0-689]-server-* \
-			percona[0-9]*-server-*
-
 USE_RC_SUBR=	mysql-server
 
+SUB_FILES=	my.cnf.sample
+
 USERS=		mysql
 GROUPS=		mysql
 
@@ -110,22 +128,30 @@
 
 PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
-
-.else
-USES+=		readline
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-CC=	clang
-CXX=	clang++
-CPP=	clang-cpp
-OPENSSL_CMAKE_ON=	-DWITH_SSL=system
-.elif ${OSVERSION} >= 1000000
-OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
+# 'WITH_OPENSSL_PORT=yes' only can be used before "bsd.port.pre.mk"
+# Then, instead we use the woeks below
+OPENSSLBASE=		${LOCALBASE}
+OPENSSL_PORT?=		security/openssl
+OPENSSL_SHLIBVER?=	8
+
+OPENSSLDIR?=		${OPENSSLBASE}/openssl
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+OPENSSLRPATH=		${LOCALBASE}/lib
+
+### Just for the sake of FreeBSD 9.X ###
+.if !defined(CLIENT_ONLY)
+EXTRA_PATCHES+=		${PATCHDIR}/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
 .endif
+.endif
 
+CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
+
 post-extract:
 	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
@@ -132,4 +158,15 @@
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
 
+.if !defined(CLIENT_ONLY)
+post-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
+
+post-stage:
+	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
+	${MKDIR} ${STAGEDIR}${MY_SECDIR}
+	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
+.endif
+
 .include <bsd.port.post.mk>
Index: databases/mysql57-server/distinfo
===================================================================
--- databases/mysql57-server/distinfo	(revision 413338)
+++ databases/mysql57-server/distinfo	(working copy)
@@ -1,4 +1,2 @@
-SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74
-SIZE (mysql-5.7.10.tar.gz) = 48919371
-SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
-SIZE (boost_1_59_0.tar.gz) = 83709983
+SHA256 (mysql-boost-5.7.12.tar.gz) = 3990c78b4064e4e972e763d62449cb8f930717b3dd2ddcbbaeeaa0f644d5333d
+SIZE (mysql-boost-5.7.12.tar.gz) = 60604385
Index: databases/mysql57-server/files/my.cnf.sample.in
===================================================================
--- databases/mysql57-server/files/my.cnf.sample.in	(nonexistent)
+++ databases/mysql57-server/files/my.cnf.sample.in	(working copy)
@@ -0,0 +1,64 @@
+# $FreeBSD$
+
+[client]
+port                            = 3306
+socket                          = /tmp/mysql.sock
+
+[mysql]
+prompt                          = \u@\h [\d]>\_
+no_auto_rehash
+
+[mysqld]
+user                            = mysql
+port                            = 3306
+socket                          = /tmp/mysql.sock
+bind-address                    = 127.0.0.1
+basedir                         = %%PREFIX%%
+datadir                         = %%MY_DBDIR%%
+tmpdir                          = %%MY_TMPDIR%%
+slave-load-tmpdir               = %%MY_TMPDIR%%
+secure-file-priv                = %%MY_SECDIR%%
+log-bin                         = mysql-bin
+log-output                      = TABLE
+master-info-repository          = TABLE
+relay-log-info-repository       = TABLE
+relay-log-recovery              = 1
+slow-query-log                  = 1
+server-id                       = 1
+sync_binlog                     = 1
+sync_relay_log                  = 1
+binlog_cache_size               = 16M
+expire_logs_days                = 30
+default_password_lifetime       = 0
+enforce-gtid-consistency        = 1
+gtid-mode                       = ON
+safe-user-create                = 1
+lower_case_table_names          = 1
+explicit-defaults-for-timestamp = 1
+myisam-recover-options          = BACKUP,FORCE
+open_files_limit                = 32768
+table_open_cache                = 16384
+table_definition_cache          = 8192
+net_retry_count                 = 16384
+key_buffer_size                 = 256M
+max_allowed_packet              = 64M
+query_cache_type                = 0
+query_cache_size                = 0
+long_query_time                 = 0.5
+innodb_buffer_pool_size         = 1G
+innodb_data_home_dir            = %%MY_DBDIR%%
+innodb_log_group_home_dir       = %%MY_DBDIR%%
+innodb_data_file_path           = ibdata1:128M:autoextend
+innodb_temp_data_file_path      = ibtmp1:128M:autoextend
+innodb_flush_method             = O_DIRECT
+innodb_log_file_size            = 256M
+innodb_log_buffer_size          = 16M
+innodb_write_io_threads         = 8
+innodb_read_io_threads          = 8
+innodb_autoinc_lock_mode        = 2
+skip-symbolic-links
+
+[mysqldump]
+max_allowed_packet              = 256M
+quote_names
+quick
Index: databases/mysql57-server/files/mysql-server.in
===================================================================
--- databases/mysql57-server/files/mysql-server.in	(revision 413338)
+++ databases/mysql57-server/files/mysql-server.in	(working copy)
@@ -14,10 +14,12 @@
 # mysql_limits (bool):	Set to "NO" by default.
 #			Set it to yes to run `limits -e -U mysql`
 #			just before mysql starts.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
+# mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
 #			Base database directory.
+# mysql_confdir (str):	Default to "%%ETCDIR%%"
+#			Base configuration directory.
 # mysql_optfile (str):	Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
+#			Default to "${mysql_confdir}/my.cnf".
 # mysql_pidfile (str):	Custum PID file path and name.
 #			Default to "${mysql_dbdir}/${hostname}.pid".
 # mysql_args (str):	Custom additional arguments to be passed
@@ -33,8 +35,13 @@
 
 : ${mysql_enable="NO"}
 : ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_dbdir="%%MY_DBDIR%%"}
+: ${mysql_confdir="%%ETCDIR%%"}
+if [ -f "${mysql_dbdir}/my.cnf" ]; then
 : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+else
+: ${mysql_optfile="${mysql_confdir}/my.cnf"}
+fi
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
@@ -41,22 +48,30 @@
 : ${hostname:=`/bin/hostname`}
 pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} %%PERFSCHEMRC%%"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%PERFSCHEMRC%%"
 procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
 mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}"
+mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
 
 mysql_create_auth_tables()
 {
 	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
 }
 
 mysql_prestart()
 {
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+	if [ -f "${mysql_dbdir}/my.cnf" ]; then
+		echo ""
+		echo "Please keep in mind that the default location for my.cnf will be changed"
+		echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\" in the near"
+		echo "future.  If you do not want to move your my.cnf to the new location then"
+		echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."
+		echo ""
+	fi
+
+	if [ ! -d "${mysql_dbdir}/mysql" ]; then
 		mysql_create_auth_tables || return 1
 	fi
 	if checkyesno mysql_limits; then
Index: databases/mysql57-server/files/patch-CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ CMakeLists.txt
-@@ -577,12 +577,10 @@ IF(UNIX)
+@@ -614,12 +614,10 @@ IF(UNIX)
  ENDIF()
  
  IF(NOT WITHOUT_SERVER)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -591,8 +589,6 @@ ENDIF()
+@@ -628,8 +626,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,7 +22,7 @@
    ADD_SUBDIRECTORY(support-files)
    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
      ADD_SUBDIRECTORY(internal)
-@@ -647,6 +643,7 @@ ENDIF()
+@@ -684,6 +680,7 @@ ENDIF()
  #
  # RPM installs documentation directly from the source tree
  #
@@ -30,7 +30,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
Index: databases/mysql57-server/files/patch-client_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-client_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-client_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ client/CMakeLists.txt
-@@ -38,8 +38,6 @@ ADD_DEFINITIONS(
+@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
@@ -9,8 +9,8 @@
  
  ## We will need libeay32.dll and ssleay32.dll when running client executables.
  COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F
- ENDIF()
+@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
 +IF(FALSE)
@@ -23,7 +23,7 @@
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
+@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
  
@@ -31,7 +31,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
-@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -44,7 +44,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
    mysqlbinlog.cc
-@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -52,7 +52,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
    ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
  ENDIF()
  
@@ -64,7 +64,7 @@
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-@@ -197,11 +203,6 @@ ENDIF(WIN32)
+@@ -123,11 +129,6 @@ ENDIF(WIN32)
  
  SET_TARGET_PROPERTIES (
    mysql_plugin
Index: databases/mysql57-server/files/patch-cmake_plugin.cmake
===================================================================
--- databases/mysql57-server/files/patch-cmake_plugin.cmake	(revision 413338)
+++ databases/mysql57-server/files/patch-cmake_plugin.cmake	(working copy)
@@ -1,6 +1,6 @@
---- cmake/plugin.cmake.orig	2015-11-29 19:16:24 UTC
+--- cmake/plugin.cmake.orig	2016-03-28 18:06:12 UTC
 +++ cmake/plugin.cmake
-@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -237,9 +237,6 @@ MACRO(MYSQL_ADD_PLUGIN)
      MYSQL_INSTALL_TARGETS(${target}
        DESTINATION ${INSTALL_PLUGINDIR}
        COMPONENT ${INSTALL_COMPONENT})
Index: databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h
===================================================================
--- databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h	(revision 413338)
+++ databases/mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h	(working copy)
@@ -1,4 +1,4 @@
---- cmd-line-utils/libedit/chartype.h.orig	2015-11-29 19:16:24 UTC
+--- cmd-line-utils/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
 +++ cmd-line-utils/libedit/chartype.h
 @@ -49,7 +49,7 @@
    TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
Index: databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c
===================================================================
--- databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c	(revision 413338)
+++ databases/mysql57-server/files/patch-cmd-line-utils_libedit_vi.c	(working copy)
@@ -1,4 +1,4 @@
---- cmd-line-utils/libedit/vi.c.orig	2015-11-29 19:16:24 UTC
+--- cmd-line-utils/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
 +++ cmd-line-utils/libedit/vi.c
 @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
   * NB: posix implies that we should enter insert mode, however
Index: databases/mysql57-server/files/patch-include_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-include_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-include_CMakeLists.txt	(working copy)
@@ -1,13 +1,16 @@
---- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ include/CMakeLists.txt
-@@ -68,11 +68,13 @@ SET(HEADERS 
+@@ -69,14 +69,13 @@ SET(HEADERS 
    ${HEADERS_GEN_CONFIGURE}
  )
  
-+IF(FALSE) 
- INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
++IF(FALSE)
+ INSTALL(FILES
+   ../libbinlogevents/export/binary_log_types.h
+   DESTINATION ${INSTALL_INCLUDEDIR}
+-  COMPONENT Development)
+-INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
   PATTERN "*.h"
   PATTERN "psi_abi*" EXCLUDE
  )
Index: databases/mysql57-server/files/patch-include_my__compare.h
===================================================================
--- databases/mysql57-server/files/patch-include_my__compare.h	(revision 413338)
+++ databases/mysql57-server/files/patch-include_my__compare.h	(working copy)
@@ -1,4 +1,4 @@
---- include/my_compare.h.orig	2015-11-29 19:16:24 UTC
+--- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
 +++ include/my_compare.h
 @@ -40,7 +40,7 @@ extern "C" {
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
Index: databases/mysql57-server/files/patch-include_my__thread__os__id.h
===================================================================
--- databases/mysql57-server/files/patch-include_my__thread__os__id.h	(revision 413338)
+++ databases/mysql57-server/files/patch-include_my__thread__os__id.h	(working copy)
@@ -1,4 +1,4 @@
---- include/my_thread_os_id.h.orig	2015-11-29 19:16:24 UTC
+--- include/my_thread_os_id.h.orig	2016-03-28 18:06:12 UTC
 +++ include/my_thread_os_id.h
 @@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
    return pthread_getthreadid_np();
Index: databases/mysql57-server/files/patch-include_myisam.h
===================================================================
--- databases/mysql57-server/files/patch-include_myisam.h	(revision 413338)
+++ databases/mysql57-server/files/patch-include_myisam.h	(working copy)
@@ -1,4 +1,4 @@
---- include/myisam.h.orig	2015-11-29 19:16:24 UTC
+--- include/myisam.h.orig	2016-03-28 18:06:12 UTC
 +++ include/myisam.h
 @@ -45,7 +45,7 @@ extern "C" {
    The following defines can be increased if necessary.
Index: databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-libmysql_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-libmysql_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- libmysql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ libmysql/CMakeLists.txt
 @@ -215,7 +215,7 @@ IF(WIN32)
  ENDIF()
Index: databases/mysql57-server/files/patch-libservices_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-libservices_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-libservices_CMakeLists.txt	(working copy)
@@ -1,7 +1,7 @@
---- libservices/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- libservices/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ libservices/CMakeLists.txt
-@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
-   security_context_service.c)
+@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
+   mysql_keyring_service.c)
  
  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
 +IF(FALSE)
Index: databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
===================================================================
--- databases/mysql57-server/files/patch-mysys__ssl_my__default.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-mysys__ssl_my__default.cc	(working copy)
@@ -1,4 +1,4 @@
---- mysys_ssl/my_default.cc.orig	2015-11-29 19:16:24 UTC
+--- mysys_ssl/my_default.cc.orig	2016-03-28 18:06:12 UTC
 +++ mysys_ssl/my_default.cc
 @@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
  
Index: databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc
===================================================================
--- databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc	(working copy)
@@ -1,4 +1,4 @@
---- plugin/password_validation/validate_password.cc.orig	2015-11-29 19:16:24 UTC
+--- plugin/password_validation/validate_password.cc.orig	2016-03-28 18:06:12 UTC
 +++ plugin/password_validation/validate_password.cc
 @@ -18,6 +18,8 @@
  #include <mysql/plugin_validate_password.h>
Index: databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt	(nonexistent)
+++ databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt	(working copy)
@@ -0,0 +1,20 @@
+--- rapid/plugin/x/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
++++ rapid/plugin/x/CMakeLists.txt
+@@ -91,14 +91,14 @@ ELSE()
+     ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include
+     ${CMAKE_SOURCE_DIR}/include #temporary
+     ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
+-    ${SSL_INCLUDE_DIRS}
+-    ${ZLIB_INCLUDE_DIR}
++    ${BOOST_INCLUDE_DIR}
+   )
+ 
+   INCLUDE_DIRECTORIES(SYSTEM
+-    ${BOOST_INCLUDE_DIR}
+     ${PROTOBUF_INCLUDE_DIRS}
+     ${LIBEVENT_INCLUDE_DIR}
++    ${SSL_INCLUDE_DIRS}
++    ${ZLIB_INCLUDE_DIR}
+   )
+ 
+   IF(XPLUGIN_NO_LITE_PROTOBUF)
Index: databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake
===================================================================
--- databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake	(nonexistent)
+++ databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__error.cmake	(working copy)
@@ -0,0 +1,11 @@
+--- rapid/plugin/x/mysqlx_error.cmake.orig	2016-04-14 21:38:55 UTC
++++ rapid/plugin/x/mysqlx_error.cmake
+@@ -26,6 +26,8 @@ GENERATE_XERRORS(${MYSQLX_PROJECT_DIR}/s
+ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_error.h.in 
+                ${CMAKE_CURRENT_BINARY_DIR}/mysqlx_error.h)
+ 
++IF(FALSE)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqlx_error.h
+         DESTINATION ${INSTALL_INCLUDEDIR}
+         COMPONENT Developement)
++ENDIF()
Index: databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt	(nonexistent)
+++ databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt	(working copy)
@@ -0,0 +1,18 @@
+--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
++++ rapid/unittest/gunit/xplugin/CMakeLists.txt
+@@ -65,7 +65,6 @@ ENDIF()
+ ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO)
+ 
+ INCLUDE_DIRECTORIES(SYSTEM
+-    ${BOOST_INCLUDE_DIR}
+     ${PROTOBUF_INCLUDE_DIRS}
+     ${SSL_INCLUDE_DIRS}
+     ${LIBEVENT_INCLUDE_DIR}
+@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
+ )
+ 
+ INCLUDE_DIRECTORIES(
++  ${BOOST_INCLUDE_DIR}
+   ${CMAKE_SOURCE_DIR}/testing/include
+   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
+   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
Index: databases/mysql57-server/files/patch-scripts_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-scripts_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-scripts_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- scripts/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ scripts/CMakeLists.txt
 @@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
Index: databases/mysql57-server/files/patch-sql_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-sql_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-sql_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- sql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- sql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ sql/CMakeLists.txt
 @@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
    ${ZLIB_INCLUDE_DIR}
Index: databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
===================================================================
--- databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc	(working copy)
@@ -1,4 +1,4 @@
---- sql/conn_handler/socket_connection.cc.orig	2015-11-29 19:16:24 UTC
+--- sql/conn_handler/socket_connection.cc.orig	2016-03-28 18:06:12 UTC
 +++ sql/conn_handler/socket_connection.cc
 @@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
      signal(SIGCHLD, SIG_DFL);
Index: databases/mysql57-server/files/patch-sql_json__dom.h
===================================================================
--- databases/mysql57-server/files/patch-sql_json__dom.h	(revision 413338)
+++ databases/mysql57-server/files/patch-sql_json__dom.h	(working copy)
@@ -1,4 +1,4 @@
---- sql/json_dom.h.orig	2015-11-29 19:16:24 UTC
+--- sql/json_dom.h.orig	2016-03-28 18:06:12 UTC
 +++ sql/json_dom.h
 @@ -368,7 +368,7 @@ struct Json_key_comparator
    Json_object class.
Index: databases/mysql57-server/files/patch-sql_sql__view.cc
===================================================================
--- databases/mysql57-server/files/patch-sql_sql__view.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-sql_sql__view.cc	(working copy)
@@ -1,6 +1,6 @@
---- sql/sql_view.cc.orig	2015-11-29 19:16:24 UTC
+--- sql/sql_view.cc.orig	2016-03-28 18:06:12 UTC
 +++ sql/sql_view.cc
-@@ -768,46 +768,46 @@ static const int required_view_parameter
+@@ -773,46 +773,46 @@ static const int required_view_parameter
  */
  static File_option view_parameters[]=
  {{{ C_STRING_WITH_LEN("query")},
Index: databases/mysql57-server/files/patch-sql_sys__vars.cc
===================================================================
--- databases/mysql57-server/files/patch-sql_sys__vars.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-sql_sys__vars.cc	(working copy)
@@ -1,4 +1,4 @@
---- sql/sys_vars.cc.orig	2015-11-29 19:16:24 UTC
+--- sql/sys_vars.cc.orig	2016-03-28 18:06:12 UTC
 +++ sql/sys_vars.cc
 @@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
         "connection before closing it",
@@ -9,7 +9,7 @@
  
  static Sys_var_ulong Sys_join_buffer_size(
         "join_buffer_size",
-@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou
+@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou
         "Number of seconds to wait for more data from a connection before "
         "aborting the read",
         SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
@@ -18,7 +18,7 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_net_read_timeout));
  
-@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo
+@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo
         "Number of seconds to wait for a block to be written to a connection "
         "before aborting the write",
         SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
@@ -27,7 +27,7 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_net_write_timeout));
  
-@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou
+@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou
         "The number of seconds the server waits for activity on a "
         "connection before closing it",
         SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
Index: databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc
===================================================================
--- databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc	(working copy)
@@ -1,6 +1,6 @@
---- storage/innobase/buf/buf0buf.cc.orig	2015-11-29 19:16:24 UTC
+--- storage/innobase/buf/buf0buf.cc.orig	2016-03-28 18:06:12 UTC
 +++ storage/innobase/buf/buf0buf.cc
-@@ -300,7 +300,7 @@ typedef std::map<
+@@ -338,7 +338,7 @@ typedef std::map<
  	const byte*,
  	buf_chunk_t*,
  	std::less<const byte*>,
Index: databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc
===================================================================
--- databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc	(working copy)
@@ -1,4 +1,4 @@
---- storage/innobase/dict/dict0stats.cc.orig	2015-11-29 19:16:24 UTC
+--- storage/innobase/dict/dict0stats.cc.orig	2016-03-28 18:06:12 UTC
 +++ storage/innobase/dict/dict0stats.cc
 @@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the 
  typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> >	boundaries_t;
Index: databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h
===================================================================
--- databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h	(revision 413338)
+++ databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h	(working copy)
@@ -1,4 +1,4 @@
---- storage/innobase/include/srv0mon.h.orig	2015-11-29 19:16:24 UTC
+--- storage/innobase/include/srv0mon.h.orig	2016-03-28 18:06:12 UTC
 +++ storage/innobase/include/srv0mon.h
 @@ -34,6 +34,10 @@ Created 12/15/2009	Jimmy Yang
  /* Required for FreeBSD so that INT64_MAX is defined. */
Index: databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc
===================================================================
--- databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc	(revision 413338)
+++ databases/mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc	(working copy)
@@ -1,6 +1,6 @@
---- storage/innobase/sync/sync0debug.cc.orig	2015-11-29 19:16:24 UTC
+--- storage/innobase/sync/sync0debug.cc.orig	2016-03-28 18:06:12 UTC
 +++ storage/innobase/sync/sync0debug.cc
-@@ -1704,7 +1704,7 @@ private:
+@@ -1702,7 +1702,7 @@ private:
  		const void*,
  		File,
  		std::less<const void*>,
Index: databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
===================================================================
--- databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c	(revision 413338)
+++ databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c	(working copy)
@@ -1,4 +1,4 @@
---- storage/myisam/mi_dynrec.c.orig	2015-11-29 19:16:24 UTC
+--- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
 +++ storage/myisam/mi_dynrec.c
 @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
      DBUG_RETURN(1);
Index: databases/mysql57-server/files/patch-support-files_CMakeLists.txt
===================================================================
--- databases/mysql57-server/files/patch-support-files_CMakeLists.txt	(revision 413338)
+++ databases/mysql57-server/files/patch-support-files_CMakeLists.txt	(working copy)
@@ -1,4 +1,4 @@
---- support-files/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
+--- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ support-files/CMakeLists.txt
 @@ -69,7 +69,9 @@ IF(UNIX)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
@@ -7,6 +7,6 @@
 +IF(FALSE)
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
 +ENDIF()
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
    
    SET(bindir ${prefix}/${INSTALL_BINDIR})
+   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
Index: databases/mysql57-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc
===================================================================
--- databases/mysql57-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc	(nonexistent)
+++ databases/mysql57-server/files/rapid_plugin-patch-_x_mysqlxtest__src_mysqlxtest.cc	(working copy)
@@ -0,0 +1,12 @@
+--- rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc.orig	2016-03-28 18:06:12 UTC
++++ rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc
+@@ -1661,7 +1661,8 @@ private:
+     if (2 == argl.size())
+       tolerance = atoi(argl[1].c_str());
+ 
+-    if (abs(expected_msec - msec) > tolerance)
++#define my_abs_64(x) ((x) < 0 ? (-x) : (x))
++    if (my_abs_64((expected_msec - msec)) > tolerance)
+     {
+       std::cerr << "Timeout should occur after " << expected_msec << "ms, but it was " << msec <<"ms.  \n";
+       return Stop_with_failure;
Index: databases/mysql57-server/pkg-message
===================================================================
--- databases/mysql57-server/pkg-message	(revision 413338)
+++ databases/mysql57-server/pkg-message	(working copy)
@@ -8,3 +8,12 @@
 in /root/.mysql_secret
 
 *****************************************************************************
+
+*****************************************************************************
+
+Please keep in mind that the default location for my.cnf will be changed
+from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near
+future.  If you do not want to move your my.cnf to the new location then
+you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
+
+*****************************************************************************
Index: databases/mysql57-server/pkg-plist
===================================================================
--- databases/mysql57-server/pkg-plist	(revision 413338)
+++ databases/mysql57-server/pkg-plist	(working copy)
@@ -14,6 +14,7 @@
 bin/mysqld_safe
 bin/mysqldumpslow
 bin/mysqltest
+bin/mysqlxtest
 bin/perror
 bin/replace
 bin/resolve_stack_dump
@@ -25,6 +26,7 @@
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/daemon_example.ini
 %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
+lib/mysql/plugin/keyring_file.so
 lib/mysql/plugin/libdaemon_example.so
 lib/mysql/plugin/libtest_framework.so
 lib/mysql/plugin/libtest_services.so
@@ -50,6 +52,7 @@
 lib/mysql/plugin/locking_service.so
 lib/mysql/plugin/mypluglib.so
 lib/mysql/plugin/mysql_no_login.so
+lib/mysql/plugin/mysqlx.so
 lib/mysql/plugin/qa_auth_client.so
 lib/mysql/plugin/qa_auth_interface.so
 lib/mysql/plugin/qa_auth_server.so
@@ -150,3 +153,7 @@
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
 %%DATADIR%%/uninstall_rewriter.sql
+@sample(root,wheel,0640) %%ETCDIR%%/my.cnf.sample
+@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
+@dir(mysql,mysql,0750) %%MY_SECDIR%%
+@dir(mysql,mysql,0750) %%MY_TMPDIR%%