Merge sync of head

80 files changed, 106 insertions, 218 deletions

diff --git a/kerberos5/Makefile b/kerberos5/Makefile
index 6eccc29..c66ad4d 100644
--- a/kerberos5/Makefile
+++ b/kerberos5/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	doc lib libexec tools usr.bin usr.sbin
+SUBDIR=	lib libexec tools usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
 KPROGS=	lib/libpam \
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index c57b18a..39bac11 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -16,9 +16,6 @@ LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
 .endif
 
-LIBVERS=	${.OBJDIR}/../../lib/libvers/libvers.a
-LIBSL=		${.OBJDIR}/../../lib/libsl/libsl.a
-
 .if defined(SRCS)
 
 ETSRCS=	\
diff --git a/kerberos5/doc/Makefile b/kerberos5/doc/Makefile
deleted file mode 100644
index 1f71ed8..0000000
--- a/kerberos5/doc/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $FreeBSD$
-
-INFO=	heimdal
-SRCDIR=	${.CURDIR}/../../crypto/heimdal/doc
-
-.include <bsd.info.mk>
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile
index d88bb5b..dddb4d2 100644
--- a/kerberos5/lib/Makefile
+++ b/kerberos5/lib/Makefile
@@ -3,7 +3,7 @@
 
 SUBDIR=	libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \
 	libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \
-	libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs
+	libroken libsl libvers libkdc libwind libheimbase libheimipcc libheimipcs
 
 SUBDIR+= libkafs5  # requires krb_err.h from libkrb5
 
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index a0c4f1c..9118683 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -3,8 +3,7 @@
 LIB=	asn1
 LDFLAGS=	-Wl,--no-undefined
 INCS=	asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
-LDADD=	-lcom_err -lroken
-DPADD=	${LIBCOM_ERR} ${LIBROKEN}
+LIBADD=	com_err roken
 VERSION_MAP=	${.CURDIR}/version.map
 
 SRCS=	asn1_err.c \
@@ -112,10 +111,10 @@ ${GEN_KX509}: kx509.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:
-	cp -f ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cp -f ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 NO_BEFOREBUILD_INCLUDES=
 
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile
index a883c7d..6116767 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile
+++ b/kerberos5/lib/libgssapi_krb5/Makefile
@@ -2,9 +2,7 @@
 
 LIB=	gssapi_krb5
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt
-DPADD=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \
-	${LIBCOM_ERR} ${LIBCRYPT}
+LIBADD=	gssapi krb5 crypto roken asn1 com_err
 SHLIB_MAJOR=	10
 
 INCS=	${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h
diff --git a/kerberos5/lib/libgssapi_krb5/Makefile.depend b/kerberos5/lib/libgssapi_krb5/Makefile.depend
index 53eaa7a..cddcc44 100644
--- a/kerberos5/lib/libgssapi_krb5/Makefile.depend
+++ b/kerberos5/lib/libgssapi_krb5/Makefile.depend
@@ -18,8 +18,8 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
-	lib/libcrypt \
 	lib/libgssapi \
+	lib/libthr \
 	secure/lib/libcrypto \
 	usr.bin/xinstall.host \
 
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile
index cfe0716..ac546f7 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile
@@ -2,8 +2,7 @@
 
 LIB=	gssapi_ntlm
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken
-DPADD=	${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN}
+LIBADD=	crypto gssapi krb5 heimntlm roken
 SHLIB_MAJOR=	10
 
 SRCS=	accept_sec_context.c \
diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile.depend b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
index a430126..6faf414 100644
--- a/kerberos5/lib/libgssapi_ntlm/Makefile.depend
+++ b/kerberos5/lib/libgssapi_ntlm/Makefile.depend
@@ -10,13 +10,13 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/libgssapi \
+	lib/libthr \
 	secure/lib/libcrypto \
 	usr.bin/xinstall.host \
 
diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile
index 0906265..5e54e95 100644
--- a/kerberos5/lib/libgssapi_spnego/Makefile
+++ b/kerberos5/lib/libgssapi_spnego/Makefile
@@ -2,8 +2,7 @@
 
 LIB=	gssapi_spnego
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
-LDADD=	-lgssapi -lheimbase -lasn1 -lroken
-DPADD=	${LIBGSSAPI} ${LIBHEIMBASE} ${LIBASN1} ${LIBROKEN}
+LIBADD=	gssapi heimbase asn1 roken
 SHLIB_MAJOR=	10
 
 SRCS=	accept_sec_context.c \
@@ -46,10 +45,10 @@ ${GEN}: spnego.asn1 spnego.opt
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cp ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cp ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index 2492ca1..66e0a67 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -3,8 +3,8 @@
 LIB=	hdb
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
-LDADD=	-lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD}
+LIBADD=	asn1 com_err krb5 roken sqlite3
+DPADD=	${LDAPDPADD}
 
 MAN=	HDB.3 hdb_entry_ex.3
 
