From 50b3937987a75961824a4a1242bf8df76bcdb6a3 Mon Sep 17 00:00:00 2001 From: ngie Date: Sun, 11 Jan 2015 18:13:56 +0000 Subject: MFC r275687,r275692: Relnotes: yes r275687: Remove termcap entry reordering; install the file verbatim instead termcap entry reordering requires ex (which is available via usr.bin/vi), which breaks on build hosts where installworld is run with MK_VI == no (or when make delete-old is run on ^/projects/building-blocks as vi, et al, are removed on the branch when the knob is tweaked to => "no") Reordering termcap was believed to improve performance, but the file is now accessed via /etc/termcap.db, so /etc/termcap (and /usr/share/misc/termcap by proxy) access is less preferred. Reordering the file broke the historical comment <-> entry mapping as well, which could muddle the purpose of entries in the file, so it could be potentially harmful to readers in its reordered state. Discussion took place on hackers@ here: https://lists.freebsd.org/pipermail/freebsd-hackers/2014-December/046657.html Discussed with: -hackers, mp Sponsored by: EMC / Isilon Storage Division r275692: Fix building termcap.db when make obj is run beforehand from a clean tree by using make variables for the filenames, which helps resolve pathing appropriately when running cap_mkdb Pointyhat to: me --- share/termcap/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'share/termcap/Makefile') diff --git a/share/termcap/Makefile b/share/termcap/Makefile index 9f6e718..46e1f8b 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -9,10 +9,7 @@ MAN= termcap.5 FILES= termcap termcap.db FILESDIR= ${BINDIR}/misc -CLEANFILES+= termcap termcap.db - -termcap: reorder termcap.src - TERM=dumb TERMCAP=dumb: ex - ${.CURDIR}/termcap.src < ${.CURDIR}/reorder +CLEANFILES+= termcap.db .include .if ${TARGET_ENDIANNESS} == "1234" @@ -24,7 +21,7 @@ CAP_MKDB_ENDIAN= .endif termcap.db: termcap - cap_mkdb ${CAP_MKDB_ENDIAN} termcap + cap_mkdb ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} etc-termcap: ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap -- cgit v1.1