Index: head/usr.bin/more/Makefile
===================================================================
--- head/usr.bin/more/Makefile	(revision 2678)
+++ head/usr.bin/more/Makefile	(revision 2679)
@@ -1,15 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	more
 CFLAGS+=-I${.CURDIR}
 SRCS=	ch.c command.c decode.c help.c input.c line.c linenum.c main.c \
 	option.c os.c output.c position.c prim.c screen.c signal.c tags.c \
 	ttyin.c
-DPADD=	${LIBTERM} ${LIBCOMPAT}
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
 LDADD=	-ltermcap -lcompat
 
 beforeinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/more.help \
 	    ${DESTDIR}/usr/share/misc
 
 .include <bsd.prog.mk>
Index: head/usr.bin/msgs/Makefile
===================================================================
--- head/usr.bin/msgs/Makefile	(revision 2678)
+++ head/usr.bin/msgs/Makefile	(revision 2679)
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	msgs
-DPADD=	${LIBTERM} ${LIBCOMPAT}
-LDADD=	-ltermlib -lcompat
+DPADD=	${LIBTERMCAP} ${LIBCOMPAT}
+LDADD=	-ltermcap -lcompat
 
 .include <bsd.prog.mk>
Index: head/usr.bin/talk/Makefile
===================================================================
--- head/usr.bin/talk/Makefile	(revision 2678)
+++ head/usr.bin/talk/Makefile	(revision 2679)
@@ -1,9 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	talk
 DPADD=	${LIBCURSES} ${LIBTERMCAP} ${LIBCOMPAT}
-LDADD=	-lcurses -ltermlib -lcompat
+LDADD=	-lcurses -ltermcap -lcompat
 SRCS=	ctl.c ctl_transact.c display.c get_addrs.c get_names.c \
 	init_disp.c invite.c io.c look_up.c msgs.c talk.c
 
 .include <bsd.prog.mk>
Index: head/usr.bin/tn3270/distribution/makefile_4.2
===================================================================
--- head/usr.bin/tn3270/distribution/makefile_4.2	(revision 2678)
+++ head/usr.bin/tn3270/distribution/makefile_4.2	(revision 2679)
@@ -1,268 +1,268 @@
 #	@(#)makefile	3.5 (Berkeley) 5/15/88
 
 # This makefile will make tn3270 on Vax 4.2 systems.  Notice, however,
 # that on an ultrix system you will need to use the Makefile_ultrix in
 # telnet/ rather than the Makefile already in that directory.
 
 # Makefile for tn3270 and friends...
 #
 #	This is the makefile for tn3270.  Note that we use the 4.3+ telnet
 # (compiled with special options; see below) to provide the telnet
 # support we need.
 #
 #	The following are the defines that may be passed (via the cc
 # -D option) to the compiler.
 #
 #	TN3270		- 	This is to be linked with tn3270.  Necessary
 #				for creating tn3270.  Only for compiling
 #				telnet.
 #
 #	NOT43		-	Allows the program to compile and run on
 #				a 4.2BSD system.
 #
 #	PUTCHAR		-	Within tn3270, on a NOT43 system,
 #				allows the use of the 4.3 curses
 #				(greater speed updating the screen).
 #				You need the 4.3 curses for this to work.
 #
 #	FD_SETSIZE	-	On whichever system, if this isn't defined,
 #				we patch over the FD_SET, etc., macros with
 #				some homebrewed ones.
 #
 #	SO_OOBINLINE	-	This is a socket option which we would like
 #				to set to allow TCP urgent data to come
 #				to us "inline".  This is NECESSARY for
 #				CORRECT operation, and desireable for
 #				simpler operation.
 #
 #	LNOFLSH		-	Detects the presence of the LNOFLSH bit
 #				in the tty structure.
 #
 #
 #	Here are some which are used throughout the system:
 #
 #	unix		-	Compiles in unix specific stuff.
 #
 #	msdos		-	Compiles in msdos specific stuff.
 #
 
 # msdos versus unix defines
 O	= .o
 #PC_O	= .obj
 
 X	=
 #PC_X	= .exe
 
 L	=
 #PC_L	= -link
 
 CC	= cc
 #PC_CC	= cl
 
 MV	= mv
 #PC_MV	= rename
 
 RM	= rm -f
 #PC_RM= erase
 
 LINT_ARGS =
 #PC_LINT_ARGS = -DLINT_ARGS
 
 DEBUG_FLAGS = -g
 #PC_DEBUG_FLAGS = -Zi -Od
 
 AR	= ar
 AR1	= cr
 AR2	=
 AR3	=
 #PC_AR	= lib
 #PC_AR1	=
 #PC_AR2	= +
 #PC_AR3	= ";"
 
 RANLIB	= ranlib
 #PC_RANLIB = echo "Done with "
 
 
 PRINT	= print
 ACTION = @sccs tell
 
 DEFINES = -DNOT43 ${LINT_ARGS}
 
 INCLUDES = -I. -I..
 
 OPTIMIZE = -O
 OPTIMIZE = ${DEBUG_FLAGS}
 
 CFLAGS	= $(OPTIMIZE) $(INCLUDES) $(DEFINES)
 
 # Lint flags
 LINTFLAGS	= -hbxaz
 # How to install the bloody thing...
 
 DESTDIR=
 
 BINDIR		= $(DESTDIR)/usr/ucb
 
 # Names for the terminal libraries...
 LIBCURSES	= -lcurses
