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
This commit is contained in:
Lexi Winter
2025-11-06 14:29:56 +00:00
parent d7a138207f
commit 8a8f2ebd2d
4 changed files with 13 additions and 6 deletions
+1 -1
View File
@@ -857,7 +857,7 @@
scrnmaps scrnmaps
.. ..
.. ..
tabset tabset tags=package=ncurses-lib
.. ..
vi vi
catalog catalog
+3 -1
View File
@@ -1,6 +1,8 @@
.PATH: ${SRCTOP}/share/termcap .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 CLEANFILES+= termcap.small
CONFS= termcap.small CONFS= termcap.small
+2
View File
@@ -1,3 +1,5 @@
PACKAGE= ncurses-lib
FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \ FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \ stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
xerox1730-lm zenith29 xerox1730-lm zenith29
+7 -4
View File
@@ -1,10 +1,13 @@
# reorder gives an editor command for most common terminals # reorder gives an editor command for most common terminals
# (in reverse order from n'th to 1'st most commonly used) # (in reverse order from n'th to 1'st most commonly used)
# to move them to the front of termcap # 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 FILES= termcap termcap.db
FILESDIR= ${BINDIR}/misc FILESDIR= ${BINDIR}/misc
CLEANFILES+= termcap.db CLEANFILES+= termcap.db
@@ -16,7 +19,7 @@ termcap.db: termcap
${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} ${CAP_MKDB_CMD} ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC}
etc-termcap: etc-termcap:
${INSTALL_SYMLINK} -T "package=runtime" \ ${INSTALL_SYMLINK} -T "package=ncurses-lib" \
${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
.include <bsd.prog.mk> .include <bsd.prog.mk>