Attachment #113027 for bug #154538

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

Lines 21-27 Link Here

(-)databases/mysql55-client/Makefile (-1 / +1 lines)
21		21
22	CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].*	22	CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[0-46-9].*
23		23
24	CMAKE_ARGS= -DWITHOUT_SERVER=1	24	CMAKE_ARGS= -DWITH_LIBEDIT=OFF -DWITHOUT_SERVER=1
25		25
26	USE_LDCONFIG= ${PREFIX}/lib/mysql	26	USE_LDCONFIG= ${PREFIX}/lib/mysql
27		27

Lines 39-46 Link Here

(-)databases/mysql55-server/Makefile (-1 / +3 lines)
39	-DINSTALL_SQLBENCHDIR="share/mysql" \	39	-DINSTALL_SQLBENCHDIR="share/mysql" \
40	-DINSTALL_SUPPORTFILESDIR="share/mysql"	40	-DINSTALL_SUPPORTFILESDIR="share/mysql"
41		41
		42	CMAKE_ARGS+= -DWITH_LIBWRAP=ON
		43
42	.ifdef USE_MYSQL	44	.ifdef USE_MYSQL
43	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.	45	.error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
44	.endif	46	.endif
45		47
46	.include <bsd.port.options.mk>	48	.include <bsd.port.options.mk>

Return to bug 154538