PERFORCE change 90798 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=90798

Change 90798 by rwatson at rwatson_zoo on 2006/01/31 15:55:25

	Build audit(8) and auditd(8) from OpenBSM, not contrib/audit_supt.

Affected files ...

.. //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#2 edit
.. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#2 (text+ko) ====

@@ -2,10 +2,13 @@
 # $FreeBSD$
 #
 
-SRCDIR=${.CURDIR}/../../contrib/audit_supt/audit
-.PATH: ${SRCDIR}
+OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+.PATH: ${OPENBSMDIR}/bin/audit
 
 PROG=	audit
-MAN=	audit.1
+MAN=	audit.8
+
+DPADD=	${LIBBSM}
+LDADD=	-lbsm
 
 .include <bsd.prog.mk>

==== //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#3 (text+ko) ====

@@ -2,12 +2,12 @@
 # $FreeBSD$
 #
 
-SRCDIR=${.CURDIR}/../../contrib/audit_supt/auditd
-.PATH: ${SRCDIR}
+OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+.PATH: ${OPENBSMDIR}/bin/auditd
 
 PROG=	auditd
+SRCS=	auditd.c audit_warn.c
 MAN=	auditd.8
-SRCS=	auditd.c audit_warn.c
 
 DPADD=	${LIBBSM}
 LDADD=	-lbsm