From owner-p4-projects@FreeBSD.ORG Wed May 30 08:12:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E25416A46B; Wed, 30 May 2007 08:12:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 320ED16A400 for ; Wed, 30 May 2007 08:12:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1F2FA13C487 for ; Wed, 30 May 2007 08:12:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4U8CmCr086932 for ; Wed, 30 May 2007 08:12:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U8CmSL086912 for perforce@freebsd.org; Wed, 30 May 2007 08:12:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 30 May 2007 08:12:48 GMT Message-Id: <200705300812.l4U8CmSL086912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2007 08:12:50 -0000 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 ==== //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 ==== //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