@@ -56,7 +56,7 @@ SRCS=	common.c \
 	${GEN:S/.x$/.c/:S/.hx$/.h/}
 
 CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \
+	-I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \
 	-I${KRB5DIR}/lib/krb5 \
 	-I. ${LDAPCFLAGS}
 CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
@@ -91,10 +91,10 @@ ${GEN}: hdb.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cp ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cp ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 NO_BEFOREBUILD_INCLUDES=
 
diff --git a/kerberos5/lib/libhdb/Makefile.depend b/kerberos5/lib/libhdb/Makefile.depend
index b4e36db..47b2075 100644
--- a/kerberos5/lib/libhdb/Makefile.depend
+++ b/kerberos5/lib/libhdb/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimbase \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
@@ -19,6 +18,8 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
+	lib/libsqlite3 \
+	lib/libthr \
 	secure/lib/libcrypto \
 	usr.bin/xinstall.host \
 
diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile
index b6a61d0..b6bf526 100644
--- a/kerberos5/lib/libheimbase/Makefile
+++ b/kerberos5/lib/libheimbase/Makefile
@@ -2,7 +2,7 @@
 
 LIB=	heimbase
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lpthread
+LIBADD=	pthread
 VERSION_MAP= ${KRB5DIR}/base/version-script.map
 
 INCS=	heimbase.h
diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile
index 2dca400..9ec7125 100644
--- a/kerberos5/lib/libheimipcc/Makefile
+++ b/kerberos5/lib/libheimipcc/Makefile
@@ -2,8 +2,7 @@
 
 LIB=	heimipcc
 PRIVATELIB=
-LDADD=	-lheimbase -lroken -lpthread
-DPADD=	${LIBHEIMBASE} ${LIBROKEN} ${LIBPTHREAD}
+LIBADD=	heimbase roken pthread
 
 SRCS=	\
 	client.c \
diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile
index 31fd4af..b1201f6 100644
--- a/kerberos5/lib/libheimipcs/Makefile
+++ b/kerberos5/lib/libheimipcs/Makefile
@@ -2,9 +2,7 @@
 
 LIB=	heimipcs
 PRIVATELIB=
-LDADD=	-lheimbase -lroken
-LDFLAGS=	-pthread
-DPADD=	${LIBHEIMBASE} ${LIBROKEN}
+LIBADD=	heimbase roken pthread
 
 SRCS=	\
 	server.c \
diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile
index 2f0415d..d35fc38 100644
--- a/kerberos5/lib/libheimntlm/Makefile
+++ b/kerberos5/lib/libheimntlm/Makefile
@@ -2,8 +2,7 @@
 
 LIB=	heimntlm
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcrypto -lcom_err -lkrb5 -lroken
-DPADD=	${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	crypto com_err krb5 roken
 SRCS=	ntlm.c ntlm_err.c
 INCS=	heimntlm.h heimntlm-protos.h ntlm_err.h
 CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken
diff --git a/kerberos5/lib/libheimntlm/Makefile.depend b/kerberos5/lib/libheimntlm/Makefile.depend
index 3efab05..ccf7070 100644
--- a/kerberos5/lib/libheimntlm/Makefile.depend
+++ b/kerberos5/lib/libheimntlm/Makefile.depend
@@ -15,6 +15,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
+	lib/libthr \
 	secure/lib/libcrypto \
 	usr.bin/xinstall.host \
 
diff --git a/kerberos5/lib/libheimsqlite/Makefile b/kerberos5/lib/libheimsqlite/Makefile
deleted file mode 100644
index b98537a..0000000
--- a/kerberos5/lib/libheimsqlite/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-LIB=	heimsqlite
-SRCS=	sqlite3.c
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
-CFLAGS+=-I${KRB5DIR}/lib/sqlite
-
-.include <bsd.lib.mk>
-
-.PATH: ${KRB5DIR}/lib/sqlite
diff --git a/kerberos5/lib/libheimsqlite/Makefile.depend b/kerberos5/lib/libheimsqlite/Makefile.depend
deleted file mode 100644
index 2fe55c2..0000000
--- a/kerberos5/lib/libheimsqlite/Makefile.depend
+++ /dev/null
@@ -1,20 +0,0 @@
-# Autogenerated - do NOT edit!
-
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/libthr \
-	usr.bin/xinstall.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile
index dc2be99..eaa3bee 100644
--- a/kerberos5/lib/libhx509/Makefile
+++ b/kerberos5/lib/libhx509/Makefile
@@ -3,8 +3,7 @@
 LIB=	hx509
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
-LDADD=	-lasn1 -lcom_err -lcrypto -lroken -lwind
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND}
+LIBADD=	asn1 com_err crypto roken wind
 
 MAN=	hx509.3 \
 	hx509_ca.3 \
@@ -286,10 +285,10 @@ ${GEN_CRMF}: crmf.asn1
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cp ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cp ${.IMPSRC} ${.TARGET}
+	${CP} ${.IMPSRC} ${.TARGET}
 
 NO_BEFOREBUILD_INCLUDES=
 
diff --git a/kerberos5/lib/libhx509/Makefile.depend b/kerberos5/lib/libhx509/Makefile.depend
index c36ae15..d243220 100644
--- a/kerberos5/lib/libhx509/Makefile.depend
+++ b/kerberos5/lib/libhx509/Makefile.depend
@@ -17,6 +17,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	secure/lib/libcrypto \
 	usr.bin/xinstall.host \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile
