9 files changed, 44 insertions, 47 deletions

diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 783e9ded8fd4..92d56bfbf684 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql80-client/files/patch-client_CMakeLists.txt b/databases/mysql80-client/files/patch-client_CMakeLists.txt
index 15ec0ab1a359..26142360bdcd 100644
--- a/databases/mysql80-client/files/patch-client_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-client_CMakeLists.txt
@@ -13,17 +13,18 @@
  
  SET(MYSQLTEST_SRC
    mysqltest/error_names.cc
-@@ -48,9 +50,11 @@
+@@ -49,10 +51,12 @@
    mysqltest/utils.cc
  )
  
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test)
+ SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
  TARGET_LINK_LIBRARIES(mysqltest mysqlclient)
  ADD_DEPENDENCIES(mysqltest GenError GenClientError)
 +ENDIF()
  
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
+ ADD_LIBRARY(mysqlcheck_core STATIC check/mysqlcheck_core.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
 @@ -108,8 +112,10 @@
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
diff --git a/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake
index e2f70f193360..2c6ce17ab9bf 100644
--- a/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake
+++ b/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake
@@ -1,8 +1,8 @@
---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
+--- cmake/os/FreeBSD.cmake.orig	2019-06-25 10:23:30 UTC
 +++ cmake/os/FreeBSD.cmake
-@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
+@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+       MESSAGE(FATAL_ERROR
+         "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})")
      ENDIF()
 -  ELSE()
 -    MESSAGE(FATAL_ERROR "Unsupported compiler!")
@@ -22,11 +22,4 @@
 +    ENDIF()
    ENDIF()
  ENDIF()
- 
- # Should not be needed any more, but kept for easy resurrection if needed
- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
--
-+# For GCC maybe it's also good idea to use
-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
-+    
+
diff --git a/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
index 9c6fb0acb77d..dd18e86c1149 100644
--- a/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
@@ -16,8 +16,8 @@
      COMPONENT SharedLibraries)
    IF(UNIX)
      # libtool compatability
--    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
+-    IF(FREEBSD OR APPLE)
++    IF(FREEBSD OR APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
        SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
      ELSE()
        SET(OS_SHARED_LIB_VERSION
diff --git a/databases/mysql80-client/files/patch-man_CMakeLists.txt b/databases/mysql80-client/files/patch-man_CMakeLists.txt
index 46a765203715..213cddda7a91 100644
--- a/databases/mysql80-client/files/patch-man_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-man_CMakeLists.txt
@@ -1,10 +1,11 @@
---- man/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
+--- man/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
 +++ man/CMakeLists.txt
-@@ -22,9 +22,6 @@
+@@ -22,10 +22,6 @@
  
  # Copy man pages
  FILE(GLOB MAN1 *.1)
 -FILE(GLOB MAN1_NDB ndb*.1)
+-FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
 -FILE(GLOB MAN8 *.8)
 -FILE(GLOB MAN8_NDB ndb*.8)
  IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
diff --git a/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc
index 0749c3ca36d5..cf0af3c629d9 100644
--- a/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc
+++ b/databases/mysql80-client/files/patch-mysys__ssl_my__default.cc
@@ -1,5 +1,5 @@
---- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
-+++ mysys_ssl/my_default.cc
+--- mysys/my_default.cc.orig	2016-08-25 11:52:06 UTC
++++ mysys/my_default.cc
 @@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
  
  /* Which directories are searched for options (and in which order) */
diff --git a/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc b/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc
index c96578284466..bed3c7d521e6 100644
--- a/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc
+++ b/databases/mysql80-client/files/patch-mysys__ssl_my__md5.cc
@@ -1,5 +1,5 @@
---- mysys_ssl/my_md5.cc.orig	2018-04-08 06:44:49 UTC
-+++ mysys_ssl/my_md5.cc
+--- mysys/my_md5.cc.orig	2018-04-08 06:44:49 UTC
++++ mysys/my_md5.cc
 @@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d
  int compute_md5_hash(char *digest, const char *buf, int len) {
    int retval = 0;
diff --git a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
index 006e36145e26..3c5e299b1d63 100644
--- a/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-support-files_CMakeLists.txt
@@ -1,23 +1,27 @@
 --- support-files/CMakeLists.txt.orig	2017-06-27 11:44:29 UTC
 +++ support-files/CMakeLists.txt
-@@ -46,6 +46,7 @@ IF(UNIX)
-   ELSE()
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-+IF (FALSE)
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-   FOREACH(script  mysqld_multi.server mysql-log-rotate)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-@@ -63,9 +64,12 @@
-        DESTINATION ${inst_location} COMPONENT ${comp}
-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-   ENDFOREACH()
-+ENDIF()
+@@ -29,9 +29,11 @@
+ 
+ SET(localstatedir "${MYSQL_DATADIR}")
+ 
++IF(FALSE)
+ SET(prefix "${CMAKE_INSTALL_PREFIX}")
+ SET(bindir ${prefix}/${INSTALL_BINDIR})
+ SET(sbindir ${prefix}/${INSTALL_SBINDIR})
 +ENDIF()
  
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-   
-+IF (FALSE)
-   SET(bindir ${prefix}/${INSTALL_BINDIR})
-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
-   SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
+ IF(LINUX)
+   SET (PIDOF "pidof")
+@@ -39,6 +41,7 @@
+   SET (PIDOF "pgrep -d' ' -f")
+ ENDIF()
+ 
++IF(FALSE)
+ FOREACH(script
+     mysql.server
+     mysqld_multi.server
+@@ -54,3 +57,4 @@
+     GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+     )
+ ENDFOREACH()
++ENDIF()
diff --git a/databases/mysql80-client/files/patch-utilities_CMakeLists.txt b/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
index a86c4e135795..3a584e82cae9 100644
--- a/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
+++ b/databases/mysql80-client/files/patch-utilities_CMakeLists.txt
@@ -16,11 +16,9 @@
  MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.cc)
  TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
  SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -169,6 +171,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+@@ -168,4 +170,5 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
+     mysys innodb_zipdecompress ${LZ4_LIBRARY})
    ADD_DEPENDENCIES(ibd2sdi GenError)
  
- 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
+ ENDIF()