This commit was generated by cvs2svn to compensate for changes in r56067,

which included commits to RCS files with non-trunk default branches.

9 files changed, 198 insertions, 0 deletions

diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
new file mode 100644
index 0000000..4a0d3f3
--- /dev/null
+++ b/kerberos5/usr.bin/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	kadmin kauth kdestroy kinit klist kpasswd
+
+.include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/Makefile.inc b/kerberos5/usr.bin/Makefile.inc
new file mode 100644
index 0000000..abd146b
--- /dev/null
+++ b/kerberos5/usr.bin/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+BINDIR=	/usr/bin
+
+.include "../Makefile.inc"
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
new file mode 100644
index 0000000..d7640f1
--- /dev/null
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -0,0 +1,51 @@
+# $FreeBSD$
+
+PROG=		kadmin
+SRCS=		kadmin.c ank.c cpw.c del.c del_enctype.c get.c rename.c util.c \
+		ext.c mod.c init.c dump.c load.c random_password.c \
+		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}/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${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err \
+		-L${SLOBJDIR} -lsl -lreadline
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBSL} \
+		${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.bin/k5auth/Makefile b/kerberos5/usr.bin/k5auth/Makefile
new file mode 100644
index 0000000..33c13b3
--- /dev/null
+++ b/kerberos5/usr.bin/k5auth/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PROG=		kauth
+SRCS=		kauth.c rkinit.c encdata.c marshall.c
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/appl/kauth
+.if defined(KRB5_KRB4_COMPAT)
+_krb4libs=	-lkrb -lkafs
+_krb4deps=	${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+NOMAN=		yes
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/appl/kauth
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
new file mode 100644
index 0000000..68db1c0
--- /dev/null
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PROG=		kdestroy
+SRCS=		kdestroy.c krb5_err.h heim_err.h
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/kuser \
+		-I${ASN1OBJDIR} \
+		-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${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
new file mode 100644
index 0000000..3dcfc33
--- /dev/null
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PROG=		kinit
+SRCS=		kinit.c kinit_options.c asn1_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}/kuser \
+		-I${ASN1OBJDIR} \
+		-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${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
new file mode 100644
index 0000000..5dfd39f
--- /dev/null
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PROG=		klist
+SRCS=		klist.c krb5_err.h heim_err.h
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/lib/asn1 \
+		-I${KRB5DIR}/kuser \
+		-I${ASN1OBJDIR} \
+		-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${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
new file mode 100644
index 0000000..55d5062
--- /dev/null
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PROG=		kpasswd
+SRCS=		kpasswd.c krb5_err.h heim_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(KRB5_KRB4_COMPAT)
+_krb4libs=	-lkrb -lkafs
+_krb4deps=	${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/kpasswd
diff --git a/kerberos5/usr.bin/kauth/Makefile b/kerberos5/usr.bin/kauth/Makefile
new file mode 100644
index 0000000..33c13b3
--- /dev/null
+++ b/kerberos5/usr.bin/kauth/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PROG=		kauth
+SRCS=		kauth.c rkinit.c encdata.c marshall.c
+CFLAGS+=	-I${KRB5DIR}/include \
+		-I${KRB5DIR}/lib/roken \
+		-I${KRB5DIR}/lib/krb5 \
+		-I${KRB5DIR}/appl/kauth
+.if defined(KRB5_KRB4_COMPAT)
+_krb4libs=	-lkrb -lkafs
+_krb4deps=	${LIBKRB} ${LIBKAFS}
+.endif
+LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
+		-L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
+		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+NOMAN=		yes
+
+.include <bsd.prog.mk>
+
+.PATH:	${KRB5DIR}/appl/kauth