From owner-svn-ports-head@freebsd.org  Thu Jan  7 14:01:35 2021
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 14FC64D1CF4;
 Thu,  7 Jan 2021 14:01:35 +0000 (UTC)
 (envelope-from bapt@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 4DBSZj5yYkz55Zh;
 Thu,  7 Jan 2021 14:01:33 +0000 (UTC)
 (envelope-from bapt@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 73A481250C;
 Thu,  7 Jan 2021 14:01:32 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 107E1WBB077573;
 Thu, 7 Jan 2021 14:01:32 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 107E1W0n077572;
 Thu, 7 Jan 2021 14:01:32 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <202101071401.107E1W0n077572@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 7 Jan 2021 14:01:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r560711 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 560711
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2021 14:01:35 -0000

Author: bapt
Date: Thu Jan  7 14:01:31 2021
New Revision: 560711
URL: https://svnweb.freebsd.org/changeset/ports/560711

Log:
  Prefer checking libncursesw.so for base ncurses
  
  While base still provides libncurses.so (as a symlink to libncurses.so in -current)
  libncursesw.so is still prefered

Modified:
  head/Mk/Uses/ncurses.mk

Modified: head/Mk/Uses/ncurses.mk
==============================================================================
--- head/Mk/Uses/ncurses.mk	Thu Jan  7 13:36:43 2021	(r560710)
+++ head/Mk/Uses/ncurses.mk	Thu Jan  7 14:01:31 2021	(r560711)
@@ -27,7 +27,7 @@
 _INCLUDE_USES_NCURSES_MK=	yes
 
 .if empty(ncurses_ARGS)
-.  if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/lib/libncurses.so)
+.  if !exists(${DESTDIR}/${LOCALBASE}/lib/libncurses.so) && exists(${DESTDIR}/usr/lib/libncursesw.so)
 ncurses_ARGS=	base
 .  else
 ncurses_ARGS=	port