From owner-p4-projects@FreeBSD.ORG Thu Sep 27 09:25:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A48F16A41B; Thu, 27 Sep 2007 09:25:13 +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 CC48916A41A for ; Thu, 27 Sep 2007 09:25:12 +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 C562113C46E for ; Thu, 27 Sep 2007 09:25:12 +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 l8R9PC1X087046 for ; Thu, 27 Sep 2007 09:25:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8R9PCA8087043 for perforce@freebsd.org; Thu, 27 Sep 2007 09:25:12 GMT (envelope-from jb@freebsd.org) Date: Thu, 27 Sep 2007 09:25:12 GMT Message-Id: <200709270925.l8R9PCA8087043@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 126853 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: Thu, 27 Sep 2007 09:25:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=126853 Change 126853 by jb@jb_freebsd1 on 2007/09/27 09:24:56 Resolve integration conflicts -- mostly by accepting the version in CVS. Affected files ... .. //depot/projects/dtrace/doc/share/images/books/handbook/install/desktop.scr#3 integrate .. //depot/projects/dtrace/doc/share/images/books/handbook/install/xf86setup.scr#3 integrate .. //depot/projects/dtrace/src/cddl/Makefile#7 integrate .. //depot/projects/dtrace/src/cddl/Makefile.inc#5 integrate .. //depot/projects/dtrace/src/cddl/lib/Makefile#6 integrate .. //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#2 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#3 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.c#4 integrate .. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#8 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/note.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#4 integrate Differences ... ==== //depot/projects/dtrace/doc/share/images/books/handbook/install/desktop.scr#3 (text+ko) ==== ==== //depot/projects/dtrace/doc/share/images/books/handbook/install/xf86setup.scr#3 (text+ko) ==== ==== //depot/projects/dtrace/src/cddl/Makefile#7 (text+ko) ==== @@ -1,11 +1,5 @@ -# $FreeBSD$ +# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.include - -SUBDIR= - -.if ${MK_CDDL} != "no" -SUBDIR+= lib usr.bin usr.sbin -.endif +SUBDIR= lib sbin usr.bin usr.sbin .include ==== //depot/projects/dtrace/src/cddl/Makefile.inc#5 (text+ko) ==== @@ -1,11 +1,3 @@ -# $FreeBSD$ +# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ -OPENSOLARIS_USR_DISTDIR=${.CURDIR}/../../../contrib/opensolaris -OPENSOLARIS_SYS_DISTDIR=${.CURDIR}/../../../sys/contrib/opensolaris - -CFLAGS+= -I${.CURDIR}/../../../sys -CFLAGS+= -D_SOLARIS_C_SOURCE - -IGNORE_PRAGMA= 1 - -WARNS?= 6 +CFLAGS+= -D_SOLARIS_C_SOURCE ==== //depot/projects/dtrace/src/cddl/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,17 @@ -# $FreeBSD$ +# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ + +.include + +SUBDIR= libavl \ + libnvpair \ + libumem \ + libuutil \ + ${_libzfs} \ + ${_libzpool} -SUBDIR= libctf libdtrace libproc +.if ${MK_ZFS} != "no" +_libzfs= libzfs +_libzpool= libzpool +.endif .include ==== //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#2 (text+ko) ==== @@ -1,19 +1,10 @@ -# $FreeBSD$ +# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $ -.include "../../Makefile.inc" +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl -LIB= avl -SHLIB_MAJOR= 1 +LIB= avl +SRCS= avl.c +CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common -SRCS= avl.c - -WARNS?= 0 - -.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/avl - -CFLAGS+= -I${.CURDIR}/../../../contrib \ - -I${.CURDIR}/../../../sys/contrib \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - .include - ==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#3 (text+ko) ==== @@ -1,5 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ + +.include + +SUBDIR= ${_ztest} -SUBDIR= ctfconvert ctfdump ctfmerge sgsmsg +.if ${MK_ZFS} != "no" +_ztest= ztest +.endif .include ==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#2 (text+ko) ==== @@ -1,5 +1,11 @@ -# $FreeBSD$ +# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $ + +.include + +SUBDIR= ${_zdb} -SUBDIR= dtrace +.if ${MK_ZFS} != "no" +_zdb= zdb +.endif .include ==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile.inc#2 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.c#4 (text+ko) ==== ==== //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.h#4 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#8 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl.h#3 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#3 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#3 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#4 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#5 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/note.h#3 (text) ==== ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#4 (text) ====