From 61020f23a63ecd913b30982befe7e17783cf9c21 Mon Sep 17 00:00:00 2001
From: "James T. Sprinkle" <the-grue@hotmail.com>
Date: Wed, 4 Oct 2017 17:41:00 -0700
Subject: [PATCH] Moved some Makefiles around to allow for install of
 configuration files.

---
 crypto/external/bsd/openssh/Makefile         |  2 +-
 crypto/external/bsd/openssh/bin/Makefile     |  8 ++++----
 crypto/external/bsd/openssh/etc/Makefile     | 14 ++++++++++++++
 crypto/external/bsd/openssh/etc/Makefile.inc |  7 +++++++
 crypto/external/bsd/openssh/lib/Makefile     |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 crypto/external/bsd/openssh/etc/Makefile
 create mode 100644 crypto/external/bsd/openssh/etc/Makefile.inc

diff --git a/crypto/external/bsd/openssh/Makefile b/crypto/external/bsd/openssh/Makefile
index d5e65553c..853735cd0 100644
--- a/crypto/external/bsd/openssh/Makefile
+++ b/crypto/external/bsd/openssh/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.1 2009/06/07 22:38:44 christos Exp $
 
-SUBDIR=		lib .WAIT bin
+SUBDIR=		lib .WAIT bin .WAIT etc
 
 .include <bsd.subdir.mk>
diff --git a/crypto/external/bsd/openssh/bin/Makefile b/crypto/external/bsd/openssh/bin/Makefile
index 803d82a97..b40a4db45 100644
--- a/crypto/external/bsd/openssh/bin/Makefile
+++ b/crypto/external/bsd/openssh/bin/Makefile
@@ -9,10 +9,10 @@ SUBDIR=	ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
 	ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper
 
 .PATH: ${SSHDIST}
-.MADE: moduli
-CONFIGFILES=	ssh_config sshd_config moduli
-FILESDIR=	/etc/ssh
-FILESDIR_moduli=/etc
+#.MADE: moduli
+#CONFIGFILES=	ssh_config sshd_config moduli
+#FILESDIR=	/etc/ssh
+#FILESDIR_moduli=/etc
 
 .include <bsd.files.mk>
 .include <bsd.subdir.mk>
diff --git a/crypto/external/bsd/openssh/etc/Makefile b/crypto/external/bsd/openssh/etc/Makefile
new file mode 100644
index 000000000..54defbf85
--- /dev/null
+++ b/crypto/external/bsd/openssh/etc/Makefile
@@ -0,0 +1,14 @@
+#	$NetBSD: Makefile,v 1.3 2010/11/21 19:19:21 adam Exp $
+
+.include <bsd.own.mk>
+
+SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
+
+.PATH: ${SSHDIST}
+.MADE: moduli
+FILESDIR=/etc/ssh
+FILESDIR_moduli=/etc
+FILES= ssh_config sshd_config moduli
+
+.include <bsd.files.mk>
+.include <bsd.subdir.mk>
diff --git a/crypto/external/bsd/openssh/etc/Makefile.inc b/crypto/external/bsd/openssh/etc/Makefile.inc
new file mode 100644
index 000000000..6c98ca44c
--- /dev/null
+++ b/crypto/external/bsd/openssh/etc/Makefile.inc
@@ -0,0 +1,7 @@
+#	$NetBSD: Makefile.inc,v 1.3 2014/10/19 16:30:58 christos Exp $
+
+CPPFLAGS+=-DWITH_OPENSSL
+LDADD+=	-lssh -lcrypto -lcrypt -lz
+DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
+
+.include "${.PARSEDIR}/../Makefile.inc"
diff --git a/crypto/external/bsd/openssh/lib/Makefile b/crypto/external/bsd/openssh/lib/Makefile
index 5eefa7ee5..212937051 100644
--- a/crypto/external/bsd/openssh/lib/Makefile
+++ b/crypto/external/bsd/openssh/lib/Makefile
@@ -4,7 +4,7 @@
 
 .include "../Makefile.inc"
 
-LIB=	ssh
+LIB=ssh
 
 .if defined(__MINIX)
 SRCS=   ssh_api.c \