Attachment #111588 for bug #152885

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

Lines 111-116 Link Here

(-)Mk/bsd.database.mk (+5 lines)
111	MYSQL41_LIBVER= 14	111	MYSQL41_LIBVER= 14
112	MYSQL50_LIBVER= 15	112	MYSQL50_LIBVER= 15
113	MYSQL51_LIBVER= 16	113	MYSQL51_LIBVER= 16
		114	MYSQL52_LIBVER= 16
114	MYSQL55_LIBVER= 16	115	MYSQL55_LIBVER= 16
115		116
116	# Setting/finding MySQL version we want.	117	# Setting/finding MySQL version we want.
Lines 158-165 Link Here
158	BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/databases/mysql${MYSQL_VER}-server	159	BUILD_DEPENDS+= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
159	.endif	160	.endif
160	.else	161	.else
		162	.if (${MYSQL_VER} == "52")
		163	LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mariadb
		164	.else
161	LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client	165	LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
162	.endif	166	.endif
		167	.endif
163	.else	168	.else
164	IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER}	169	IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER}
165	.endif # Check for correct libs	170	.endif # Check for correct libs

Lines 72-75 Link Here

(-)databases/mariadb/Makefile (+3 lines)
72	MAN8= mysqld.8 \	72	MAN8= mysqld.8 \
73	mysqlmanager.8	73	mysqlmanager.8
74		74
		75	post-install:
		76	USE_LDCONFIG= ${PREFIX}/lib/mysql
		77
75	.include <bsd.port.mk>	78	.include <bsd.port.mk>

Return to bug 152885