[Midnightbsd-cvs] src: secure/usr.sbin: Merge changes.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Merge changes.

Modified Files:
--------------
    src/secure/usr.sbin:
        Makefile (r1.1.1.1 -> r1.2)
    src/secure/usr.sbin/sshd:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/usr.sbin/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L secure/usr.sbin/Makefile -L secure/usr.sbin/Makefile -u -r1.1.1.1 -r1.2
--- secure/usr.sbin/Makefile
+++ secure/usr.sbin/Makefile
@@ -1,7 +1,9 @@
-# $FreeBSD: src/secure/usr.sbin/Makefile,v 1.5 2000/10/24 16:04:51 gshapiro Exp $
+# $FreeBSD: src/secure/usr.sbin/Makefile,v 1.6 2006/03/17 18:54:32 ru Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR= 
-.if !defined(NO_OPENSSH) && !defined(NO_OPENSSL)
+.if ${MK_OPENSSH} != "no"
 SUBDIR+=sshd
 .endif
 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/usr.sbin/sshd/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L secure/usr.sbin/sshd/Makefile -L secure/usr.sbin/sshd/Makefile -u -r1.5 -r1.6
--- secure/usr.sbin/sshd/Makefile
+++ secure/usr.sbin/sshd/Makefile
@@ -2,6 +2,8 @@
 # $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.44 2005/06/07 09:31:28 des Exp $
 #
 
+.include <bsd.own.mk>
+
 PROG=	sshd
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	sshpty.c sshlogin.c servconf.c serverloop.c \
@@ -24,8 +26,14 @@
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
 LDADD=	-lssh -lutil -lz -lwrap ${MINUSLPAM}
 
-.if !defined(NO_KERBEROS)
-CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
+.if ${MK_AUDIT} != "no"
+CFLAGS+= -DUSE_BSM_AUDIT
+DPADD+=  ${LIBBSM}
+LDADD+=  -lbsm
+.endif
+
+.if ${MK_KERBEROS_SUPPORT} != "no"
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	 ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
 LDADD+=	 -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
 .endif