View | Details | Raw Unified | Return to bug 205815 | Differences between
and this patch

Collapse All | Expand All

(-)mysql57-client/Makefile (-1 lines)
Lines 14-20 Link Here
14
PATCHDIR=	${.CURDIR}/files
14
PATCHDIR=	${.CURDIR}/files
15
PLIST=		${.CURDIR}/pkg-plist
15
PLIST=		${.CURDIR}/pkg-plist
16
16
17
CONFLICTS_BUILD=	boost-libs-1.55*
18
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-*
17
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-*
19
18
20
CMAKE_ARGS+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
19
CMAKE_ARGS+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
(-)mysql57-server/Makefile (-2 / +2 lines)
Lines 40-46 Link Here
40
		-DINSTALL_SCRIPTDIR="bin" \
40
		-DINSTALL_SCRIPTDIR="bin" \
41
		-DINSTALL_SHAREDIR="share" \
41
		-DINSTALL_SHAREDIR="share" \
42
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
42
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
43
		-DLOCAL_BOOST_DIR=${WRKSRC}/../boost_1_59_0 \
43
		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
44
		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
44
		-DWITH_INNODB_EXTRA_DEBUG=0
45
		-DWITH_INNODB_EXTRA_DEBUG=0
45
46
46
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
47
SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
Lines 61-67 Link Here
61
USES+=		bison:build cpe perl5
62
USES+=		bison:build cpe perl5
62
USE_PERL5=	run
63
USE_PERL5=	run
63
64
64
CONFLICTS_BUILD=	boost-libs-1.55*
65
CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
65
CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
66
			mysql[0-46-9][0-689]-server-* \
66
			mysql[0-46-9][0-689]-server-* \
67
			percona[0-9]*-server-*
67
			percona[0-9]*-server-*

Return to bug 205815