diff options
| author | brnrd <brnrd@FreeBSD.org> | 2015-11-08 20:45:02 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2015-11-08 20:45:02 +0800 |
| commit | 8422c8cff524c826a2e8d3ee266c5af18fa2abe8 (patch) | |
| tree | 3c3a5fae860d8d6d57801adfa88ce684246d81ac /databases | |
| parent | ec57e4dba38afb27120dce6c0d98a6ba14550d64 (diff) | |
| download | freebsd-ports-graphics-8422c8cff524c826a2e8d3ee266c5af18fa2abe8.tar.gz freebsd-ports-graphics-8422c8cff524c826a2e8d3ee266c5af18fa2abe8.tar.zst freebsd-ports-graphics-8422c8cff524c826a2e8d3ee266c5af18fa2abe8.zip | |
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
Reviewed by: koobs (mentor)
Approved by: koobs (mentor)
Differential Revision: https://reviews.freebsd.org/D4100
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb100-client/Makefile | 10 | ||||
| -rw-r--r-- | databases/mariadb100-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/mariadb100-server/distinfo | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile index 729ca9482df..4d6ded7d761 100644 --- a/databases/mariadb100-client/Makefile +++ b/databases/mariadb100-client/Makefile @@ -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 diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 445d9cd96e2..1645b40275b 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -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 diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo index 34c8f85bf28..8baef1a56e3 100644 --- a/databases/mariadb100-server/distinfo +++ b/databases/mariadb100-server/distinfo @@ -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 |