Style sync with rest of FreeBSD.

svn path=/head/; revision=106538

secure/lib/libcipher/Makefile

@@ -1,6 +1,4 @@
-#
 # $FreeBSD$
-#
 
 LIB=	cipher
 SRCS=	crypt.c

secure/lib/libcrypto/Makefile

@@ -36,7 +36,6 @@ SRCS+=	cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_dbg.c \
 	tmdiff.c uid.c
 
 # asn1
-
 SRCS+=	a_bitstr.c a_bmp.c a_bool.c a_bytes.c a_d2i_fp.c a_digest.c \
 	a_dup.c a_enum.c a_gentm.c a_hdr.c a_i2d_fp.c a_int.c \
 	a_mbstr.c a_meth.c a_null.c a_object.c a_octet.c a_print.c \

secure/lib/libcrypto/Makefile.asm

@@ -13,13 +13,11 @@
        ${LCRYPTO_SRC}/sha/asm ${LCRYPTO_SRC}/bn/asm \
        ${LCRYPTO_SRC}/bf/asm ${LCRYPTO_SRC}/md5/asm \
        ${LCRYPTO_SRC}/ripemd/asm
+
 PERLPATH=	${LCRYPTO_SRC}/des/asm:${LCRYPTO_SRC}/perlasm
 
-SRCS=
-
 # blowfish
-SRCS+=	bf-686.pl
-SRCS+=	bf-586.pl
+SRCS=	bf-686.pl bf-586.pl
 
 # bn
 SRCS+=	bn-586.pl co-586.pl
@@ -58,6 +56,5 @@ CLEANFILES+=	${SRCS:M*.pl:S/.pl$/.cmt/} ${SRCS:M*.pl:S/.pl$/.s/}
 .cmt.s:
 	tr -d "'" < ${.IMPSRC} > ${.TARGET}
 
-
 .include <bsd.prog.mk>
 .endif

secure/lib/libcrypto/Makefile.inc

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl/crypto
-CFLAGS+= -DTERMIOS -DANSI_SOURCE -I${LCRYPTO_SRC} -I${.OBJDIR}
+CFLAGS+= -DTERMIOS -DANSI_SOURCE -nostdinc -I${LCRYPTO_SRC} -I${.OBJDIR} -I/usr/include
 .if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
 CFLAGS+= -DNO_IDEA
 .endif

secure/lib/libssh/Makefile

@@ -1,5 +1,4 @@
 # $FreeBSD$
-#
 
 LIB=	ssh
 SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
@@ -13,22 +12,21 @@ SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
 SRCS+=	bsd-misc.c entropy.c
 # FreeBSD additions
 SRCS+=	version.c
-CFLAGS+=-I${SSHDIR}
-
-NOLINT=	true
-
-.if defined(MAKE_KERBEROS4)
-CFLAGS+= -DKRB4
-.endif
-
-.if defined(MAKE_KERBEROS5)
-CFLAGS+= -DKRB5 -DHEIMDAL
-.endif
 
 .if defined(COMPAT_GETADDRINFO)
 SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
 .endif
 
+CFLAGS+= -I${SSHDIR}
+.if defined(MAKE_KERBEROS4)
+CFLAGS+= -DKRB4
+.endif
+.if defined(MAKE_KERBEROS5)
+CFLAGS+= -DKRB5 -DHEIMDAL
+.endif
+
+NOLINT=	true
+
 DPADD=	${LIBCRYPTO} ${LIBZ}
 LDADD=	-lcrypto -lz
 

secure/lib/libtelnet/Makefile

@@ -1,16 +1,13 @@
 # $FreeBSD$
 
 LIB=	telnet
-
 INTERNALLIB=	yes
 
-SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
-		enc_des.c sra.c pk.c
-
-CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA \
-		-I${TELNETDIR} -I${TELNETDIR}/libtelnet
+SRCS=	genget.c getent.c misc.c encrypt.c auth.c enc_des.c sra.c pk.c
 
 WARNS?=	2
+CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \
+	 -I${TELNETDIR} -I${TELNETDIR}/libtelnet
 
 INCS=	${TELNETDIR}/arpa/telnet.h
 INCSDIR=${INCLUDEDIR}/arpa