index c413b5d..1f3401e 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile
+++ b/kerberos5/lib/libkadm5clnt/Makefile
@@ -2,8 +2,7 @@
 
 LIB=	kadm5clnt
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcom_err -lkrb5 -lroken
-DPADD=	${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	com_err krb5 roken
 
 INCS=	admin.h \
 	kadm5-private.h \
diff --git a/kerberos5/lib/libkadm5clnt/Makefile.depend b/kerberos5/lib/libkadm5clnt/Makefile.depend
index 8cb61ee..cf30e8f 100644
--- a/kerberos5/lib/libkadm5clnt/Makefile.depend
+++ b/kerberos5/lib/libkadm5clnt/Makefile.depend
@@ -16,6 +16,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
+	lib/libthr \
 	usr.bin/xinstall.host \
 
 
diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile
index 5c3a191..adf49a5 100644
--- a/kerberos5/lib/libkadm5srv/Makefile
+++ b/kerberos5/lib/libkadm5srv/Makefile
@@ -2,8 +2,7 @@
 
 LIB=	kadm5srv
 LDFLAGS=	-Wl,--no-undefined
-LDADD=	-lcom_err -lhdb -lkrb5 -lroken
-DPADD=	${LIBCOM_ERR} ${LIBHDB} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	com_err hdb krb5 roken
 VERSION_MAP= ${KRB5DIR}/lib/kadm5/version-script.map
 MAN=	kadm5_pwcheck.3
 
diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend
index 48db2a5..2a559eb 100644
--- a/kerberos5/lib/libkadm5srv/Makefile.depend
+++ b/kerberos5/lib/libkadm5srv/Makefile.depend
@@ -16,6 +16,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
+	lib/libthr \
 	usr.bin/xinstall.host \
 
 
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index 6d66578..6b7a4cd 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 LIB=	kafs5
-LDADD=	-lasn1 -lroken -lkrb5
 LDFLAGS=	-Wl,--no-undefined
-DPADD=	${LIBASN1} ${LIBKRB5} ${LIBROKEN}
+LIBADD=	asn1 krb5 roken
 INCS=	kafs.h
 MAN=	kafs5.3
 VERSION_MAP=	${.CURDIR}/version.map
diff --git a/kerberos5/lib/libkafs5/Makefile.depend b/kerberos5/lib/libkafs5/Makefile.depend
index 3eaa22a..a2e5f8c 100644
--- a/kerberos5/lib/libkafs5/Makefile.depend
+++ b/kerberos5/lib/libkafs5/Makefile.depend
@@ -14,6 +14,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libthr \
 	secure/lib/libcrypto \
 	usr.bin/xinstall.host \
 
diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile
index fa9792d..14b0797 100644
--- a/kerberos5/lib/libkdc/Makefile
+++ b/kerberos5/lib/libkdc/Makefile
@@ -3,9 +3,7 @@
 LIB=	kdc
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
-LDADD=	-lroken -lhdb -lhx509 -lkrb5 -lheimntlm -lasn1 -lcrypt -lcrypto
-DPADD=	${LIBROKEN} ${LIBHDB} ${LIBHX509} ${LIBKRB5} ${LIBHEIMNTLM} \
-	${LIBASN1} ${LIBCRYPT} ${LIBCRYPTO}
+LIBADD=	roken hdb hx509 krb5 heimntlm asn1 crypto
 
 INCS=	kdc.h \
 	kdc-protos.h
diff --git a/kerberos5/lib/libkdc/Makefile.depend b/kerberos5/lib/libkdc/Makefile.depend
index 14e302a..391591d 100644
--- a/kerberos5/lib/libkdc/Makefile.depend
+++ b/kerberos5/lib/libkdc/Makefile.depend
@@ -20,7 +20,7 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcom_err \
 	lib/libcompiler_rt \
-	lib/libcrypt \
+	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
 	usr.bin/xinstall.host \
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 4128762..a1999cc 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -3,9 +3,7 @@
 LIB=	krb5
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
-LDADD=	-lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC}
-DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
-USEPRIVATELIB= heimipcc
+LIBADD=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
 
 INCS=	heim_err.h \
 	heim_threads.h \
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index cf9368b..aade99a 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 LIB=	roken
-LDADD=	-lcrypt
-DPADD=	${LIBCRYPT}
+LIBADD=	crypt
 VERSION_MAP=	${KRB5DIR}/lib/roken/version-script.map
 INCS=	roken.h \
 	roken-common.h \
diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile
index 6d0b9c0..a489566 100644
--- a/kerberos5/lib/libwind/Makefile
+++ b/kerberos5/lib/libwind/Makefile
@@ -3,8 +3,7 @@
 LIB=	wind
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/wind/version-script.map
-LDADD=	-lcom_err -lroken
-DPADD=	${LIBCOM_ERR} ${LIBROKEN}
+LIBADD=	com_err roken
 
 INCS=	wind.h \
 	wind_err.h
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 0c45c37..f018aac 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -8,11 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/ipc \
 		-I${KRB5DIR}/lib/wind \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS} -lheimntlm
-USEPRIVATELIB= heimipcs
+LIBADD=	hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/digest-service/Makefile.depend b/kerberos5/libexec/digest-service/Makefile.depend
index 8910b84..d19df42 100644
--- a/kerberos5/libexec/digest-service/Makefile.depend
+++ b/kerberos5/libexec/digest-service/Makefile.depend
@@ -11,9 +11,9 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimipcs \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkdc \
 	kerberos5/lib/libkrb5 \
