From nobody Thu Nov 06 15:22:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d2QtL0849z6GLl2; Thu, 06 Nov 2025 15:22:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2QtK6XpJz4DW2; Thu, 06 Nov 2025 15:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762442570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPssssZY5NMeyDktAbc+ty9/f+SuPeSxud5+dxHmvNE=; b=xGsgS7vkxyqep5iIGTMzDCtTKQ3mqUO/wdwKsDBbb8Q8DUYHU7V6hwa1avLpO5DeMKIBfc PP2hxqV9tu14YBHoTeUj90EuCF+1ha7J4sRdwHEG2P5zsVaaUEqxDU8RLBWSCdxJQ5KoUp qP2ZplPlOpR4NVKnu8Y2o6+V+mamdt/wUS8kuDZv/S6wkfWxBwme5as3clAqT51anZFnKj XIl5s5/GUS1aDpsWf1YprYXhLaI6BO7XA6y01CVJqLetrPAGpZSvp8lwSQLKmW99yMiSnN /Oj2Xl/J1OpTB7v6pvimSwMaN2x+SdT4cBdPsFoy1GPdtEGDUf9jte+OzzyssA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762442569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qPssssZY5NMeyDktAbc+ty9/f+SuPeSxud5+dxHmvNE=; b=iNdoyU6O6BIkpVbjjUlgMsqh3Gxm/1NggomBMOcjuJT0wuDmqy4tMY5sChwOK4jh4oDGQF X3WjhiNLZ9W1dqbq4RbMiBzFoNQ1Tkht2t0JcunjqXN/Zn9VkHEWfvMn6c5r3NrWIm1NE8 DCbbiMs0JX8bJm4jMily77OjuxeizBhN55MY3pWxOe2Tz6OReN/8sMAGBjbJ46XwzL9J2u h3SsBGYP9rH1XdL+UzryfIJ3zYsygGQMAgLN5InQqIlWtIg9Gds0Quea33kP30Zpheud3J KpaVNn8vMUD06+9cn8rAzXmM++vy0zIQybOX2MGjKM+FHH+q8Ol+jslCQyD+9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762442570; a=rsa-sha256; cv=none; b=WuaXMJwBdi3SMsCnyjWUQF9gslbY46LFgCjg85W8z7fQHZxwFNE7b1D7fepxhGnw8fcIIx gHlws/Hk4PrXX4eWDsjBNFi3+1vMEeE/ygJ4W345e2oRe4Kg8yOXOXeO6qDOKahEPrBzJY eMQVXlZOvoqZNqxZwzZXp0/tDoSyvOkQemtYsKDKjwpJ9/Lk783r6kKqzfqU7iFkWFzuDS susNXQ0yygLDhoHDGcBiCVoBMJoQUW7PBPp5UeR8jHrkEUOORuEJ6veLPdhQnHJBRXRm/9 xQSVGv9YASder+jZVmlW+NUJ/R1UZp9iJZjTrqwcmInub47xQemJj7MCTg5Z8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d2QtK5y9mz43x; Thu, 06 Nov 2025 15:22:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A6FMnBd023267; Thu, 6 Nov 2025 15:22:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A6FMnpf023264; Thu, 6 Nov 2025 15:22:49 GMT (envelope-from git) Date: Thu, 6 Nov 2025 15:22:49 GMT Message-Id: <202511061522.5A6FMnpf023264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 8a8f2ebd2d3e - main - ncurses: Move termcap and tabset to ncurses-lib List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a8f2ebd2d3e09cfc057b5ba6ced2fd3151cfb0f Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8a8f2ebd2d3e09cfc057b5ba6ced2fd3151cfb0f commit 8a8f2ebd2d3e09cfc057b5ba6ced2fd3151cfb0f Author: Lexi Winter AuthorDate: 2025-11-06 14:29:56 +0000 Commit: Lexi Winter CommitDate: 2025-11-06 15:20:52 +0000 ncurses: Move termcap and tabset to ncurses-lib termcap and tabset are currently in runtime, but since ncurses is the only thing which uses them, they belong in the ncurses package. curses without termcap is not very useful, so put them in the -lib subpackage rather than ncurses itself, so that installing ncurses-lib provides a working curses. This change moves files between packages so, until we have a proper policy on how to handle this in release/stable branches, it should not be MFC'd. MFC after: never Discussed with: kevans Reviewed by: manu, kevans Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53610 --- etc/mtree/BSD.usr.dist | 2 +- etc/termcap/Makefile | 4 +++- share/tabset/Makefile | 2 ++ share/termcap/Makefile | 11 +++++++---- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 54d408865fa5..2fc7baed3ccc 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -857,7 +857,7 @@ scrnmaps .. .. - tabset + tabset tags=package=ncurses-lib .. vi catalog diff --git a/etc/termcap/Makefile b/etc/termcap/Makefile index cd5516f3e04b..ea8fab4e839e 100644 --- a/etc/termcap/Makefile +++ b/etc/termcap/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/share/termcap -PACKAGE= runtime +# Note: This is in ncurses-lib rather than ncurses because without it, ncurses +# doesn't work, and the base ncurses package is optional. +PACKAGE= ncurses-lib CLEANFILES+= termcap.small CONFS= termcap.small diff --git a/share/tabset/Makefile b/share/tabset/Makefile index fe7519084716..4da1a3650888 100644 --- a/share/tabset/Makefile +++ b/share/tabset/Makefile @@ -1,3 +1,5 @@ +PACKAGE= ncurses-lib + FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \ stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \ xerox1730-lm zenith29 diff --git a/share/termcap/Makefile b/share/termcap/Makefile index 34ad41fd520a..603b098e4de1 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -1,10 +1,13 @@ # reorder gives an editor command for most common terminals # (in reverse order from n'th to 1'st most commonly used) # to move them to the front of termcap -# -MAN= termcap.5 -PACKAGE= runtime +MAN= termcap.5 +MANPACKAGE= ncurses + +# Note: This is in ncurses-lib rather than ncurses because without it, ncurses +# doesn't work, and the base ncurses package is optional. +PACKAGE= ncurses-lib FILES= termcap termcap.db FILESDIR= ${BINDIR}/misc CLEANFILES+= termcap.db @@ -16,7 +19,7 @@ termcap.db: termcap ${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} etc-termcap: - ${INSTALL_SYMLINK} -T "package=runtime" \ + ${INSTALL_SYMLINK} -T "package=ncurses-lib" \ ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap .include