Index: databases/mysql80-client/Makefile
===================================================================
--- databases/mysql80-client/Makefile	(revision 430902)
+++ databases/mysql80-client/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
Index: databases/mysql80-client/files/patch-include_CMakeLists.txt
===================================================================
--- databases/mysql80-client/files/patch-include_CMakeLists.txt	(revision 430902)
+++ databases/mysql80-client/files/patch-include_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+--- include/CMakeLists.txt.orig	2016-08-25 12:32:09 UTC
 +++ include/CMakeLists.txt
-@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
+@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
  
  SET(HEADERS 
    ${HEADERS_ABI} 
@@ -8,3 +8,95 @@
    my_dbug.h 
    m_string.h
    my_sys.h 
+@@ -64,6 +65,81 @@ SET(HEADERS 
+   thr_cond.h
+   thr_mutex.h
+   thr_rwlock.h
++  base64.h
++  c_string_less.h
++  crypt_genhash_impl.h
++  depth_first_search.h
++  dur_prop.h
++  ft_global.h
++  heap.h
++  i_callable.h
++  instance_callback.h
++  lf.h
++  mutex_lock.h
++  my_aes.h
++  my_atomic.h
++  my_base.h
++  my_bit.h
++  my_bitmap.h
++  my_check_opt.h
++  my_compare.h
++  my_compare.h.orig
++  my_default.h
++  my_icp.h
++  my_md5.h
++  my_md5_size.h
++  my_murmur3.h
++  my_rdtsc.h
++  my_rnd.h
++  my_sqlcommand.h
++  my_stacktrace.h
++  my_thread_os_id.h
++  my_time.h
++  my_timer.h
++  my_tree.h
++  my_uctype.h
++  my_user.h
++  myisam.h
++  myisam.h.orig
++  myisammrg.h
++  myisampack.h
++  mysql.h.pp
++  mysql_version.h.in
++  mysys_err.h
++  nullable.h
++  password.h
++  pfs_cond_provider.h
++  pfs_error_provider.h
++  pfs_file_provider.h
++  pfs_idle_provider.h
++  pfs_memory_provider.h
++  pfs_metadata_provider.h
++  pfs_mutex_provider.h
++  pfs_rwlock_provider.h
++  pfs_socket_provider.h
++  pfs_stage_provider.h
++  pfs_statement_provider.h
++  pfs_table_provider.h
++  pfs_thread_provider.h
++  pfs_transaction_provider.h
++  prealloced_array.h
++  priority_queue.h
++  probes_mysql.d.base
++  probes_mysql.h
++  probes_mysql_nodtrace.h
++  queues.h
++  rwlock_scoped_lock.h
++  scope_guard.h
++  service_versions.h
++  sha1.h
++  sha2.h
++  sql_chars.h
++  sql_string.h
++  str_uca_type.h
++  template_utils.h
++  thr_lock.h
++  violite.h
++  welcome_copyright_notice.h
+   ${HEADERS_GEN_CONFIGURE}
+ )
+ 
+@@ -76,5 +152,9 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
+  PATTERN "*.h"
+  PATTERN "psi_abi*" EXCLUDE
+ )
++INSTALL(DIRECTORY atomic/ DESTINATION ${INSTALL_INCLUDEDIR}/atomic COMPONENT Development 
++ PATTERN "*.h"
++ PATTERN "psi_abi*" EXCLUDE
++)
+ 
+ 
Index: databases/mysql80-client/pkg-plist
===================================================================
--- databases/mysql80-client/pkg-plist	(revision 430902)
+++ databases/mysql80-client/pkg-plist	(working copy)
@@ -10,36 +10,85 @@
 bin/mysqlpump
 bin/mysqlshow
 bin/mysqlslap
+include/mysql/atomic/gcc_atomic.h
+include/mysql/atomic/gcc_sync.h
+include/mysql/atomic/generic-msvc.h
+include/mysql/atomic/solaris.h
+include/mysql/base64.h
+include/mysql/big_endian.h
 include/mysql/binary_log_types.h
-include/mysql/big_endian.h
 include/mysql/byte_order_generic.h
 include/mysql/byte_order_generic_x86.h
+include/mysql/c_string_less.h
+include/mysql/crypt_genhash_impl.h
 include/mysql/decimal.h
+include/mysql/depth_first_search.h
+include/mysql/dur_prop.h
 include/mysql/errmsg.h
+include/mysql/ft_global.h
 include/mysql/hash.h
+include/mysql/heap.h
+include/mysql/i_callable.h
+include/mysql/instance_callback.h
 include/mysql/keycache.h
+include/mysql/lf.h
 include/mysql/little_endian.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
+include/mysql/mutex_lock.h
+include/mysql/my_aes.h
 include/mysql/my_alloc.h
+include/mysql/my_atomic.h
+include/mysql/my_base.h
+include/mysql/my_bit.h
+include/mysql/my_bitmap.h
 include/mysql/my_byteorder.h
+include/mysql/my_check_opt.h
 include/mysql/my_command.h
+include/mysql/my_compare.h
 include/mysql/my_compiler.h
 include/mysql/my_config.h
 include/mysql/my_dbug.h
+include/mysql/my_default.h
 include/mysql/my_dir.h
 include/mysql/my_getopt.h
 include/mysql/my_global.h
+include/mysql/my_icp.h
 include/mysql/my_list.h
+include/mysql/my_md5.h
+include/mysql/my_md5_size.h
+include/mysql/my_murmur3.h
+include/mysql/my_rdtsc.h
+include/mysql/my_rnd.h
+include/mysql/my_sqlcommand.h
+include/mysql/my_stacktrace.h
 include/mysql/my_sys.h
 include/mysql/my_thread.h
 include/mysql/my_thread_local.h
