Explicitly add libz and libcrypto to LDADD for any ssh utilities missing

it. While not strictly required, it unbreaks the cross-build world that
is resulting from moving the libraries around.

I have a more permanent solution to this problem in the works, but I
asked des for permission to commit this to get the ball rolling. This
also makes the ssh build more along the lines of what the openssh-portable
and OpenBSD openssh Makefile glue does.

Reviewed by:	des

secure/libexec/sftp-server/Makefile

@@ -5,8 +5,8 @@ SRCS=   sftp-common.c sftp-server.c
 MAN=	sftp-server.8
 CFLAGS+=-I${SSHDIR}
 
-DPADD+=	${LIBSSH} ${LIBCRYPTO}
-LDADD+=	-lssh -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD+=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/scp/Makefile

@@ -3,8 +3,8 @@
 PROG=	scp
 CFLAGS+=-I${SSHDIR}
 
-DPADD=	${LIBSSH}
-LDADD=	-lssh
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/sftp/Makefile

@@ -4,8 +4,8 @@ PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
 CFLAGS+=-I${SSHDIR}
 
-DPADD=	${LIBSSH} ${LIBCRYPTO}
-LDADD=	-lssh -lcrypto
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-add/Makefile

@@ -3,8 +3,8 @@
 PROG=	ssh-add
 CFLAGS+=-I${SSHDIR}
 
-DPADD=	${LIBSSH} ${LIBCRYPTO}
-LDADD=	-lssh -lcrypto
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-agent/Makefile

@@ -3,8 +3,8 @@
 PROG=	ssh-agent
 CFLAGS+=-I${SSHDIR}
 
-DPADD=	${LIBSSH} ${LIBCRYPTO}
-LDADD=	-lssh -lcrypto
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-keygen/Makefile

@@ -3,8 +3,8 @@
 PROG=	ssh-keygen
 CFLAGS+=-I${SSHDIR}
 
-DPADD=	${LIBSSH} ${LIBCRYPTO}
-LDADD=	-lssh -lcrypto
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>