3 files changed, 123 insertions, 63 deletions
diff --git a/lib/libkeynote/Makefile b/lib/libkeynote/Makefile
new file mode 100644
index 00000000000..166adeb1fb0
--- /dev/null
+++ b/lib/libkeynote/Makefile
@@ -0,0 +1,31 @@
+#	$OpenBSD: Makefile,v 1.7 1999/10/01 01:41:32 angelos Exp $
+
+LIB=	keynote
+MAN=	keynote.3 keynote.4
+
+CFLAGS+= -Wall -DCRYPTO -DHAVE_CONFIG_H -I. -I${.CURDIR}
+LEXFLAGS = -Cr -Pkn -s -i
+YACCFLAGS = -d -p kn -b k
+
+HDRS=	keynote.h
+SRCS=	k.tab.c lex.kn.c environment.c parse_assertion.c signature.c aux.c \
+	base64.c
+
+CLEANFILES+= k.tab.c lex.kn.c k.tab.h
+
+k.tab.c: keynote.y keynote.h signature.h
+	$(YACC.y) $(YACCFLAGS) ${.CURDIR}/keynote.y
+
+lex.kn.c: keynote.l keynote.y keynote.h assertion.h signature.h
+	$(LEX.l) $(LEXFLAGS) ${.CURDIR}/keynote.l
+
+includes:
+	@@cd ${.CURDIR}; for i in $(HDRS); do \
+	    j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+		$$i ${DESTDIR}/usr/include"; \
+	    echo $$j; \
+	    eval "$$j"; \
+	done
+
+.include <bsd.lib.mk>
diff --git a/lib/libkeynote/Makefile.bsd-wrapper b/lib/libkeynote/Makefile.bsd-wrapper
deleted file mode 100644
index 38127555405..00000000000
--- a/lib/libkeynote/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,63 +0,0 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.1 1999/10/01 01:08:28 angelos Exp $
-
-HDRS=	keynote.h
-MAN=	keynote.1 keynote.3 keynote.4
-
-all:	config.status
-	@cd ${.CURDIR} && ${MAKE} all
-
-.FORCE:	.IGNORE
-
-.include <bsd.own.mk>
-
-.ifdef GLOBAL_AUTOCONF_CACHE
-CF=	--cache-file=${GLOBAL_AUTOCONF_CACHE}
-.else
-CF=
-.endif
-
-config: .FORCE
-.ifndef GLOBAL_AUTOCONF_CACHE
-	-rm -f config.cache
-.endif
-	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
-	/bin/sh ${.CURDIR}/configure ${CF}
-
-config.status:	Makefile.in configure
-	PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
-	/bin/sh ${.CURDIR}/configure ${CF} && touch config.status
-
-includes:
-	@cd ${.CURDIR}; for i in $(HDRS); do \
-	    j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-		$$i ${DESTDIR}/usr/include"; \
-	    echo $$j; \
-	    eval "$$j"; \
-	done
-
-clean:
-	-rm -f keynote.cat3 keynote.cat4 keynote.cat1
-	@if [ -f Makefile ]; then ${MAKE} clean; fi
-
-cleandir:
-	-rm -f keynote.cat3 keynote.cat4 keynote.cat1
-	@if [ -f Makefile ]; then ${MAKE} cleanall; fi
-
-install-keynote:
-	install -c -s -o root -g bin  -m 555 keynote /usr/bin
-	install -c -o root -g bin -m 444 keynote.cat1 /usr/share/man/cat1/keynote.0
-
-install:
-	install -c -o root -g bin -m 600 libkeynote.a  /usr/lib
-	ranlib -t /usr/lib/libkeynote.a
-	chmod 444 /usr/lib/libkeynote.a
-	install -c -o root -g bin -m 444 keynote.cat3 /usr/share/man/cat3/keynote.0
-	install -c -o root -g bin -m 444 keynote.cat4 /usr/share/man/cat4/keynote.0
-
-depend:
-	# Nothing here so far...
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
-.include <bsd.man.mk>
diff --git a/lib/libkeynote/config.h b/lib/libkeynote/config.h
new file mode 100644
index 00000000000..df0ee300595
--- /dev/null
+++ b/lib/libkeynote/config.h
@@ -0,0 +1,92 @@
+/* config.h.  Generated automatically by configure.  */
+/* config.hin.  Generated automatically from configure.in by autoheader.  */
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define if you have the _close function.  */
+/* #undef HAVE__CLOSE */
+
+/* Define if you have the _open function.  */
+/* #undef HAVE__OPEN */
+
+/* Define if you have the _read function.  */
+/* #undef HAVE__READ */
+
+/* Define if you have the b64_ntop function.  */
+#define HAVE___B64_NTOP 1
+
+/* Define if you have the close function.  */
+#define HAVE_CLOSE 1
+
+/* Define if you have the getopt function.  */
+#define HAVE_GETOPT 1
+
+/* Define if you have the memcpy function.  */
+#define HAVE_MEMCPY 1
+
+/* Define if you have the open function.  */
+#define HAVE_OPEN 1
+
+/* Define if you have the read function.  */
+#define HAVE_READ 1
+
+/* Define if you have the regcomp function.  */
+#define HAVE_REGCOMP 1
+
+/* Define if you have the snprintf function.  */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have the strcasecmp function.  */
+#define HAVE_STRCASECMP 1
+
+/* Define if you have the strchr function.  */
+#define HAVE_STRCHR 1
+
+/* Define if you have the stricmp function.  */
+/* #undef HAVE_STRICMP */
+
+/* Define if you have the strncasecmp function.  */
+#define HAVE_STRNCASECMP 1
+
+/* Define if you have the strnicmp function.  */
+/* #undef HAVE_STRNICMP */
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <io.h> header file.  */
+/* #undef HAVE_IO_H */
+
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <memory.h> header file.  */
+#define HAVE_MEMORY_H 1
+
+/* Define if you have the <openssl/crypto.h> header file.  */
+#define HAVE_OPENSSL_CRYPTO_H 1
+
+/* Define if you have the <regex.h> header file.  */
+#define HAVE_REGEX_H 1
+
+/* Define if you have the <ssl/crypto.h> header file.  */
+#define HAVE_SSL_CRYPTO_H 1
+
+/* Define if you have the <sys/time.h> header file.  */
+#define HAVE_SYS_TIME_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the crypto library (-lcrypto).  */
+#define HAVE_LIBCRYPTO 1
+
+/* Define if you have /dev/urandom file.  */
+#define HAVE__DEV_URANDOM 1