-LIBTERM		= -ltermlib
+LIBTERMCAP	= -ltermcap
 
 #PC_LIBCURSES	=
 #PC_LIBTERM	=
 
 # The source files...
 ALLH =	telnet.ext
 
 MSMAIN = ascii/mset.c
 
 ALLC =
 
 ALLO	= mset$O
 
 ALLHC=	${ALLH} ${ALLC}
 ALLPRINT =	${ALLHC}
 
 ALLSOURCE =	${ALLPRINT} makefile makefile.mak makefile_4.2 README
 
 SYS	= sys_curses
 #PC_SYS	= sys_dos
 
 # The places where the various components live...
 
 SUBDIR =	api ascii ctlr general ${SYS} telnet
 
 # The following are directories we don't do regular make's in, but
 # we do make everywhere, print, and sourcelist in.
 
 EXTRADIR =	arpa sys_dos tools utilities
 
 # The libraries we use.  The order here is important.
 # syslib.a and ctlrlib.a should come first, then the rest.
 SUBLIB =	${SYS}/syslib.a ctlr/ctlrlib.a \
 		ascii/asciilib.a general/generallib.a
 
 .s.o:
 	/lib/cpp -E $< | as -o $@
 
 .c.obj:
 	${CC} ${CFLAGS} -c $<
 
 all:	FRC tn3270$X mset$X
 
 FRC:
 	for i in ${SUBDIR}; \
 		do (cd $$i; make ${MFLAGS} "CFLAGS=${CFLAGS}"); done
 
 tn3270$X:	telnet/telprog.o ${SUBLIB} api/apilib.a
 	${CC} ${CFLAGS} -o tn3270 telnet/telprog.o \
