From owner-p4-projects@FreeBSD.ORG  Fri May 23 04:44:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 550201065677; Fri, 23 May 2008 04:44:41 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15F94106564A
	for <perforce@freebsd.org>; Fri, 23 May 2008 04:44:41 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A7168FC1C
	for <perforce@freebsd.org>; Fri, 23 May 2008 04:44:41 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4N4iefA029112
	for <perforce@freebsd.org>; Fri, 23 May 2008 04:44:40 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4N4ieF5029110
	for perforce@freebsd.org; Fri, 23 May 2008 04:44:40 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 23 May 2008 04:44:40 GMT
Message-Id: <200805230444.m4N4ieF5029110@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 142094 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 23 May 2008 04:44:41 -0000

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

Change 142094 by jb@freebsd3 on 2008/05/23 04:44:40

	IFC

Affected files ...

.. //depot/projects/dtrace/src/Makefile#22 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#46 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#10 integrate

Differences ...

==== //depot/projects/dtrace/src/Makefile#22 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.348 2008/04/29 09:08:33 rwatson Exp $
+# $FreeBSD: src/Makefile,v 1.349 2008/05/23 04:20:59 jb Exp $
 #
 # The user-driven targets are:
 #

==== //depot/projects/dtrace/src/Makefile.inc1#46 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.604 2008/05/07 13:52:56 dfr Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir

==== //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#10 (text+ko) ====

@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.91 2006/10/24 07:12:31 imp Exp $";
+  "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.92 2008/05/23 03:55:26 jb Exp $";
 #endif /* not lint */
 
 /*