My previous style commits weren't entirely right. Fix some bugs I

introduced, and a few more I hadn't yet fixed.

Submitted by:	bde

secure/usr.bin/scp/Makefile

@@ -1,8 +1,6 @@
 # $FreeBSD$
-#
 
 PROG=	scp
-SRCS=	scp.c
 
 DPADD=	${LIBSSH}
 LDADD=	-lssh

secure/usr.bin/sftp/Makefile

@@ -1,11 +1,10 @@
 # $FreeBSD$
-#
 
 PROG=	sftp
 SRCS=   sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c
 
-LDADD=	-lssh -lcrypto
 DPADD=	${LIBSSH} ${LIBCRYPTO}
+LDADD=	-lssh -lcrypto
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-add/Makefile

@@ -1,11 +1,9 @@
 # $FreeBSD$
-#
 
 PROG=	ssh-add
-SRCS=	ssh-add.c
 
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+=	-lssh -lcrypto -lz
+DPADD=	${LIBSSH} ${LIBCRYPTO}
+LDADD=	-lssh -lcrypto
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-agent/Makefile

@@ -1,11 +1,9 @@
 # $FreeBSD$
-#
 
 PROG=	ssh-agent
-SRCS=	ssh-agent.c
 
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+=	-lssh -lcrypto -lz
+DPADD=	${LIBSSH} ${LIBCRYPTO}
+LDADD=	-lssh -lcrypto
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-keygen/Makefile

@@ -1,11 +1,9 @@
 # $FreeBSD$
-#
 
 PROG=	ssh-keygen
-SRCS=	ssh-keygen.c
 
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+=	-lssh -lcrypto -lz
+DPADD=	${LIBSSH} ${LIBCRYPTO}
+LDADD=	-lssh -lcrypto
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-keyscan/Makefile

@@ -1,11 +1,9 @@
 # $FreeBSD$
-#
 
 PROG=	ssh-keyscan
-SRCS=	ssh-keyscan.c
 
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+=	-lssh -lcrypto -lz
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-keysign/Makefile

@@ -1,11 +1,10 @@
 # $FreeBSD$
-#
 
 PROG=	ssh-keysign
 MAN=	ssh-keysign.8
 
-DPADD+=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
-LDADD+=	-lssh -lcrypto -lz
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypto -lz
 
 .include <bsd.prog.mk>