svn commit: r405305 - in head/databases: mysql57-client mysql57-server

[Kubilay Kocak]

On 6/01/2016 4:29 AM, Mikhail Teterin wrote:
> Author: mi
> Date: Tue Jan  5 17:29:49 2016
> New Revision: 405305
> URL: https://svnweb.freebsd.org/changeset/ports/405305
> 
> Log:
>   Add additional CMAKE-argument to avoid build-time conflicts between
>   Boost-1_59 used privately by this port and Boost-1_55 installed by
>   its own port.
>   
>   While at it, replace WRKSRC/.. with simply WRKDIR.
>   
>   PR:		205815
>   Approved by:	maintainer
> 
> Modified:
>   head/databases/mysql57-client/Makefile
>   head/databases/mysql57-server/Makefile
> 
> Modified: head/databases/mysql57-client/Makefile
> ==============================================================================
> --- head/databases/mysql57-client/Makefile	Tue Jan  5 17:11:57 2016	(r405304)
> +++ head/databases/mysql57-client/Makefile	Tue Jan  5 17:29:49 2016	(r405305)
> @@ -14,7 +14,6 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
>  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 \
> 
> Modified: head/databases/mysql57-server/Makefile
> ==============================================================================
> --- head/databases/mysql57-server/Makefile	Tue Jan  5 17:11:57 2016	(r405304)
> +++ head/databases/mysql57-server/Makefile	Tue Jan  5 17:29:49 2016	(r405305)
> @@ -40,7 +40,8 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc
>  		-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 @@ WANT_MYSQL_VER=	57
>  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-*
> 

Good MFH candidate?