Index: head/kerberos5/Makefile.inc
===================================================================
--- head/kerberos5/Makefile.inc	(revision 287207)
+++ head/kerberos5/Makefile.inc	(revision 287208)
@@ -1,49 +1,50 @@
 # $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 -Wl,-rpath,${OPENLDAPBASE}/lib
+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/lib/libhdb/Makefile
===================================================================
--- head/kerberos5/lib/libhdb/Makefile	(revision 287207)
+++ head/kerberos5/lib/libhdb/Makefile	(revision 287208)
@@ -1,108 +1,109 @@
 # $FreeBSD$
 
 LIB=	hdb
-LDFLAGS=	-Wl,--no-undefined
+LDFLAGS=	-Wl,--no-undefined ${LDAPLDFLAGS}
 VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
 LIBADD=	asn1 com_err krb5 roken sqlite3
+LDADD=	${LDAPLDADD}
 DPADD=	${LDAPDPADD}
 
 MAN=	HDB.3 hdb_entry_ex.3
 
 MLINKS=	HDB.3 hdb__del.3 \
 	HDB.3 hdb__get.3 \
 	HDB.3 hdb__put.3 \
 	HDB.3 hdb_auth_status.3 \
 	HDB.3 hdb_check_constrained_delegation.3 \
 	HDB.3 hdb_check_pkinit_ms_upn_match.3 \
 	HDB.3 hdb_check_s4u2self.3 \
 	HDB.3 hdb_close.3 \
 	HDB.3 hdb_destroy.3 \
 	HDB.3 hdb_fetch_kvno.3 \
 	HDB.3 hdb_firstkey.3 \
 	HDB.3 hdb_free.3 \
 	HDB.3 hdb_get_realms.3 \
 	HDB.3 hdb_lock.3 \
 	HDB.3 hdb_name.3 \
 	HDB.3 hdb_nextkey.3 \
 	HDB.3 hdb_open.3 \
 	HDB.3 hdb_password.3 \
 	HDB.3 hdb_remove.3 \
 	HDB.3 hdb_rename.3 \
 	HDB.3 hdb_store.3 \
 	HDB.3 hdb_unlock.3
 
 INCS=	hdb-protos.h \
 	hdb.h \
 	hdb_asn1.h \
 	hdb_err.h
 
 SRCS=	common.c \
 	db.c \
 	db3.c \
 	dbinfo.c \
 	ext.c \
 	hdb-ldap.c \
 	hdb.c \
 	hdb_err.c \
 	hdb_err.h \
 	hdb-sqlite.c \
 	hdb-keytab.c \
 	hdb-mitdb.c \
 	keys.c \
 	keytab.c \
 	mkey.c \
 	ndbm.c \
 	print.c \
 	${GEN:S/.x$/.c/:S/.hx$/.h/}
 
 CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \
 	-I${KRB5DIR}/lib/krb5 \
 	-I. ${LDAPCFLAGS}
 CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
 
 GEN=	asn1_Salt.x \
 	asn1_Key.x \
 	asn1_Event.x \
 	asn1_HDBFlags.x \
 	asn1_GENERATION.x \
 	asn1_HDB_Ext_PKINIT_acl.x \
 	asn1_HDB_Ext_PKINIT_cert.x \
 	asn1_HDB_Ext_PKINIT_hash.x \
 	asn1_HDB_Ext_Constrained_delegation_acl.x \
 	asn1_HDB_Ext_Lan_Manager_OWF.x \
 	asn1_HDB_Ext_Password.x \
 	asn1_HDB_Ext_Aliases.x \
 	asn1_HDB_extension.x \
 	asn1_HDB_extensions.x \
 	asn1_hdb_entry.x \
 	asn1_hdb_entry_alias.x \
 	asn1_hdb_keyset.x \
 	hdb_asn1.hx \
 	hdb_asn1-priv.hx
 
 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:   
 	${CP} ${.IMPSRC} ${.TARGET}
 
 .hx.h:
 	${CP} ${.IMPSRC} ${.TARGET}
 
 # This makefile generates a lot of its headers
 # so tell bsd.sys.mk not to try and stage them before they are built.
 # Note: this is rare
 NO_BEFOREBUILD_INCLUDES=
 
 .include <bsd.lib.mk>
 
 .SUFFIXES: .h .c .x .hx
 
 .PATH: ${KRB5DIR}/lib/hdb ${KRB5DIR}/doc/doxyout/hdb/man/man3/