Date: Sun, 24 May 2020 20:57:47 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536422 - head/shells/fish Message-ID: <202005242057.04OKvlMi057470@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers (src committer) Date: Sun May 24 20:57:47 2020 New Revision: 536422 URL: https://svnweb.freebsd.org/changeset/ports/536422 Log: shells/fish: link against devel/ncurses if it's installed at build time shells/fish is built using CMake and requires the FindCurses module. Unless CURSES_NEED_NCURSES=TRUE, shells/fish will always be built against ncurses from base, even when devel/ncurses is already installed. This change has no effect for packages built from Poudriere, which will not install devel/ncurses when building fish. PR: 246365 Submitted by: Dustin Boyd <memreflect@pm.me> Modified: head/shells/fish/Makefile Modified: head/shells/fish/Makefile ============================================================================== --- head/shells/fish/Makefile Sun May 24 20:48:02 2020 (r536421) +++ head/shells/fish/Makefile Sun May 24 20:57:47 2020 (r536422) @@ -38,6 +38,14 @@ NLS_CMAKE_BOOL= WITH_GETTEXT PORTDOCS= * +.include <bsd.port.pre.mk> + +.if ${NCURSESBASE:M${LOCALBASE}} +CMAKE_ARGS+= -DCURSES_NEED_NCURSES=TRUE +.else +.info NCURSES BASE +.endif + post-install: .for i in fish fish_indent fish_key_reader @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} @@ -50,4 +58,4 @@ post-stage-MANPAGES-off: @${RM} -rf ${STAGEDIR}${MANPREFIX}/man/man1 @${RM} -rf ${STAGEDIR}${DATADIR}/man -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005242057.04OKvlMi057470>