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.

4 files changed, 13 insertions, 17 deletions

diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile
index a93667f..3074dab 100644
--- a/secure/lib/libcipher/Makefile
+++ b/secure/lib/libcipher/Makefile
@@ -7,7 +7,7 @@ SRCS=		crypt.c
 PRECIOUSLIB=	yes
 #NOPROFILE=	yes
 
-MAN3=   cipher.3
+MAN=	cipher.3
 MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3
 MLINKS+=cipher.3 des_cipher.3 cipher.3 des_setkey.3
 
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 3cf7d85..0e7f19e 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -337,9 +337,8 @@ POD3+=	ssl/SSL_CIPHER_get_name.pod \
 .for section in 1 3
 .for pod in ${POD${section}}
 .for target in ${pod:T:S/.pod/.${section}/g}
-MAN${section}+= ${target}
+MAN+= ${target}
 CLEANFILES+= ${target}
-all-man: ${target}
 ${target}: ${LCRYPTO_SRC}/../doc/${pod}
 	pod2man ${LCRYPTO_SRC}/../doc/${pod} > ${target}
 .endfor
@@ -347,7 +346,7 @@ ${target}: ${LCRYPTO_SRC}/../doc/${pod}
 .endfor
 .endif
 
-MAN3+=	des_crypt.3
+MAN+=	des_crypt.3
 
 MLINKS= des_crypt.3 des_read_password.3 \
 	des_crypt.3 des_read_2password.3 des_crypt.3 des_string_to_key.3 \
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index f13800b..f10d110 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,8 +1,6 @@
 # $FreeBSD$
 #
 
-SSHSRC=	${.CURDIR}/../../../crypto/openssh
-
 LIB=	ssh
 SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
 	cipher.c compat.c compress.c crc32.c deattack.c \
@@ -11,19 +9,14 @@ SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
 	key.c dispatch.c dsa.c kex.c hmac.c uuencode.c util.c \
 	cli.c rijndael.c
 
-NOPIC=	yes
-
-install:
+NOPIC=		yes
+INTERNALLIB=	yes
+INTERNALSTATICLIB=	yes
 
 .if defined(COMPAT_GETADDRINFO)
 SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
 .endif
 
-.include <bsd.own.mk>
-
-.PATH:		${SSHSRC}
-.PATH:		${SSHSRC}/lib
-
 .if defined(MAKE_KERBEROS4) && \
 	((${MAKE_KERBEROS4} == "yes") || (${MAKE_KERBEROS4} == "YES"))
 CFLAGS+= -DKRB4
@@ -38,4 +31,7 @@ CFLAGS+= -DSKEY
 DPADD+=	${LIBOPIE}
 LDADD+= -lopie
 SRCS+=	auth-skey.c auth2-skey.c
+
 .include <bsd.lib.mk>
+
+.PATH:	${SSHDIR} ${SSHDIR}/lib
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index 17cab4f..23a0d0e 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -6,11 +6,12 @@ SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c pk.c
 
 CFLAGS+=        -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-                -I${TELNETDIR} \
+                -I${TELNETDIR}
 
 NOPIC=          yes
 
-INCLUDES=       ${TELNETDIR}/arpa/telnet.h 
+INCS=		${TELNETDIR}/arpa/telnet.h
+INCDIR=		/usr/include/arpa
 
 #
 # Before complaining about this, please *double-check* that you have
@@ -20,7 +21,7 @@ INCLUDES=       ${TELNETDIR}/arpa/telnet.h
 # shared against libtelnet, so that in a future release we can move this
 # off to a compat dist (like compat22).
 #
-beforeinstall:
+afterinstall:
 	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
 
 .include <bsd.lib.mk>