secure/ build fixes:

- TELNETOBJDIR is gone.  `buildworld' already installs libtelnet.a
  in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.

- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
  New LIBSSH is introduced for libssh.a (an internal static lib).
  Previously, build without prior `obj' was broken; SSH modules
  always looked for libssh.a in ${.OBJDIR}.  Also, the dependancies
  on the libssh.a were missing.

- libtelnet/ did not install the crypto version of telnet.h into
  /usr/include/arpa.

- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.

Reviewed by:	markm

- MAN[1-9] -> MAN.

3 files changed, 9 insertions, 17 deletions

diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc
index 4adbbf530d15..2b094361f75f 100644
--- a/secure/libexec/Makefile.inc
+++ b/secure/libexec/Makefile.inc
@@ -1,4 +1,5 @@
 #	$FreeBSD$
 
-BINDIR=	/usr/libexec
+BINDIR?=	/usr/libexec
+
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 731676c4621d..a913d5d3a811 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,22 +1,13 @@
 # $FreeBSD$
 #
 
-SSHSRC=	${.CURDIR}/../../../crypto/openssh
-
-.PATH:		${SSHSRC}
-#.PATH:		${SSHSRC}/lib
-
 PROG=   sftp-server
-BINOWN= root
-
-BINMODE?=555
-
-BINDIR= /usr/libexec
-MAN8=    sftp-server.8
-
 SRCS=   sftp-server.c log-server.c
+MAN=	sftp-server.8
+
+LDADD+=	${LIBSSH} -lcrypto
+DPADD+=	${LIBSSH} ${LIBCRYPTO}
 
 .include <bsd.prog.mk>
 
-LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto
-DPADD+=	${LIBCRYPTO}
+.PATH:	${SSHDIR}
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 53de979f88d2..20ec331dc62e 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -4,7 +4,7 @@
 # telnet implementations.
 
 PROG=		telnetd
-MAN8=		telnetd.8
+MAN=		telnetd.8
 
 CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 		-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
@@ -15,7 +15,7 @@ SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
 
 DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBMP} \
                 ${LIBCRYPT}
-LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt -lmp
+LDADD=		-lutil -ltermcap -ltelnet -lcrypto -lcrypt -lmp
 
 .include <bsd.prog.mk>