Index: branches/2015Q4/databases/mariadb55-client/Makefile
===================================================================
--- branches/2015Q4/databases/mariadb55-client/Makefile	(revision 402787)
+++ branches/2015Q4/databases/mariadb55-client/Makefile	(revision 402788)
@@ -1,25 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
 PKGNAMESUFFIX=	55-client
 
 COMMENT=	Multithreaded SQL database (client)
 
+LICENSE+=	LGPL21
+
 MASTERDIR=	${.CURDIR}/../mariadb55-server
 
 FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql*-client-* \
-			mariadb1[0-9][0-9]-client-* \
-			mariadb5[0-46-9]-client-* \
+CONFLICTS_INSTALL=	mariadb5[0-46-9]-client-* \
+			mariadb1*-client-* \
+			mysql*-client-* \
 			percona*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 CLIENT_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2015Q4/databases/mariadb55-server/Makefile
===================================================================
--- branches/2015Q4/databases/mariadb55-server/Makefile	(revision 402787)
+++ branches/2015Q4/databases/mariadb55-server/Makefile	(revision 402788)
@@ -1,130 +1,132 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	5.5.44
+PORTVERSION=	5.5.46
 CATEGORIES=	databases ipv6
 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=	never@nevermind.kiev.ua
 COMMENT?=	Multithreaded SQL database (server)
 
+LICENSE=	GPLv2
+
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb55-client
 USES=		cmake execinfo gmake shebangfix
 SHEBANG_FILES=	scripts/*.sh
 
 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_LIBEDIT=0 \
 		-DWITH_LIBWRAP=1 \
 		-DEXECINFO_ROOT=${LOCALBASE} \
 		-DCOMPILATION_COMMENT="FreeBSD Ports"
 
 DATADIR=	${PREFIX}/share/mysql
 
 BROKEN_armv6=		Does not compile on arm
 
 .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
 
 .if !defined(CLIENT_ONLY)
 # MySQL-Server part
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	55m
 
-CONFLICTS_INSTALL=	mysql*-server-* \
-			mariadb1[0-9][0-9]-server-* \
-			mariadb5[0-46-9]-server-* \
-			percona*-server-*
+CONFLICTS_INSTALL=	mariadb5[0-46-9]-server-* \
+			mariadb1*-server-* \
+			mysql[0-9]*-server-* \
+			percona[0-9]*-server-*
 
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
 
 .else
 # MySQL-Client part
 USES+=		readline
 .endif
 
 OPTIONS_DEFINE+=	FASTMTX
 OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
 OPTIONS_DEFAULT+=	OPENSSL
 OPTIONS_SUB=		yes
 NO_OPTIONS_SORT=yes
 
 BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
 FASTMTX_DESC=	Replace mutexes with spinlocks
 WITHOUT_SSL_DESC=	No SSL/TLS support
 OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
 OPENSSL_USE=		USE_OPENSSL=yes
 BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
 WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
 
 FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
 
 .if !defined(CLIENT_ONLY)
 # 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_CMAKE_OFF=	-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1
 OQGRAPH_USE=	GCC=yes
 OQGRAPH_CMAKE_ON=	-DWITH_OQGRAPH_STORAGE_ENGINE=1
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
 
 MAXKEY_EXTRA_PATCHES=	${FILESDIR}/extra-patch-include_my_compare.h
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
 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' && ${OSVERSION} >= 1001000
 USE_GCC=	yes
 .endif
 
 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/2015Q4/databases/mariadb55-server/distinfo
===================================================================
--- branches/2015Q4/databases/mariadb55-server/distinfo	(revision 402787)
+++ branches/2015Q4/databases/mariadb55-server/distinfo	(revision 402788)
@@ -1,2 +1,2 @@
-SHA256 (mariadb-5.5.44.tar.gz) = 7d425caf5f1e45de9e5eb72daa98ceb542e7b134a89bd01540b60fe9c5965e8f
-SIZE (mariadb-5.5.44.tar.gz) = 45672065
+SHA256 (mariadb-5.5.46.tar.gz) = 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10
+SIZE (mariadb-5.5.46.tar.gz) = 45683962
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 402787)
+++ branches/2015Q4	(revision 402788)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r402786