From 4c05509cd095dad8782ab56cc9cca3330a72b14b Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 30 Jul 2001 14:36:19 +0000
Subject: [PATCH] Fixed world breakage when NOSHARED=yes.  libmp now depends on
 libcrypto, so it must be linked before libcrypto to work right.

---
 secure/libexec/telnetd/Makefile | 8 ++++----
 secure/usr.bin/telnet/Makefile  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 498c13f12f95..24e373168393 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -13,10 +13,10 @@ CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
 		termstat.c utility.c authenc.c
 
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} \
-		${LIBCRYPT} ${LIBMP} ${LIBPAM}
-LDADD=		-lutil -ltermcap ${LIBTELNET} -lcrypto \
-		-lcrypt -lmp ${MINUSLPAM}
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+		${LIBCRYPT} ${LIBPAM}
+LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+		-lcrypt ${MINUSLPAM}
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index 14e4e796afa0..56f7a7e8b899 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -9,9 +9,9 @@ CFLAGS+=	-DIPSEC -DINET6
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c tn3270.c utilities.c
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP} \
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBIPSEC} ${LIBPAM}
-LDADD=		-ltermcap ${LIBTELNET} -lcrypto -lcrypt -lmp \
+LDADD=		-ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \
 		-lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>