Index: head/eBones/libexec/telnetd/Makefile
===================================================================
--- head/eBones/libexec/telnetd/Makefile	(revision 2677)
+++ head/eBones/libexec/telnetd/Makefile	(revision 2678)
@@ -1,37 +1,37 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
 
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
 CFLAGS+=-DOLD_ENVIRON -DENV_HACK
 CFLAGS+=-I${.CURDIR}/../../lib
 #CFLAGS+=-DAUTHENTICATION -DENCRYPTION
 SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
-DPADD=	${LIBUTIL} ${LIBTERM}
+DPADD=	${LIBUTIL} ${LIBTERMCAP}
 LDADD=	-lutil -ltermcap -ltelnet
 #LDADD+=	-lkrb -ldes
 MAN8=	telnetd.8
 
 # These are the sources that have encryption stuff in them.
 CRYPT_SRC= authenc.c ext.h state.c telnetd.c termstat.c
 CRYPT_SRC+= utility.c Makefile
 NOCRYPT_DIR=${.CURDIR}/Nocrypt
 
 .include <bsd.prog.mk>
 
 nocrypt:
 #ifdef	ENCRYPTION
 	@for i in ${CRYPT_SRC}; do \
 	    if [ ! -d ${NOCRYPT_DIR} ]; then \
 		echo Creating subdirectory ${NOCRYPT_DIR}; \
 		mkdir ${NOCRYPT_DIR}; \
 	    fi; \
 	    echo ${NOCRYPT_DIR}/$$i; \
 	    unifdef -UENCRYPTION ${.CURDIR}/$$i | \
 		sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
 	done
 
 placeholder:
 #else	/* ENCRYPTION */
 	@echo "Encryption code already removed."
 #endif	/* ENCRYPTION */
Index: head/lib/libedit/Makefile
===================================================================
--- head/lib/libedit/Makefile	(revision 2677)
+++ head/lib/libedit/Makefile	(revision 2678)
@@ -1,52 +1,52 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 LIB=	edit
 
 OSRCS=	chared.c common.c el.c emacs.c hist.c key.c map.c parse.c \
 	prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c \
 	help.c fcns.c help.h
 
 # For speed and debugging
 #SRCS=   ${OSRCS} tokenizer.c history.c
 # For protection
 SRCS=	editline.c tokenizer.c history.c
 
 CLEANFILES+=common.h emacs.h fcns.h help.h vi.h help.c fcns.c editline.c
 CFLAGS+=-I. -I${.CURDIR} 
 CFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
 CFLAGS+=#-DDEBUG_PASTE
 
 AHDR=vi.h emacs.h common.h 
 ASRC=${.CURDIR}/vi.c ${.CURDIR}/emacs.c ${.CURDIR}/common.c
 
 vi.h: vi.c makelist
 	sh ${.CURDIR}/makelist -h ${.CURDIR}/vi.c > ${.TARGET}
 
 emacs.h: emacs.c makelist
 	sh ${.CURDIR}/makelist -h ${.CURDIR}/emacs.c > ${.TARGET}
 
 common.h: common.c makelist
 	sh ${.CURDIR}/makelist -h ${.CURDIR}/common.c > ${.TARGET}
 
 fcns.h: ${AHDR} makelist
 	sh ${.CURDIR}/makelist -fh ${AHDR} > ${.TARGET}
 
 fcns.c: ${AHDR} fcns.h makelist
 	sh ${.CURDIR}/makelist -fc ${AHDR} > ${.TARGET}
 
 help.c: ${ASRC} makelist 
 	sh ${.CURDIR}/makelist -bc ${ASRC} > ${.TARGET}
 
 help.h: ${ASRC} makelist
 	sh ${.CURDIR}/makelist -bh ${ASRC} > ${.TARGET}
 
 editline.c: ${OSRCS}
 	sh ${.CURDIR}/makelist -e ${.ALLSRC:T} > ${.TARGET}
 
 .depend: vi.h emacs.h common.h fcns.h help.h help.c
 
 
-test:	test.o libedit.a ${DPADD} ${LIBTERM}
+test:	test.o libedit.a ${DPADD} ${LIBTERMCAP}
 	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermcap
 
 .include <bsd.lib.mk>
Index: head/libexec/telnetd/Makefile
===================================================================
--- head/libexec/telnetd/Makefile	(revision 2677)
+++ head/libexec/telnetd/Makefile	(revision 2678)
@@ -1,18 +1,18 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
 
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS
 #CFLAGS+=-DKLUDGELINEMODE
 CFLAGS+=-DOLD_ENVIRON -DENV_HACK
 CFLAGS+=-I${.CURDIR}/../../lib
 #CFLAGS+=-DAUTHENTICATION -DENCRYPTION
 SRCS=	global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
 #SRCS+=	authenc.c
-DPADD=	${LIBUTIL} ${LIBTERM}
+DPADD=	${LIBUTIL} ${LIBTERMCAP}
 LDADD=	-lutil -ltermcap -ltelnet
 #LDADD+=	-lkrb -ldes
 MAN8=	telnetd.8
 
 
 .include <bsd.prog.mk>
Index: head/secure/libexec/telnetd/Makefile
===================================================================
--- head/secure/libexec/telnetd/Makefile	(revision 2677)
+++ head/secure/libexec/telnetd/Makefile	(revision 2678)
@@ -1,37 +1,37 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
 
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS
 CFLAGS+=-DOLD_ENVIRON -DENV_HACK
 CFLAGS+=-I${.CURDIR}/../../lib
 #CFLAGS+=-DAUTHENTICATION -DENCRYPTION
 SRCS=	authenc.c global.c slc.c state.c sys_term.c telnetd.c \
 	termstat.c utility.c
-DPADD=	${LIBUTIL} ${LIBTERM}
+DPADD=	${LIBUTIL} ${LIBTERMCAP}
 LDADD=	-lutil -ltermcap -ltelnet
 #LDADD+=	-lkrb -ldes
 MAN8=	telnetd.8
 
 # These are the sources that have encryption stuff in them.
 CRYPT_SRC= authenc.c ext.h state.c telnetd.c termstat.c
 CRYPT_SRC+= utility.c Makefile
 NOCRYPT_DIR=${.CURDIR}/Nocrypt
 
 .include <bsd.prog.mk>
 
 nocrypt:
 #ifdef	ENCRYPTION
 	@for i in ${CRYPT_SRC}; do \
 	    if [ ! -d ${NOCRYPT_DIR} ]; then \
 		echo Creating subdirectory ${NOCRYPT_DIR}; \
 		mkdir ${NOCRYPT_DIR}; \
 	    fi; \
 	    echo ${NOCRYPT_DIR}/$$i; \
 	    unifdef -UENCRYPTION ${.CURDIR}/$$i | \
 		sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
 	done
 
 placeholder:
 #else	/* ENCRYPTION */
 	@echo "Encryption code already removed."
 #endif	/* ENCRYPTION */