From 3bbaa5903cdfa6d903256d9ad37d1d8c20c79437 Mon Sep 17 00:00:00 2001
From: pst <pst@FreeBSD.org>
Date: Wed, 19 Oct 1994 00:03:45 +0000
Subject: Include most of the logdaemon v4.4 S/key changes

---
 usr.bin/key/Makefile | 18 ++++--------------
 usr.bin/key/skey.c   |  5 +++--
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'usr.bin/key')

diff --git a/usr.bin/key/Makefile b/usr.bin/key/Makefile
index b8553ab..9612051 100644
--- a/usr.bin/key/Makefile
+++ b/usr.bin/key/Makefile
@@ -1,21 +1,11 @@
-
 #	@(#)Makefile	5.6 (Berkeley) 3/5/91
 #
 
 PROG=	key
-MAN1=   key.1 skey.1
-CFLAGS+=-I${.CURDIR}/../../lib
-
-
-DPADD=	/usr/bin/libskey.a
-LDADD=	-lskey
-
-.if exists(/usr/lib/libcrypt.a)
-DPADD+= ${LIBCRYPT}
-LDADD+= -lcrypt
-.endif
-
 SRCS=	skey.c
+MAN1=   key.1
 
-.include <bsd.prog.mk>
+DPADD=	${LIBSKEY} ${LIBMD}
+LDADD=	-lskey -lmd
 
+.include <bsd.prog.mk>
diff --git a/usr.bin/key/skey.c b/usr.bin/key/skey.c
index d1bc239..1e810e9 100644
--- a/usr.bin/key/skey.c
+++ b/usr.bin/key/skey.c
@@ -12,12 +12,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #ifdef	__MSDOS__
 #include <dos.h>
 #else	/* Assume BSD unix */
 #include <fcntl.h>
 #endif
-#include "libskey/md4.h"
+
 #include <skey.h>
 
 char *readpass();
@@ -119,10 +120,10 @@ char *argv[];
 	}
 	return 0;
 }
+
 void
 usage(s)
 char *s;
 {
 	fprintf(stderr,"Usage: %s [-n count] <sequence #>[/] <key> \n",s);
 }
-
-- 
cgit v1.1