Update default MySQL version to 5.7.

PR:		238365
Submitted by:	ale
Exp-run by:	antoine
Approved by:	portmgr (antoine)

14 files changed, 41 insertions, 134 deletions

diff --git a/databases/apq-mysql/Makefile b/databases/apq-mysql/Makefile
index 3f4f0d627a1f..13a4dee44a6b 100644
--- a/databases/apq-mysql/Makefile
+++ b/databases/apq-mysql/Makefile
@@ -18,8 +18,9 @@ BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
 
-USES=		ada tar:bzip2
-USE_MYSQL=	yes
+USES=		ada tar:bzip2 mysql
+
+IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
 HAS_CONFIGURE=	yes
 WRKPATH=	${WRKDIR}/build
 CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/databases/ateam_mysql_ldap_auth/Makefile b/databases/ateam_mysql_ldap_auth/Makefile
index 0168cc701f79..15205100da7e 100644
--- a/databases/ateam_mysql_ldap_auth/Makefile
+++ b/databases/ateam_mysql_ldap_auth/Makefile
@@ -17,6 +17,8 @@ LIB_DEPENDS=	libconfig.so:devel/libconfig
 USE_OPENLDAP=	yes
 USES=		gmake mysql:client,server
 
+IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	ateamsystems
 GH_TAGNAME=	f6a1a5d
diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile
index 6906ba33c983..b1e5f512077b 100644
--- a/databases/mroonga/Makefile
+++ b/databases/mroonga/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	libgroonga.so:textproc/groonga
 
 USES=		libtool mysql pkgconfig
 
+IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
 		--with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
diff --git a/databases/mysac/Makefile b/databases/mysac/Makefile
index a303e3541d5e..12b962b65414 100644
--- a/databases/mysac/Makefile
+++ b/databases/mysac/Makefile
@@ -12,8 +12,11 @@ COMMENT=	MySQL Simple Asynchronous Client
 
 LICENSE=	LGPL3
 
+USES=		mysql
+
+IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
+
 USE_LDCONFIG=	yes
-USE_MYSQL=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-I${LOCALBASE}/lib
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
index 17aa973891bd..0f1b4d0d5d0b 100644
--- a/databases/mysql-connector-odbc/Makefile
+++ b/databases/mysql-connector-odbc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-odbc
-PORTVERSION=	5.3.4
-PORTREVISION=	1
+PORTVERSION=	5.3.13
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/Connector-ODBC/5.3
 PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
@@ -13,25 +12,22 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	unixODBC>=2.2.14_1:databases/unixODBC
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USES=		cmake mysql
-CMAKE_ARGS=	-DWITH_UNIXODBC=1
+
+CMAKE_ARGS=	-DWITH_UNIXODBC=1 -DDISABLE_GUI=1
 USE_LDCONFIG=	yes
 
 MAKE_JOBS_UNSAFE=yes
 
-IGNORE_WITH_MYSQL=	55 55m 55p 51 51m 51p
-
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DRIVER_MANAGER=	unixodbc
 
-PORTDOCS=	ChangeLog INSTALL \
-		README README.debug Licenses_for_Third-Party_Components.txt
+PORTDOCS=	*
 
 PLIST_FILES=	bin/myodbc-installer \
 		lib/libmyodbc5a.so \
diff --git a/databases/mysql-connector-odbc/distinfo b/databases/mysql-connector-odbc/distinfo
index 8431c8f260ad..53ee695d2482 100644
--- a/databases/mysql-connector-odbc/distinfo
+++ b/databases/mysql-connector-odbc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mysql-connector-odbc-5.3.4-src.tar.gz) = a5f7a490f2958f2768d18b8a57f71909f9699a8619c82776b3ad1c02b8abce0d
-SIZE (mysql-connector-odbc-5.3.4-src.tar.gz) = 667340
+TIMESTAMP = 1560498109
+SHA256 (mysql-connector-odbc-5.3.13-src.tar.gz) = 6127639a503e80cff71e211d7534801a074e781624974807a279c7f6e6f0353a
+SIZE (mysql-connector-odbc-5.3.13-src.tar.gz) = 3009032
diff --git a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
index 980b069bf6dd..f184b2a0e6f4 100644
--- a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
+++ b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
@@ -1,36 +1,30 @@
---- CMakeLists.txt.orig	2014-06-18 22:50:16 UTC
+--- CMakeLists.txt.orig	2019-04-15 16:56:34 UTC
 +++ CMakeLists.txt
