Attachment #149046 for bug #194822

Lines 110-116 Link Here

(-)mariadb55-server/Makefile (-1 / +4 lines)
110	USE_MYSQL= yes	110	USE_MYSQL= yes
111	WANT_MYSQL_VER= 55m	111	WANT_MYSQL_VER= 55m
112		112
113	CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-46-9][0-9]-server-* mariadb5.[0-46-9]-server-* percona[0-9][0-9]-server-*	113	CONFLICTS_INSTALL= mariadb5[4-9]-server-* \
		114	mariadb1-server- \
		115	mysql-server- \
		116	percona-server-
114		117
115	USE_RC_SUBR= mysql-server	118	USE_RC_SUBR= mysql-server
116		119

Lines 11-17 Link Here

(-)mariadb55-client/Makefile (-1 / +4 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[0-9][0-9]-client-* mariadb[0-46-9][0-9]-client-* mariadb5.[0-46-9]-client-* percona[0-9][0-9]-client-*	14	CONFLICTS_INSTALL= mariadb5[4-9]-client-* \
		15	mariadb1-client- \
		16	mysql-client- \
		17	percona-client-
15		18
16	CMAKE_ARGS+= -DWITHOUT_SERVER=1	19	CMAKE_ARGS+= -DWITHOUT_SERVER=1
17		20

Return to bug 194822