--- mysql57-client/Makefile	(revision 405108)
+++ mysql57-client/Makefile	(working copy)
@@ -14,7 +14,6 @@ 
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_BUILD=	boost-libs-1.55*
 CONFLICTS_INSTALL=	mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
 
 CMAKE_ARGS+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
--- mysql57-server/Makefile	(revision 405108)
+++ mysql57-server/Makefile	(working copy)
@@ -40,7 +40,8 @@ 
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DLOCAL_BOOST_DIR=${WRKSRC}/../boost_1_59_0 \
+		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
+		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
 		-DWITH_INNODB_EXTRA_DEBUG=0
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
@@ -61,7 +62,6 @@ 
 USES+=		bison:build cpe perl5
 USE_PERL5=	run
 
-CONFLICTS_BUILD=	boost-libs-1.55*
 CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
 			mysql[0-46-9][0-689]-server-* \
 			percona[0-9]*-server-*