From owner-p4-projects@FreeBSD.ORG  Wed Jan  6 12:25:33 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C69A1106568F; Wed,  6 Jan 2010 12:25:33 +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 716501065670
	for <perforce@freebsd.org>; Wed,  6 Jan 2010 12:25:33 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D3048FC17
	for <perforce@freebsd.org>; Wed,  6 Jan 2010 12:25:33 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o06CPXsj058873
	for <perforce@freebsd.org>; Wed, 6 Jan 2010 12:25:33 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o06CPWgt058871
	for perforce@freebsd.org; Wed, 6 Jan 2010 12:25:32 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 6 Jan 2010 12:25:32 GMT
Message-Id: <201001061225.o06CPWgt058871@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 172653 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 06 Jan 2010 12:25:34 -0000

http://p4web.freebsd.org/chv.cgi?CH=172653

Change 172653 by mav@mav_mavbook on 2010/01/06 12:24:58

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/COPYRIGHT#3 integrate
.. //depot/projects/scottl-camlock/src/Makefile.inc1#12 integrate
.. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#22 integrate
.. //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#3 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/error.c#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/eval.c#10 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/exec.c#9 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/exec.h#4 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/expand.c#7 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/output.h#5 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/parser.c#11 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/sh.1#8 integrate
.. //depot/projects/scottl-camlock/src/crypto/heimdal/kcm/connect.c#2 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/devfs.rules#3 integrate
.. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#13 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/named#4 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/nsswitch#2 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#8 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#7 integrate
.. //depot/projects/scottl-camlock/src/games/pom/pom.6#2 integrate
.. //depot/projects/scottl-camlock/src/games/pom/pom.c#2 integrate
.. //depot/projects/scottl-camlock/src/include/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/include/dirent.h#3 integrate
.. //depot/projects/scottl-camlock/src/include/semaphore.h#1 branch
.. //depot/projects/scottl-camlock/src/include/strings.h#3 integrate
.. //depot/projects/scottl-camlock/src/lib/Makefile.inc#4 integrate
.. //depot/projects/scottl-camlock/src/lib/csu/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/lib/csu/arm/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/csu/mips/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/lib/libauditd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libautofs/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libbegemot/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libbsm/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libbz2/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Makefile.inc#8 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/Symbol.map#9 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/_pthread_stubs.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/opendir.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/scandir.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sem.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_new.c#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/include/libc_private.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/posix1e/Makefile.inc#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/rpc/getnetpath.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/kqueue.2#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libcalendar/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libcam/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libcompat/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libcrypt/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libdevinfo/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libdevstat/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libdwarf/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libedit/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libelf/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libexpat/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libftpio/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgeom/geom_getxml.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libgpib/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libgssapi/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libipsec/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libipx/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libjail/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libkiconv/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libkvm/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libmagic/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libmd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libmilter/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libmp/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libncp/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libngatm/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libopie/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_exec/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_krb5/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_radius/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_ssh/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libpcap/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libpmc/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libproc/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libradius/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/librpcsec_gss/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/librt/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libsbuf/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libsm/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libsmdb/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libsmutil/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libtacplus/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/pthread.map#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/thread/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_init.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_private.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_sem.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libthread_db/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libufs/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libugidfw/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libugidfw/ugidfw.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libulog/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libutil/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libvgl/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libwrap/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/lib/liby/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libypclnt/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libz/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/lib/ncurses/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/atrun/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/bootpd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/bootpd/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/bootpd/tools/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/comsat/comsat.c#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/fingerd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/getty/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/mail.local/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/mknetid/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/pppoed/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rbootd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/revnetgroup/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rstatd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rusersd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rwalld/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.sprayd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rshd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/libexec/smrsh/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/talkd/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/libexec/tcpd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/tftp-proxy/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/tftpd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/ulog-helper/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/libexec/ypxfr/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/release/Makefile#9 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/cache/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/cache/gcache.8#1 branch
.. //depot/projects/scottl-camlock/src/sbin/geom/class/raid3/geom_raid3.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/raid3/graid3.8#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/core/geom.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/growfs/growfs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/newfs/mkfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/secure/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/mfi.4#7 integrate
.. //depot/projects/scottl-camlock/src/share/man/man7/security.7#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_CHECKEXP.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/VFS_FHTOVP.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man9/vm_page_bits.9#2 integrate
.. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#7 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-doc.dot#3 integrate
.. //depot/projects/scottl-camlock/src/share/mk/bsd.sys.mk#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#13 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#29 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/cpufunc.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc_asm_fa526.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/arm/elf_trampoline.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/conf/CNS11XXNAS#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/conf/DEFAULTS#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/econa/cfi_bus_econa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/econa.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/econa_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/econa_reg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/econa_var.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/ehci_ebus.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/files.econa#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/if_ece.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/if_ecereg.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/if_ecevar.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/ohci_ec.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/std.econa#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/timer.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/uart_bus_ec.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/econa/uart_cpu_ec.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/include/cpuconf.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/cpufunc.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/module.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/Makefile.inc#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot0.5/selector.s#3 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/asm.S#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/asm.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/bios.S#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.c#8 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.h#5 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot1.S#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot2.S#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot2.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/dinode.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/disk.c#5 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/fs.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/inode.h#4 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/io.c#7 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/quota.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial.S#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_16550.S#4 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_8251.S#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/start.S#2 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/sys.c#6 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/table.c#3 delete
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/Makefile#8 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/libpc98.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/pc98_sys.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/Makefile.arm#13 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#18 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.arm#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/Makefile#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus_cis.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dc.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dc/if_dcreg.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/exca/excareg.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/tdkphy.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txx.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_pci.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pccard/card_if.m#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_private.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uipaq.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#37 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/xl/if_xl.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdstate.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#28 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/cpufunc.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#13 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#19 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/bus_machdep.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/nexus.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sys_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/bus.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_nfs4.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#39 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_compat.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_sem.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/conf/DEFAULTS#3 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#40 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_llatbl.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#30 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/net/route.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_dynamic.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/in6.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#28 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6_rtr.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#11 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#22 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/DEFAULTS#10 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#24 integrate
.. //depot/projects/scottl-camlock/src/sys/security/mac_lomac/mac_lomac.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/DEFAULTS#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#26 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/NOTES#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psychovar.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizovar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/eeprom.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/DEFAULTS#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_semaphore.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/_umtx.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/sys/copyright.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/event.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#38 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/semaphore.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/sys/tty.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/umtx.h#14 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/acct/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/acct/regress.t#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/date/regress.sh#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/mv/regress.sh#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/builtin1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/command6.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/command6.0.stdout#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/command7.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/type2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/arith2.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/cmdsubst1.0#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/posixsem2/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/posixsem2/semtest.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/calendar/regress.sh#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/jot/regress.sh#4 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/lastcomm/values.sh#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/common.sh#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/expected.status.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/expected.stderr.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/expected.stdout.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/syntax/directive-t0/test.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.status.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stderr.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/expected.stdout.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/2/1/test.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t0/mk/sys.mk#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/cleanup#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.status.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stderr.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/expected.stdout.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/2/1/test.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t1/mk/sys.mk#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/cleanup#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.status.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stderr.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/expected.stdout.1#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/2/1/test.t#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/make/sysmk/t2/mk/sys.mk#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/sed/multitest.t#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/apply/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ar/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ar/acpyacc.y#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ar/ar.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/at/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/at/at.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/atm/sscop/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/awk/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/banner/banner.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/biff/biff.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/bluetooth/bthost/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/bsdiff/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/bzip2/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/catman/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/catman/catman.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/chkey/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/chpass/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/colldef/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/compile_et/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/compress/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpio/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpio/test/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/cpuset/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ctags/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ctags/ctags.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ctags/fortran.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/dig/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/du/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/elf2aout/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/elfdump/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/env/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/fetch/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/fetch/fetch.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/file2c/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/find/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/finger/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/fstat/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/fsync/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ftp/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gcore/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gencat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/getent/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gprof/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gprof/aout.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/head/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/hexdump/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/host/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/id/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ipcrm/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ipcs/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/keylogin/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ktrace/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ktrdump/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lam/lam.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/last/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ldd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/leave/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/less/Makefile.common#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lex/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lex/flex.skl#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lex/initscan.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lex/lib/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/limits/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/locate/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/locate/locate/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lock/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/logger/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/login/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/login/login.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/login/login_fbtab.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/logins/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/logname/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/look/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/lsvfs/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/m4/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mail/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/dir.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/dir.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/make.1#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/make/parse.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/makewhatis/makewhatis.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/minigzip/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mkfifo/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mklocale/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mkstr/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/mkuzip/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/msgs/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/nc/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ncplist/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/newkey/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/nfsstat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/nl/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/nohup/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/nslookup/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/nsupdate/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/opieinfo/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/opiekey/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/opiepasswd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/passwd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/passwd/passwd.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/pr/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/printf/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/procstat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/renice/renice.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/revoke/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rlogin/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_hout.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_main.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rpcinfo/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rsh/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rup/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ruptime/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rusers/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/rwho/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/script/script.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sed/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/showmount/showmount.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/smbutil/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sockstat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/sockstat/sockstat.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/su/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tail/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tail/misc.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tar/test/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tcopy/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tcopy/tcopy.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/telnet/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tftp/tftp.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/time/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/top/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/tr/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/truss/syscalls.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/unifdef/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/unzip/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/users/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/uudecode/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/uuencode/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/vacation/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/vgrind/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/vi/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/vmstat/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/w/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/wall/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/wc/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/whereis/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/who/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/write/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/xargs/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/xinstall/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/xlint/xlint/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/xlint/xlint/xlint.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/yacc/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/yacc/skeleton.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ypcat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ypmatch/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/ypwhich/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ac/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/accton/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/accton/accton.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpiconf/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/acpi/acpidump/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/acpi/iasl/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/amd/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ancontrol/ancontrol.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/apm/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/apmd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/arp/arp.c#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/asf/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/asf/asf_kld.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/audit/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/auditd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/auditreduce/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/authpf/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/boot0cfg/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bootparamd/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bootparamd/bootparamd/bootparamd.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/gensnmptree/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/btxld/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/burncd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/cdcontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/cdcontrol/cdcontrol.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/chkgrp/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/chown/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/chroot/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/chroot/chroot.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/clear_locks/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/config/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/cpucontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/cron/cron/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/crunch/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_rmail/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ctm/ctm_smail/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/daemon/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/dconschat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/devinfo/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/digictl/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/diskinfo/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-dsfromkey/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-keyfromlabel/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-keygen/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/dnssec-signzone/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/dumpcis/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/editmap/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/edquota/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/eeprom/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/extattr/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/extattrctl/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/extattrctl/extattrctl.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/faithd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/faithd/faithd.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdcontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdformat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdread/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fdwrite/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/fifolog/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ftp-proxy/libevent/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/getfmac/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/getpmac/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/gstat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/inetd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/inetd/inetd.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/iostat/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ip6addrctl/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ipfwpcap/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jail/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jexec/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/jls/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/kbdcontrol/kbdcontrol.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/kernbb/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lmcconfig/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/common_source/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/common_source/lp.h#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/common_source/rmjob.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/filters.ru/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lpc/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lpd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lpr/lpr/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lptcontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mailstats/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mailwrapper/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/makemap/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/memcontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.8#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mixer/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mld6query/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mlxcontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mount_portalfs/mount_portalfs.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mount_smbfs/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/moused/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mptable/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/mtree/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/named-checkconf/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/named-checkzone/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/named/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ndiscvt/ndiscvt.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ndp/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nghook/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nscd/nscd.conf.5#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ntp/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ntp/doc/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/nvram/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ofwdump/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pciconf/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/delete/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/info/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/updating/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pkg_install/version/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcannotate/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmccontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pmcstat/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pnpinfo/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/portsnap/make_index/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/portsnap/phttpget/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/powerd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pppctl/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/praliases/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/praudit/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/procctl/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pstat/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pw/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/pwd_mkdb/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/quotaon/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/quotaon/quotaon.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/repquota/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rip6query/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rip6query/rip6query.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rmt/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rmt/rmt.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rndc-confgen/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rndc/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/route6d/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.lockd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.statd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.umntall/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.yppasswdd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.ypupdated/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpc.ypxfrd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rpcbind/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rrenumd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtadvd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtprio/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rtsold/probe.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/rwhod/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sa/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sendmail/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/setfmac/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/setpmac/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/smbmsg/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/snapinfo/snapinfo.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/disks.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/label.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/tcpdchk/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/tcpdmatch/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/tcpdrop/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/tcpdump/Makefile.inc#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/traceroute/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/traceroute6/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/tzsetup/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/uathload/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/usbdevs/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/vipw/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wake/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.8#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/watchdogd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wlandebug/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/wlconfig/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/yp_mkdb/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ypbind/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/yppoll/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/yppush/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/yppush/yppush_main.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/ypset/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/zic/zdump/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/zic/zic/Makefile#2 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/COPYRIGHT#3 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/COPYRIGHT,v 1.11 2008/12/30 04:46:25 imp Exp $
+# $FreeBSD: src/COPYRIGHT,v 1.12 2009/12/31 10:00:37 obrien Exp $
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2010 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

