don't link to hx509, pthread and ntlm related libraries

5 files changed, 13 insertions, 13 deletions

diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure
index 7feddf064b6..954721dd9ba 100644
--- a/gnu/usr.bin/cvs/configure
+++ b/gnu/usr.bin/cvs/configure
@@ -4021,7 +4021,7 @@ EOF
   includeopt="${includeopt} -I$GSSAPI/include/kerberosV"
   # FIXME: This is ugly, but these things don't seem to be standardized.
   if test "$ac_cv_header_gssapi_h" = "yes"; then
-    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lheimbase -lwind -lroken -lcom_err -lheimntlm -lpthread"
+    LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lcrypto -lheimbase -lasn1 -lwind -lroken -lcom_err"
   else
     LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err"
   fi
diff --git a/libexec/login_krb5-or-pwd/Makefile b/libexec/login_krb5-or-pwd/Makefile
index 4bb77fffccc..a60cf283618 100644
--- a/libexec/login_krb5-or-pwd/Makefile
+++ b/libexec/login_krb5-or-pwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2013/06/17 19:23:33 robert Exp $
+#	$OpenBSD: Makefile,v 1.16 2013/06/19 19:45:03 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -10,8 +10,8 @@ CFLAGS+=-DPASSWD -Wall -I${.CURDIR}/../login_passwd
 .if (${KERBEROS5:L} == "yes")
 SRCS+=	login_krb5.c
 DPADD+=  ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBUTIL}
-LDADD+=	-lkrb5 -lhx509 -lasn1 -lcrypto -lutil
-LDADD+=	-lwind -lroken -lcom_err -lpthread -lheimbase
+LDADD+=	-lkrb5 -lasn1 -lcrypto -lutil
+LDADD+=	-lwind -lroken -lcom_err -lheimbase
 CFLAGS+=-DKRB5
 .PATH:	${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 ${.CURDIR}/../../usr.bin/passwd
 .else
diff --git a/libexec/login_krb5/Makefile b/libexec/login_krb5/Makefile
index 35d2e3310d9..9027b18ad96 100644
--- a/libexec/login_krb5/Makefile
+++ b/libexec/login_krb5/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2013/06/17 19:23:33 robert Exp $
+#	$OpenBSD: Makefile,v 1.19 2013/06/19 19:45:03 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -11,8 +11,8 @@ CFLAGS+=-Wall -I${.CURDIR}/../login_passwd
 .if (${KERBEROS5:L} == "yes")
 SRCS+=	login_krb5.c
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lhx509 -lasn1 -lcrypto
-LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase
+LDADD+=	-lkrb5 -lasn1 -lcrypto
+LDADD+= -lwind -lroken -lcom_err -lheimbase
 CFLAGS+=-DKRB5
 .endif
 
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 770afda57ef..bc9af47a2f0 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.34 2013/06/18 20:27:20 miod Exp $
+#	$OpenBSD: Makefile,v 1.35 2013/06/19 19:46:44 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -21,8 +21,8 @@ CFLAGS+=-DYP -I${.CURDIR}/../../lib/libc/yp
 SRCS+= krb5_passwd.c
 CFLAGS+= -DKRB5
 DPADD+=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
-LDADD+=	-lkrb5 -lhx509 -lasn1 -lcrypto
-LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase
+LDADD+=	-lkrb5 -lasn1 -lcrypto
+LDADD+= -lwind -lroken -lcom_err -lheimbase
 .endif
 
 BINMODE=4555
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 16ab684bc44..6ba11dd2ee7 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2013/06/18 20:27:20 miod Exp $
+#	$OpenBSD: Makefile,v 1.27 2013/06/19 19:46:43 robert Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -46,8 +46,8 @@ SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
 .if (${KERBEROS5:L} == "yes")
 CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -DDES_ENCRYPTION
 DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO}
-LDADD+= -lkrb5 -lhx509 -lasn1 -lcrypto
-LDADD+= -lwind -lroken -lcom_err -lpthread -lheimbase
+LDADD+= -lkrb5 -lasn1 -lcrypto
+LDADD+= -lwind -lroken -lcom_err -lheimbase
 SRCS+= kerberos5.c enc_des.c
 .endif