@@ -25,6 +25,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index ac1dffa..88f3dad 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -10,10 +10,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/ntlm
 CFLAGS+=-I${KRB5DIR}/kdc
 CFLAGS+=-I${.OBJDIR}/../../lib/libkrb5
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/libexec/hprop/Makefile.depend b/kerberos5/libexec/hprop/Makefile.depend
index b407aae..1885fad 100644
--- a/kerberos5/libexec/hprop/Makefile.depend
+++ b/kerberos5/libexec/hprop/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkrb5 \
@@ -25,6 +24,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index e0722bd..9f7f9e7 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -4,10 +4,9 @@ PROG=	hpropd
 MAN=	hpropd.8
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/libexec/hpropd/Makefile.depend b/kerberos5/libexec/hpropd/Makefile.depend
index 63599a9..b09cf17 100644
--- a/kerberos5/libexec/hpropd/Makefile.depend
+++ b/kerberos5/libexec/hpropd/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
@@ -24,6 +23,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index 99a4f9c..53e6ade 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -5,10 +5,9 @@ MAN=	iprop.8
 SRCS=	ipropd_common.c ipropd_master.c kadm5_err.h
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 foo::
diff --git a/kerberos5/libexec/ipropd-master/Makefile.depend b/kerberos5/libexec/ipropd-master/Makefile.depend
index 4cd3c9b..39d8295 100644
--- a/kerberos5/libexec/ipropd-master/Makefile.depend
+++ b/kerberos5/libexec/ipropd-master/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5srv \
 	kerberos5/lib/libkrb5 \
@@ -24,6 +23,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index 8a72d9e..cae84aa 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -5,10 +5,9 @@ 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}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/libexec/ipropd-slave/Makefile.depend b/kerberos5/libexec/ipropd-slave/Makefile.depend
index 5adbfed..9f162ce 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile.depend
+++ b/kerberos5/libexec/ipropd-slave/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5srv \
 	kerberos5/lib/libkrb5 \
@@ -24,6 +23,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	secure/lib/libcrypto \
 
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index f88ac2f..27200d6 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -9,10 +9,9 @@ SRCS=	rpc.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \
-	${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \
-	-lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD}
+LIBADD=	kadm5srv gssapi hdb krb5 roken vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kadmind/Makefile.depend b/kerberos5/libexec/kadmind/Makefile.depend
index ff1fa9f..0aafe39 100644
--- a/kerberos5/libexec/kadmind/Makefile.depend
+++ b/kerberos5/libexec/kadmind/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkadm5srv \
@@ -27,6 +26,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libgssapi \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile
index c0e1544..fa7a0cf 100644
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -19,11 +19,9 @@ SRCS=	acl.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
-	${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \
-	-lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
-USEPRIVATELIB= heimipcs
+LIBADD=	krb5 roken heimntlm heimipcs crypto
+DPADD=	${LDAPDPADD}
+LDADD=	${LIBVERS} ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kcm/Makefile.depend b/kerberos5/libexec/kcm/Makefile.depend
index ae60a40..22a46a2 100644
--- a/kerberos5/libexec/kcm/Makefile.depend
+++ b/kerberos5/libexec/kcm/Makefile.depend
@@ -9,11 +9,10 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
-	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
+	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimipcs \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 4ca5c3a..c88a5cd 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -10,9 +10,7 @@ SRCS=	config.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBKDC} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkdc -lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	kdc hdb krb5 roken crypt vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/kdc/Makefile.depend b/kerberos5/libexec/kdc/Makefile.depend
index 8149361..4e23c9d 100644
--- a/kerberos5/libexec/kdc/Makefile.depend
+++ b/kerberos5/libexec/kdc/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkdc \
 	kerberos5/lib/libkrb5 \
