From owner-svn-ports-head@freebsd.org Tue Jan 5 17:29:51 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 283F3A6297A; Tue, 5 Jan 2016 17:29:51 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D155D1E83; Tue, 5 Jan 2016 17:29:50 +0000 (UTC) (envelope-from mi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05HTn7n006300; Tue, 5 Jan 2016 17:29:49 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05HTnTU006298; Tue, 5 Jan 2016 17:29:49 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201601051729.u05HTnTU006298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Tue, 5 Jan 2016 17:29:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405305 - in head/databases: mysql57-client mysql57-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2016 17:29:51 -0000 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-*