From owner-svn-ports-head@freebsd.org Tue Jan 5 17:40:03 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 76253A62D65; Tue, 5 Jan 2016 17:40:03 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com [IPv6:2607:f8b0:400e:c03::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DD271954; Tue, 5 Jan 2016 17:40:03 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pa0-x236.google.com with SMTP id ho8so2040064pac.2; Tue, 05 Jan 2016 09:40:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=hKmJ2BlddBQ5nGAkWzwwK+DYKVm0335+wsMb6WamAYc=; b=tH3IYpOzAdNQS2gKQf24goSQypRpgkU3/2Mk57+vpHYqUdLVS3GNepP7mksgZoGMvZ a9BdMUu+XDX/WnrpJsnHrR7OC4zIXmORmy8S+fawEymoOtrOSyprstphAAUkSYjM7tZR hGgrzLYhe4DnrBSraGZWIlsC58yMog07j9EvTOjN4fmGOhFQzmBHLmJ8C6WFSZdomxJE k8Ql4Z84xUSHvl3MqsAOlXJ13rjC30ZSF3bVFnlQeHDJcS/WZFaKe5jlbd3D0lmhkX2u TagulHfbfdrMBspPX30RX/rH/wMYczE4sPQUKCAmMDJ2Dw120YmKg1jLkBSQJBDvHs8F bbjg== X-Received: by 10.67.3.230 with SMTP id bz6mr136524227pad.118.1452015602981; Tue, 05 Jan 2016 09:40:02 -0800 (PST) Received: from ?IPv6:2001:44b8:31ae:7b01::4? (2001-44b8-31ae-7b01-0000-0000-0000-0004.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01::4]) by smtp.gmail.com with ESMTPSA id uz4sm134991360pac.39.2016.01.05.09.40.00 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jan 2016 09:40:02 -0800 (PST) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r405305 - in head/databases: mysql57-client mysql57-server References: <201601051729.u05HTnTU006298@repo.freebsd.org> To: Mikhail Teterin , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org From: Kubilay Kocak Message-ID: <568BFFE9.2020500@FreeBSD.org> Date: Wed, 6 Jan 2016 04:39:53 +1100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:43.0) Gecko/20100101 Thunderbird/43.0 MIME-Version: 1.0 In-Reply-To: <201601051729.u05HTnTU006298@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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:40:03 -0000 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?