svn commit: r403431 - in branches/2015Q4/databases: mariadb100-client mariadb100-server

[Bernard Spil]

Author: brnrd
Date: Wed Dec  9 20:01:49 2015
New Revision: 403431
URL: https://svnweb.freebsd.org/changeset/ports/403431

Log:
  MFH: r401058
  
  databases/mariadb100-server: Update to 10.0.22
  
    * Update server and (slave) client port
    * Alphabetic ordering of CONFLICTS
    * Consistent globbing of CONFLICTS
    * Alphabetical ordering of USES
    * Add LGPL21 for MySQL client C/Java libs
  
  PR:		205159
  Reviewed by:	koobs (mentor)
  Approved by:	ports-secteam (feld), koobs (mentor)
  Security:	851a0eea-88aa-11e5-90e7-b499baebfeaf
  Differential Revision:	https://reviews.freebsd.org/D4100

Modified:
  branches/2015Q4/databases/mariadb100-client/Makefile
  branches/2015Q4/databases/mariadb100-server/Makefile
  branches/2015Q4/databases/mariadb100-server/distinfo
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/databases/mariadb100-client/Makefile
==============================================================================
--- branches/2015Q4/databases/mariadb100-client/Makefile	Wed Dec  9 19:52:46 2015	(r403430)
+++ branches/2015Q4/databases/mariadb100-client/Makefile	Wed Dec  9 20:01:49 2015	(r403431)
@@ -5,16 +5,18 @@ PKGNAMESUFFIX=	100-client
 
 COMMENT=	Multithreaded SQL database (client)
 
+LICENSE+=	LGPL21
+
 MASTERDIR=	${.CURDIR}/../mariadb100-server
 
 FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql[0-9][0-9]-client-* \
-			mariadb[0-46-9][0-9]-client-* \
-			mariadb5.[0-46-9]-client-* \
-			percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mariadb5*-client-* \
+			mariadb10[1-9]-client-* \
+			mysql*-client-* \
+			percona*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 

Modified: branches/2015Q4/databases/mariadb100-server/Makefile
==============================================================================
--- branches/2015Q4/databases/mariadb100-server/Makefile	Wed Dec  9 19:52:46 2015	(r403430)
+++ branches/2015Q4/databases/mariadb100-server/Makefile	Wed Dec  9 20:01:49 2015	(r403431)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.21
+PORTVERSION=	10.0.22
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@@ -22,7 +22,7 @@ SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb100-client
-USES=		bison:build cmake execinfo gmake shebangfix cpe
+USES=		bison:build cmake cpe execinfo gmake shebangfix
 USE_LDCONFIG=	${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin
 SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
@@ -90,8 +90,9 @@ USES+=		readline
 .else
 # MySQL-Server part
 
-CONFLICTS_INSTALL=	mysql*-server-* \
-			mariadb[0-9][0-9]-server-* \
+CONFLICTS_INSTALL=	mariadb5*-server-* \
+			mariadb10[1-9]-server-* \
+			mysql*-server-* \
 			percona*-server-*
 
 USE_MYSQL=	yes

Modified: branches/2015Q4/databases/mariadb100-server/distinfo
==============================================================================
--- branches/2015Q4/databases/mariadb100-server/distinfo	Wed Dec  9 19:52:46 2015	(r403430)
+++ branches/2015Q4/databases/mariadb100-server/distinfo	Wed Dec  9 20:01:49 2015	(r403431)
@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.0.21.tar.gz) = 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545
-SIZE (mariadb-10.0.21.tar.gz) = 56216903
+SHA256 (mariadb-10.0.22.tar.gz) = 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b
+SIZE (mariadb-10.0.22.tar.gz) = 56252325