-		$L ${SUBLIB} api/apilib.a $(LIBCURSES) $(LIBTERM)
+		$L ${SUBLIB} api/apilib.a ${LIBCURSES} ${LIBTERMCAP}
 
 #PC_tn3270$X:
 #PC_	link <@<
 #PC_	telnet
 #PC_	tn3270
 #PC_	nul
 #PC_	${SUBLIB} api/apilib.a+
 #PC_	\lib\ublib\ubtcp
 #PC_	_PC_<
 
 mset$X:	mset$O ascii/map3270$O
 	${CC} ${CFLAGS} -o mset mset$O ascii/map3270$O $L api/apilib.a
 
 mset$O:	$(MSMAIN)
 	$(CC) $(CFLAGS) -c $(MSMAIN)
 
 install:	tn3270$X mset$X
 	install -m 755 -o bin -g bin -s tn3270 $(BINDIR)
 	install -m 755 -o bin -g bin -s mset $(BINDIR)
 
 action:
 	${ACTION}
 
 clist:	${ALLHC}
 	@for i in ${SUBDIR}; \
 		do (cd $$i; make ${MFLAGS} "DIRPATH=${DIRPATH}$$i/" \
 							    clist); done
 
 hclist:	${ALLHC}
 	@for i in ${SUBDIR}; \
 		do (cd $$i; make ${MFLAGS} "DIRPATH=${DIRPATH}$$i/" \
 							    hclist); done
 
 everywhere:	action
 	for i in ${SUBDIR} ${EXTRADIR}; \
 		do (echo "[$$i]"; cd $$i; make ${MFLAGS} action \
 						"ACTION=${ACTION}"); done
 
 clean:
 	for i in $(ALLO) mset tn3270 errs makefile.bak; \
 			do (${RM} $$i); done
 	for i in ${SUBDIR} ${EXTRADIR}; \
 			do (cd $$i; make ${MFLAGS} clean); done
 
 sccsclean:
 	-sccs clean
 	-sccs get makefile
 	for i in ${SUBDIR} ${EXTRADIR}; \
 			do (cd $$i; make ${MFLAGS} sccsclean); done
 
 print:
 	${PRINT} ${ALLPRINT}
 	for i in ${SUBDIR} ${EXTRADIR}; \
 			do (cd $$i; make ${MFLAGS} "PRINT=${PRINT}" print); done
 
 tags:	${ALLC} ${ALLH}
 	ctags -t `make ${MFLAGS} hclist`
 
 sourcelist:	${ALLSOURCE}
 	@for i in ${ALLSOURCE}; \
 		do (echo ${DIRPATH}$$i); done
 	@for i in ${SUBDIR} ${EXTRADIR}; \
 		do (cd $$i; make ${MFLAGS} "DIRPATH=${DIRPATH}$$i/" \
 							    sourcelist); done
 
 lint:
 	lint ${LINTFLAGS} ${INCLUDES} ${DEFINES} -DTN3270 \
 				`make clist` -lcurses
 
 lintmset:
 	lint ${LINTFLAGS} ${INCLUDES} ${DEFINES} ${MSMAIN} \
 				ascii/map3270.c -lcurses
 
 makefiles.pc:	tools/mkmake
 	for i in . ${SUBDIR} ${EXTRADIR}; \
 	do (sed -e "s/lib\.a/.lib/g" -e "s/^#PC_//" < $$i/makefile | \
 		./tools/mkmake | \
 		sed -e "sx/x\\\\xg" -e "s/[ 	]*_PC_//" > $$i/makefile.mak); \
 	    done
 
 tools/mkmake:
 	(cd tools; make mkmake)
 
 .DEFAULT:
 	sccs get $<
 
 depend:	thisdepend
 	for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} depend); done
 
 thisdepend:
 	echo > eddep.c
 	grep '^#include' ${ALLC} eddep.c | grep -v '<' | \
 	sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' \
 	    -e 's/\.c/$$O/' | \
 	awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
 		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
 		       else rec = rec " " $$2 } } \
 	      END { print rec } ' > makedep
 	echo '$$r makedep' >>eddep
 	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
 	echo '$$r makedep' >>eddep
 	echo 'w' >>eddep
 	-rm -f makefile.bak
 	cp makefile makefile.bak
 	ed - makefile < eddep
 	rm eddep makedep eddep.c
 
 # DO NOT DELETE THIS LINE
 
Index: head/usr.bin/vi/common/Makefile
===================================================================
--- head/usr.bin/vi/common/Makefile	(revision 2678)
+++ head/usr.bin/vi/common/Makefile	(revision 2679)
@@ -1,105 +1,105 @@
 #	@(#)Makefile	8.51 (Berkeley) 8/17/94
 
 VI=	nvi
 EX=	nex
 VIEW=	nview
 PROG=	nvi
 LINKS=	${BINDIR}/${VI} ${BINDIR}/${EX} ${BINDIR}/${VI} ${BINDIR}/${VIEW}
 LINKS+= ${BINDIR}/${VI} ${BINDIR}/vi ${BINDIR}/${EX} ${BINDIR}/ex
 LINKS+= ${BINDIR}/${VI} ${BINDIR}/view
 MAN1=	${.CURDIR}/../USD.doc/vi.man/vi.1
 
 CFLAGS+=-I. -I${.CURDIR}
