Attachment #162989 for bug #204410

Lines 11-19 Link Here

(-)databases/mariadb55-client/Makefile (-3 / +3 lines)
11	PATCHDIR= ${.CURDIR}/files	11	PATCHDIR= ${.CURDIR}/files
12	PLIST= ${.CURDIR}/pkg-plist	12	PLIST= ${.CURDIR}/pkg-plist
13		13
14	CONFLICTS_INSTALL= mysql-client- \	14	CONFLICTS_INSTALL= mariadb5[0-46-9]-client-* \
15	mariadb1[0-9][0-9]-client-* \	15	mariadb1-client- \
16	mariadb5[0-46-9]-client-* \	16	mysql-client- \
17	percona-client-	17	percona-client-
18		18
19	CMAKE_ARGS+= -DWITHOUT_SERVER=1	19	CMAKE_ARGS+= -DWITHOUT_SERVER=1




# $FreeBSD$

PORTNAME?=	mariadb
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/ \

USE_MYSQL=	yes
WANT_MYSQL_VER=	55m

CONFLICTS_INSTALL=	mariadb5[0-46-9]-server-* \
			mariadb1*-server-* \
			mysql*-server-* \
			percona*-server-*

USE_RC_SUBR=	mysql-server

Lines 1-2 Link Here

(-)databases/mariadb55-server/distinfo (-2 / +2 lines)
1	SHA256 (mariadb-5.5.44.tar.gz) = 7d425caf5f1e45de9e5eb72daa98ceb542e7b134a89bd01540b60fe9c5965e8f	1	SHA256 (mariadb-5.5.46.tar.gz) = 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10
2	SIZE (mariadb-5.5.44.tar.gz) = 45672065	2	SIZE (mariadb-5.5.46.tar.gz) = 45683962

Return to bug 204410

Lines 1-7 Link Here

(-)databases/mariadb55-server/Makefile (-4 / +4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME?= mariadb	3	PORTNAME?= mariadb
4	PORTVERSION= 5.5.44	4	PORTVERSION= 5.5.46
5	CATEGORIES= databases ipv6	5	CATEGORIES= databases ipv6
6	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \	6	MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
7	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \	7	http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
Lines 58-66 Link Here
58	USE_MYSQL= yes	58	USE_MYSQL= yes
59	WANT_MYSQL_VER= 55m	59	WANT_MYSQL_VER= 55m
60		60
61	CONFLICTS_INSTALL= mysql-server- \	61	CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \
62	mariadb1[0-9][0-9]-server-* \	62	mariadb1-server- \
63	mariadb5[0-46-9]-server-* \	63	mysql-server- \
64	percona-server-	64	percona-server-
65		65
66	USE_RC_SUBR= mysql-server	66	USE_RC_SUBR= mysql-server