databases/mariadb102-server: Update to 10.2.9

3 files changed, 14 insertions, 98 deletions

diff --git a/databases/mariadb102-client/Makefile b/databases/mariadb102-client/Makefile
index 59d0b0af46b3..ef123c0e651e 100644
--- a/databases/mariadb102-client/Makefile
+++ b/databases/mariadb102-client/Makefile
@@ -23,7 +23,7 @@ CLIENT_ONLY=	yes
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
 	${RM} -r ${STAGEDIR}${DATADIR}/policy
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam*
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
diff --git a/databases/mariadb102-client/files/patch-include_CMakeLists.txt b/databases/mariadb102-client/files/patch-include_CMakeLists.txt
index cb951775682f..159c833bc898 100644
--- a/databases/mariadb102-client/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-include_CMakeLists.txt
@@ -1,16 +1,17 @@
---- include/CMakeLists.txt.orig	2017-04-04 19:11:34 UTC
+--- include/CMakeLists.txt.orig	2017-08-17 10:05:38 UTC
 +++ include/CMakeLists.txt
-@@ -73,11 +73,13 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
- STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
+@@ -80,12 +80,14 @@ STRING(REPLACE "." "\\." EXCL_RE "${HEAD
  STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
  
+ MACRO(INSTALL_PRIVATE DIR)
 +IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN CMakeFiles EXCLUDE
-   PATTERN mysql EXCLUDE
-   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+   INSTALL(DIRECTORY ${DIR}/.
+     DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
+     FILES_MATCHING PATTERN "*.h"
+     PATTERN CMakeFiles EXCLUDE
+     PATTERN mysql EXCLUDE
+     REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
 +ENDIF()
+ ENDMACRO()
  
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
+ INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/databases/mariadb102-client/pkg-plist b/databases/mariadb102-client/pkg-plist
index 3cff799d4277..3528e70c23a4 100644
--- a/databases/mariadb102-client/pkg-plist
+++ b/databases/mariadb102-client/pkg-plist
@@ -11,22 +11,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/mysqlslap
 bin/mysql_config
-include/mysql/auth_dialog_client.h
-include/mysql/big_endian.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/byte_order_generic_x86_64.h
-include/mysql/client_plugin.h
-include/mysql/decimal.h
 include/mysql/errmsg.h
-include/mysql/handler_ername.h
-include/mysql/handler_state.h
-include/mysql/json_lib.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/ma_dyncol.h
 include/mysql/ma_list.h
 include/mysql/ma_pvio.h
 include/mysql/ma_tls.h
@@ -36,82 +21,11 @@ include/mysql/mariadb_ctype.h
 include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_byteorder.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_decimal_limits.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_valgrind.h
-include/mysql/my_xml.h
 include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
 include/mysql/mysql/plugin_auth_common.h
-include/mysql/pack.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_auth.h
-include/mysql/plugin_auth_common.h
-include/mysql/plugin_encryption.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_password_validation.h
-include/mysql/psi/mysql_file.h
-include/mysql/psi/mysql_idle.h
-include/mysql/psi/mysql_socket.h
-include/mysql/psi/mysql_stage.h
-include/mysql/psi/mysql_statement.h
-include/mysql/psi/mysql_table.h
-include/mysql/psi/mysql_thread.h
-include/mysql/psi/psi.h
-include/mysql/psi/psi_abi_v0.h
-include/mysql/psi/psi_abi_v1.h
-include/mysql/psi/psi_abi_v2.h
-include/mysql/psi/psi_base.h
-include/mysql/psi/psi_memory.h
-include/mysql/service_base64.h
-include/mysql/service_debug_sync.h
-include/mysql/service_encryption.h
-include/mysql/service_encryption_scheme.h
-include/mysql/service_kill_statement.h
-include/mysql/service_logger.h
-include/mysql/service_md5.h
-include/mysql/service_my_crypt.h
-include/mysql/service_my_print_error.h
-include/mysql/service_my_snprintf.h
-include/mysql/service_progress_report.h
-include/mysql/service_sha1.h
-include/mysql/service_sha2.h
-include/mysql/service_thd_alloc.h
-include/mysql/service_thd_autoinc.h
-include/mysql/service_thd_error_context.h
-include/mysql/service_thd_rnd.h
-include/mysql/service_thd_specifics.h
-include/mysql/service_thd_timezone.h
-include/mysql/service_thd_wait.h
-include/mysql/service_wsrep.h
-include/mysql/services.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
+@comment include/mysql/mysqld_error.h
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
 lib/mysql/libmariadb.so
 lib/mysql/libmariadb.so.3
@@ -161,6 +75,7 @@ lib/mysql/plugin/sha256_password.so
 %%DATADIR%%/french/errmsg.sys
 %%DATADIR%%/german/errmsg.sys
 %%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
 %%DATADIR%%/hungarian/errmsg.sys
 %%DATADIR%%/italian/errmsg.sys
 %%DATADIR%%/japanese/errmsg.sys