Date: Mon, 7 Sep 2015 11:16:17 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396260 - head/databases/mysql56-server Message-ID: <201509071116.t87BGHO8097698@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509071116.t87BGHO8097698>