==== //depot/projects/scottl-camlock/src/Makefile.inc1#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.635 2009/12/16 02:54:34 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.636 2009/12/31 00:07:26 ed Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -940,6 +940,11 @@
 _sed=		usr.bin/sed
 .endif
 
+.if ${BOOTSTRAPPING} < 900006
+_lex=		usr.bin/lex
+_yacc=		usr.bin/yacc
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -966,6 +971,8 @@
     ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
+    ${_lex} \
+    ${_yacc} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \

==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#22 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.216 2009/12/29 20:20:51 trasz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.218 2010/01/05 02:37:59 davidxu Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100105: new userland semaphore implementation
+OLD_FILES+=usr/include/sys/semaphore.h
+# 20100103: ntptrace(8) removed
+OLD_FILES+=usr/sbin/ntptrace
+OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
 # 20091229: remove no longer relevant examples
 OLD_FILES+=usr/share/examples/pppd/auth-down.sample
 OLD_FILES+=usr/share/examples/pppd/auth-up.sample

==== //depot/projects/scottl-camlock/src/bin/pkill/pkill.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.5 2009/12/28 22:56:30 antoine Exp $");
+__FBSDID("$FreeBSD: src/bin/pkill/pkill.c,v 1.7 2010/01/04 10:50:17 obrien Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -671,8 +671,19 @@
 					li->li_number = -1;	/* any jail */
 				break;
 			case LT_TTY:
-				usage();
-				/* NOTREACHED */
+				if (li->li_number < 0)
+					errx(STATUS_BADUSAGE,
+					     "Negative /dev/pts tty `%s'", sp);
+				snprintf(buf, sizeof(buf), _PATH_DEV "pts/%s",
+				    sp);
+				if (stat(buf, &st) != -1)
+					goto foundtty;
+				if (errno == ENOENT)
+					errx(STATUS_BADUSAGE, "No such tty: `"
+					    _PATH_DEV "pts/%s'", sp);
+				err(STATUS_ERROR, "Cannot access `"
+				    _PATH_DEV "pts/%s'", sp);
+				break;
 			default:
 				break;
 			}

==== //depot/projects/scottl-camlock/src/bin/sh/error.c#4 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.28 2009/12/24 20:55:14 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.29 2010/01/01 18:17:46 jilles Exp $");
 
 /*
  * Errors and exceptions.
@@ -160,8 +160,8 @@
 #endif
 	if (msg) {
 		if (commandname)
-			outfmt(&errout, "%s: ", commandname);
-		doformat(&errout, msg, ap);
+			outfmt(out2, "%s: ", commandname);
+		doformat(out2, msg, ap);
 		out2c('\n');
 	}
 	flushall();

==== //depot/projects/scottl-camlock/src/bin/sh/eval.c#10 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.71 2009/12/27 18:04:05 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.75 2010/01/03 15:01:38 jilles Exp $");
 
 #include <paths.h>
 #include <signal.h>
@@ -646,7 +646,7 @@
 		out2str(ps4val());
 		for (sp = varlist.list ; sp ; sp = sp->next) {
 			if (sep != 0)
-				outc(' ', &errout);
+				out2c(' ');
 			p = sp->text;
 			while (*p != '=' && *p != '\0')
 				out2c(*p++);
@@ -658,7 +658,7 @@
 		}
 		for (sp = arglist.list ; sp ; sp = sp->next) {
 			if (sep != 0)
-				outc(' ', &errout);
+				out2c(' ');
 			/* Disambiguate command looking like assignment. */
 			if (sp == arglist.list &&
 					strchr(sp->text, '=') != NULL &&
@@ -670,7 +670,7 @@
 				out2qstr(sp->text);
 			sep = ' ';
 		}
