From owner-p4-projects@FreeBSD.ORG  Fri Dec 31 23:33:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B8F216A4D0; Fri, 31 Dec 2004 23:33:05 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 53D9516A4CE
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 23:33:05 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 398F043D45
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 23:33:05 +0000 (GMT)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iBVNX5Gk047242
	for <perforce@freebsd.org>; Fri, 31 Dec 2004 23:33:05 GMT
	(envelope-from trhodes@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBVNX4r5047239
	for perforce@freebsd.org; Fri, 31 Dec 2004 23:33:04 GMT
	(envelope-from trhodes@freebsd.org)
Date: Fri, 31 Dec 2004 23:33:04 GMT
Message-Id: <200412312333.iBVNX4r5047239@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trhodes@freebsd.org using -f
From: Tom Rhodes <trhodes@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 68051 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Dec 2004 23:33:06 -0000

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

Change 68051 by trhodes@trhodes_local on 2004/12/31 23:32:52

	Add NO_AUDIT option
	<enter description here>

Affected files ...

.. //depot/projects/trustedbsd/audit3/lib/Makefile#4 edit
.. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#4 edit
.. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#3 edit
.. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#6 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/lib/Makefile#4 (text+ko) ====

@@ -47,7 +47,7 @@
 _libngatm=	libngatm
 .endif
 
-.if !defined(NOAUDIT)
+.if !defined(NO_AUDIT)
 _libbsm=	libbsm
 .endif
 

==== //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#4 (text+ko) ====

@@ -110,6 +110,7 @@
 # To avoid building various parts of the base system:
 #NO_ACPI=		# do not build acpiconf(8) and related programs
 #NOATM=			# do not build ATM related programs and libraries
+#NO_AUDIT= 		# do not build audit libraries or utilities
 #NO_AUTHPF=		# do not build and install authpf (setuid/gid)
 #NO_BLUETOOTH=		# do not build Bluetooth related stuff
 #NO_BOOT=		# do not build boot blocks and loader

==== //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#3 (text+ko) ====

@@ -410,6 +410,9 @@
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.
+.It Va NO_AUDIT
+.Pq Vt bool
+Set to not build audit utilities and libraries.
 .It Va NO_BLUETOOTH
 .Pq Vt bool
 Set to not build Bluetooth related kernel modules, programs and libraries.

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

@@ -12,9 +12,9 @@
 	${_apmd} \
 	${_arlcontrol} \
 	arp \
-	audit \
-	auditd \
-	auditon \
+	${_audit} \
+	${_auditd} \
+	${_auditon} \
 	${_asf} \
 	${_atm} \
 	${_authpf} \
@@ -195,6 +195,12 @@
 _atm=		atm
 .endif
 
+.if !defined(NO_AUDIT)
+_audit=		audit
+_auditd=	auditd
+_auditon=	auditon
+.endif
+
 .if !defined(NO_BIND)
 .if !defined(NO_BIND_DNSSEC) && !defined(NOCRYPT)
 _dnssec-keygen=		dnssec-keygen