Index: head/databases/mariadb102-client/files/patch-CMakeLists.txt
===================================================================
--- head/databases/mariadb102-client/files/patch-CMakeLists.txt	(revision 504494)
+++ head/databases/mariadb102-client/files/patch-CMakeLists.txt	(revision 504495)
@@ -1,27 +1,27 @@
---- CMakeLists.txt.orig	2017-04-04 19:11:32 UTC
+--- CMakeLists.txt.orig	2019-06-14 18:29:40 UTC
 +++ CMakeLists.txt
-@@ -170,6 +170,8 @@ IF(DISABLE_SHARED)
+@@ -172,6 +172,8 @@ IF(DISABLE_SHARED)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
  OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
 +OPTION(WITHOUT_CLIENT "Build only the server components" OFF)
 +OPTION(WITHOUT_DOCS   "Do not install documentation" OFF)
  IF(UNIX)
    OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
  ENDIF()
-@@ -454,6 +456,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -472,6 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(NOT WITHOUT_DOCS)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
                        EXCEPTIONS-CLIENT COMPONENT Readme)
  
-@@ -465,6 +468,7 @@ IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
+@@ -481,6 +484,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDP
+ 
+ IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
 +ENDIF()
+ ENDIF()
  
- INCLUDE(CPack)
- 
+ INCLUDE(build_depends)
Index: head/databases/mariadb102-server/Makefile
===================================================================
--- head/databases/mariadb102-server/Makefile	(revision 504494)
+++ head/databases/mariadb102-server/Makefile	(revision 504495)
@@ -1,233 +1,233 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.24
+PORTVERSION=	10.2.25
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
 		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
 		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
 		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
 		http://mirror.layerjet.com/${SITESDIR}/ \
 		http://mirror.switch.ch/mirror/${SITESDIR}/ \
 		http://ftp.osuosl.org/pub/${SITESDIR}/
 PKGNAMESUFFIX?=	102-server
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
 LICENSE_NAME_PerconaFT=	PerconaFT patents license
 LICENSE_FILE_PerconaFT=	${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
 LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 SUB_FILES=	pkg-message
 
 SLAVEDIRS=	databases/mariadb102-client
 USES=		bison:build cmake compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
 DOCSDIR=	${PREFIX}/share/doc/mysql
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_DEFAULT=	GSSAPI_BASE
 
 .if ${PKGNAMESUFFIX:M*-server}
 # MySQL-Server options
 OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER
 OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
 OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
 OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
 OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
 OPTIONS_EXCLUDE_i386=	TOKUDB
 
 CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
 COMPRESSION_DESC=	Optional page compression
 ENGINES_DESC=	Optional MariaDB storage engines
 GROONGA_DESC=	Optional Mroonga features
 INNOBASE_DESC=	InnoDB default engine
 MROONGA_DESC=	Mroonga Full Text Search engine
 MSGPACK_DESC=	MsgPack support
 OQGRAPH_DESC=	Open Query Graph Computation engine
 ROCKSDB_DESC=	RocksDB LSM engine (Alpha)
 SPHINX_DESC=	SphinxSE engine
 SPIDER_DESC=	Partitioning and XA-transactions engine
 TOKUDB_DESC=	Fractal tree index tree data structure engine
 XTRADB_DESC=	Build XtraDB engine next to InnoDB
 ZMQ_DESC=	ZeroMQ support
 ZSTD_DESC+=	Zstandard compression support (RocksDB only)
 .endif
 
 GSSAPI_BASE_USES=	gssapi
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
 
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="info" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="man" \
 		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR= \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SQLBENCHDIR= \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
 		-DWITH_SSL="${OPENSSLBASE}" \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
 		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
 		-DICONV_LIBRARIES="${ICONV_LIB_PATH}" \
 		-DKRB5_CONFIG="${KRB5CONFIG}" \
 		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
 		-DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \
 		-DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \
 		-DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \
 		-DREMOTEIO_PLUGIN_TYPE="NO" \
 		-DCOMPILATION_COMMENT="FreeBSD Ports" \
 		-DCMAKE_PREFIX_PATH=${PREFIX}
 CMAKE_ON+=	WITH_LIBWRAP WITH_JEMALLOC WITHOUT_DOCS
 CMAKE_OFF+=	WITH_UNIT_TESTS
 
 DATADIR=	${PREFIX}/share/mysql
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again.
 .endif
 
 CONFLICTS_INSTALL=	mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mariadb10[013-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysqlwsrep* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
 
 FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
 GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=NO
 OPTIONS_SUB=		yes
 
 .if ${PKGNAMESUFFIX:M*-client}
 # MySQL-Client part
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 USES+=		readline
 CMAKE_ON+=	WITHOUT_SERVER CONC_WITH_MYSQLCOMPAT
 CMAKE_OFF+=	WITH_WSREP
 .else
 # MySQL-Server part
 USES+=		mysql:102m
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 USE_RC_SUBR=	mysql-server
 USERS=		mysql
 GROUPS=		mysql
 CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER WITHOUT_EXAMPLE_STORAGE_ENGINE
 
 .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
 ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO \
 			-DWITHOUT_${ENGINE}=1
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 INNOBASE_CMAKE_OFF=	-DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1
 
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USES=		gnome
 CONNECT_EXTRA_USE=		gnome=libxml2
 GSSAPI_NONE_CMAKE_ON+=	-DPLUGIN_AUTH_GSSAPI=NO
 LZ4_CMAKE_BOOL=		GRN_WITH_LZ4 WITH_INNODB_LZ4 WITH_ROCKSDB_LZ4
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZO_CMAKE_BOOL=		WITH_INNODB_LZO
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 MROONGA_IMPLIES=	LZ4
 MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
 ROCKSDB_USES=		python
 SNAPPY_CMAKE_BOOL=	WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 TOKUDB_IMPLIES=		SNAPPY
 TOKUDB_PORTDOCS=	README.md
 TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 ZSTD_CMAKE_BOOL=	WITH_ROCKSDB_ZSTD
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 .endif # ${PKGNAMESUFFIX:M*-client}
 
 .include <bsd.port.options.mk>
 
 .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
 IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
 SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == DragonFly
 CMAKE_ARGS+=	-DWITHOUT_TOKUDB
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
 .if ${OPSYS} == DragonFly
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake
 .endif
 
 post-configure:
 	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
 		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
 		${WRKDIR}/.build/libmariadb/mariadb_config/mariadb_config.c
 
 .if ${PKGNAMESUFFIX:M*-client} # targets for -client
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \
 		${STAGEDIR}${PREFIX}/man/man1/aria* \
 		${STAGEDIR}${PREFIX}/man/man1/myisam*
 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig \
 		${STAGEDIR}${DATADIR}/policy \
 		${STAGEDIR}${PREFIX}/include/mysql/server
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
 	@${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
 
 post-install-GSSAPI_NONE:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
 
 .else # targets for -server
 
 post-install:
 # Remove programs to avoid conflict with mariadb102-client
 # These are "client" components, so there should be a switch that
 # prevents them from being installed but it's unknown right now
 	${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
 		${STAGEDIR}${PREFIX}/bin/mysql_config \
 		${STAGEDIR}${PREFIX}/bin/mysql_find_rows \
 		${STAGEDIR}${PREFIX}/bin/mysqlaccess
 	${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
 		${STAGEDIR}/${PREFIX}/share/pkgconfig \
 		${STAGEDIR}${DATADIR}/charsets
 	${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient*
 	${RM} ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING \
 		${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING.thirdparty \
 		${STAGEDIR}${LOCALBASE}/share/groonga-normalizer-mysql/lgpl-2.0.txt \
 		${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \
 		${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \
 		${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING
 	${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h
 
 .endif # targets for -server
 
 .include <bsd.port.post.mk>
Index: head/databases/mariadb102-server/distinfo
===================================================================
--- head/databases/mariadb102-server/distinfo	(revision 504494)
+++ head/databases/mariadb102-server/distinfo	(revision 504495)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557489019
-SHA256 (mariadb-10.2.24.tar.gz) = 97f4d924e69f77abb2f650116785c2f5ef356230442534ebcbaadb51d9bb8bc4
-SIZE (mariadb-10.2.24.tar.gz) = 71965656
+TIMESTAMP = 1560710508
+SHA256 (mariadb-10.2.25.tar.gz) = face0818bb51b7dc20712ae225489c85a477d505cb6c2f6a6f6cf7d51ecfecc9
+SIZE (mariadb-10.2.25.tar.gz) = 71997847
Index: head/databases/mariadb102-server/files/patch-CMakeLists.txt
===================================================================
--- head/databases/mariadb102-server/files/patch-CMakeLists.txt	(revision 504494)
+++ head/databases/mariadb102-server/files/patch-CMakeLists.txt	(revision 504495)
@@ -1,27 +1,27 @@
---- CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- CMakeLists.txt.orig	2019-06-14 18:29:40 UTC
 +++ CMakeLists.txt
-@@ -170,6 +170,8 @@ IF(DISABLE_SHARED)
+@@ -172,6 +172,8 @@ IF(DISABLE_SHARED)
  ENDIF()
  OPTION(ENABLED_PROFILING "Enable profiling" ON)
  OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
 +OPTION(WITHOUT_CLIENT "Build only the server components" OFF)
 +OPTION(WITHOUT_DOCS   "Do not install documentation" OFF)
  IF(UNIX)
    OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
  ENDIF()
-@@ -452,6 +454,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -472,6 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(NOT WITHOUT_DOCS)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
                        EXCEPTIONS-CLIENT COMPONENT Readme)
  
-@@ -463,6 +466,7 @@ IF(UNIX)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
+@@ -481,6 +484,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDP
+ 
+ IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
 +ENDIF()
+ ENDIF()
  
- INCLUDE(CPack)
- 
+ INCLUDE(build_depends)
Index: head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt
===================================================================
--- head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt	(revision 504494)
+++ head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt	(revision 504495)
@@ -1,14 +1,14 @@
---- plugin/auth_ed25519/CMakeLists.txt.orig	2017-05-14 23:13:17 UTC
+--- plugin/auth_ed25519/CMakeLists.txt.orig	2019-06-14 18:29:42 UTC
 +++ plugin/auth_ed25519/CMakeLists.txt
-@@ -23,9 +24,11 @@ ENDIF()
+@@ -23,9 +23,11 @@ ENDIF()
  # compiled with MYSQL_DYNAMIC_PLUGIN
  MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY)
  
 +IF(NOT WITHOUT_CLIENT)
  # client plugin and unit test ed25519-t can use the library
  MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY
-   CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins)
+   CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins)
 +ENDIF()
  
  IF(WITH_UNIT_TESTS)
-   MY_ADD_TESTS(ed25519 LINK_LIBRARIES mysys ref10)
+   MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl)