Index: branches/2020Q1/databases/mariadb55-server/Makefile
===================================================================
--- branches/2020Q1/databases/mariadb55-server/Makefile	(revision 524975)
+++ branches/2020Q1/databases/mariadb55-server/Makefile	(revision 524976)
@@ -1,129 +1,129 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	5.5.66
-PORTREVISION?=	1
+PORTVERSION=	5.5.67
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
 		http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/
 PKGNAMESUFFIX?=	55-server
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
 
 SUB_FILES=	pkg-message
 
 USES+=		cmake:insource,noninja compiler:c++11-lang shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES=	scripts/*.sh sql-bench/[a-km-z]*
 
 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="share/mysql" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_UNIT_TESTS=0 \
 		-DWITH_LIBWRAP=1 \
 		-DWITH_SSL=yes \
 		-DCOMPILATION_COMMENT="FreeBSD Ports"
 
 DATADIR=	${PREFIX}/share/mysql
 
 BROKEN_sparc64=		Does not compile: Unsupported platform
 
 .if defined(USE_MYSQL)
 .error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 OPTIONS_DEFINE+=	FASTMTX
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=	yes
 
 FASTMTX_DESC=		Replace mutexes with spinlocks
 
 FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
 
 .if !defined(CLIENT_ONLY)
 # MySQL-Server part
 USES+=		mysql:55m
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 
 CONFLICTS_INSTALL=	mariadb5[0-46-9]-server-* \
 			mariadb1*-server-* \
 			mysql[0-9]*-server-* \
 			mysqlwsrep* \
 			percona[0-9]*-server-*
 
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
 
 CMAKE_ARGS+=	-DREADLINE_INCLUDE_DIR=/usr/include \
 		-DWITH_EMBEDDED_SERVER="ON" \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
 
 # MySQL-Server options
 OPTIONS_DEFINE+=	MAXKEY OQGRAPH
 OPTIONS_DEFAULT+=	MAXKEY
 
 MAXKEY_DESC=	Change max key length from 1000 to 4000
 
 OQGRAPH_DESC=	Open Query Graph Computation engine
 
 OQGRAPH_USE=	GCC=yes
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 OQGRAPH_BROKEN=	OQGraph does not build
 
 MAXKEY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-include_my__compare.h
 .endif
 
 .include <bsd.port.options.mk>
 
 .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} == FreeBSD
 CMAKE_ARGS+=	-DWITH_JEMALLOC="system"
 .else
 CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
 .endif
 
 # Server segfaults on i386 when built with clang >= 3.4
 .if ${ARCH} == 'i386'
 USE_GCC=	yes
 .endif
 
 post-extract-OQGRAPH-off:
 	@${RM} -r ${WRKSRC}/storage/oqgraph
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
 
 .include <bsd.port.post.mk>
Index: branches/2020Q1/databases/mariadb55-server/distinfo
===================================================================
--- branches/2020Q1/databases/mariadb55-server/distinfo	(revision 524975)
+++ branches/2020Q1/databases/mariadb55-server/distinfo	(revision 524976)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574710698
-SHA256 (mariadb-5.5.66.tar.gz) = d7457c6d2edc9c4ca9278deab9812cd28b38e1af4e47911a1590ca532379f6ae
-SIZE (mariadb-5.5.66.tar.gz) = 45962591
+TIMESTAMP = 1580633911
+SHA256 (mariadb-5.5.67.tar.gz) = a622b2db2f02f5fb97dcd4978366c0b49716dfed3698fe4b826dd910fe7b7b85
+SIZE (mariadb-5.5.67.tar.gz) = 45971908
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 524975)
+++ branches/2020Q1	(revision 524976)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r524837