@@ -25,6 +24,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile
index c88e3b9..f9b42e5 100644
--- a/kerberos5/libexec/kdigest/Makefile
+++ b/kerberos5/libexec/kdigest/Makefile
@@ -5,10 +5,7 @@ MAN=	kdigest.8
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} \
-	${LIBVERS} -ledit
+LIBADD=	krb5 heimntlm roken crypto edit sl vers
 SRCS=	kdigest.c \
 	kdigest-commands.c \
 	kdigest-commands.h
diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile
index f5081f1..82df3ad 100644
--- a/kerberos5/libexec/kfd/Makefile
+++ b/kerberos5/libexec/kfd/Makefile
@@ -4,10 +4,7 @@ PROG=	kfd
 MAN=	kfd.8
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/kimpersonate/Makefile b/kerberos5/libexec/kimpersonate/Makefile
index 32f9777..3c94db6 100644
--- a/kerberos5/libexec/kimpersonate/Makefile
+++ b/kerberos5/libexec/kimpersonate/Makefile
@@ -6,10 +6,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken asn1 vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/libexec/kimpersonate/Makefile.depend b/kerberos5/libexec/kimpersonate/Makefile.depend
index 3a7e74b..0bc3ece 100644
--- a/kerberos5/libexec/kimpersonate/Makefile.depend
+++ b/kerberos5/libexec/kimpersonate/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimntlm \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index 2287686..2fe7964 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -3,10 +3,9 @@
 PROG=	kpasswdd
 MAN=	kpasswdd.8
 CFLAGS+=-I${KRB5DIR}/lib/roken -I../../lib/libhdb ${LDAPCFLAGS}
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LIBADD=	kadm5srv hdb krb5 roken vers asn1
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kpasswdd/Makefile.depend b/kerberos5/libexec/kpasswdd/Makefile.depend
index 2cda4e9..865ecf5 100644
--- a/kerberos5/libexec/kpasswdd/Makefile.depend
+++ b/kerberos5/libexec/kpasswdd/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkadm5srv \
@@ -25,6 +24,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index 88224da..54c2fdf 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -3,8 +3,9 @@
 PROG=	asn1_compile
 MAN=
 LIBROKEN_A=	${.OBJDIR}/../../lib/libroken/libroken.a
-LDADD=	${LIBROKEN_A} ${LIBVERS}
-DPADD=	${LIBROKEN_A} ${LIBVERS}
+LIBADD=	vers
+LDADD=	${LIBROKEN_A}
+DPADD=	${LIBROKEN_A}
 
 SRCS=	\
 	asn1parse.y \
diff --git a/kerberos5/tools/asn1_compile/Makefile.depend b/kerberos5/tools/asn1_compile/Makefile.depend
index 2364b29..15a4073 100644
--- a/kerberos5/tools/asn1_compile/Makefile.depend
+++ b/kerberos5/tools/asn1_compile/Makefile.depend
@@ -13,6 +13,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile
index 1a26e7c..cabd589 100644
--- a/kerberos5/tools/slc/Makefile
+++ b/kerberos5/tools/slc/Makefile
@@ -2,8 +2,9 @@
 
 PROG=	slc
 LIBROKEN_A=     ${.OBJDIR}/../../lib/libroken/libroken.a
-LDADD=  ${LIBROKEN_A} ${LIBVERS}
-DPADD=  ${LIBROKEN_A} ${LIBVERS}
+LIBADD=	vers
+LDADD=  ${LIBROKEN_A}
+DPADD=  ${LIBROKEN_A}
 MAN=
 
 SRCS=	roken.h \
