View | Details | Raw Unified | Return to bug 194821
Collapse All | Expand All

(-)percona56-server/Makefile (-1 / +3 lines)
Lines 63-69 Link Here
63
USE_MYSQL=	yes
63
USE_MYSQL=	yes
64
WANT_MYSQL_VER=	56p
64
WANT_MYSQL_VER=	56p
65
65
66
CONFLICTS_INSTALL=	mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona5.[0-57-9]-server-* percona[0-46-9][0-9]-server-*
66
CONFLICTS_INSTALL=	mysql*-server-* \
67
			mariadb*-server-* \
68
			percona5[0-57-9]-server-*
67
69
68
USE_RC_SUBR=	mysql-server
70
USE_RC_SUBR=	mysql-server
69
71
(-)percona56-client/Makefile (-1 / +3 lines)
Lines 12-18 Link Here
12
PATCHDIR=	${.CURDIR}/files
12
PATCHDIR=	${.CURDIR}/files
13
PLIST=		${.CURDIR}/pkg-plist
13
PLIST=		${.CURDIR}/pkg-plist
14
14
15
CONFLICTS_INSTALL=	mysql[0-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona5.[0-57-9]-client-* percona[0-46-9][0-9]-client-*
15
CONFLICTS_INSTALL=	mysql*-client-* \
16
			mariadb*-client-* \
17
			percona5[0-57-9]-client-*
16
18
17
CMAKE_ARGS+=	-DWITHOUT_SERVER=1
19
CMAKE_ARGS+=	-DWITHOUT_SERVER=1
18
20

Return to bug 194821