summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2014-12-10 20:40:03 +0000
committerngie <ngie@FreeBSD.org>2014-12-10 20:40:03 +0000
commitfd6bb9e41a83919f5817b077c59df9032c36abed (patch)
tree4ccadef453190d6bd89840955b41bd0e7a8c113b
parent79f295cc93a1a4909cad2dbdd09c11bc3d9d033b (diff)
downloadFreeBSD-src-fd6bb9e41a83919f5817b077c59df9032c36abed.zip
FreeBSD-src-fd6bb9e41a83919f5817b077c59df9032c36abed.tar.gz
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 MFC after: 1 month Sponsored by: EMC / Isilon Storage Division
-rw-r--r--share/termcap/Makefile5
-rw-r--r--share/termcap/README4
-rw-r--r--share/termcap/reorder62
-rw-r--r--share/termcap/termcap (renamed from share/termcap/termcap.src)0
4 files changed, 4 insertions, 67 deletions
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 9f6e718..1fdc5ed 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 <bsd.endian.mk>
.if ${TARGET_ENDIANNESS} == "1234"
diff --git a/share/termcap/README b/share/termcap/README
index f299ce8..c28d87f 100644
--- a/share/termcap/README
+++ b/share/termcap/README
@@ -1,4 +1,6 @@
# @(#)README 8.1 (Berkeley) 6/8/93
+#
+# $FreeBSD$
<< 12 May 1983 >>
To install this directory on your system:
@@ -19,7 +21,7 @@ common and really should go near the front.
Third, if you are not a super user and cannot create the directory
/usr/lib/tabset, make a corresponding directory somewhere you can and add
a line to reorder to globally change all /usr/lib/tabset's to your own
-path name. This change is better than just changing the termcap.src file
+path name. This change is better than just changing the termcap file
because it makes it easier to diff it from newer distributed versions.
Try to keep the source as is whenever possible, and put mungings into
reorder.
diff --git a/share/termcap/reorder b/share/termcap/reorder
deleted file mode 100644
index 8fc94a7..0000000
--- a/share/termcap/reorder
+++ /dev/null
@@ -1,62 +0,0 @@
-" $FreeBSD$
-/# << EOH -/k a
-/^adm12|/;.,/^[^ ]/-m'a
-/^pcplot/;.,/^[^ ]/-m'a
-/^c100|/;.,/^[^ ]/-m'a
-/^c100-rv|/;.,/^[^ ]/-m'a
-/^c100-rv-pp|/;.,/^[^ ]/-m'a
-/^c108-4p|/;.,/^[^ ]/-m'a
-/^c108-rv-4p|/;.,/^[^ ]/-m'a
-/^c108|/;.,/^[^ ]/-m'a
-/^c108-rv-8p|/;.,/^[^ ]/-m'a
-/^avt|/;.,/^[^ ]/-m'a
-/^avt-rv|/;.,/^[^ ]/-m'a
-/^avt-4p-s|/;.,/^[^ ]/-m'a
-/^avt-8p-s|/;.,/^[^ ]/-m'a
-/^ansi.sys|/;.,/^[^ ]/-m'a
-/^ansi.sysk|/;.,/^[^ ]/-m'a
-/^nansi.sys|/;.,/^[^ ]/-m'a
-/^nansi.sysk|/;.,/^[^ ]/-m'a
-/^h19k|/;.,/^[^ ]/-m'a
-/^msk22714|/;.,/^[^ ]/-m'a
-/^msk227am|/;.,/^[^ ]/-m'a
-/^msk227|/;.,/^[^ ]/-m'a
-/^pckermit120|/;.,/^[^ ]/-m'a
-/^pckermit|/;.,/^[^ ]/-m'a
-/^kermitam|/;.,/^[^ ]/-m'a
-/^kermit|/;.,/^[^ ]/-m'a
-/^sun-17|/;.,/^[^ ]/-m'a
-/^sun-24|/;.,/^[^ ]/-m'a
-/^sun-34|/;.,/^[^ ]/-m'a
-/^sun-48|/;.,/^[^ ]/-m'a
-/^sun-e-s|/;.,/^[^ ]/-m'a
-/^sun-s|/;.,/^[^ ]/-m'a
-/^sun-e|/;.,/^[^ ]/-m'a
-/^sun|/;.,/^[^ ]/-m'a
-/^xterm|/;.,/^[^ ]/-m'a
-/^adm3|/;.,/^[^ ]/-m'a
-/^adm31|/;.,/^[^ ]/-m'a
-/^adm3a|/;.,/^[^ ]/-m'a
-/^tvi924vb|/;.,/^[^ ]/-m'a
-/^tvi924|/;.,/^[^ ]/-m'a
-/^tvi912|/;.,/^[^ ]/-m'a
-/^920b|/;.,/^[^ ]/-m'a
-/^tvi925vb|/;.,/^[^ ]/-m'a
-/^tvi925|/;.,/^[^ ]/-m'a
-/^vt100|/;.,/^[^ ]/-m'a
-/^vt200|/;.,/^[^ ]/-m'a
-/^hp|/;.,/^[^ ]/-m'a
-/^hp2645|/;.,/^[^ ]/-m'a
-/^2621-nl|/;.,/^[^ ]/-m'a
-/^2621|/;.,/^[^ ]/-m'a
-/^h29|/;.,/^[^ ]/-m'a
-/^h19|/;.,/^[^ ]/-m'a
-/^h19-u|/;.,/^[^ ]/-m'a
-/^h19-us|/;.,/^[^ ]/-m'a
-/^h19-e|/;.,/^[^ ]/-m'a
-/^h19-g|/;.,/^[^ ]/-m'a
-/^dmd|/;.,/^[^ ]/-m'a
-/^s/;.,/^#/-m'a
-'ad
-w! termcap
-q
diff --git a/share/termcap/termcap.src b/share/termcap/termcap
index 08a1c83..08a1c83 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap
OpenPOWER on IntegriCloud