aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/mariadb55-client/Makefile8
-rw-r--r--databases/mariadb55-server/Makefile12
-rw-r--r--databases/mariadb55-server/distinfo4
3 files changed, 14 insertions, 10 deletions
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index c5f1c3338e06..7b6bd9fe4f05 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -5,15 +5,17 @@ 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
diff --git a/databases/mariadb55-server/Makefile b/databases/mariadb55-server/Makefile
index 49f995193957..89a3cc24d5cb 100644
--- a/databases/mariadb55-server/Makefile
+++ b/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 @@ PKGNAMESUFFIX?= 55-server
MAINTAINER= never@nevermind.kiev.ua
COMMENT?= Multithreaded SQL database (server)
+LICENSE= GPLv2
+
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -58,10 +60,10 @@ BROKEN_armv6= Does not compile on arm
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
diff --git a/databases/mariadb55-server/distinfo b/databases/mariadb55-server/distinfo
index 0465d5bcb264..169b444b6318 100644
--- a/databases/mariadb55-server/distinfo
+++ b/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