No need to refer to LIBHX509 nor LIBHEIMNTLM since both are disabled.

ok robert@

14 files changed, 28 insertions, 28 deletions

diff --git a/kerberosV/libexec/hprop/Makefile b/kerberosV/libexec/hprop/Makefile
index d6519c44509..e310b9974d5 100644
--- a/kerberosV/libexec/hprop/Makefile
+++ b/kerberosV/libexec/hprop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2013/07/10 11:14:39 ajacoutot Exp $
 
 PROG=	hprop
 MPAGES=	hprop.8
@@ -10,7 +10,7 @@ CPPFLAGS=	-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/ntlm \
 		-I${KRB5DIR}/kdc \
 		-I${.OBJDIR}/../../lib/libkrb5
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind
diff --git a/kerberosV/libexec/hpropd/Makefile b/kerberosV/libexec/hpropd/Makefile
index dfbb9c3775e..2a90e30e34d 100644
--- a/kerberosV/libexec/hpropd/Makefile
+++ b/kerberosV/libexec/hpropd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2013/07/10 11:14:39 ajacoutot Exp $
 
 PROG=	hpropd
 MPAGES=	hpropd.8
 MSRC=	${KRB5DIR}/kdc
 CPPFLAGS=	-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/kdc
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index 919dffe31d5..975606a22c4 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2013/07/10 11:14:39 ajacoutot Exp $
 
 PROG=	ipropd-master
 MPAGES=	iprop.8
@@ -6,7 +6,7 @@ MSRC=	${KRB5DIR}/lib/kadm5
 SRCS=	ipropd_common.c ipropd_master.c kadm5_err.h
 CPPFLAGS=	-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 		-I.
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lwind -lheimbase \
diff --git a/kerberosV/libexec/ipropd-slave/Makefile b/kerberosV/libexec/ipropd-slave/Makefile
index ac58145fe36..93c165bee4d 100644
--- a/kerberosV/libexec/ipropd-slave/Makefile
+++ b/kerberosV/libexec/ipropd-slave/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	ipropd-slave
 NOMAN=
 SRCS=	ipropd_common.c ipropd_slave.c kadm5_err.h
 CPPFLAGS=	-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 		-I.
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind -lutil
diff --git a/kerberosV/libexec/kcm/Makefile b/kerberosV/libexec/kcm/Makefile
index 24752a064da..f169bc6083a 100644
--- a/kerberosV/libexec/kcm/Makefile
+++ b/kerberosV/libexec/kcm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kcm
 MPAGES=	kcm.8
@@ -20,7 +20,7 @@ SRCS=	acl.c \
 
 CPPFLAGS=	-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc
-DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
+DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
 	${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBVERS}
 LDADD=	-lhdb -lkrb5 -lroken -lasn1 ${LIBHEIMIPCS} \
 	-lcrypto ${LIBVERS} -lwind -lcom_err -lwind \
diff --git a/kerberosV/libexec/kpasswdd/Makefile b/kerberosV/libexec/kpasswdd/Makefile
index f04a6496e1b..fa746848b5c 100644
--- a/kerberosV/libexec/kpasswdd/Makefile
+++ b/kerberosV/libexec/kpasswdd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kpasswdd
 MPAGES=	kpasswdd.8
 MSRC=	${KRB5DIR}/kpasswd
 
 CPPFLAGS=	-I${KRB5DIR}/lib/roken -I../../lib/libhdb
-DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind -lutil
diff --git a/kerberosV/usr.bin/hxtool/Makefile b/kerberosV/usr.bin/hxtool/Makefile
index a9681b87b13..25d6663add9 100644
--- a/kerberosV/usr.bin/hxtool/Makefile
+++ b/kerberosV/usr.bin/hxtool/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	hxtool
 NOMAN=
 CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBHX509} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBSL} ${LIBVERS} ${LIBEDIT}
+DPADD=	${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBSL} ${LIBVERS} ${LIBEDIT}
 LDADD=	-lroken -lasn1 -lcrypto ${LIBSL} ${LIBVERS} -ledit -lcurses -lcom_err -lwind
 SRCS=	hxtool.c hxtool-commands.c hxtool-commands.h
 
diff --git a/kerberosV/usr.bin/kcc/Makefile b/kerberosV/usr.bin/kcc/Makefile
index 23d22f3d403..d5555bded04 100644
--- a/kerberosV/usr.bin/kcc/Makefile
+++ b/kerberosV/usr.bin/kcc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kcc
 MPAGES=	klist.1
@@ -7,7 +7,7 @@ LINKS=	${BINDIR}/kcc ${BINDIR}/klist
 CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBKAFS5} ${LIBSL} ${LIBVERS} ${LIBEDIT}
 LDADD=	-lkrb5 -lroken -lasn1 -lcrypto -lkafs5 ${LIBSL} \
 	${LIBVERS} -ledit -lcurses -lwind -lcom_err -lheimbase
diff --git a/kerberosV/usr.bin/kdestroy/Makefile b/kerberosV/usr.bin/kdestroy/Makefile
index 93760da3979..4b51ed79ebd 100644
--- a/kerberosV/usr.bin/kdestroy/Makefile
+++ b/kerberosV/usr.bin/kdestroy/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kdestroy
 CPPFLAGS=	-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO}
 LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lwind -lcom_err \
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index 2e00883a112..276e6f5faa2 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kinit
 CPPFLAGS=	-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO}
 LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lheimbase -lwind
diff --git a/kerberosV/usr.bin/verify_krb5_conf/Makefile b/kerberosV/usr.bin/verify_krb5_conf/Makefile
index 29a8677cb0b..6d1e32014d8 100644
--- a/kerberosV/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberosV/usr.bin/verify_krb5_conf/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	verify_krb5_conf
 MPAGES=	verify_krb5_conf.8
 MSRC=	${KRB5DIR}/lib/krb5
 CPPFLAGS=	-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR}
 LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcom_err -lwind -lheimbase
diff --git a/kerberosV/usr.sbin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index b098d857377..37691eae31b 100644
--- a/kerberosV/usr.sbin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kadmin
 MPAGES=	kadmin.8
@@ -26,7 +26,7 @@ SRCS=	add_enctype.c \
 
 CPPFLAGS=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
+DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} \
 	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCOM_ERR} \
 	${LIBEDIT} ${LIBNCURSES}
diff --git a/kerberosV/usr.sbin/kdigest/Makefile b/kerberosV/usr.sbin/kdigest/Makefile
index 2b7dc53e87d..f6f76c2d3c1 100644
--- a/kerberosV/usr.sbin/kdigest/Makefile
+++ b/kerberosV/usr.sbin/kdigest/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kdigest
 MPAGES=	kdigest.8
@@ -7,7 +7,7 @@ MSRC=	${KRB5DIR}/kuser
 CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBSL} ${LIBVERS} ${LIBEDIT}
 LDADD=	-lkrb5 -lheimntlm -lroken -lasn1 -lcrypto ${LIBSL} \
 	${LIBVERS} -ledit -lwind \
diff --git a/kerberosV/usr.sbin/kimpersonate/Makefile b/kerberosV/usr.sbin/kimpersonate/Makefile
index 7d1af6b337c..d9061925a2d 100644
--- a/kerberosV/usr.sbin/kimpersonate/Makefile
+++ b/kerberosV/usr.sbin/kimpersonate/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2013/07/10 11:14:40 ajacoutot Exp $
 
 PROG=	kimpersonate
 MPAGES=	kimpersonate.8
@@ -7,7 +7,7 @@ MSRC=	${KRB5DIR}/kuser
 CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/sl -I.
-DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBHEIMNTLM} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} \
 	${LIBVERS}
 LDADD=	-lkafs5 -lkrb5 -lroken -lasn1 -lcrypto \
 	${LIBVERS} -lcom_err -lheimbase -lwind