Index: databases/mariadb55-client/Makefile =================================================================== --- databases/mariadb55-client/Makefile +++ databases/mariadb55-client/Makefile @@ -5,15 +5,17 @@ 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 Index: databases/mariadb55-server/Makefile =================================================================== --- databases/mariadb55-server/Makefile +++ databases/mariadb55-server/Makefile @@ -1,7 +1,7 @@ # $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/ \ @@ -17,6 +17,8 @@ MAINTAINER= never@nevermind.kiev.ua COMMENT?= Multithreaded SQL database (server) +LICENSE= GPLv2 + SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message @@ -58,9 +60,9 @@ USE_MYSQL= yes WANT_MYSQL_VER= 55m -CONFLICTS_INSTALL= mysql*-server-* \ - mariadb1[0-9][0-9]-server-* \ - mariadb5[0-46-9]-server-* \ +CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \ + mariadb1*-server-* \ + mysql*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server Index: databases/mariadb55-server/distinfo =================================================================== --- databases/mariadb55-server/distinfo +++ databases/mariadb55-server/distinfo @@ -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