Index: head/kerberos5/Makefile.inc
===================================================================
--- head/kerberos5/Makefile.inc	(revision 287215)
+++ head/kerberos5/Makefile.inc	(revision 287216)
@@ -1,50 +1,49 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
 .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
 LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib
-LDFLAGS+=	${LDAPLDFLAGS}
 .endif
 
 .if defined(SRCS)
 
 ETSRCS=	\
 	${KRB5DIR}/lib/asn1/asn1_err.et \
 	${KRB5DIR}/lib/hdb/hdb_err.et \
 	${KRB5DIR}/lib/kadm5/kadm5_err.et \
 	${KRB5DIR}/lib/krb5/heim_err.et \
 	${KRB5DIR}/lib/krb5/k524_err.et \
 	${KRB5DIR}/lib/krb5/krb5_err.et \
 	${KRB5DIR}/lib/krb5/krb_err.et \
 	${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et \
 	${KRB5DIR}/lib/hx509/hx509_err.et \
 	${KRB5DIR}/lib/wind/wind_err.et \
 	${KRB5DIR}/lib/ntlm/ntlm_err.et
 
 .for ET in ${ETSRCS}
 .for _ET in ${ET:T:R}
 .if ${SRCS:M${_ET}.[ch]} != ""
 .ORDER: ${_ET}.h ${_ET}.c
 ${_ET}.c ${_ET}.h: ${ET}
 	compile_et ${.ALLSRC}
 CLEANFILES+=	${_ET}.h ${_ET}.c
 .endif
 .endfor
 .endfor
 
 .endif # defined(SRCS)
 
 ASN1_COMPILE=	asn1_compile
 MAKE_ROKEN=	make-roken
 SLC=		slc
Index: head/kerberos5/libexec/digest-service/Makefile
===================================================================
--- head/kerberos5/libexec/digest-service/Makefile	(revision 287215)
+++ head/kerberos5/libexec/digest-service/Makefile	(revision 287216)
@@ -1,15 +1,16 @@
 # $FreeBSD$
 
 PROG=	digest-service
 MAN=
 CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/ipc \
 		-I${KRB5DIR}/lib/wind \
 		-I${KRB5DIR}/lib/roken
 LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc
Index: head/kerberos5/libexec/kdc/Makefile
===================================================================
--- head/kerberos5/libexec/kdc/Makefile	(revision 287215)
+++ head/kerberos5/libexec/kdc/Makefile	(revision 287216)
@@ -1,17 +1,18 @@
 # $FreeBSD$
 
 PROG=	kdc
 MAN=	kdc.8
 
 SRCS=	config.c \
 	connect.c \
 	announce.c \
 	main.c
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
 LIBADD=	kdc hdb krb5 roken crypt vers
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc
Index: head/kerberos5/usr.bin/kpasswd/Makefile
===================================================================
--- head/kerberos5/usr.bin/kpasswd/Makefile	(revision 287215)
+++ head/kerberos5/usr.bin/kpasswd/Makefile	(revision 287216)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
 LIBADD=	hdb krb5 roken vers crypto
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kpasswd
Index: head/kerberos5/usr.sbin/iprop-log/Makefile
===================================================================
--- head/kerberos5/usr.sbin/iprop-log/Makefile	(revision 287215)
+++ head/kerberos5/usr.sbin/iprop-log/Makefile	(revision 287216)
@@ -1,22 +1,23 @@
 # $FreeBSD$
 
 PROG=	iprop-log
 MAN=	iprop-log.8
 SRCS=	iprop-log.c iprop-commands.c iprop-commands.h kadm5_err.h
 CFLAGS+=	-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl \
 		-I.
 LIBADD=	kadm5srv hdb krb5 roken edit sl vers
+LDFLAGS=${LDAPLDFLAGS}
 
 iprop-commands.h: iprop-commands.in
 	${SLC} ${.ALLSRC:M*.in}
 
 .for ext in c o
 iprop-commands.${ext}: iprop-commands.h
 .endfor
 
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/lib/kadm5