-@@ -269,7 +269,7 @@ ENDIF(NOT DISABLE_GUI)
+@@ -431,7 +431,6 @@ ENDIF(NOT DISABLE_GUI)
+ 
  ADD_SUBDIRECTORY(dltest)
  ADD_SUBDIRECTORY(installer)
- 
 -ADD_SUBDIRECTORY(test)
-+# ADD_SUBDIRECTORY(test)
  
- ##############################################################################
- #
-@@ -382,18 +382,17 @@ IF(WIN32)
+ # For dynamic linking use the built-in sys and strings
+ IF(NOT MYSQLCLIENT_STATIC_LINKING)
+@@ -501,8 +500,8 @@ cmake/sql.*\\\\.c$
+ #------------ Installation ---------------------------
+ 
+ 
+-INSTALL(FILES LICENSE.txt   DESTINATION .)
+-INSTALL(FILES README.txt    DESTINATION .)
++INSTALL(FILES LICENSE.txt   DESTINATION ./share/doc/mysql-connector-odbc/)
++INSTALL(FILES README.txt    DESTINATION ./share/doc/mysql-connector-odbc/)
+ 
+ IF(WIN32)
+ 
+@@ -542,7 +541,7 @@ IF(WIN32)
  
  ELSE(WIN32)
  
 -  INSTALL(FILES ChangeLog    DESTINATION .)
--  INSTALL(FILES README       DESTINATION .)
--  INSTALL(FILES README.debug DESTINATION .)
--  INSTALL(FILES INSTALL      DESTINATION .)
 +  INSTALL(FILES ChangeLog    DESTINATION ./share/doc/mysql-connector-odbc/)
-+  INSTALL(FILES README       DESTINATION ./share/doc/mysql-connector-odbc/)
-+  INSTALL(FILES README.debug DESTINATION ./share/doc/mysql-connector-odbc/)
-+  INSTALL(FILES INSTALL      DESTINATION ./share/doc/mysql-connector-odbc/)
-   IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
--    INSTALL(FILES COPYING       DESTINATION .)
-   ELSE()
--    INSTALL(FILES LICENSE.mysql DESTINATION .)
-+    INSTALL(FILES LICENSE.mysql DESTINATION ./share/doc/mysql-connector-odbc/)
-   ENDIF()
  
  ENDIF(WIN32)
  
--INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
-+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ./share/doc/mysql-connector-odbc/)
- 
- INCLUDE(CPack)
diff --git a/databases/mysql-connector-odbc/files/patch-driver_catalog_no_i_s.c b/databases/mysql-connector-odbc/files/patch-driver_catalog_no_i_s.c
deleted file mode 100644
index 8555b2db9124..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_catalog_no_i_s.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- driver/catalog_no_i_s.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/catalog_no_i_s.c	2015-03-26 12:31:13.356945009 +0300
-@@ -1093,7 +1093,11 @@
-   unsigned long *lengths;
-   SQLRETURN rc= SQL_SUCCESS;
- 
-+#ifdef MARIADB_BASE_VERSION
-+  my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
-+#else
-   my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
-+#endif
- 
-   /* Get the list of tables that match szCatalog and szTable */
-   pthread_mutex_lock(&stmt->dbc->lock);
diff --git a/databases/mysql-connector-odbc/files/patch-driver_desc.c b/databases/mysql-connector-odbc/files/patch-driver_desc.c
deleted file mode 100644
index a95514f390bc..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_desc.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- driver/desc.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/desc.c	2015-03-26 12:34:50.610931661 +0300
-@@ -63,13 +63,21 @@
-      but in desc_get_rec we manually get a pointer to it. This avoids
-      having to call set_dynamic after modifying the DESCREC.
-   */
-+#ifdef MARIADB_BASE_VERSION
-+  if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, 0))
-+#else
-   if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
-+#endif
-   {
-     x_free((char *)desc);
-     return NULL;
-   }
- 
-+#ifdef MARIADB_BASE_VERSION
-+  if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, 0))
-+#else
-   if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
-+#endif
-   {
-     delete_dynamic(&desc->records);
-     x_free((char *)desc);
-@@ -997,7 +1005,12 @@
-   delete_dynamic(&dest->records);
-   if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
-                             src->records.max_element,
-+#ifdef MARIADB_BASE_VERSION
-+                            src->records.alloc_increment,
-+                            0))
-+#else
-                             src->records.alloc_increment))
-+#endif
-   {
-     return set_desc_error(dest, "HY001",
-               "Memory allocation error",
diff --git a/databases/mysql-connector-odbc/files/patch-driver_handle.c b/databases/mysql-connector-odbc/files/patch-driver_handle.c
deleted file mode 100644
index c0e2c5834f8f..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_handle.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- driver/handle.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/handle.c	2015-03-26 12:36:14.548929818 +0300
-@@ -403,7 +403,11 @@
-     }
-   }
- 
-+#ifdef MARIADB_BASE_VERSION
-+  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, 0);
-+#else
-   my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
-+#endif
-   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
- 											(*param_bind)->max_element);
- 
diff --git a/databases/mysql-connector-odbc/files/patch-driver_parse.c b/databases/mysql-connector-odbc/files/patch-driver_parse.c
deleted file mode 100644
index a65f66f0470f..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_parse.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- driver/parse.c.orig	2014-06-19 02:50:16.000000000 +0400
-+++ driver/parse.c	2015-03-26 12:37:12.112907082 +0300
-@@ -129,8 +129,13 @@
- 
-     /* TODO: Store offsets rather than ptrs. In this case we will be fine
-        if work with copy of the originally parsed string */
-+#ifdef MARIADB_BASE_VERSION
-+    my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, 0);
-+    my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, 0);
-+#else
-     my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
-     my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
-+#endif
-   }
- 
-   return pq;
diff --git a/databases/mysql-connector-odbc/files/patch-util_odbcinstw.c b/databases/mysql-connector-odbc/files/patch-util_odbcinstw.c
deleted file mode 100644
index 8d2cdd5a6f38..000000000000
--- a/databases/mysql-connector-odbc/files/patch-util_odbcinstw.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- util/odbcinstw.c.orig	2015-03-26 15:10:03.189270855 +0300
-+++ util/odbcinstw.c	2015-03-26 15:10:43.503271192 +0300
-@@ -105,7 +105,8 @@
-   x_free(section);
-   x_free(entry);
-   x_free(def);
--  x_free(ret);
-+  if (ret)
-+    free(ret);
-   x_free(filename);
- 
-   return rc;
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index 34329b91bcd9..09541d64accb 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -14,8 +14,9 @@ COMMENT=	Message queue that works as a pluggable storage engine of MySQL
 FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:fetch
 BUILD_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
 
-USES=		gmake perl5 libtool
-USE_MYSQL=	server
+USES=		gmake perl5 libtool mysql:server
+
+IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
 USE_GCC=	any
 USE_PERL5=	run
 
diff --git a/databases/mysqlbigram/Makefile b/databases/mysqlbigram/Makefile
index 1ad3b378975f..3ba711dd7355 100644
--- a/databases/mysqlbigram/Makefile
+++ b/databases/mysqlbigram/Makefile
@@ -13,9 +13,10 @@ COMMENT=	Simple n-gram (bi-gram) fulltext parser plugin for MySQL
 
 LICENSE=	LGPL21
 
+USES=		libtool mysql
+
 GNU_CONFIGURE=	yes
-USES=		libtool
-USE_MYSQL=	yes
+IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
 INSTALL_TARGET=	install-strip
 WRKSRC=		${WRKDIR}/bi_gram