diff --git a/kerberos5/tools/slc/Makefile.depend b/kerberos5/tools/slc/Makefile.depend
index 8c9acfb..fc49f81 100644
--- a/kerberos5/tools/slc/Makefile.depend
+++ b/kerberos5/tools/slc/Makefile.depend
@@ -13,6 +13,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile
index 3946484..53612fd 100644
--- a/kerberos5/usr.bin/hxtool/Makefile
+++ b/kerberos5/usr.bin/hxtool/Makefile
@@ -6,8 +6,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lhx509 -lroken -lasn1 -lcrypto -lcrypt ${LIBSL} ${LIBVERS} -ledit
+LIBADD=	hx509 roken asn1 crypto sl vers edit
 SRCS=	hxtool.c hxtool-commands.c hxtool-commands.h
 
 hxtool-commands.h: hxtool-commands.in
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 8ea3efc..b3b84b9 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -26,14 +26,9 @@ SRCS=	add_enctype.c \
 
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS}
-DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
-	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-	${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD}
-LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
-	${LIBSL} -lroken ${LIBVERS} -lasn1 \
-	-lcrypto -lcrypt -lcom_err \
-	-ledit -lncursesw ${LDAPLDADD}
+LIBADD=	kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kadmin/Makefile.depend b/kerberos5/usr.bin/kadmin/Makefile.depend
index 77fe838..fedd97f 100644
--- a/kerberos5/usr.bin/kadmin/Makefile.depend
+++ b/kerberos5/usr.bin/kadmin/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5clnt \
 	kerberos5/lib/libkadm5srv \
@@ -27,6 +26,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	lib/ncurses/ncursesw \
diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile
index 3da43d7..cde73f5 100644
--- a/kerberos5/usr.bin/kcc/Makefile
+++ b/kerberos5/usr.bin/kcc/Makefile
@@ -8,10 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto -lcrypt -lkafs5 ${LIBSL} \
-	${LIBVERS} -ledit
+LIBADD=	krb5 roken asn1 kafs5 edit sl vers
 SRCS=	kcc.c \
 	kcc-commands.c \
 	kcc-commands.h \
diff --git a/kerberos5/usr.bin/kcc/Makefile.depend b/kerberos5/usr.bin/kcc/Makefile.depend
index b00a47f..aef9d5b 100644
--- a/kerberos5/usr.bin/kcc/Makefile.depend
+++ b/kerberos5/usr.bin/kcc/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimntlm \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index b3946e4..23e9023 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -2,10 +2,7 @@
 
 PROG=	kdestroy
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt
+LIBADD=	kafs5 krb5 roken vers
 MAN=	kdestroy.1
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kdestroy/Makefile.depend b/kerberos5/usr.bin/kdestroy/Makefile.depend
index 3a7e74b..0bc3ece 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile.depend
+++ b/kerberos5/usr.bin/kdestroy/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	kerberos5/lib/libasn1 \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimntlm \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
diff --git a/kerberos5/usr.bin/kf/Makefile b/kerberos5/usr.bin/kf/Makefile
index c9d3fce..44d9183 100644
--- a/kerberos5/usr.bin/kf/Makefile
+++ b/kerberos5/usr.bin/kf/Makefile
@@ -4,10 +4,7 @@ PROG=	kf
 MAN=	kf.1
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
-	${LIBVERS}
+LIBADD=	krb5 roken vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/kgetcred/Makefile b/kerberos5/usr.bin/kgetcred/Makefile
index dac38ad..1451154 100644
--- a/kerberos5/usr.bin/kgetcred/Makefile
+++ b/kerberos5/usr.bin/kgetcred/Makefile
@@ -3,8 +3,7 @@
 PROG=	kgetcred
 CFLAGS+=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	krb5 roken asn1 vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index e0229f9..7622b8d 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -2,10 +2,7 @@
 
 PROG=	kinit
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=	-lkafs5 -lkrb5 -lheimntlm -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	kafs5 krb5 heimntlm roken crypto vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index a9ab1c9..66cb456 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -2,10 +2,7 @@
 
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	hdb krb5 roken vers crypto
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/kpasswd/Makefile.depend b/kerberos5/usr.bin/kpasswd/Makefile.depend
index 6a1350b..e835c54 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile.depend
+++ b/kerberos5/usr.bin/kpasswd/Makefile.depend
@@ -9,6 +9,7 @@ DIRDEPS = \
 	include/arpa \
 	include/xlocale \
 	kerberos5/lib/libasn1 \
