svn commit: r402788 - in branches/2015Q4/databases: mariadb55-client mariadb55-server

[Bernard Spil]

Author: brnrd
Date: Tue Dec  1 21:03:30 2015
New Revision: 402788
URL: https://svnweb.freebsd.org/changeset/ports/402788

Log:
  MFH: r402786
  
  databases/mariadb55-server: Update to 5.5.46
  
    * Update server and (slave) client port
    * Add LICENSE
    * Consistent globbing of CONFLICTS
  
  The release notes for MariaDB 5.5.46 can be found at:
  
      https://mariadb.com/kb/en/mariadb/mariadb-5546-release-notes/
  
  PR:		204410
  Submitted by:	Sevan Janiyan <venture37 at geeklan.co.uk>
  Reviewed by:	koobs (mentor), feld (ports-secteam@)
  Approved by:	ports-secteam (feld)
  Security:	851a0eea-88aa-11e5-90e7-b499baebfeaf
  Differential Revision:	https://reviews.freebsd.org/D4134
  > Description of fields to fill in above:                     76 columns --|
  > PR:            If a Bugzilla PR is affected by the change.
  > Submitted by:  If someone else sent in the change.
  > Reviewed by:   If someone else reviewed your modification.
  > Approved by:   If you needed approval for this commit.
  > Obtained from: If the change is from a third party.
  > MFC after:     N [day[s]|week[s]|month[s]].  Request a reminder email.
  > Relnotes:      Set to 'yes' for mention in release notes.
  > Security:      Vulnerability reference (one per line) or description.
  > Sponsored by:  If the change was sponsored by an organization.
  > Empty fields above will be automatically removed.
  
  M    mariadb55-client/Makefile
  M    mariadb55-server/Makefile
  M    mariadb55-server/distinfo

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

Modified: branches/2015Q4/databases/mariadb55-client/Makefile
==============================================================================
--- branches/2015Q4/databases/mariadb55-client/Makefile	Tue Dec  1 20:50:34 2015	(r402787)
+++ branches/2015Q4/databases/mariadb55-client/Makefile	Tue Dec  1 21:03:30 2015	(r402788)
@@ -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

Modified: branches/2015Q4/databases/mariadb55-server/Makefile
==============================================================================
--- branches/2015Q4/databases/mariadb55-server/Makefile	Tue Dec  1 20:50:34 2015	(r402787)
+++ branches/2015Q4/databases/mariadb55-server/Makefile	Tue Dec  1 21:03:30 2015	(r402788)
@@ -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 at 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
 

Modified: branches/2015Q4/databases/mariadb55-server/distinfo
==============================================================================
--- branches/2015Q4/databases/mariadb55-server/distinfo	Tue Dec  1 20:50:34 2015	(r402787)
+++ branches/2015Q4/databases/mariadb55-server/distinfo	Tue Dec  1 21:03:30 2015	(r402788)
@@ -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