From: Sascha Wildner <saw@online.de>
Date: Tue, 24 Mar 2020 15:24:01 +0000 (+0100)
Subject: Hook ssh-copy-id into the build and adjust README.DELETED.
X-Git-Tag: v6.0.0rc1~1301
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/6e5c5008c71988af079ced51a6dab447847730bc

Hook ssh-copy-id into the build and adjust README.DELETED.
---

diff --git a/crypto/openssh/README.DELETED b/crypto/openssh/README.DELETED
index 8627e7bbb5..e68ba0a032 100644
--- a/crypto/openssh/README.DELETED
+++ b/crypto/openssh/README.DELETED
@@ -29,7 +29,19 @@ config.h.in
 config.sub
 configure
 configure.ac
-contrib/
+contrib/Makefile
+contrib/README
+contrib/aix/
+contrib/cygwin/
+contrib/findssl.sh
+contrib/gnome-ssh-askpass1.c
+contrib/gnome-ssh-askpass2.c
+contrib/hpux/
+contrib/redhat/
+contrib/solaris/
+contrib/sshd.pam.freebsd
+contrib/sshd.pam.generic
+contrib/suse/
 crc32.c
 digest-libc.c
 fixalgorithms
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 7cb783c2bb..43660f29ca 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -182,6 +182,7 @@ SUBDIR=	alias \
 	ssh \
 	ssh-add \
 	ssh-agent \
+	ssh-copy-id \
 	ssh-keygen \
 	ssh-keyscan \
 	stat \
diff --git a/usr.bin/ssh-copy-id/Makefile b/usr.bin/ssh-copy-id/Makefile
new file mode 100644
index 0000000000..71d80f9097
--- /dev/null
+++ b/usr.bin/ssh-copy-id/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD: head/usr.bin/ssh-copy-id/Makefile 298107 2016-04-16 07:45:30Z gjb $
+
+.PATH:	${.CURDIR}/../../crypto/openssh/contrib
+
+SCRIPTS= ssh-copy-id
+MAN=	ssh-copy-id.1
+
+.include <bsd.prog.mk>