Index: head/kerberos5/lib/libtelnet/Makefile
===================================================================
--- head/kerberos5/lib/libtelnet/Makefile	(revision 87142)
+++ head/kerberos5/lib/libtelnet/Makefile	(revision 87143)
@@ -1,35 +1,35 @@
 # $FreeBSD$
 
 LIB=		telnet
 
 INTERNALLIB=	yes
 INTERNALSTATICLIB=yes
 NOPIC=		yes
 
 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
-.if defined(MAKE_KERBEROS4)
-SRCS+=		kerberos.c
-CFLAGS+=	-DKRB4 -I${KRB4DIR}/lib/krb
-.endif
+SRCS+=		kerberos5.c
 
-#SRCS+=		kerberos5.c
+#WARNS?=		2
 
-CFLAGS+=	-DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-		-DSRA -I${TELNETDIR}
-#CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
+CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
+CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5
 
 INCS=		${TELNETDIR}/arpa/telnet.h
 INCDIR=		/usr/include/arpa
 
+.include <bsd.lib.mk>
+
+.PATH:	${TELNETDIR}/libtelnet
+
 #
 # Remove obsolete shared libraries, if any.  We don't bother moving them
 # to /usr/lib/compat, since they were only used by telnet, telnetd and
 # tn3270.
 #
-beforeinstall:
+beforeinstall: __remove-stale-libs
+__remove-stale-libs: .PHONY
+.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0)
+	-chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
 	rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
-
-.include <bsd.lib.mk>
-
-.PATH:	${TELNETDIR}/libtelnet
+.endif
Index: head/kerberos5/libexec/telnetd/Makefile
===================================================================
--- head/kerberos5/libexec/telnetd/Makefile	(revision 87142)
+++ head/kerberos5/libexec/telnetd/Makefile	(revision 87143)
@@ -1,31 +1,28 @@
 # $FreeBSD$
 
 # Do not define -DKLUDGELINEMODE, as it does not interact well with many
 # telnet implementations.
 
 PROG=		telnetd
 MAN=		telnetd.8
 
+SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
+		termstat.c utility.c authenc.c
+
 CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 		-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
 		-I${TELNETDIR} -DINET6
+CFLAGS+=	-DKRB5
 
-SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
-		termstat.c utility.c authenc.c
+WARNS?=		2
 
-DPADD=
-LDADD=
-
-.if defined(MAKE_KERBEROS4)
-DPADD+=		${LIBKRB} ${LIBCOM_ERR}
-LDADD+=		-lkrb -lcom_err
-.endif
-
-DPADD+=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+		${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \
 		${LIBCRYPT} ${LIBPAM}
-LDADD+=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+		-lkrb5 -lasn1 -lroken -lcom_err \
 		-lcrypt ${MINUSLPAM}
 
 .include <bsd.prog.mk>
 
 .PATH:	${TELNETDIR}/telnetd
Index: head/kerberos5/usr.bin/telnet/Makefile
===================================================================
--- head/kerberos5/usr.bin/telnet/Makefile	(revision 87142)
+++ head/kerberos5/usr.bin/telnet/Makefile	(revision 87143)
@@ -1,33 +1,25 @@
 # $FreeBSD$
 
 PROG=		telnet
 
+SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
+		telnet.c terminal.c utilities.c
+
 CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
 		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
-		-I${TELNETDIR}
+		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/
 
-.if defined(MAKE_KERBEROS4)
-CFLAGS+=	-DKRB4
-.endif
+CFLAGS+=	-DKRB5
 
-#CFLAGS+=	-DKRB5
+WARNS?=		2
 
-SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
-		telnet.c terminal.c tn3270.c utilities.c
-
-DPADD=
-LDADD=
-
-.if defined(MAKE_KERBEROS4)
-DPADD+=		${LIBKRB} ${LIBCOM_ERR}
-LDADD+=		-lkrb -lcom_err
-.endif
-
-DPADD+=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
-		${LIBIPSEC} ${LIBPAM}
-LDADD+=		-ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
-		-lipsec ${MINUSLPAM}
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
+		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
+LDADD=		-ltermcap ${LIBTELNET} -lmp \
+		-lkrb5 -lasn1 -lcom_err -lroken \
+		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>
 
 .PATH:	${TELNETDIR}/telnet