From owner-dev-commits-ports-main@freebsd.org Thu Sep 23 16:22:56 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 C449D6A97FA; Thu, 23 Sep 2021 16:22:56 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HFgSJ55W3z3DMR; Thu, 23 Sep 2021 16:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8EEAE2E38F; Thu, 23 Sep 2021 16:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18NGMuhI096936; Thu, 23 Sep 2021 16:22:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18NGMuso096935; Thu, 23 Sep 2021 16:22:56 GMT (envelope-from git) Date: Thu, 23 Sep 2021 16:22:56 GMT Message-Id: <202109231622.18NGMuso096935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 3556bb222640 - main - USES=ncurses: expose variable with the name of the lib to link against MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3556bb222640f4cf6dd22a59542fafdf5ffbd934 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Sep 2021 16:22:56 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=3556bb222640f4cf6dd22a59542fafdf5ffbd934 commit 3556bb222640f4cf6dd22a59542fafdf5ffbd934 Author: Baptiste Daroussin AuthorDate: 2021-09-23 16:05:28 +0000 Commit: Baptiste Daroussin CommitDate: 2021-09-23 16:22:53 +0000 USES=ncurses: expose variable with the name of the lib to link against ncurses from ports and futur ncurses in base differs from current ncurses in base by the fact it is not providing a giant libncurses.so but 2 libraries: libtinfo and libncurses, those information often needs to be reported to the consumer port. while here remove a now useless test for support of widechar ncurses in base, all supported version of freebsd have it now. --- Mk/Uses/ncurses.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/ncurses.mk b/Mk/Uses/ncurses.mk index 3a6a30e78476..6fad636a5ab4 100644 --- a/Mk/Uses/ncurses.mk +++ b/Mk/Uses/ncurses.mk @@ -35,9 +35,6 @@ ncurses_ARGS= port .if ${ncurses_ARGS} == base NCURSESBASE= /usr NCURSESINC= ${NCURSESBASE}/include -.if !exists(/usr/lib/libncursesw.so) -NCURSES_IMPL= ncurses -.endif . if exists(${LOCALBASE}/lib/libncurses.so) _USES_sanity+= 400:check-depends-ncurses @@ -75,6 +72,8 @@ NCURSES_SHLIBVER?= 6 BUILD_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT} RUN_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT} NCURSESRPATH= ${NCURSESBASE}/lib +TINFO_LIB= -ltinfo +NCURSES_LIB= -lncurses .if defined(NCURSES_RPATH) CFLAGS+= -Wl,-rpath,${NCURSESRPATH} @@ -87,5 +86,8 @@ LDFLAGS+= -Wl,-rpath=${NCURSESRPATH} NCURSESLIB= ${NCURSESBASE}/lib NCURSES_IMPL?= ncursesw +TINFO_LIB?= -ltinfow +NCURSES_LIB?= -lncursesw +NCURSESLIBS= ${NCURSES_LIB} ${TINFO_LIB} .endif