-DPADD+= ${LIBCURSES} ${LIBTERM} ${LIBUTIL}
-LDADD+=	-lcurses -ltermlib -lutil
+DPADD+= ${LIBCURSES} ${LIBTERMCAP} ${LIBUTIL}
+LDADD+=	-lcurses -ltermcap -lutil
 
 .PATH:	${.CURDIR}/../common ${.CURDIR}/../ex ${.CURDIR}/../sex \
 	${.CURDIR}/../vi ${.CURDIR}/../svi ${.CURDIR}/../xaw
 
 SPECHDR=compat.h excmd.h options.h
 
 CLEANFILES+=${SPECHDR} ${EX}
 
 # General sources.
 SRCS=	cut.c delete.c exf.c line.c log.c main.c mark.c msg.c options.c \
 	options_f.c put.c screen.c search.c seq.c signal.c recover.c \
 	term.c trace.c util.c ${SPECHDR}
 
 # Ex source.
 SRCS+=	ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \
 	ex_cd.c ex_delete.c ex_digraph.c ex_display.c ex_edit.c ex_equal.c \
 	ex_exit.c ex_file.c ex_global.c ex_init.c ex_join.c ex_map.c \
 	ex_mark.c ex_mkexrc.c ex_move.c ex_open.c ex_preserve.c ex_print.c \
 	ex_put.c ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \
 	ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c ex_undo.c \
 	ex_usage.c ex_util.c ex_version.c ex_visual.c ex_write.c ex_yank.c \
 	ex_z.c excmd.c filter.c
 
 # Ex screen source.
 SRCS+=	sex_confirm.c sex_get.c sex_refresh.c sex_screen.c sex_term.c \
 	sex_util.c sex_window.c
 
 # Vi source.
 SRCS+=	getc.c v_ch.c v_delete.c v_ex.c v_increment.c v_init.c v_left.c \
 	v_mark.c v_match.c v_ntext.c v_paragraph.c v_put.c v_redraw.c \
 	v_replace.c v_right.c v_screen.c v_scroll.c v_search.c v_section.c \
 	v_sentence.c v_status.c v_stop.c v_text.c v_ulcase.c v_undo.c \
 	v_util.c v_word.c v_xchar.c v_yank.c v_z.c v_zexit.c vcmd.c vi.c
 
 # Vi curses screen source.
 SRCS+=	svi_confirm.c svi_curses.c svi_ex.c svi_get.c svi_line.c \
 	svi_refresh.c svi_relative.c svi_screen.c svi_smap.c svi_split.c \
 	svi_term.c svi_util.c
 
 # Athena widget set screen source.
 SRCS+=	xaw_screen.c
 
 all: ${VI} ${EX}
 
 all: nvi nex
 nex: nvi
 	rm -f nex
 	ln nvi nex
 
 ${EX}: ${VI}
 	rm -f ${EX}
 	ln ${VI} ${EX}
 
 compat.h:
 	:> compat.h
 
 excmd.h: excmd.h.stub excmd.c excmd.awk
 	rm -f excmd.h
 	cat ${.CURDIR}/../ex/excmd.h.stub > excmd.h
 	awk -f ${.CURDIR}/../ex/excmd.awk ${.CURDIR}/../ex/excmd.c >> excmd.h
 
 options.h: options.h.stub options.c options.awk
 	rm -f options.h
 	cat ${.CURDIR}/options.h.stub > options.h
 	awk -f ${.CURDIR}/options.awk ${.CURDIR}/options.c >> options.h
 
 excmd.h: excmd.h.stub excmd.c excmd.awk
 	rm -f excmd.h
 	cat ${.CURDIR}/../ex/excmd.h.stub > excmd.h
 	awk -f ${.CURDIR}/../ex/excmd.awk ${.CURDIR}/../ex/excmd.c >> excmd.h
 
 tags::
 	-(cd ${.CURDIR} && rm -f tags && \
 	    ctags ../common/*.[ch] ../common/*.stub ../ex/*.[ch] ../ex/*.stub \
 	    ../vi/*.[ch] ../sex/*.[ch] ../svi/*.[ch] ../xaw/*.[ch])
 
 warn:: ${SRCS}
 	-(cd ${.CURDIR} && gcc -Wall -O4 -DDEBUG \
-	    -Iobj -I. ${.ALLSRC} -lcurses -ltermlib 2>&1 | \
+	    -Iobj -I. ${.ALLSRC} -lcurses -ltermcap 2>&1 | \
 	    sed -e "/warning: .*sccsid.*defined but not used/d" \
 	    	-e "/warning: suggest parentheses around/d" \
 	    	-e "/In function /d" \
 	    	-e "/At top level:/d" \
 	    	-e "/warning: .*inline call to/d" \
 	    	-e "/warning: comparison is always 1 due /d") > \
 		${.CURDIR}/WARN.OUT
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
 
 .depend: ${SPECHDR}