KerberosIV is no longer compulsory. This should fix "make release".

12 files changed, 23 insertions, 45 deletions

diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile
index ec85d88..816f711 100644
--- a/kerberos5/usr.bin/Makefile
+++ b/kerberos5/usr.bin/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	k5admin k5auth k5destroy k5init k5list k5passwd
+SUBDIR=	k5admin k5destroy k5init k5list k5passwd
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index 04bbfbb..43cc5a5 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -15,11 +15,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
 		-L${HDBOBJDIR} -lhdb \
diff --git a/kerberos5/usr.bin/k5auth/Makefile b/kerberos5/usr.bin/k5auth/Makefile
deleted file mode 100644
index 36e8426..0000000
--- a/kerberos5/usr.bin/k5auth/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-PROG=		k5auth
-SRCS=		kauth.c rkinit.c encdata.c marshall.c roken.h
-CFLAGS+=	-I${KRB5DIR}/include \
-		-I${KRB5DIR}/lib/roken \
-		-I${KRB5DIR}/lib/krb5 \
-		-I${KRB5DIR}/appl/kauth \
-		-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 -lcrypto -lmd -lcrypt -lcom_err
-DPADD=		${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${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
index 607d4c4..d8d9f3f 100644
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -9,11 +9,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
index 824b3a3..4c5b470 100644
--- a/kerberos5/usr.bin/k5init/Makefile
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -9,11 +9,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
+.if defined(MAKE_KERBEROS4)
+_krb4libs=	-L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
+_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
index b3798f4..6e2f0c1 100644
--- a/kerberos5/usr.bin/k5list/Makefile
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -9,11 +9,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
index 9bd3e2d..be2b77d 100644
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -9,7 +9,7 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kpasswd \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 04bbfbb..43cc5a5 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -15,11 +15,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${ASN1OBJDIR} \
 		-I${HDBOBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
 		-L${HDBOBJDIR} -lhdb \
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 607d4c4..d8d9f3f 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -9,11 +9,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 824b3a3..4c5b470 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -9,11 +9,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
-_krb4libs=	-lkrb -lkafs
-_krb4deps=	${LIBKRB} ${LIBKAFS}
+.if defined(MAKE_KERBEROS4)
+_krb4libs=	-L${KAFS5OBJDIR} -lkafs5 -lkrb -lkafs
+_krb4deps=	${LIBKAFS5} ${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index b3798f4..6e2f0c1 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -9,11 +9,11 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kuser \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif
-LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
+LDADD=		-L${KRB5OBJDIR} -lkrb5 \
 		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
 		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
 DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 9bd3e2d..be2b77d 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -9,7 +9,7 @@ CFLAGS+=	-I${KRB5DIR}/include \
 		-I${KRB5DIR}/kpasswd \
 		-I${ASN1OBJDIR} \
 		-I${.OBJDIR}
-.if defined(KRB5_KRB4_COMPAT)
+.if defined(MAKE_KERBEROS4)
 _krb4libs=	-lkrb -lkafs
 _krb4deps=	${LIBKRB} ${LIBKAFS}
 .endif