From owner-svn-ports-all@freebsd.org  Sun May 24 20:57:47 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id BADD42D9159;
 Sun, 24 May 2020 20:57:47 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49VXcC4C3Bz4dCt;
 Sun, 24 May 2020 20:57:47 +0000 (UTC)
 (envelope-from asomers@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 86DDD2709E;
 Sun, 24 May 2020 20:57:47 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04OKvlSU057471;
 Sun, 24 May 2020 20:57:47 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04OKvlMi057470;
 Sun, 24 May 2020 20:57:47 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <202005242057.04OKvlMi057470@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Sun, 24 May 2020 20:57:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r536422 - head/shells/fish
X-SVN-Group: ports-head
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: head/shells/fish
X-SVN-Commit-Revision: 536422
X-SVN-Commit-Repository: ports
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.33
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 May 2020 20:57:47 -0000

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>