+include/mysql/my_thread_os_id.h
+include/mysql/my_time.h
+include/mysql/my_timer.h
+include/mysql/my_tree.h
+include/mysql/my_uctype.h
+include/mysql/my_user.h
 include/mysql/my_xml.h
+include/mysql/myisam.h
+include/mysql/myisammrg.h
+include/mysql/myisampack.h
 include/mysql/mysql.h
+include/mysql/mysql.h.pp
 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/components/component_implementation.h
+include/mysql/mysql/components/my_service.h
+include/mysql/mysql/components/service.h
+include/mysql/mysql/components/service_implementation.h
+include/mysql/mysql/components/services/dynamic_loader.h
+include/mysql/mysql/components/services/dynamic_loader_scheme_file.h
+include/mysql/mysql/components/services/persistent_dynamic_loader.h
+include/mysql/mysql/components/services/registry.h
 include/mysql/mysql/get_password.h
 include/mysql/mysql/group_replication_priv.h
 include/mysql/mysql/innodb_priv.h
@@ -58,23 +107,29 @@
 include/mysql/mysql/plugin_query_rewrite.h
 include/mysql/mysql/plugin_trace.h
 include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/components/component_implementation.h
-include/mysql/mysql/components/my_service.h
-include/mysql/mysql/components/service.h
-include/mysql/mysql/components/service_implementation.h
-include/mysql/mysql/components/services/dynamic_loader.h
-include/mysql/mysql/components/services/dynamic_loader_scheme_file.h
-include/mysql/mysql/components/services/persistent_dynamic_loader.h
-include/mysql/mysql/components/services/registry.h
 include/mysql/mysql/psi/mysql_cond.h
 include/mysql/mysql/psi/mysql_error.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_mutex.h
+include/mysql/mysql/psi/mysql_ps.h
 include/mysql/mysql/psi/mysql_rwlock.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_cond.h
 include/mysql/mysql/psi/psi_error.h
 include/mysql/mysql/psi/psi_file.h
 include/mysql/mysql/psi/psi_idle.h
 include/mysql/mysql/psi/psi_mdl.h
+include/mysql/mysql/psi/psi_memory.h
 include/mysql/mysql/psi/psi_mutex.h
 include/mysql/mysql/psi/psi_rwlock.h
 include/mysql/mysql/psi/psi_socket.h
@@ -83,20 +138,6 @@
 include/mysql/mysql/psi/psi_table.h
 include/mysql/mysql/psi/psi_thread.h
 include/mysql/mysql/psi/psi_transaction.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_memory.h
 include/mysql/mysql/service_command.h
 include/mysql/mysql/service_locking.h
 include/mysql/mysql/service_my_plugin_log.h
@@ -125,8 +166,26 @@
 include/mysql/mysql_com_server.h
 include/mysql/mysql_time.h
 include/mysql/mysql_version.h
+include/mysql/mysql_version.h.in
 include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
+include/mysql/mysys_err.h
+include/mysql/nullable.h
+include/mysql/password.h
+include/mysql/pfs_cond_provider.h
+include/mysql/pfs_error_provider.h
+include/mysql/pfs_file_provider.h
+include/mysql/pfs_idle_provider.h
+include/mysql/pfs_memory_provider.h
+include/mysql/pfs_metadata_provider.h
+include/mysql/pfs_mutex_provider.h
+include/mysql/pfs_rwlock_provider.h
+include/mysql/pfs_socket_provider.h
+include/mysql/pfs_stage_provider.h
+include/mysql/pfs_statement_provider.h
+include/mysql/pfs_table_provider.h
+include/mysql/pfs_thread_provider.h
+include/mysql/pfs_transaction_provider.h
 include/mysql/plugin.h
 include/mysql/plugin_audit.h
 include/mysql/plugin_ftparser.h
@@ -133,21 +192,39 @@
 include/mysql/plugin_group_replication.h
 include/mysql/plugin_keyring.h
 include/mysql/plugin_validate_password.h
+include/mysql/prealloced_array.h
+include/mysql/priority_queue.h
+include/mysql/probes_mysql.d.base
+include/mysql/probes_mysql.h
+include/mysql/probes_mysql_nodtrace.h
+include/mysql/queues.h
+include/mysql/rwlock_scoped_lock.h
+include/mysql/scope_guard.h
+include/mysql/service_versions.h
+include/mysql/sha1.h
+include/mysql/sha2.h
+include/mysql/sql_chars.h
 include/mysql/sql_common.h
+include/mysql/sql_string.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
+include/mysql/str_uca_type.h
+include/mysql/template_utils.h
 include/mysql/thr_cond.h
+include/mysql/thr_lock.h
 include/mysql/thr_mutex.h
 include/mysql/thr_rwlock.h
 include/mysql/typelib.h
+include/mysql/violite.h
+include/mysql/welcome_copyright_notice.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.21
-lib/mysql/libmysqlservices.a
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.21
+lib/mysql/libmysqlservices.a
 libdata/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1.gz
 man/man1/mysql.1.gz
Index: databases/php70-mysqli/files/patch-mysqli.c
===================================================================
--- databases/php70-mysqli/files/patch-mysqli.c	(nonexistent)
+++ databases/php70-mysqli/files/patch-mysqli.c	(working copy)
@@ -0,0 +1,11 @@
+--- mysqli.c.orig	2016-12-06 18:05:01 UTC
++++ mysqli.c
+@@ -703,7 +703,7 @@ PHP_MINIT_FUNCTION(mysqli)
+ #ifdef MYSQLND_STRING_TO_INT_CONVERSION
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT);
+ #endif
+-#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND)
++#if (MYSQL_VERSION_ID < 80000 && MYSQL_VERSION_ID > 50110) || defined(MYSQLI_USE_MYSQLND)
+ 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
+ #endif
+