Index: head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
===================================================================
--- head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt	(revision 476015)
+++ head/databases/mysql80-client/files/patch-utilities_CMakeLists.txt	(revision 476016)
@@ -1,31 +1,31 @@
 --- utilities/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
 +++ utilities/CMakeLists.txt
 @@ -45,6 +45,7 @@ ENDIF()
  
  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h
                     ${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/english/errmsg.sys
 +                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/share/
                     COMMAND comp_err
                      --charset=${PROJECT_SOURCE_DIR}/share/charsets
                      --out-dir=${PROJECT_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/
 @@ -73,4 +74,5 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
  ENDIF()
  
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
  TARGET_LINK_LIBRARIES(my_print_defaults  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(FALSE)
  IF(UNIX)
    MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
    TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
  ENDIF()
 +ENDIF()
  
  # In published release builds on Solaris, we need to bundle gcc source.
  # PB2 will take care of putting it in extra/ when needed