Merge head

15 files changed, 40 insertions, 25 deletions

diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index 401957b32f25..6eccc29d390f 100644
--- a/kerberos5/Makefile
+++ b/kerberos5/Makefile
@@ -21,11 +21,11 @@ kerberize:
 dekerberize:
 .for entry in ${KPROGS}
 	cd ${.CURDIR}/../${entry}; \
-	${MAKE} -DWITHOUT_KERBEROS cleandir; \
-	${MAKE} -DWITHOUT_KERBEROS obj; \
-	${MAKE} -DWITHOUT_KERBEROS depend; \
-	${MAKE} -DWITHOUT_KERBEROS all; \
-	${MAKE} -DWITHOUT_KERBEROS install
+	${MAKE} MK_KERBEROS=no cleandir; \
+	${MAKE} MK_KERBEROS=no obj; \
+	${MAKE} MK_KERBEROS=no depend; \
+	${MAKE} MK_KERBEROS=no all; \
+	${MAKE} MK_KERBEROS=no install
 .endfor
 
 .include <bsd.subdir.mk>
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 6eb1f54918bd..6dfd5187e0da 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,12 +1,14 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
-.if defined(WITH_OPENLDAP) && !defined(COMPAT_32BIT)
+.if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index d1d44e014777..d88bb5b1bd7b 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -2,7 +2,9 @@
 # $FreeBSD$
 
 SUBDIR=	libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
-	libheimntlm libhx509 libkadm5clnt libkadm5srv libkafs5 libkrb5 \
+	libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \
 	libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs
 
+SUBDIR+= libkafs5  # requires krb_err.h from libkrb5
+
 .include <bsd.subdir.mk>
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 94c79db67594..dc1de5c61506 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -56,10 +56,12 @@ INCS+=	krb5_asn1.h \
 	digest_asn1.h \
 	kx509_asn1.h
 
+.ORDER: ${GEN_CMS}
 ${GEN_CMS}: cms.asn1 cms.opt
 	${ASN1_COMPILE} --one-code-file \
 		--option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1
 
+.ORDER: ${GEN_RFC2459}
 ${GEN_RFC2459}: rfc2459.asn1
 	${ASN1_COMPILE} \
 		--one-code-file \
@@ -70,32 +72,39 @@ ${GEN_RFC2459}: rfc2459.asn1
 		--sequence=Extensions \
 		--sequence=CRLDistributionPoints ${.ALLSRC:M*.asn1} rfc2459_asn1
 
+.ORDER: ${GEN_K5}
 ${GEN_K5}: krb5.asn1 krb5.opt
 	${ASN1_COMPILE} \
 		--one-code-file \
 		--option-file=${.ALLSRC:M*.opt} \
 		${.ALLSRC:M*.asn1} krb5_asn1
 
+.ORDER: ${GEN_PKINIT}
 ${GEN_PKINIT}: pkinit.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkinit_asn1
 
+.ORDER: ${GEN_PKCS8}
 ${GEN_PKCS8}: pkcs8.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkcs8_asn1
 
+.ORDER: ${GEN_PKCS9}
 ${GEN_PKCS9}: pkcs9.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkcs9_asn1
 
+.ORDER: ${GEN_PKCS12}
 ${GEN_PKCS12}: pkcs12.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkcs12_asn1
 
+.ORDER: ${GEN_DIGEST}
 ${GEN_DIGEST}: digest.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} digest_asn1
 
+.ORDER: ${GEN_KX509}
 ${GEN_KX509}: kx509.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} kx509_asn1
@@ -103,10 +112,10 @@ ${GEN_KX509}: kx509.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 	
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile
index 00d299e32a20..09062655d0e1 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -38,6 +38,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I.
 CLEANFILES=	${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \
 		spnego_asn1_files spnego_asn1-template.c
 
+.ORDER: ${GEN}
 ${GEN}: spnego.asn1 spnego.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 		${.ALLSRC:M*.asn1} spnego_asn1
@@ -45,10 +46,10 @@ ${GEN}: spnego.asn1 spnego.opt
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 87a72ddef2d2..a1ed80612896 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -84,16 +84,17 @@ GEN=	asn1_Salt.x \
 CLEANFILES=	${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \
 		hdb_asn1-template.[ch]*
 
+.ORDER: ${GEN}
 ${GEN}: hdb.asn1
 	${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1
 
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
index 469950a18e74..3bffda6eb0e4 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -269,24 +269,27 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} ocsp_asn1_files \
 
 INCS+=	ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h
 
+.ORDER: ${GEN_OSCP}
 ${GEN_OCSP}: ocsp.asn1 ocsp.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 	 ${.ALLSRC:M*.asn1} ocsp_asn1
 
+.ORDER: ${GEN_PKCS10}
 ${GEN_PKCS10}: pkcs10.asn1 pkcs10.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 	${.ALLSRC:M*.asn1} pkcs10_asn1
 
+.ORDER: ${GEN_CRMF}
 ${GEN_CRMF}: crmf.asn1
 	${ASN1_COMPILE} ${.ALLSRC:M*.asn1} crmf_asn1
 
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
+	cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index 3d3326bd6175..6d66578cb247 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -24,9 +24,6 @@ MLINKS=	kafs5.3 k_afs_cell_of_file.3 \
 	kafs5.3 krb_afslog_uid.3
 
 SRCS=	afssys.c afskrb5.c common.c krb5_err.h
-SRCS=	afssys.c \
-	afskrb5.c \
-	common.c
 
 CFLAGS+=	-I${KRB5DIR}/lib/kafs \
 		-I${KRB5DIR}/lib/krb5 \
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 79a7c8b50177..72f7125fa2f3 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	digest-service
-NO_MAN=	1
+MAN=
 CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/krb5 \
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index e2141e739191..8a72d9e8b2e2 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	ipropd-slave
-NO_MAN=
+MAN=
 SRCS=	ipropd_common.c ipropd_slave.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index 194642136a0d..88224da89eff 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	asn1_compile
-NO_MAN=
+MAN=
 LIBROKEN_A=	${.OBJDIR}/../../lib/libroken/libroken.a
 LDADD=	${LIBROKEN_A} ${LIBVERS}
 DPADD=	${LIBROKEN_A} ${LIBVERS}
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
index a039943ad5e8..fb7487016c65 100644
--- a/kerberos5/tools/make-roken/Makefile
+++ b/kerberos5/tools/make-roken/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	make-roken
-NO_MAN=
+MAN=
 
 CLEANFILES= make-roken.c
 
diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile
index d1b752f46405..1a26e7cd7959 100644
--- a/kerberos5/tools/slc/Makefile
+++ b/kerberos5/tools/slc/Makefile
@@ -4,7 +4,7 @@ PROG=	slc
 LIBROKEN_A=     ${.OBJDIR}/../../lib/libroken/libroken.a
 LDADD=  ${LIBROKEN_A} ${LIBVERS}
 DPADD=  ${LIBROKEN_A} ${LIBVERS}
-NO_MAN=
+MAN=
 
 SRCS=	roken.h \
 	slc-gram.y \
diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile
index c8ebf9a8951f..3946484b78a1 100644
--- a/kerberos5/usr.bin/hxtool/Makefile
+++ b/kerberos5/usr.bin/hxtool/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	hxtool
-NO_MAN=	1
+MAN=
 CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index c6a029090cfc..9e2786577ff8 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -5,7 +5,7 @@ PROG=	ksu
 BINMODE=4555
 PRECIOUSPROG=
 .endif
-NO_MAN=
+MAN=
 SRCS=	su.c
 CFLAGS+=-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \