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

(-)Makefile (-3 / +7 lines)
Lines 90-96 Link Here
90
USE_MYSQL=	yes
90
USE_MYSQL=	yes
91
WANT_MYSQL_VER=	51
91
WANT_MYSQL_VER=	51
92
92
93
CONFLICTS_INSTALL=	mysql5.[02-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
93
CONFLICTS_INSTALL=	mysql5[2-9]-server-* \
94
			mariadb*-server-* \
95
			percona*-server-*
94
96
95
USE_RC_SUBR=	mysql-server
97
USE_RC_SUBR=	mysql-server
96
98
Lines 158-164 Link Here
158
.else
160
.else
159
# MySQL-Client part
161
# MySQL-Client part
160
.if defined(CLIENT_ONLY)
162
.if defined(CLIENT_ONLY)
161
CONFLICTS_INSTALL=	mysql5.[02-9]-client-* mysql[0-46-9][0-9]-client-*
163
CONFLICTS_INSTALL=	mysql5[02-9]-client-* \
164
			mariadb*-client-* \
165
			percona*-client-* 
162
166
163
MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
167
MAN1=		mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
164
		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
168
		mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
Lines 186-192 Link Here
186
190
187
RUN_DEPENDS=	p5-DBD-mysql51>=0:${PORTSDIR}/databases/p5-DBD-mysql51
191
RUN_DEPENDS=	p5-DBD-mysql51>=0:${PORTSDIR}/databases/p5-DBD-mysql51
188
192
189
CONFLICTS_INSTALL=	mysql[0-46-9][0-9]-scripts-* mysql5.[02-9]-scripts-*
193
CONFLICTS_INSTALL=	mariadb51-scripts-*
190
194
191
MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
195
MAN1=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
192
		mysql_fix_extensions.1 mysql_secure_installation.1 \
196
		mysql_fix_extensions.1 mysql_secure_installation.1 \

Return to bug 194809