-		outc('\n', &errout);
+		out2c('\n');
 		flushout(&errout);
 	}
 
@@ -722,10 +722,10 @@
 					break;
 				if ((cmdentry.u.index = find_builtin(*argv,
 				    &cmdentry.special)) < 0) {
-					outfmt(&errout, "%s: not found\n", *argv);
-					exitstatus = 127;
-					flushout(&errout);
-					return;
+					cmdentry.u.index = BLTINCMD;
+					argv--;
+					argc++;
+					break;
 				}
 				if (cmdentry.u.index != BLTINCMD)
 					break;
@@ -792,20 +792,20 @@
 			unreffunc(cmdentry.u.func);
 			poplocalvars();
 			localvars = savelocalvars;
+			funcnest--;
 			handler = savehandler;
 			longjmp(handler->loc, 1);
 		}
 		handler = &jmploc;
+		funcnest++;
 		INTON;
 		for (sp = varlist.list ; sp ; sp = sp->next)
 			mklocal(sp->text);
-		funcnest++;
 		exitstatus = oexitstatus;
 		if (flags & EV_TESTED)
 			evaltree(getfuncnode(cmdentry.u.func), EV_TESTED);
 		else
 			evaltree(getfuncnode(cmdentry.u.func), 0);
-		funcnest--;
 		INTOFF;
 		unreffunc(cmdentry.u.func);
 		poplocalvars();
