Date: Wed, 30 May 2007 08:12:48 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 120600 for review Message-ID: <200705300812.l4U8CmSL086912@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=120600 Change 120600 by rwatson@rwatson_zoo on 2007/05/30 08:12:29 Sync up CVS and P4 versions of various Makefile and $FreeBSD$ bits that at some point got out of sync. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#3 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#13 edit .. //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#5 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#4 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#5 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/tools/regression/audit/audit_pipe_ioctl/Makefile,v 1.1 2006/03/19 15:47:53 rwatson Exp $ # PROG= audit_pipe_ioctl ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c,v 1.1 2006/03/19 15:47:53 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#13 (text+ko) ==== @@ -22,10 +22,4 @@ PRECIOUSPROG= .endif -.if !defined(NO_AUDIT) -DPADD+= ${LIBBSM} -LDADD+= -lbsm -CFLAGS += -DUSE_BSM_AUDIT -.endif - .include <bsd.prog.mk> ==== //depot/projects/trustedbsd/audit3/usr.bin/su/Makefile#5 (text+ko) ==== @@ -18,10 +18,4 @@ BINMODE=4555 PRECIOUSPROG= -.if !defined(NO_AUDIT) -CFLAGS+= -DUSE_BSM_AUDIT -DPADD+= ${LIBBSM} -LDADD+= -lbsm -.endif - .include <bsd.prog.mk> ==== //depot/projects/trustedbsd/audit3/usr.sbin/audit/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/audit/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditd/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/auditd/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm ==== //depot/projects/trustedbsd/audit3/usr.sbin/praudit/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD$ +# $FreeBSD: src/usr.sbin/praudit/Makefile,v 1.1 2006/02/02 10:15:30 rwatson Exp $ # OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705300812.l4U8CmSL086912>