From 1bcfc94e3662a0bd029d4775d2f64c26a73020a0 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Thu, 24 Feb 2000 21:01:54 +0000
Subject: [PATCH] Use libcrypto instead of libdes.

---
 sbin/dump/Makefile      |  3 ++-
 sbin/mount_nfs/Makefile |  4 ++--
 sbin/nfsd/Makefile      | 10 +++++-----
 sbin/restore/Makefile   |  3 ++-
 usr.sbin/nfsd/Makefile  | 10 +++++-----
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 4c06df6d8c97..b2e0e08c68f1 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -26,7 +26,8 @@ MLINKS+=dump.8 rdump.8
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
-LDADD+=	-lkrb -ldes
+DPADD=	${LIBKRB} ${LIBCRYPTO}
+LDADD+=	-lkrb -lcrypto
 CFLAGS+=-DKERBEROS -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 10b176b8aecb..5e36bc8898b1 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -14,8 +14,8 @@ CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL}
 .if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
 	|| defined(MAKE_EBONES))
 CFLAGS+=-DKERBEROS
-DPADD=	${LIBKRB} ${LIBDES}
-LDADD=	-lkrb -ldes
+DPADD=	${LIBKRB} ${LIBCRYPTO}
+LDADD=	-lkrb -lcrypto
 DISTRIBUTION=	krb
 .endif
 
diff --git a/sbin/nfsd/Makefile b/sbin/nfsd/Makefile
index 12ce92e2d90a..a18aad017aa8 100644
--- a/sbin/nfsd/Makefile
+++ b/sbin/nfsd/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
+# $FreeBSD$
 
 PROG=	nfsd
 CFLAGS+=-DNFS
@@ -6,12 +7,11 @@ MAN8=	nfsd.8
 DPADD+=	${LIBUTIL}
 LDADD+=	-lutil
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
-	|| defined(MAKE_EBONES))
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DKERBEROS
-DPADD+=	${LIBKRB} ${LIBDES}
-LDADD+=	-lkrb -ldes
-DISTRIBUTION=	krb
+DPADD+=	${LIBKRB} ${LIBCRYPTO}
+LDADD+=	-lkrb -lcrypto
+DISTRIBUTION=	krb4
 .endif
 
 .include <bsd.prog.mk>
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 3f0a363f4a2c..2da8e87cf64c 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -16,7 +16,8 @@ MLINKS+=restore.8 rrestore.8
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
-LDADD+=	-lkrb -ldes
+DPADD+=	${LIBKRB} ${LIBCRYPTO}
+LDADD+=	-lkrb -lcrypto
 CFLAGS+=-DKERBEROS -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile
index 12ce92e2d90a..a18aad017aa8 100644
--- a/usr.sbin/nfsd/Makefile
+++ b/usr.sbin/nfsd/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
+# $FreeBSD$
 
 PROG=	nfsd
 CFLAGS+=-DNFS
@@ -6,12 +7,11 @@ MAN8=	nfsd.8
 DPADD+=	${LIBUTIL}
 LDADD+=	-lutil
 
-.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_KERBEROS) \
-	|| defined(MAKE_EBONES))
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
 CFLAGS+=-DKERBEROS
-DPADD+=	${LIBKRB} ${LIBDES}
-LDADD+=	-lkrb -ldes
-DISTRIBUTION=	krb
+DPADD+=	${LIBKRB} ${LIBCRYPTO}
+LDADD+=	-lkrb -lcrypto
+DISTRIBUTION=	krb4
 .endif
 
 .include <bsd.prog.mk>