From owner-p4-projects@FreeBSD.ORG  Sat Oct 20 22:55:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 03D0416A419; Sat, 20 Oct 2007 22:55:23 +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 B5A0416A468
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 22:55:22 +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 3127813C467
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 22:55:22 +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 l9KMtL46070188
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 22:55:21 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KMtLfN070185
	for perforce@freebsd.org; Sat, 20 Oct 2007 22:55:21 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 20 Oct 2007 22:55:21 GMT
Message-Id: <200710202255.l9KMtLfN070185@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 127858 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: Sat, 20 Oct 2007 22:55:23 -0000

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

Change 127858 by jb@jb_freebsd8 on 2007/10/20 22:54:24

	Fix typos.

Affected files ...

.. //depot/projects/dtrace6/src/Makefile.inc1#3 edit
.. //depot/projects/dtrace6/src/cddl/lib/Makefile#2 edit
.. //depot/projects/dtrace6/src/include/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace6/src/Makefile.inc1#3 (text+ko) ====

@@ -50,7 +50,7 @@
 .if !defined(NO_GAMES)
 SUBDIR+=games
 .endif
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
 SUBDIR+=cddl
 .else
 NO_CTF=1
@@ -242,7 +242,7 @@
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
-.if define(NO_CDDL)
+.if defined(NO_CDDL)
 WMAKEENV+=	NO_CTF=1
 .endif
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
@@ -451,7 +451,7 @@
 .for _t in obj includes
 	cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t}
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
 	cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t}
 .endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
@@ -865,7 +865,7 @@
 _pwd_mkdb=	usr.sbin/pwd_mkdb
 .endif
 
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
@@ -1039,7 +1039,7 @@
 
 _generic_libs+=	lib
 
-.if !define(NO_CDDL)
+.if !defined(NO_CDDL)
 _cddl_lib= cddl/lib
 .endif
 

==== //depot/projects/dtrace6/src/cddl/lib/Makefile#2 (text+ko) ====

@@ -5,7 +5,6 @@
 SUBDIR=	libavl \
 	libctf \
 	libdtrace \
-	libproc \
-	libumem
+	libproc
 
 .include <bsd.subdir.mk>

==== //depot/projects/dtrace6/src/include/Makefile#3 (text+ko) ====

@@ -5,7 +5,7 @@
 
 CLEANFILES= osreldate.h version vers.c
 SUBDIR= arpa protocols rpcsvc rpc
-INCS=	a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h
+INCS=	a.out.h alloca.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h \
 	ctype.h db.h \
 	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
 	fts.h ftw.h getopt.h glob.h grp.h \