Post KerberosIV de-orbit: Clean up Kerberos5. We dont need KerberosIV

compatiblity mode anymore. Rename the k5foo utils to kfoo (after
repo-copy).

14 files changed, 17 insertions, 295 deletions

diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index ab1b9d5..89c7503 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	k5admin k5destroy k5init k5list k5passwd k5su krb5-config telnet
+SUBDIR=	kadmin kdestroy kinit klist kpasswd ksu krb5-config telnet
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
deleted file mode 100644
index 04ae169..0000000
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# $FreeBSD$
-
-PROG=		k5admin
-SRCS=		\
-	ank.c					\
-	cpw.c					\
-	del.c					\
-	del_enctype.c				\
-	dump.c					\
-	ext.c					\
-	get.c					\
-	init.c					\
-	kadmin.c				\
-	load.c					\
-	mod.c					\
-	rename.c				\
-	util.c					\
-	random_password.c			\
-	kadmin_locl.h				\
-	krb5_err.h heim_err.h hdb_err.h		\
-	kadm5/private.h				\
-	kadm5/admin.h				\
-	kadm5/kadm5_err.h
-
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/hdb \
-		-I${KRB5DIR}/lib/sl \
-		-I${KRB5DIR}/lib/kadm5 \
-		-I${KRB5DIR}/kadmin \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${ROKENOBJDIR} -lroken \
-		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
-		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-		-L${HDBOBJDIR} -lhdb \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \
-		-L${SLOBJDIR} -lsl -lreadline
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBSL} ${LIBREADLINE}
-MAN=		k5admin.8
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kadmin
-
-kadm5/private.h:	kadm5
-	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
-
-kadm5/admin.h:	kadm5
-	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
-
-kadm5/kadm5_err.h: kadm5 kadm5_err.h
-	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
-
-kadm5:
-	mkdir ${.TARGET}
-
-k5admin.8:	kadmin.8
-	ln -sf ${.OODATE} ${.TARGET}
-
-CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=	kadm5
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
deleted file mode 100644
index 42717c6..0000000
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PROG=		k5destroy
-SRCS=		kdestroy.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${ROKENOBJDIR} -lroken \
-		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kuser
-
-k5destroy.1:	kdestroy.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
deleted file mode 100644
index 3f2ec42..0000000
--- a/kerberos5/usr.bin/k5init/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-PROG=		k5init
-SRCS=		kinit.c asn1_err.h krb5_err.h heim_err.h \
-       		k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
-_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${ROKENOBJDIR} -lroken \
-		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kuser
-
-k5init.1:	kinit.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
deleted file mode 100644
index f73528b..0000000
--- a/kerberos5/usr.bin/k5list/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PROG=		k5list
-SRCS=		klist.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${ROKENOBJDIR} -lroken \
-		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kuser
-
-k5list.1:	klist.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
deleted file mode 100644
index de6316a..0000000
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-PROG=		k5passwd
-SRCS=		kpasswd.c krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/kpasswd \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
-		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kpasswd
-
-k5passwd.1:	kpasswd.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/k5su/Makefile b/kerberos5/usr.bin/k5su/Makefile
deleted file mode 100644
index 47339ad..0000000
--- a/kerberos5/usr.bin/k5su/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD$
-
-PROG=		k5su
-SRCS=		su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/kafs \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/lib/asn1 \
-		-I${KRB5DIR}/kuser \
-		-I${ASN1OBJDIR} \
-		-I${.OBJDIR}
-NOMAN=		true
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5
-_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 \
-		-L${ROKENOBJDIR} -lroken \
-		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-.if defined(ENABLE_SUID_K5SU)
-BINMODE=4555
-.endif
-INSTALLFLAGS=-fschg
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/appl/su
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 04ae169..fc72b3d 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-PROG=		k5admin
-SRCS=		\
+PROG=	kadmin
+SRCS=	\
 	ank.c					\
 	cpw.c					\
 	del.c					\
@@ -33,23 +33,18 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
 		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
 		-L${HDBOBJDIR} -lhdb \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \
 		-L${SLOBJDIR} -lsl -lreadline
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
 		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
 		${LIBSL} ${LIBREADLINE}
-MAN=		k5admin.8
+MAN=		kadmin.8
 
 .include <bsd.prog.mk>
 
@@ -67,8 +62,5 @@ kadm5/kadm5_err.h: kadm5 kadm5_err.h
 kadm5:
 	mkdir ${.TARGET}
 
-k5admin.8:	kadmin.8
-	ln -sf ${.OODATE} ${.TARGET}
-
 CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
 CLEANDIRS+=	kadm5
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 42717c6..51233ea 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		k5destroy
+PROG=		kdestroy
 SRCS=		kdestroy.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
@@ -10,21 +10,13 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kuser
-
-k5destroy.1:	kdestroy.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 3f2ec42..2d2f780 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		k5init
+PROG=		kinit
 SRCS=		kinit.c asn1_err.h krb5_err.h heim_err.h \
        		k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
@@ -11,21 +11,13 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
-_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kuser
-
-k5init.1:	kinit.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index f73528b..d1db57c 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		k5list
+PROG=		klist
 SRCS=		klist.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
@@ -10,21 +10,13 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kuser
-
-k5list.1:	klist.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index de6316a..20b0913 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		k5passwd
+PROG=		kpasswd
 SRCS=		kpasswd.c krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/asn1 \
@@ -9,20 +9,12 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kpasswd \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
+DPADD=		${LIBKRB5} ${LIBROKEN} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 
 .include <bsd.prog.mk>
 
 .PATH:	${KRB5DIR}/kpasswd
-
-k5passwd.1:	kpasswd.1
-	ln -sf ${.OODATE} ${.TARGET}
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 47339ad..50699e2 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		k5su
+PROG=		ksu
 SRCS=		su.c asn1_err.h krb5_err.h heim_err.h k524_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
@@ -11,16 +11,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
 NOMAN=		true
-.if defined(MAKE_KERBEROS4)
-_krb4libs=	-L${KAFS5OBJDIR} -lkafs -lkrb -lkafs5
-_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
-.endif
 LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken \
 		-L${VERSOBJDIR} -lvers \
-		${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
 		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 .if defined(ENABLE_SUID_K5SU)
 BINMODE=4555
diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile
index 00d5f11..01566bb 100644
--- a/kerberos5/usr.bin/telnet/Makefile
+++ b/kerberos5/usr.bin/telnet/Makefile
@@ -13,18 +13,10 @@ CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
 
 WARNS?=		2
 
-DPADD=
-LDADD=
-
-.if defined(MAKE_KERBEROS4)
-DPADD+=		${LIBKRB} ${LIBCOM_ERR}
-LDADD+=		-lkrb -lcom_err
-.endif
-
-DPADD+=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
 		${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \
 		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
-LDADD+=		-ltermcap ${LIBTELNET} -lmp \
+LDADD=		-ltermcap ${LIBTELNET} -lmp \
 		-L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \
 		-L${ROKENOBJDIR} -lroken \
 		-lcrypto -lcrypt -lipsec ${MINUSLPAM}