@@ -813,6 +813,7 @@
 		freeparam(&shellparam);
 		shellparam = saveparam;
 		handler = savehandler;
+		funcnest--;
 		popredir();
 		INTON;
 		if (evalskip == SKIPFUNC) {
@@ -831,6 +832,7 @@
 			memout.nextc = memout.buf;
 			memout.bufsize = 64;
 			mode |= REDIR_BACKQ;
+			cmdentry.special = 0;
 		}
 		savecmdname = commandname;
 		savetopfile = getcurrentfile();
@@ -864,20 +866,21 @@
 			}
 		}
 		handler = savehandler;
+		if (flags == EV_BACKCMD) {
+			backcmd->buf = memout.buf;
+			backcmd->nleft = memout.nextc - memout.buf;
+			memout.buf = NULL;
+		}
 		if (e != -1) {
 			if ((e != EXERROR && e != EXEXEC)
 			    || cmdentry.special)
 				exraise(e);
 			popfilesupto(savetopfile);
-			FORCEINTON;
+			if (flags != EV_BACKCMD)
+				FORCEINTON;
 		}
 		if (cmdentry.u.index != EXECCMD)
 			popredir();
-		if (flags == EV_BACKCMD) {
-			backcmd->buf = memout.buf;
-			backcmd->nleft = memout.nextc - memout.buf;
-			memout.buf = NULL;
-		}
 	} else {
 #ifdef DEBUG
 		trputs("normal command:  ");  trargs(argv);
@@ -942,12 +945,17 @@
  */
 
 /*
- * No command given, or a bltin command with no arguments.
+ * No command given, a bltin command with no arguments, or a bltin command
+ * with an invalid name.
  */
 
 int
-bltincmd(int argc __unused, char **argv __unused)
+bltincmd(int argc, char **argv)
 {
+	if (argc > 1) {
+		out2fmt_flush("%s: not found\n", argv[1]);
+		return 127;
+	}
 	/*
 	 * Preserve exitstatus of a previous possible redirection

>>> TRUNCATED FOR MAIL (1000 lines) <<<