+	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
@@ -21,6 +22,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 9e27865..ebd39c6 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -8,10 +8,7 @@ PRECIOUSPROG=
 MAN=
 SRCS=	su.c
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	kafs5 krb5 roken vers crypto crypt
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile
index fc790e2..eb7b204 100644
--- a/kerberos5/usr.bin/string2key/Makefile
+++ b/kerberos5/usr.bin/string2key/Makefile
@@ -7,9 +7,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/windc
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBVERS}
-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lcrypto -lcrypt ${LIBVERS}
+LIBADD=	krb5 roken crypto vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/string2key/Makefile.depend b/kerberos5/usr.bin/string2key/Makefile.depend
index 63599a9..f8e773d 100644
--- a/kerberos5/usr.bin/string2key/Makefile.depend
+++ b/kerberos5/usr.bin/string2key/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
index 830e66a..ced7543 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@@ -3,10 +3,7 @@
 PROG=	verify_krb5_conf
 MAN=	verify_krb5_conf.8
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD=	-lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
+LIBADD=	krb5 roken  vers
 
 .include <bsd.prog.mk>
 
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
index 0bc3ece..ff20361 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libhx509 \
-	kerberos5/lib/libkafs5 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile
index 176012a..f31be51 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile
+++ b/kerberos5/usr.sbin/iprop-log/Makefile
@@ -8,10 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/lib/kadm5 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl \
 		-I.
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} \
-	${LIBCRYPT} ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBEDIT}
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lasn1 -lcrypto -lcrypt ${LIBSL} -lroken \
-	${LIBVERS} -ledit
+LIBADD=	kadm5srv hdb krb5 roken edit sl vers
 
 iprop-commands.h: iprop-commands.in
 	${SLC} ${.ALLSRC:M*.in}
diff --git a/kerberos5/usr.sbin/iprop-log/Makefile.depend b/kerberos5/usr.sbin/iprop-log/Makefile.depend
index 6cd298d..8d6a1ea 100644
--- a/kerberos5/usr.sbin/iprop-log/Makefile.depend
+++ b/kerberos5/usr.sbin/iprop-log/Makefile.depend
@@ -12,7 +12,6 @@ DIRDEPS = \
 	kerberos5/lib/libhdb \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkadm5srv \
 	kerberos5/lib/libkrb5 \
@@ -26,6 +25,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libedit \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/ncurses/ncursesw \
 	secure/lib/libcrypto \
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 024e45d..d96c96c 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -4,10 +4,9 @@ PROG=	kstash
 MAN=	kstash.8
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kdc ${LDAPCFLAGS}
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt ${LDAPLDADD}
+LIBADD=	hdb krb5 crypto vers
+DPADD=	${LDAPDPADD}
+LDADD=	${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
diff --git a/kerberos5/usr.sbin/kstash/Makefile.depend b/kerberos5/usr.sbin/kstash/Makefile.depend
index 63599a9..b09cf17 100644
--- a/kerberos5/usr.sbin/kstash/Makefile.depend
+++ b/kerberos5/usr.sbin/kstash/Makefile.depend
@@ -13,7 +13,6 @@ DIRDEPS = \
 	kerberos5/lib/libheimbase \
 	kerberos5/lib/libheimipcc \
 	kerberos5/lib/libheimntlm \
-	kerberos5/lib/libheimsqlite \
 	kerberos5/lib/libhx509 \
 	kerberos5/lib/libkrb5 \
 	kerberos5/lib/libroken \
@@ -24,6 +23,7 @@ DIRDEPS = \
 	lib/libcom_err \
 	lib/libcompiler_rt \
 	lib/libcrypt \
+	lib/libsqlite3 \
 	lib/libthr \
 	lib/libutil \
 	secure/lib/libcrypto \
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index f7d340f..fe45494 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -17,10 +17,7 @@ SRCS=	add.c \
 	rename.c
 
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
-	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBEDIT}
-LDADD=	-lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -ledit
+LIBADD=	kadm5clnt krb5 roken crypto edit sl vers
 
 .include <bsd.prog.mk>