Remove largescale evidence of crack-smoking.

Where a k4 applet has a k5 namesake, rename the k5 version
from k<app> to k5<app>. (Repo copy done).

Do some repairs to dependancies to support make world properly.

5 files changed, 3 insertions, 103 deletions

diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile
index a9acbe0..45e4fa5 100644
--- a/kerberos5/usr.sbin/Makefile
+++ b/kerberos5/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	kadmin kstash ktutil
+SUBDIR=	k5stash ktutil
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.sbin/k5admin/Makefile b/kerberos5/usr.sbin/k5admin/Makefile
deleted file mode 100644
index efb6211..0000000
--- a/kerberos5/usr.sbin/k5admin/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $FreeBSD$
-
-PROG=		kadmin
-SRCS=		kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
-		get.c ext.c random_password.c mod.c rename.c util.c \
-		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
-		krb5_err.h heim_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}/kadmin \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-		-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBREADLINE}
-NOMAN=		yes
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kadmin
-
-kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h:	kadm5
-	cp ${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}
-
-CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=	kadm5
diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
index 6b690d1..1e65bbb 100644
--- a/kerberos5/usr.sbin/k5stash/Makefile
+++ b/kerberos5/usr.sbin/k5stash/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		kstash
+PROG=		k5stash
 SRCS=		kstash.c hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/usr.sbin/kadmin/Makefile b/kerberos5/usr.sbin/kadmin/Makefile
deleted file mode 100644
index efb6211..0000000
--- a/kerberos5/usr.sbin/kadmin/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $FreeBSD$
-
-PROG=		kadmin
-SRCS=		kadmin.c dump.c load.c ank.c del.c del_enctype.c init.c cpw.c \
-		get.c ext.c random_password.c mod.c rename.c util.c \
-		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h \
-		krb5_err.h heim_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}/kadmin \
-		-I${ASN1OBJDIR} \
-		-I${HDBOBJDIR} \
-		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
-.endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-		-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
-		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
-DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
-		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBREADLINE}
-NOMAN=		yes
-
-.include <bsd.prog.mk>
-
-.PATH:	${KRB5DIR}/kadmin
-
-kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
-
-kadm5/admin.h:	kadm5
-	cp ${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}
-
-CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
-CLEANDIRS+=	kadm5
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 6b690d1..1e65bbb 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PROG=		kstash
+PROG=		k5stash
 SRCS=		kstash.c hdb_err.h
 CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/lib/roken \