From owner-svn-ports-all@freebsd.org Mon Sep 7 11:16:18 2015 Return-Path: Delivered-To: svn-ports-all@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 01E029CB431; Mon, 7 Sep 2015 11:16:18 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 E62C21B73; Mon, 7 Sep 2015 11:16:17 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t87BGHk7097699; Mon, 7 Sep 2015 11:16:17 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t87BGHO8097698; Mon, 7 Sep 2015 11:16:17 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201509071116.t87BGHO8097698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 7 Sep 2015 11:16:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396260 - head/databases/mysql56-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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2015 11:16:18 -0000 Author: rakuco Date: Mon Sep 7 11:16:17 2015 New Revision: 396260 URL: https://svnweb.freebsd.org/changeset/ports/396260 Log: Switch to USES=libedit. Instead of manually adding both a build- and a run-time dependency on libedit from ports, use USES=libedit instead. Not only does it take care of adding the proper dependency, but it also sets CMAKE_PREFIX_PATH to ${LOCALBASE} to make sure that the version in ports is preferred instead of the one in base. This is a dependency for moving to CMake 3.3.x, as starting with 3.3.0 calls to find_library() will also look in the $PATH environment variable and end up finding libedit from base by default (see bug 202516). PR: 202618 Approved by: maintainer timeout (ale, 14 days) Modified: head/databases/mysql56-server/Makefile Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Mon Sep 7 11:12:32 2015 (r396259) +++ head/databases/mysql56-server/Makefile Mon Sep 7 11:16:17 2015 (r396260) @@ -64,8 +64,7 @@ MMAN1= my_print_defaults.1 myisam_ftdum CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" .else -BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit -RUN_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit +USES+= libedit .endif post-patch: @@ -76,5 +75,5 @@ post-patch: .if ${ARCH} == "armv6" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif - + .include