Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Jan 2019 14:43:08 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490140 - in head/databases: mariadb103-client mariadb103-server
Message-ID:  <201901131443.x0DEh8nv029080@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sun Jan 13 14:43:08 2019
New Revision: 490140
URL: https://svnweb.freebsd.org/changeset/ports/490140

Log:
  databases/mariadb103-server: Update to 10.3.12

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

Modified: head/databases/mariadb103-client/Makefile
==============================================================================
--- head/databases/mariadb103-client/Makefile	Sun Jan 13 14:41:59 2019	(r490139)
+++ head/databases/mariadb103-client/Makefile	Sun Jan 13 14:43:08 2019	(r490140)
@@ -23,11 +23,6 @@ CLIENT_ONLY=	yes
 
 CONFLICTS_INSTALL=	databases/mytop
 
-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
-
 post-install:
 	${RM} -r ${STAGEDIR}${DATADIR}
 	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server

Modified: head/databases/mariadb103-server/Makefile
==============================================================================
--- head/databases/mariadb103-server/Makefile	Sun Jan 13 14:41:59 2019	(r490139)
+++ head/databases/mariadb103-server/Makefile	Sun Jan 13 14:43:08 2019	(r490140)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.3.11
-PORTREVISION?=	2
+PORTVERSION=	10.3.12
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -29,7 +29,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SLAVEDIRS=	databases/mariadb102-client
 USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
-SHEBANG_FILES=	scripts/*.sh storage/rocksdb/myrocks_hotbackup
+SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
 DOCSDIR=	${PREFIX}/share/doc/mysql
 
@@ -87,6 +87,7 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
 		-DWITH_JEMALLOC="system" \
 		-DWITH_LIBWRAP=1 \
+		-DWITH_CONNECT_WITH_MONGO="OFF" \
 		-DWITH_SSL="${OPENSSLBASE}" \
 		-DWITH_UNIT_TESTS=0 \
 		-DWITHOUT_DOCS=1 \
@@ -192,6 +193,7 @@ CMAKE_ARGS+=	-DWITHOUT_TOKUDB
 .endif
 
 post-patch:
+	${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \
 		${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake

Modified: head/databases/mariadb103-server/distinfo
==============================================================================
--- head/databases/mariadb103-server/distinfo	Sun Jan 13 14:41:59 2019	(r490139)
+++ head/databases/mariadb103-server/distinfo	Sun Jan 13 14:43:08 2019	(r490140)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542715300
-SHA256 (mariadb-10.3.11.tar.gz) = 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2
-SIZE (mariadb-10.3.11.tar.gz) = 70669435
+TIMESTAMP = 1547313088
+SHA256 (mariadb-10.3.12.tar.gz) = f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6
+SIZE (mariadb-10.3.12.tar.gz) = 70666408

Modified: head/databases/mariadb103-server/pkg-plist
==============================================================================
--- head/databases/mariadb103-server/pkg-plist	Sun Jan 13 14:41:59 2019	(r490139)
+++ head/databases/mariadb103-server/pkg-plist	Sun Jan 13 14:43:08 2019	(r490140)
@@ -49,8 +49,6 @@ bin/resolveip
 %%WSREP%%bin/wsrep_sst_mysqldump
 %%WSREP%%bin/wsrep_sst_rsync
 %%WSREP%%bin/wsrep_sst_rsync_wan
-%%WSREP%%bin/wsrep_sst_xtrabackup
-%%WSREP%%bin/wsrep_sst_xtrabackup-v2
 @comment data/test/db.opt
 @comment include/mysql/my_config.h
 @comment include/mysql/my_global.h
@@ -164,6 +162,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
+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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901131443.x0DEh8nv029080>