Page MenuHomeFreeBSD
Files F168231115

D4100.id10012.diff
No OneTemporary
Actions

D4100.id10012.diff
View Options

Index: databases/mariadb100-client/Makefile
===================================================================
--- databases/mariadb100-client/Makefile
+++ databases/mariadb100-client/Makefile
@@ -11,10 +11,10 @@
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
Index: databases/mariadb100-server/Makefile
===================================================================
--- databases/mariadb100-server/Makefile
+++ 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}/ \
@@ -90,8 +90,9 @@
.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
Index: databases/mariadb100-server/distinfo
===================================================================
--- databases/mariadb100-server/distinfo
+++ 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

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 1:55 AM (16 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37428096
Default Alt Text
D4100.id10012.diff (1 KB)

Event Timeline