7 files changed, 59 insertions, 76 deletions

diff --git a/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
index e47db3ec7d33..36927c672ddd 100644
--- a/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
@@ -1,30 +1,31 @@
 --- scripts/CMakeLists.txt.orig	2017-04-04 19:11:52 UTC
 +++ scripts/CMakeLists.txt
-@@ -90,6 +90,7 @@ SET(ADD_GIS_SP_EOL ";")
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
-   ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY)
+@@ -21,7 +21,7 @@ IF(NOT CMAKE_CROSSCOMPILING)
+  TARGET_LINK_LIBRARIES(comp_sql)
+ ENDIF()
  
+-
 +IF(NOT WITHOUT_SERVER)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -102,6 +103,7 @@ INSTALL(FILES 
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
+ # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts)
+ IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
+   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
+@@ -65,6 +65,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
+   ALL
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
  )
 +ENDIF()
  
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -177,6 +179,7 @@ ELSE()
-   SET(localstatedir ${MYSQL_DATADIR})
+ IF(UNIX)
+  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
+@@ -126,6 +127,7 @@ ELSE()
+   SET (PERL_PATH "/usr/bin/perl")
  ENDIF()
  
 +IF(NOT WITHOUT_SERVER)
  IF(UNIX)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
-   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -190,6 +193,7 @@ INSTALL_SCRIPT(
+   # FIND_PROC and CHECK_PID are used by mysqld_safe
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+@@ -207,6 +209,7 @@ INSTALL_SCRIPT(
    COMPONENT Server
    )
  ENDIF()
@@ -32,7 +33,7 @@
  
  SET(prefix "${CMAKE_INSTALL_PREFIX}")
  IF(INSTALL_SYSCONFDIR)
-@@ -277,13 +281,8 @@ ELSE()
+@@ -298,13 +301,8 @@ ELSE()
    SET(BIN_SCRIPTS
      msql2mysql
      mysql_config
diff --git a/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
index c9b7dc713769..56ec2acdc4de 100644
--- a/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
@@ -1,20 +1,5 @@
 --- support-files/CMakeLists.txt.orig	2018-06-25 11:13:30 UTC
 +++ support-files/CMakeLists.txt
-@@ -41,12 +41,14 @@ ELSE()
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(NOT WITHOUT_SERVER)
- FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
-                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-           DESTINATION ${inst_location} COMPONENT IniFiles)
- ENDFOREACH()
-+ENDIF()
- 
- IF(WITH_WSREP)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh
 @@ -57,6 +59,7 @@ ENDIF()
  
  IF(UNIX)
diff --git a/databases/mariadb102-client/pkg-plist b/databases/mariadb102-client/pkg-plist
index f2a345cb5d58..819e24bec6bd 100644
--- a/databases/mariadb102-client/pkg-plist
+++ b/databases/mariadb102-client/pkg-plist
@@ -72,31 +72,6 @@ lib/mysql/plugin/sha256_password.so
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%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
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
 man/man1/msql2mysql.1.gz
 man/man1/mysql.1.gz
 man/man1/mysql_config.1.gz
diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index 0621f2665251..22d12d7cadc5 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.16
-PORTREVISION?=	2
+PORTVERSION=	10.2.17
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
diff --git a/databases/mariadb102-server/distinfo b/databases/mariadb102-server/distinfo
index 174b98934b60..7c7af876361a 100644
--- a/databases/mariadb102-server/distinfo
+++ b/databases/mariadb102-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530034863
-SHA256 (mariadb-10.2.16.tar.gz) = c182ee93bacee9c1395a4cece56acfc433bc5153ec627c4898927b93eee54dc4
-SIZE (mariadb-10.2.16.tar.gz) = 73363798
+TIMESTAMP = 1534231063
+SHA256 (mariadb-10.2.17.tar.gz) = e7b3078f8de874a4d451242a8a3eed49bf6f916dcd52fc3efa55886f5f35be27
+SIZE (mariadb-10.2.17.tar.gz) = 73409162
diff --git a/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt b/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
index 3d0dab9820c2..b0479f8337c7 100644
--- a/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt
@@ -1,17 +1,14 @@
---- sql/share/CMakeLists.txt.orig	2017-05-14 23:13:18 UTC
+--- sql/share/CMakeLists.txt.orig	2018-08-12 11:29:50 UTC
 +++ sql/share/CMakeLists.txt
-@@ -14,6 +14,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
-+IF(FALSE)
-+
- SET (dirs 
- danish
- german 
-@@ -53,3 +55,5 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE
+@@ -45,9 +45,11 @@ SET(files 
+  errmsg-utf8.txt
  )
  
- INSTALL(FILES ${files} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server)
-+
++IF (NOT WITHOUT_CLIENT)
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/charsets DESTINATION ${INSTALL_MYSQLSHAREDIR}
+   COMPONENT Common PATTERN "languages.html" EXCLUDE
+ )
 +ENDIF()
+ 
+ IF (NOT WITHOUT_SERVER)
+   FOREACH (dir ${dirs})
diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist
index 8605c827465c..a9a48392a71e 100644
--- a/databases/mariadb102-server/pkg-plist
+++ b/databases/mariadb102-server/pkg-plist
@@ -136,9 +136,23 @@ man/man1/wsrep_sst_xtrabackup-v2.1.gz
 man/man1/wsrep_sst_xtrabackup.1.gz
 man/man8/mysqld.8.gz
 %%DATADIR%%/binary-configure
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
 %%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/magic
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
 %%SPIDER%%%%DATADIR%%/install_spider.sql
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/magic
 %%DATADIR%%/maria_add_gis_sp.sql
 %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
 %%MROONGA%%%%DATADIR%%/mroonga/install.sql
@@ -157,6 +171,17 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_test_data_timezone.sql
 %%DATADIR%%/mysql_to_mariadb.sql
 %%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
 %%DATADIR%%/wsrep.cnf
 %%DATADIR%%/wsrep_notify
 %%MROONGA%%share/groonga-normalizer-mysql/README.md