svn commit: r490065 - in head/databases: mariadb102-client mariadb102-server

[Bernard Spil]

Author: brnrd
Date: Sat Jan 12 17:05:50 2019
New Revision: 490065
URL: https://svnweb.freebsd.org/changeset/ports/490065

Log:
  databases/mariadb102-server: Update to 10.2.21
  
   - Switch to ninja build

Modified:
  head/databases/mariadb102-client/Makefile
  head/databases/mariadb102-client/pkg-plist
  head/databases/mariadb102-server/Makefile
  head/databases/mariadb102-server/distinfo
  head/databases/mariadb102-server/pkg-plist

Modified: head/databases/mariadb102-client/Makefile
==============================================================================
--- head/databases/mariadb102-client/Makefile	Sat Jan 12 16:53:40 2019	(r490064)
+++ head/databases/mariadb102-client/Makefile	Sat Jan 12 17:05:50 2019	(r490065)
@@ -23,7 +23,7 @@ CLIENT_ONLY=	yes
 post-configure:
 	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
 		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
-		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
+		${WRKDIR}/.build/libmariadb/mariadb_config/mariadb_config.c
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \

Modified: head/databases/mariadb102-client/pkg-plist
==============================================================================
--- head/databases/mariadb102-client/pkg-plist	Sat Jan 12 16:53:40 2019	(r490064)
+++ head/databases/mariadb102-client/pkg-plist	Sat Jan 12 17:05:50 2019	(r490065)
@@ -41,7 +41,8 @@ lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
- at comment lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
 lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/dialog.so
 lib/mysql/plugin/mysql_clear_password.so

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Sat Jan 12 16:53:40 2019	(r490064)
+++ head/databases/mariadb102-server/Makefile	Sat Jan 12 17:05:50 2019	(r490065)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.19
-PORTREVISION?=	2
+PORTVERSION=	10.2.21
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -25,7 +25,7 @@ LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mir
 SUB_FILES=	pkg-message
 
 SLAVEDIRS=	databases/mariadb102-client
-USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
+USES=		bison:build cmake compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES=	scripts/*.sh storage/rocksdb/myrocks_hotbackup
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
@@ -214,13 +214,5 @@ post-patch:
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake
 .endif
-
-# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 	 
-post-configure-INNOBASE-on: 	 
-	${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
-		-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
-		-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
-		-e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
-		${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
 
 .include <bsd.port.post.mk>

Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb102-server/distinfo	Sat Jan 12 16:53:40 2019	(r490064)
+++ head/databases/mariadb102-server/distinfo	Sat Jan 12 17:05:50 2019	(r490065)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542115149
-SHA256 (mariadb-10.2.19.tar.gz) = c0e103cfd73ee96d58402073e9513f0f7b5c0bd216641faecc8d763fb6529727
-SIZE (mariadb-10.2.19.tar.gz) = 71856357
+TIMESTAMP = 1546460692
+SHA256 (mariadb-10.2.21.tar.gz) = 637f0808b65ec06902897a2f885a60377828d019d35802402dca541f8113536c
+SIZE (mariadb-10.2.21.tar.gz) = 71878359

Modified: head/databases/mariadb102-server/pkg-plist
==============================================================================
--- head/databases/mariadb102-server/pkg-plist	Sat Jan 12 16:53:40 2019	(r490064)
+++ head/databases/mariadb102-server/pkg-plist	Sat Jan 12 17:05:50 2019	(r490065)
@@ -60,6 +60,7 @@ lib/mysql/plugin/auth_ed25519.so
 lib/mysql/plugin/auth_pam.so
 lib/mysql/plugin/auth_socket.so
 lib/mysql/plugin/auth_test_plugin.so
+ at comment lib/mysql/plugin/caching_sha2_password.so
 @comment lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/debug_key_management.so
 @comment lib/mysql/plugin/dialog.so