From a008e67b2ee9d36b6db0bd00c5491096f6a9d03e Mon Sep 17 00:00:00 2001
From: Nate Willams <nate@FreeBSD.org>
Date: Tue, 20 Jul 1993 22:04:39 +0000
Subject: [PATCH] Libcrypt changes

---
 lib/Makefile            |  6 +++++-
 usr.bin/telnet/Makefile | 43 +++++++++--------------------------------
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 7e2cb930f6..738f187c0a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,10 @@
 #	@(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
-SUBDIR=	csu.${MACHINE} libc libcrypt libcurses libg++ libm \
+SUBDIR=	csu.${MACHINE} libc libcurses libg++ libm \
 	libresolv librpc libtelnet libterm libutil liby
 
+.if exists(libcrypt)
+SUBDIR+= libcrypt
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 6fc8109f27..96bf01563d 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,35 +1,4 @@
-#
-# Copyright (c) 1990 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
+
 #	@(#)Makefile	5.6 (Berkeley) 3/5/91
 #
 
@@ -38,9 +7,15 @@ PROG=	telnet
 CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO
 CFLAGS+=-I${.CURDIR}/../../lib
 
+.if exists(/usr/lib/libcrypt.a)
+#CFLAGS+= -DENCRYPT
+DPADD+= ${LIBCRYPT}
+LDADD+= -lcrypt
+.endif
+
+LDADD+=	-ltermcap -ltelnet
+DPADD+=	${LIBTERMCAP} ${LIBTELNET}
 
-LDADD=	-ltermcap -ltelnet
-DPADD=	${LIBTERMCAP} ${LIBTELNET}
 
 SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
 	terminal.c tn3270.c utilities.c
-- 
2.20.1