From owner-svn-src-projects@FreeBSD.ORG  Wed Aug 22 19:26:00 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC0B31065672;
	Wed, 22 Aug 2012 19:26:00 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A2A2F8FC15;
	Wed, 22 Aug 2012 19:26:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7MJQ0x4083685;
	Wed, 22 Aug 2012 19:26:00 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7MJQ0vM083653;
	Wed, 22 Aug 2012 19:26:00 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201208221926.q7MJQ0vM083653@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 22 Aug 2012 19:26:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239572 - in projects/bmake: . bin/cat bin/chflags
	bin/chio bin/chmod bin/cp bin/csh bin/date bin/dd bin/df
	bin/domainname bin/echo bin/ed bin/expr bin/getfacl
	bin/hostname bin/kenv bin...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Aug 2012 19:26:00 -0000

Author: marcel
Date: Wed Aug 22 19:25:57 2012
New Revision: 239572
URL: http://svn.freebsd.org/changeset/base/239572

Log:
  Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
  
  Requested by: Simon Gerraty <sjg@juniper.net>

Added:
  projects/bmake/bin/cat/Makefile.depend
  projects/bmake/bin/chflags/Makefile.depend
  projects/bmake/bin/chio/Makefile.depend
  projects/bmake/bin/chmod/Makefile.depend
  projects/bmake/bin/cp/Makefile.depend
  projects/bmake/bin/csh/Makefile.depend
  projects/bmake/bin/date/Makefile.depend
  projects/bmake/bin/dd/Makefile.depend
  projects/bmake/bin/df/Makefile.depend
  projects/bmake/bin/domainname/Makefile.depend
  projects/bmake/bin/echo/Makefile.depend
  projects/bmake/bin/ed/Makefile.depend
  projects/bmake/bin/expr/Makefile.depend
  projects/bmake/bin/getfacl/Makefile.depend
  projects/bmake/bin/hostname/Makefile.depend
  projects/bmake/bin/kenv/Makefile.depend
  projects/bmake/bin/kill/Makefile.depend
  projects/bmake/bin/ln/Makefile.depend
  projects/bmake/bin/ls/Makefile.depend
  projects/bmake/bin/mkdir/Makefile.depend
  projects/bmake/bin/mv/Makefile.depend
  projects/bmake/bin/pax/Makefile.depend
  projects/bmake/bin/pkill/Makefile.depend
  projects/bmake/bin/ps/Makefile.depend
  projects/bmake/bin/pwait/Makefile.depend
  projects/bmake/bin/pwd/Makefile.depend
  projects/bmake/bin/rcp/Makefile.depend
  projects/bmake/bin/realpath/Makefile.depend
  projects/bmake/bin/rm/Makefile.depend
  projects/bmake/bin/rmail/Makefile.depend
  projects/bmake/bin/rmdir/Makefile.depend
  projects/bmake/bin/setfacl/Makefile.depend
  projects/bmake/bin/sh/Makefile.depend
  projects/bmake/bin/sleep/Makefile.depend
  projects/bmake/bin/stty/Makefile.depend
  projects/bmake/bin/sync/Makefile.depend
  projects/bmake/bin/test/Makefile.depend
  projects/bmake/bin/uuidgen/Makefile.depend
  projects/bmake/cddl/lib/drti/Makefile.depend
  projects/bmake/cddl/lib/libavl/Makefile.depend
  projects/bmake/cddl/lib/libctf/Makefile.depend
  projects/bmake/cddl/lib/libdtrace/Makefile.depend
  projects/bmake/cddl/lib/libnvpair/Makefile.depend
  projects/bmake/cddl/lib/libumem/Makefile.depend
  projects/bmake/cddl/lib/libuutil/Makefile.depend
  projects/bmake/cddl/lib/libzfs/Makefile.depend
  projects/bmake/cddl/lib/libzpool/Makefile.depend
  projects/bmake/cddl/sbin/zfs/Makefile.depend
  projects/bmake/cddl/sbin/zpool/Makefile.depend
  projects/bmake/cddl/usr.bin/ctfconvert/Makefile.depend
  projects/bmake/cddl/usr.bin/ctfdump/Makefile.depend
  projects/bmake/cddl/usr.bin/ctfmerge/Makefile.depend
  projects/bmake/cddl/usr.bin/sgsmsg/Makefile.depend
  projects/bmake/cddl/usr.bin/zinject/Makefile.depend
  projects/bmake/external/bsd/bmake/usr.bin/bmake/Makefile.depend
  projects/bmake/external/bsd/bmake/usr.bin/bmake/Makefile.inc
  projects/bmake/games/bcd/Makefile.depend
  projects/bmake/games/caesar/Makefile.depend
  projects/bmake/games/factor/Makefile.depend
  projects/bmake/games/fortune/datfiles/Makefile.depend
  projects/bmake/games/fortune/fortune/Makefile.depend
  projects/bmake/games/fortune/strfile/Makefile.depend
  projects/bmake/games/fortune/unstr/Makefile.depend
  projects/bmake/games/grdc/Makefile.depend
  projects/bmake/games/morse/Makefile.depend
  projects/bmake/games/number/Makefile.depend
  projects/bmake/games/pom/Makefile.depend
  projects/bmake/games/ppt/Makefile.depend
  projects/bmake/games/primes/Makefile.depend
  projects/bmake/games/random/Makefile.depend
  projects/bmake/gnu/lib/csu/Makefile.depend
  projects/bmake/gnu/lib/libdialog/Makefile.depend
  projects/bmake/gnu/lib/libgcc/Makefile.depend
  projects/bmake/gnu/lib/libgcov/Makefile.depend
  projects/bmake/gnu/lib/libgomp/Makefile.depend
  projects/bmake/gnu/lib/libreadline/history/Makefile.depend
  projects/bmake/gnu/lib/libreadline/readline/Makefile.depend
  projects/bmake/gnu/lib/libregex/Makefile.depend
  projects/bmake/gnu/lib/libssp/Makefile.depend
  projects/bmake/gnu/lib/libssp/libssp_nonshared/Makefile.depend
  projects/bmake/gnu/lib/libstdc++/Makefile.depend
  projects/bmake/gnu/lib/libsupc++/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/addr2line/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/ar/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/as/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/ld/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/libbfd/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/libbinutils/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/libiberty/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/libopcodes/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/nm/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/objcopy/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/objdump/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/ranlib/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/readelf/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/size/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/strings/Makefile.depend
  projects/bmake/gnu/usr.bin/binutils/strip/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/c++/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/c++filt/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/cc/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/cc1/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/cc1plus/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/cc_int/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/cc_tools/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/cpp/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/gcov/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/include/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/libcpp/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/libdecnumber/Makefile.depend
  projects/bmake/gnu/usr.bin/cc/libiberty/Makefile.depend
  projects/bmake/gnu/usr.bin/cvs/cvs/Makefile.depend
  projects/bmake/gnu/usr.bin/cvs/cvsbug/Makefile.depend
  projects/bmake/gnu/usr.bin/cvs/lib/Makefile.depend
  projects/bmake/gnu/usr.bin/cvs/libdiff/Makefile.depend
  projects/bmake/gnu/usr.bin/dialog/Makefile.depend
  projects/bmake/gnu/usr.bin/diff/Makefile.depend
  projects/bmake/gnu/usr.bin/diff3/Makefile.depend
  projects/bmake/gnu/usr.bin/dtc/Makefile.depend
  projects/bmake/gnu/usr.bin/gdb/gdb/Makefile.depend
  projects/bmake/gnu/usr.bin/gdb/gdbserver/Makefile.depend
  projects/bmake/gnu/usr.bin/gdb/gdbtui/Makefile.depend
  projects/bmake/gnu/usr.bin/gdb/kgdb/Makefile.depend
  projects/bmake/gnu/usr.bin/gdb/libgdb/Makefile.depend
  projects/bmake/gnu/usr.bin/gperf/Makefile.depend
  projects/bmake/gnu/usr.bin/grep/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devX100-12/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devX100/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devX75-12/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devX75/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devascii/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devcp1047/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devdvi/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devhtml/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devkoi8-r/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devlatin1/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devlbp/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devlj4/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devps/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/font/devutf8/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/man/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/devices/grodvi/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/devices/grohtml/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/devices/grolbp/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/devices/grolj4/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/devices/grops/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/devices/grotty/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/libs/libbib/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/libs/libdriver/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/libs/libgroff/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/preproc/grn/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/preproc/html/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/preproc/tbl/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/roff/groff/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/roff/grog/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/roff/psroff/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/roff/troff/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/addftinfo/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/hpftodit/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/indxbib/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/lkbib/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/lookbib/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/pfbtops/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile.depend
  projects/bmake/gnu/usr.bin/groff/tmac/Makefile.depend
  projects/bmake/gnu/usr.bin/patch/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/ci/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/co/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/ident/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/lib/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/merge/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/rcs/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/rcsclean/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/rcsdiff/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/rcsfreeze/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/rcsmerge/Makefile.depend
  projects/bmake/gnu/usr.bin/rcs/rlog/Makefile.depend
  projects/bmake/gnu/usr.bin/sdiff/Makefile.depend
  projects/bmake/gnu/usr.bin/send-pr/Makefile.depend
  projects/bmake/gnu/usr.bin/sort/Makefile.depend
  projects/bmake/gnu/usr.bin/texinfo/info/Makefile.depend
  projects/bmake/gnu/usr.bin/texinfo/infokey/Makefile.depend
  projects/bmake/gnu/usr.bin/texinfo/install-info/Makefile.depend
  projects/bmake/gnu/usr.bin/texinfo/libtxi/Makefile.depend
  projects/bmake/gnu/usr.bin/texinfo/makeinfo/Makefile.depend
  projects/bmake/gnu/usr.bin/texinfo/texindex/Makefile.depend
  projects/bmake/include/Makefile.depend
  projects/bmake/include/arpa/Makefile.depend
  projects/bmake/include/gssapi/Makefile.depend
  projects/bmake/include/protocols/Makefile.depend
  projects/bmake/include/rpc/Makefile.depend
  projects/bmake/include/rpcsvc/Makefile.depend
  projects/bmake/include/xlocale/Makefile.depend
  projects/bmake/kerberos5/lib/libasn1/Makefile.depend
  projects/bmake/kerberos5/lib/libgssapi_krb5/Makefile.depend
  projects/bmake/kerberos5/lib/libgssapi_ntlm/Makefile.depend
  projects/bmake/kerberos5/lib/libgssapi_spnego/Makefile.depend
  projects/bmake/kerberos5/lib/libhdb/Makefile.depend
  projects/bmake/kerberos5/lib/libheimbase/Makefile.depend
  projects/bmake/kerberos5/lib/libheimipcc/Makefile.depend
  projects/bmake/kerberos5/lib/libheimipcs/Makefile.depend
  projects/bmake/kerberos5/lib/libheimntlm/Makefile.depend
  projects/bmake/kerberos5/lib/libheimsqlite/Makefile.depend
  projects/bmake/kerberos5/lib/libhx509/Makefile.depend
  projects/bmake/kerberos5/lib/libkadm5clnt/Makefile.depend
  projects/bmake/kerberos5/lib/libkadm5srv/Makefile.depend
  projects/bmake/kerberos5/lib/libkafs5/Makefile.depend
  projects/bmake/kerberos5/lib/libkdc/Makefile.depend
  projects/bmake/kerberos5/lib/libkrb5/Makefile.depend
  projects/bmake/kerberos5/lib/libroken/Makefile.depend
  projects/bmake/kerberos5/lib/libsl/Makefile.depend
  projects/bmake/kerberos5/lib/libvers/Makefile.depend
  projects/bmake/kerberos5/lib/libwind/Makefile.depend
  projects/bmake/kerberos5/libexec/digest-service/Makefile.depend
  projects/bmake/kerberos5/libexec/hprop/Makefile.depend
  projects/bmake/kerberos5/libexec/hpropd/Makefile.depend
  projects/bmake/kerberos5/libexec/ipropd-master/Makefile.depend
  projects/bmake/kerberos5/libexec/ipropd-slave/Makefile.depend
  projects/bmake/kerberos5/libexec/kadmind/Makefile.depend
  projects/bmake/kerberos5/libexec/kcm/Makefile.depend
  projects/bmake/kerberos5/libexec/kdc/Makefile.depend
  projects/bmake/kerberos5/libexec/kdigest/Makefile.depend
  projects/bmake/kerberos5/libexec/kfd/Makefile.depend
  projects/bmake/kerberos5/libexec/kimpersonate/Makefile.depend
  projects/bmake/kerberos5/libexec/kpasswdd/Makefile.depend
  projects/bmake/kerberos5/tools/asn1_compile/Makefile.depend
  projects/bmake/kerberos5/tools/make-roken/Makefile.depend
  projects/bmake/kerberos5/tools/slc/Makefile.depend
  projects/bmake/kerberos5/usr.bin/hxtool/Makefile.depend
  projects/bmake/kerberos5/usr.bin/kadmin/Makefile.depend
  projects/bmake/kerberos5/usr.bin/kcc/Makefile.depend
  projects/bmake/kerberos5/usr.bin/kdestroy/Makefile.depend
  projects/bmake/kerberos5/usr.bin/kf/Makefile.depend
  projects/bmake/kerberos5/usr.bin/kgetcred/Makefile.depend
  projects/bmake/kerberos5/usr.bin/kinit/Makefile.depend
  projects/bmake/kerberos5/usr.bin/kpasswd/Makefile.depend
  projects/bmake/kerberos5/usr.bin/krb5-config/Makefile.depend
  projects/bmake/kerberos5/usr.bin/ksu/Makefile.depend
  projects/bmake/kerberos5/usr.bin/string2key/Makefile.depend
  projects/bmake/kerberos5/usr.bin/verify_krb5_conf/Makefile.depend
  projects/bmake/kerberos5/usr.sbin/iprop-log/Makefile.depend
  projects/bmake/kerberos5/usr.sbin/kstash/Makefile.depend
  projects/bmake/kerberos5/usr.sbin/ktutil/Makefile.depend
  projects/bmake/lib/bind/bind9/Makefile.depend
  projects/bmake/lib/bind/dns/Makefile.depend
  projects/bmake/lib/bind/isc/Makefile.depend
  projects/bmake/lib/bind/isccc/Makefile.depend
  projects/bmake/lib/bind/isccfg/Makefile.depend
  projects/bmake/lib/bind/lwres/Makefile.depend
  projects/bmake/lib/clang/include/Makefile.depend
  projects/bmake/lib/clang/libclanganalysis/Makefile.depend
  projects/bmake/lib/clang/libclangarcmigrate/Makefile.depend
  projects/bmake/lib/clang/libclangast/Makefile.depend
  projects/bmake/lib/clang/libclangbasic/Makefile.depend
  projects/bmake/lib/clang/libclangcodegen/Makefile.depend
  projects/bmake/lib/clang/libclangdriver/Makefile.depend
  projects/bmake/lib/clang/libclangedit/Makefile.depend
  projects/bmake/lib/clang/libclangfrontend/Makefile.depend
  projects/bmake/lib/clang/libclangfrontendtool/Makefile.depend
  projects/bmake/lib/clang/libclanglex/Makefile.depend
  projects/bmake/lib/clang/libclangparse/Makefile.depend
  projects/bmake/lib/clang/libclangrewrite/Makefile.depend
  projects/bmake/lib/clang/libclangsema/Makefile.depend
  projects/bmake/lib/clang/libclangserialization/Makefile.depend
  projects/bmake/lib/clang/libclangstaticanalyzercheckers/Makefile.depend
  projects/bmake/lib/clang/libclangstaticanalyzercore/Makefile.depend
  projects/bmake/lib/clang/libclangstaticanalyzerfrontend/Makefile.depend
  projects/bmake/lib/clang/libllvmanalysis/Makefile.depend
  projects/bmake/lib/clang/libllvmarchive/Makefile.depend
  projects/bmake/lib/clang/libllvmarmasmparser/Makefile.depend
  projects/bmake/lib/clang/libllvmarmcodegen/Makefile.depend
  projects/bmake/lib/clang/libllvmarmdesc/Makefile.depend
  projects/bmake/lib/clang/libllvmarmdisassembler/Makefile.depend
  projects/bmake/lib/clang/libllvmarminfo/Makefile.depend
  projects/bmake/lib/clang/libllvmarminstprinter/Makefile.depend
  projects/bmake/lib/clang/libllvmasmparser/Makefile.depend
  projects/bmake/lib/clang/libllvmasmprinter/Makefile.depend
  projects/bmake/lib/clang/libllvmbitreader/Makefile.depend
  projects/bmake/lib/clang/libllvmbitwriter/Makefile.depend
  projects/bmake/lib/clang/libllvmcodegen/Makefile.depend
  projects/bmake/lib/clang/libllvmcore/Makefile.depend
  projects/bmake/lib/clang/libllvmdebuginfo/Makefile.depend
  projects/bmake/lib/clang/libllvmexecutionengine/Makefile.depend
  projects/bmake/lib/clang/libllvminstcombine/Makefile.depend
  projects/bmake/lib/clang/libllvminstrumentation/Makefile.depend
  projects/bmake/lib/clang/libllvminterpreter/Makefile.depend
  projects/bmake/lib/clang/libllvmipa/Makefile.depend
  projects/bmake/lib/clang/libllvmipo/Makefile.depend
  projects/bmake/lib/clang/libllvmjit/Makefile.depend
  projects/bmake/lib/clang/libllvmlinker/Makefile.depend
  projects/bmake/lib/clang/libllvmmc/Makefile.depend
  projects/bmake/lib/clang/libllvmmcdisassembler/Makefile.depend
  projects/bmake/lib/clang/libllvmmcjit/Makefile.depend
  projects/bmake/lib/clang/libllvmmcparser/Makefile.depend
  projects/bmake/lib/clang/libllvmmipsasmparser/Makefile.depend
  projects/bmake/lib/clang/libllvmmipscodegen/Makefile.depend
  projects/bmake/lib/clang/libllvmmipsdesc/Makefile.depend
  projects/bmake/lib/clang/libllvmmipsinfo/Makefile.depend
  projects/bmake/lib/clang/libllvmmipsinstprinter/Makefile.depend
  projects/bmake/lib/clang/libllvmobject/Makefile.depend
  projects/bmake/lib/clang/libllvmpowerpccodegen/Makefile.depend
  projects/bmake/lib/clang/libllvmpowerpcdesc/Makefile.depend
  projects/bmake/lib/clang/libllvmpowerpcinfo/Makefile.depend
  projects/bmake/lib/clang/libllvmpowerpcinstprinter/Makefile.depend
  projects/bmake/lib/clang/libllvmruntimedyld/Makefile.depend
  projects/bmake/lib/clang/libllvmscalaropts/Makefile.depend
  projects/bmake/lib/clang/libllvmselectiondag/Makefile.depend
  projects/bmake/lib/clang/libllvmsupport/Makefile.depend
  projects/bmake/lib/clang/libllvmtablegen/Makefile.depend
  projects/bmake/lib/clang/libllvmtarget/Makefile.depend
  projects/bmake/lib/clang/libllvmtransformutils/Makefile.depend
  projects/bmake/lib/clang/libllvmvectorize/Makefile.depend
  projects/bmake/lib/clang/libllvmx86asmparser/Makefile.depend
  projects/bmake/lib/clang/libllvmx86codegen/Makefile.depend
  projects/bmake/lib/clang/libllvmx86desc/Makefile.depend
  projects/bmake/lib/clang/libllvmx86disassembler/Makefile.depend
  projects/bmake/lib/clang/libllvmx86info/Makefile.depend
  projects/bmake/lib/clang/libllvmx86instprinter/Makefile.depend
  projects/bmake/lib/clang/libllvmx86utils/Makefile.depend
  projects/bmake/lib/csu/i386-elf/Makefile.depend
  projects/bmake/lib/libalias/libalias/Makefile.depend
  projects/bmake/lib/libalias/modules/cuseeme/Makefile.depend
  projects/bmake/lib/libalias/modules/dummy/Makefile.depend
  projects/bmake/lib/libalias/modules/ftp/Makefile.depend
  projects/bmake/lib/libalias/modules/irc/Makefile.depend
  projects/bmake/lib/libalias/modules/nbt/Makefile.depend
  projects/bmake/lib/libalias/modules/pptp/Makefile.depend
  projects/bmake/lib/libalias/modules/skinny/Makefile.depend
  projects/bmake/lib/libalias/modules/smedia/Makefile.depend
  projects/bmake/lib/libarchive/Makefile.depend
  projects/bmake/lib/libauditd/Makefile.depend
  projects/bmake/lib/libbegemot/Makefile.depend
  projects/bmake/lib/libblocksruntime/Makefile.depend
  projects/bmake/lib/libbluetooth/Makefile.depend
  projects/bmake/lib/libbsm/Makefile.depend
  projects/bmake/lib/libbsnmp/libbsnmp/Makefile.depend
  projects/bmake/lib/libbz2/Makefile.depend
  projects/bmake/lib/libc/Makefile.depend
  projects/bmake/lib/libcalendar/Makefile.depend
  projects/bmake/lib/libcam/Makefile.depend
  projects/bmake/lib/libcom_err/Makefile.depend
  projects/bmake/lib/libcompat/Makefile.depend
  projects/bmake/lib/libcompiler_rt/Makefile.depend
  projects/bmake/lib/libcrypt/Makefile.depend
  projects/bmake/lib/libdevinfo/Makefile.depend
  projects/bmake/lib/libdevstat/Makefile.depend
  projects/bmake/lib/libdisk/Makefile.depend
  projects/bmake/lib/libdwarf/Makefile.depend
  projects/bmake/lib/libedit/Makefile.depend
  projects/bmake/lib/libedit/edit/readline/Makefile.depend
  projects/bmake/lib/libelf/Makefile.depend
  projects/bmake/lib/libexpat/Makefile.depend
  projects/bmake/lib/libfetch/Makefile.depend
  projects/bmake/lib/libgeom/Makefile.depend
  projects/bmake/lib/libgpib/Makefile.depend
  projects/bmake/lib/libgssapi/Makefile.depend
  projects/bmake/lib/libipsec/Makefile.depend
  projects/bmake/lib/libipx/Makefile.depend
  projects/bmake/lib/libjail/Makefile.depend
  projects/bmake/lib/libkiconv/Makefile.depend
  projects/bmake/lib/libkvm/Makefile.depend
  projects/bmake/lib/liblzma/Makefile.depend
  projects/bmake/lib/libmagic/Makefile.depend
  projects/bmake/lib/libmd/Makefile.depend
  projects/bmake/lib/libmemstat/Makefile.depend
  projects/bmake/lib/libmilter/Makefile.depend
  projects/bmake/lib/libmp/Makefile.depend
  projects/bmake/lib/libncp/Makefile.depend
  projects/bmake/lib/libnetgraph/Makefile.depend
  projects/bmake/lib/libngatm/Makefile.depend
  projects/bmake/lib/libopie/Makefile.depend
  projects/bmake/lib/libpam/libpam/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_chroot/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_deny/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_echo/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_exec/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_ftpusers/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_group/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_guest/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_krb5/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_ksu/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_lastlog/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_login_access/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_nologin/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_opie/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_opieaccess/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_passwdqc/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_permit/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_radius/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_rhosts/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_rootok/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_securetty/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_self/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_ssh/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_tacplus/Makefile.depend
  projects/bmake/lib/libpam/modules/pam_unix/Makefile.depend
  projects/bmake/lib/libpcap/Makefile.depend
  projects/bmake/lib/libpmc/Makefile.depend
  projects/bmake/lib/libproc/Makefile.depend
  projects/bmake/lib/libprocstat/Makefile.depend
  projects/bmake/lib/libprocstat/zfs/Makefile.depend
  projects/bmake/lib/libradius/Makefile.depend
  projects/bmake/lib/librpcsec_gss/Makefile.depend
  projects/bmake/lib/librpcsvc/Makefile.depend
  projects/bmake/lib/librt/Makefile.depend
  projects/bmake/lib/librtld_db/Makefile.depend
  projects/bmake/lib/libsbuf/Makefile.depend
  projects/bmake/lib/libsdp/Makefile.depend
  projects/bmake/lib/libsm/Makefile.depend
  projects/bmake/lib/libsmb/Makefile.depend
  projects/bmake/lib/libsmdb/Makefile.depend
  projects/bmake/lib/libsmutil/Makefile.depend
  projects/bmake/lib/libstand/Makefile.depend
  projects/bmake/lib/libstdbuf/Makefile.depend
  projects/bmake/lib/libstdthreads/Makefile.depend
  projects/bmake/lib/libtacplus/Makefile.depend
  projects/bmake/lib/libtelnet/Makefile.depend
  projects/bmake/lib/libthr/Makefile.depend
  projects/bmake/lib/libthread_db/Makefile.depend
  projects/bmake/lib/libufs/Makefile.depend
  projects/bmake/lib/libugidfw/Makefile.depend
  projects/bmake/lib/libulog/Makefile.depend
  projects/bmake/lib/libusb/Makefile.depend
  projects/bmake/lib/libusbhid/Makefile.depend
  projects/bmake/lib/libutil/Makefile.depend
  projects/bmake/lib/libvgl/Makefile.depend
  projects/bmake/lib/libwrap/Makefile.depend
  projects/bmake/lib/liby/Makefile.depend
  projects/bmake/lib/libypclnt/Makefile.depend
  projects/bmake/lib/libz/Makefile.depend
  projects/bmake/lib/msun/Makefile.depend
  projects/bmake/lib/ncurses/form/Makefile.depend
  projects/bmake/lib/ncurses/formw/Makefile.depend
  projects/bmake/lib/ncurses/menu/Makefile.depend
  projects/bmake/lib/ncurses/menuw/Makefile.depend
  projects/bmake/lib/ncurses/ncurses/Makefile.depend
  projects/bmake/lib/ncurses/ncursesw/Makefile.depend
  projects/bmake/lib/ncurses/panel/Makefile.depend
  projects/bmake/lib/ncurses/panelw/Makefile.depend
  projects/bmake/libexec/atrun/Makefile.depend
  projects/bmake/libexec/bootpd/Makefile.depend
  projects/bmake/libexec/bootpd/bootpgw/Makefile.depend
  projects/bmake/libexec/bootpd/tools/bootpef/Makefile.depend
  projects/bmake/libexec/bootpd/tools/bootptest/Makefile.depend
  projects/bmake/libexec/comsat/Makefile.depend
  projects/bmake/libexec/fingerd/Makefile.depend
  projects/bmake/libexec/ftpd/Makefile.depend
  projects/bmake/libexec/getty/Makefile.depend
  projects/bmake/libexec/mail.local/Makefile.depend
  projects/bmake/libexec/mknetid/Makefile.depend
  projects/bmake/libexec/pppoed/Makefile.depend
  projects/bmake/libexec/rbootd/Makefile.depend
  projects/bmake/libexec/revnetgroup/Makefile.depend
  projects/bmake/libexec/rlogind/Makefile.depend
  projects/bmake/libexec/rpc.rquotad/Makefile.depend
  projects/bmake/libexec/rpc.rstatd/Makefile.depend
  projects/bmake/libexec/rpc.rusersd/Makefile.depend
  projects/bmake/libexec/rpc.rwalld/Makefile.depend
  projects/bmake/libexec/rpc.sprayd/Makefile.depend
  projects/bmake/libexec/rshd/Makefile.depend
  projects/bmake/libexec/rtld-elf/Makefile.depend
  projects/bmake/libexec/smrsh/Makefile.depend
  projects/bmake/libexec/talkd/Makefile.depend
  projects/bmake/libexec/tcpd/Makefile.depend
  projects/bmake/libexec/telnetd/Makefile.depend
  projects/bmake/libexec/tftp-proxy/Makefile.depend
  projects/bmake/libexec/tftpd/Makefile.depend
  projects/bmake/libexec/ulog-helper/Makefile.depend
  projects/bmake/libexec/ypxfr/Makefile.depend
  projects/bmake/sbin/adjkerntz/Makefile.depend
  projects/bmake/sbin/atacontrol/Makefile.depend
  projects/bmake/sbin/atm/atmconfig/Makefile.depend
  projects/bmake/sbin/badsect/Makefile.depend
  projects/bmake/sbin/bsdlabel/Makefile.depend
  projects/bmake/sbin/camcontrol/Makefile.depend
  projects/bmake/sbin/ccdconfig/Makefile.depend
  projects/bmake/sbin/clri/Makefile.depend
  projects/bmake/sbin/comcontrol/Makefile.depend
  projects/bmake/sbin/conscontrol/Makefile.depend
  projects/bmake/sbin/ddb/Makefile.depend
  projects/bmake/sbin/devd/Makefile.depend
  projects/bmake/sbin/devfs/Makefile.depend
  projects/bmake/sbin/dhclient/Makefile.depend
  projects/bmake/sbin/dmesg/Makefile.depend
  projects/bmake/sbin/dump/Makefile.depend
  projects/bmake/sbin/dumpfs/Makefile.depend
  projects/bmake/sbin/dumpon/Makefile.depend
  projects/bmake/sbin/etherswitchcfg/Makefile.depend
  projects/bmake/sbin/fdisk/Makefile.depend
  projects/bmake/sbin/fdisk_pc98/Makefile.depend
  projects/bmake/sbin/ffsinfo/Makefile.depend
  projects/bmake/sbin/fsck/Makefile.depend
  projects/bmake/sbin/fsck_ffs/Makefile.depend
  projects/bmake/sbin/fsck_msdosfs/Makefile.depend
  projects/bmake/sbin/fsdb/Makefile.depend
  projects/bmake/sbin/fsirand/Makefile.depend
  projects/bmake/sbin/gbde/Makefile.depend
  projects/bmake/sbin/geom/class/cache/Makefile.depend
  projects/bmake/sbin/geom/class/concat/Makefile.depend
  projects/bmake/sbin/geom/class/eli/Makefile.depend
  projects/bmake/sbin/geom/class/journal/Makefile.depend
  projects/bmake/sbin/geom/class/label/Makefile.depend
  projects/bmake/sbin/geom/class/mirror/Makefile.depend
  projects/bmake/sbin/geom/class/mountver/Makefile.depend
  projects/bmake/sbin/geom/class/multipath/Makefile.depend
  projects/bmake/sbin/geom/class/nop/Makefile.depend
  projects/bmake/sbin/geom/class/part/Makefile.depend
  projects/bmake/sbin/geom/class/raid/Makefile.depend
  projects/bmake/sbin/geom/class/raid3/Makefile.depend
  projects/bmake/sbin/geom/class/sched/Makefile.depend
  projects/bmake/sbin/geom/class/shsec/Makefile.depend
  projects/bmake/sbin/geom/class/stripe/Makefile.depend
  projects/bmake/sbin/geom/class/virstor/Makefile.depend
  projects/bmake/sbin/geom/core/Makefile.depend
  projects/bmake/sbin/ggate/ggatec/Makefile.depend
  projects/bmake/sbin/ggate/ggated/Makefile.depend
  projects/bmake/sbin/ggate/ggatel/Makefile.depend
  projects/bmake/sbin/growfs/Makefile.depend
  projects/bmake/sbin/gvinum/Makefile.depend
  projects/bmake/sbin/hastctl/Makefile.depend
  projects/bmake/sbin/hastd/Makefile.depend
  projects/bmake/sbin/ifconfig/Makefile.depend
  projects/bmake/sbin/init/Makefile.depend
  projects/bmake/sbin/ipf/ipf/Makefile.depend
  projects/bmake/sbin/ipf/ipfs/Makefile.depend
  projects/bmake/sbin/ipf/ipfstat/Makefile.depend
  projects/bmake/sbin/ipf/ipftest/Makefile.depend
  projects/bmake/sbin/ipf/ipmon/Makefile.depend
  projects/bmake/sbin/ipf/ipnat/Makefile.depend
  projects/bmake/sbin/ipf/ippool/Makefile.depend
  projects/bmake/sbin/ipf/ipresend/Makefile.depend
  projects/bmake/sbin/ipf/libipf/Makefile.depend
  projects/bmake/sbin/ipfw/Makefile.depend
  projects/bmake/sbin/iscontrol/Makefile.depend
  projects/bmake/sbin/kldconfig/Makefile.depend
  projects/bmake/sbin/kldload/Makefile.depend
  projects/bmake/sbin/kldstat/Makefile.depend
  projects/bmake/sbin/kldunload/Makefile.depend
  projects/bmake/sbin/ldconfig/Makefile.depend
  projects/bmake/sbin/mca/Makefile.depend
  projects/bmake/sbin/md5/Makefile.depend
  projects/bmake/sbin/mdconfig/Makefile.depend
  projects/bmake/sbin/mdmfs/Makefile.depend
  projects/bmake/sbin/mknod/Makefile.depend
  projects/bmake/sbin/mksnap_ffs/Makefile.depend
  projects/bmake/sbin/mount/Makefile.depend
  projects/bmake/sbin/mount_cd9660/Makefile.depend
  projects/bmake/sbin/mount_ext2fs/Makefile.depend
  projects/bmake/sbin/mount_msdosfs/Makefile.depend
  projects/bmake/sbin/mount_nfs/Makefile.depend
  projects/bmake/sbin/mount_ntfs/Makefile.depend
  projects/bmake/sbin/mount_nullfs/Makefile.depend
  projects/bmake/sbin/mount_reiserfs/Makefile.depend
  projects/bmake/sbin/mount_std/Makefile.depend
  projects/bmake/sbin/mount_udf/Makefile.depend
  projects/bmake/sbin/mount_unionfs/Makefile.depend
  projects/bmake/sbin/natd/Makefile.depend
  projects/bmake/sbin/newfs/Makefile.depend
  projects/bmake/sbin/newfs_msdos/Makefile.depend
  projects/bmake/sbin/nfsiod/Makefile.depend
  projects/bmake/sbin/nos-tun/Makefile.depend
  projects/bmake/sbin/pfctl/Makefile.depend
  projects/bmake/sbin/pflogd/Makefile.depend
  projects/bmake/sbin/ping/Makefile.depend
  projects/bmake/sbin/ping6/Makefile.depend
  projects/bmake/sbin/quotacheck/Makefile.depend
  projects/bmake/sbin/rcorder/Makefile.depend
  projects/bmake/sbin/reboot/Makefile.depend
  projects/bmake/sbin/recoverdisk/Makefile.depend
  projects/bmake/sbin/resolvconf/Makefile.depend
  projects/bmake/sbin/restore/Makefile.depend
  projects/bmake/sbin/route/Makefile.depend
  projects/bmake/sbin/routed/Makefile.depend
  projects/bmake/sbin/routed/rtquery/Makefile.depend
  projects/bmake/sbin/rtsol/Makefile.depend
  projects/bmake/sbin/savecore/Makefile.depend
  projects/bmake/sbin/sconfig/Makefile.depend
  projects/bmake/sbin/setkey/Makefile.depend
  projects/bmake/sbin/shutdown/Makefile.depend
  projects/bmake/sbin/spppcontrol/Makefile.depend
  projects/bmake/sbin/sunlabel/Makefile.depend
  projects/bmake/sbin/swapon/Makefile.depend
  projects/bmake/sbin/sysctl/Makefile.depend
  projects/bmake/sbin/tunefs/Makefile.depend
  projects/bmake/sbin/umount/Makefile.depend
  projects/bmake/secure/lib/libcrypto/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/lib4758cca/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/libaep/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/libatalla/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/libchil/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/libcswift/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/libnuron/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/libsureware/Makefile.depend
  projects/bmake/secure/lib/libcrypto/engines/libubsec/Makefile.depend
  projects/bmake/secure/lib/libssh/Makefile.depend
  projects/bmake/secure/lib/libssl/Makefile.depend
  projects/bmake/secure/libexec/sftp-server/Makefile.depend
  projects/bmake/secure/libexec/ssh-keysign/Makefile.depend
  projects/bmake/secure/libexec/ssh-pkcs11-helper/Makefile.depend
  projects/bmake/secure/usr.bin/bdes/Makefile.depend
  projects/bmake/secure/usr.bin/openssl/Makefile.depend
  projects/bmake/secure/usr.bin/scp/Makefile.depend
  projects/bmake/secure/usr.bin/sftp/Makefile.depend
  projects/bmake/secure/usr.bin/ssh-add/Makefile.depend
  projects/bmake/secure/usr.bin/ssh-agent/Makefile.depend
  projects/bmake/secure/usr.bin/ssh-keygen/Makefile.depend
  projects/bmake/secure/usr.bin/ssh-keyscan/Makefile.depend
  projects/bmake/secure/usr.bin/ssh/Makefile.depend
  projects/bmake/secure/usr.sbin/sshd/Makefile.depend
  projects/bmake/share/colldef/Makefile.depend
  projects/bmake/share/dict/Makefile.depend
  projects/bmake/share/doc/IPv6/Makefile.depend
  projects/bmake/share/doc/bind9/Makefile.depend
  projects/bmake/share/doc/legal/intel_ipw/Makefile.depend
  projects/bmake/share/doc/legal/intel_iwi/Makefile.depend
  projects/bmake/share/doc/legal/intel_iwn/Makefile.depend
  projects/bmake/share/doc/legal/intel_wpi/Makefile.depend
  projects/bmake/share/doc/llvm/Makefile.depend
  projects/bmake/share/doc/llvm/clang/Makefile.depend
  projects/bmake/share/examples/libvgl/Makefile.depend
  projects/bmake/share/i18n/csmapper/APPLE/Makefile.depend
  projects/bmake/share/i18n/csmapper/AST/Makefile.depend
  projects/bmake/share/i18n/csmapper/BIG5/Makefile.depend
  projects/bmake/share/i18n/csmapper/CNS/Makefile.depend
  projects/bmake/share/i18n/csmapper/CP/Makefile.depend
  projects/bmake/share/i18n/csmapper/EBCDIC/Makefile.depend
  projects/bmake/share/i18n/csmapper/GB/Makefile.depend
  projects/bmake/share/i18n/csmapper/GEORGIAN/Makefile.depend
  projects/bmake/share/i18n/csmapper/ISO-8859/Makefile.depend
  projects/bmake/share/i18n/csmapper/ISO646/Makefile.depend
  projects/bmake/share/i18n/csmapper/JIS/Makefile.depend
  projects/bmake/share/i18n/csmapper/KAZAKH/Makefile.depend
  projects/bmake/share/i18n/csmapper/KOI/Makefile.depend
  projects/bmake/share/i18n/csmapper/KS/Makefile.depend
  projects/bmake/share/i18n/csmapper/MISC/Makefile.depend
  projects/bmake/share/i18n/csmapper/TCVN/Makefile.depend
  projects/bmake/share/man/man1/Makefile.depend
  projects/bmake/share/man/man3/Makefile.depend
  projects/bmake/share/man/man4/Makefile.depend
  projects/bmake/share/man/man4/man4.arm/Makefile.depend
  projects/bmake/share/man/man4/man4.i386/Makefile.depend
  projects/bmake/share/man/man4/man4.powerpc/Makefile.depend
  projects/bmake/share/man/man4/man4.sparc64/Makefile.depend
  projects/bmake/share/man/man5/Makefile.depend
  projects/bmake/share/man/man6/Makefile.depend
  projects/bmake/share/man/man7/Makefile.depend
  projects/bmake/share/man/man8/Makefile.depend
  projects/bmake/share/man/man9/Makefile.depend
  projects/bmake/share/me/Makefile.depend
  projects/bmake/share/misc/Makefile.depend
  projects/bmake/share/mk/Makefile.depend
  projects/bmake/share/mk/auto.obj.mk
  projects/bmake/share/mk/dirdeps.mk
  projects/bmake/share/mk/gendirdeps.mk
  projects/bmake/share/mk/host-target.mk
  projects/bmake/share/mk/install-new.mk
  projects/bmake/share/mk/local.autodep.mk
  projects/bmake/share/mk/local.dirdeps.mk
  projects/bmake/share/mk/local.gendirdeps.mk
  projects/bmake/share/mk/local.init.mk
  projects/bmake/share/mk/local.sys.mk
  projects/bmake/share/mk/meta.autodep.mk
  projects/bmake/share/mk/meta.stage.mk
  projects/bmake/share/mk/meta.subdir.mk
  projects/bmake/share/mk/meta.sys.mk
  projects/bmake/share/mk/meta2deps.py   (contents, props changed)
  projects/bmake/share/mk/meta2deps.sh   (contents, props changed)
  projects/bmake/share/mk/sys.dependfile.mk
  projects/bmake/share/mklocale/Makefile.depend
  projects/bmake/share/monetdef/Makefile.depend
  projects/bmake/share/msgdef/Makefile.depend
  projects/bmake/share/numericdef/Makefile.depend
  projects/bmake/share/security/Makefile.depend
  projects/bmake/share/skel/Makefile.depend
  projects/bmake/share/snmp/mibs/Makefile.depend
  projects/bmake/share/syscons/fonts/Makefile.depend
  projects/bmake/share/syscons/keymaps/Makefile.depend
  projects/bmake/share/syscons/scrnmaps/Makefile.depend
  projects/bmake/share/tabset/Makefile.depend
  projects/bmake/share/termcap/Makefile.depend
  projects/bmake/share/timedef/Makefile.depend
  projects/bmake/share/zoneinfo/Makefile.depend
  projects/bmake/sys/boot/ficl/Makefile.depend
  projects/bmake/sys/boot/i386/boot2/Makefile.depend
  projects/bmake/sys/boot/i386/loader/Makefile.depend
  projects/bmake/sys/boot/i386/zfsloader/Makefile.depend
  projects/bmake/usr.bin/apply/Makefile.depend
  projects/bmake/usr.bin/ar/Makefile.depend
  projects/bmake/usr.bin/asa/Makefile.depend
  projects/bmake/usr.bin/at/Makefile.depend
  projects/bmake/usr.bin/atm/sscop/Makefile.depend
  projects/bmake/usr.bin/awk/Makefile.depend
  projects/bmake/usr.bin/banner/Makefile.depend
  projects/bmake/usr.bin/basename/Makefile.depend
  projects/bmake/usr.bin/bc/Makefile.depend
  projects/bmake/usr.bin/biff/Makefile.depend
  projects/bmake/usr.bin/bluetooth/bthost/Makefile.depend
  projects/bmake/usr.bin/bluetooth/btsockstat/Makefile.depend
  projects/bmake/usr.bin/bluetooth/rfcomm_sppd/Makefile.depend
  projects/bmake/usr.bin/brandelf/Makefile.depend
  projects/bmake/usr.bin/bsdiff/bsdiff/Makefile.depend
  projects/bmake/usr.bin/bsdiff/bspatch/Makefile.depend
  projects/bmake/usr.bin/bzip2/Makefile.depend
  projects/bmake/usr.bin/bzip2recover/Makefile.depend
  projects/bmake/usr.bin/c89/Makefile.depend
  projects/bmake/usr.bin/c99/Makefile.depend
  projects/bmake/usr.bin/calendar/Makefile.depend
  projects/bmake/usr.bin/cap_mkdb/Makefile.depend
  projects/bmake/usr.bin/catman/Makefile.depend
  projects/bmake/usr.bin/chat/Makefile.depend
  projects/bmake/usr.bin/checknr/Makefile.depend
  projects/bmake/usr.bin/chkey/Makefile.depend
  projects/bmake/usr.bin/chpass/Makefile.depend
  projects/bmake/usr.bin/cksum/Makefile.depend
  projects/bmake/usr.bin/clang/clang-tblgen/Makefile.depend
  projects/bmake/usr.bin/clang/clang/Makefile.depend
  projects/bmake/usr.bin/clang/tblgen/Makefile.depend
  projects/bmake/usr.bin/cmp/Makefile.depend
  projects/bmake/usr.bin/col/Makefile.depend
  projects/bmake/usr.bin/colcrt/Makefile.depend
  projects/bmake/usr.bin/colldef/Makefile.depend
  projects/bmake/usr.bin/colrm/Makefile.depend
  projects/bmake/usr.bin/column/Makefile.depend
  projects/bmake/usr.bin/comm/Makefile.depend
  projects/bmake/usr.bin/compile_et/Makefile.depend
  projects/bmake/usr.bin/compress/Makefile.depend
  projects/bmake/usr.bin/cpio/Makefile.depend
  projects/bmake/usr.bin/cpuset/Makefile.depend
  projects/bmake/usr.bin/csplit/Makefile.depend
  projects/bmake/usr.bin/csup/Makefile.depend
  projects/bmake/usr.bin/ctags/Makefile.depend
  projects/bmake/usr.bin/ctlstat/Makefile.depend
  projects/bmake/usr.bin/cut/Makefile.depend
  projects/bmake/usr.bin/dc/Makefile.depend
  projects/bmake/usr.bin/dig/Makefile.depend
  projects/bmake/usr.bin/dirname/Makefile.depend
  projects/bmake/usr.bin/du/Makefile.depend
  projects/bmake/usr.bin/ee/Makefile.depend
  projects/bmake/usr.bin/elf2aout/Makefile.depend
  projects/bmake/usr.bin/elfdump/Makefile.depend
  projects/bmake/usr.bin/enigma/Makefile.depend
  projects/bmake/usr.bin/env/Makefile.depend
  projects/bmake/usr.bin/expand/Makefile.depend
  projects/bmake/usr.bin/false/Makefile.depend
  projects/bmake/usr.bin/fetch/Makefile.depend
  projects/bmake/usr.bin/file/Makefile.depend
  projects/bmake/usr.bin/file2c/Makefile.depend
  projects/bmake/usr.bin/find/Makefile.depend
  projects/bmake/usr.bin/finger/Makefile.depend
  projects/bmake/usr.bin/fmt/Makefile.depend
  projects/bmake/usr.bin/fold/Makefile.depend
  projects/bmake/usr.bin/from/Makefile.depend
  projects/bmake/usr.bin/fstat/Makefile.depend
  projects/bmake/usr.bin/fsync/Makefile.depend
  projects/bmake/usr.bin/ftp/Makefile.depend
  projects/bmake/usr.bin/gcore/Makefile.depend
  projects/bmake/usr.bin/gencat/Makefile.depend
  projects/bmake/usr.bin/getconf/Makefile.depend
  projects/bmake/usr.bin/getent/Makefile.depend
  projects/bmake/usr.bin/getopt/Makefile.depend
  projects/bmake/usr.bin/gprof/Makefile.depend
  projects/bmake/usr.bin/grep/Makefile.depend
  projects/bmake/usr.bin/gzip/Makefile.depend
  projects/bmake/usr.bin/head/Makefile.depend
  projects/bmake/usr.bin/hexdump/Makefile.depend
  projects/bmake/usr.bin/host/Makefile.depend
  projects/bmake/usr.bin/id/Makefile.depend
  projects/bmake/usr.bin/indent/Makefile.depend
  projects/bmake/usr.bin/ipcrm/Makefile.depend
  projects/bmake/usr.bin/ipcs/Makefile.depend
  projects/bmake/usr.bin/join/Makefile.depend
  projects/bmake/usr.bin/jot/Makefile.depend
  projects/bmake/usr.bin/kdump/Makefile.depend
  projects/bmake/usr.bin/keylogin/Makefile.depend
  projects/bmake/usr.bin/keylogout/Makefile.depend
  projects/bmake/usr.bin/killall/Makefile.depend
  projects/bmake/usr.bin/ktrace/Makefile.depend
  projects/bmake/usr.bin/ktrdump/Makefile.depend
  projects/bmake/usr.bin/lam/Makefile.depend
  projects/bmake/usr.bin/last/Makefile.depend
  projects/bmake/usr.bin/lastcomm/Makefile.depend
  projects/bmake/usr.bin/ldd/Makefile.depend
  projects/bmake/usr.bin/leave/Makefile.depend
  projects/bmake/usr.bin/less/Makefile.depend
  projects/bmake/usr.bin/lessecho/Makefile.depend
  projects/bmake/usr.bin/lesskey/Makefile.depend
  projects/bmake/usr.bin/lex/Makefile.depend
  projects/bmake/usr.bin/lex/lib/Makefile.depend
  projects/bmake/usr.bin/limits/Makefile.depend
  projects/bmake/usr.bin/locale/Makefile.depend
  projects/bmake/usr.bin/locate/bigram/Makefile.depend
  projects/bmake/usr.bin/locate/code/Makefile.depend
  projects/bmake/usr.bin/locate/locate/Makefile.depend
  projects/bmake/usr.bin/lock/Makefile.depend
  projects/bmake/usr.bin/lockf/Makefile.depend
  projects/bmake/usr.bin/logger/Makefile.depend
  projects/bmake/usr.bin/login/Makefile.depend
  projects/bmake/usr.bin/logins/Makefile.depend
  projects/bmake/usr.bin/logname/Makefile.depend
  projects/bmake/usr.bin/look/Makefile.depend
  projects/bmake/usr.bin/lorder/Makefile.depend
  projects/bmake/usr.bin/lsvfs/Makefile.depend
  projects/bmake/usr.bin/lzmainfo/Makefile.depend
  projects/bmake/usr.bin/m4/Makefile.depend
  projects/bmake/usr.bin/mail/Makefile.depend
  projects/bmake/usr.bin/make/Makefile.depend
  projects/bmake/usr.bin/makewhatis/Makefile.depend
  projects/bmake/usr.bin/man/Makefile.depend
  projects/bmake/usr.bin/mesg/Makefile.depend
  projects/bmake/usr.bin/minigzip/Makefile.depend
  projects/bmake/usr.bin/ministat/Makefile.depend
  projects/bmake/usr.bin/mkcsmapper_static/Makefile.depend
  projects/bmake/usr.bin/mkdep/Makefile.depend
  projects/bmake/usr.bin/mkfifo/Makefile.depend
  projects/bmake/usr.bin/mklocale/Makefile.depend
  projects/bmake/usr.bin/mkstr/Makefile.depend
  projects/bmake/usr.bin/mktemp/Makefile.depend
  projects/bmake/usr.bin/mkulzma/Makefile.depend
  projects/bmake/usr.bin/mkuzip/Makefile.depend
  projects/bmake/usr.bin/msgs/Makefile.depend
  projects/bmake/usr.bin/mt/Makefile.depend
  projects/bmake/usr.bin/nc/Makefile.depend
  projects/bmake/usr.bin/ncal/Makefile.depend
  projects/bmake/usr.bin/ncplist/Makefile.depend
  projects/bmake/usr.bin/ncplogin/Makefile.depend
  projects/bmake/usr.bin/netstat/Makefile.depend
  projects/bmake/usr.bin/newgrp/Makefile.depend
  projects/bmake/usr.bin/newkey/Makefile.depend
  projects/bmake/usr.bin/nfsstat/Makefile.depend
  projects/bmake/usr.bin/nice/Makefile.depend
  projects/bmake/usr.bin/nl/Makefile.depend
  projects/bmake/usr.bin/nohup/Makefile.depend
  projects/bmake/usr.bin/nslookup/Makefile.depend
  projects/bmake/usr.bin/nsupdate/Makefile.depend
  projects/bmake/usr.bin/opieinfo/Makefile.depend
  projects/bmake/usr.bin/opiekey/Makefile.depend
  projects/bmake/usr.bin/opiepasswd/Makefile.depend
  projects/bmake/usr.bin/pagesize/Makefile.depend
  projects/bmake/usr.bin/pamtest/Makefile.depend
  projects/bmake/usr.bin/passwd/Makefile.depend
  projects/bmake/usr.bin/paste/Makefile.depend
  projects/bmake/usr.bin/pathchk/Makefile.depend
  projects/bmake/usr.bin/perror/Makefile.depend
  projects/bmake/usr.bin/pr/Makefile.depend
  projects/bmake/usr.bin/printenv/Makefile.depend
  projects/bmake/usr.bin/printf/Makefile.depend
  projects/bmake/usr.bin/procstat/Makefile.depend
  projects/bmake/usr.bin/quota/Makefile.depend
  projects/bmake/usr.bin/rctl/Makefile.depend
  projects/bmake/usr.bin/renice/Makefile.depend
  projects/bmake/usr.bin/rev/Makefile.depend
  projects/bmake/usr.bin/revoke/Makefile.depend
  projects/bmake/usr.bin/rlogin/Makefile.depend
  projects/bmake/usr.bin/rpcgen/Makefile.depend
  projects/bmake/usr.bin/rpcinfo/Makefile.depend
  projects/bmake/usr.bin/rs/Makefile.depend
  projects/bmake/usr.bin/rsh/Makefile.depend
  projects/bmake/usr.bin/rup/Makefile.depend
  projects/bmake/usr.bin/ruptime/Makefile.depend
  projects/bmake/usr.bin/rusers/Makefile.depend
  projects/bmake/usr.bin/rwall/Makefile.depend
  projects/bmake/usr.bin/rwho/Makefile.depend
  projects/bmake/usr.bin/script/Makefile.depend
  projects/bmake/usr.bin/sed/Makefile.depend
  projects/bmake/usr.bin/seq/Makefile.depend
  projects/bmake/usr.bin/setchannel/Makefile.depend
  projects/bmake/usr.bin/shar/Makefile.depend
  projects/bmake/usr.bin/showmount/Makefile.depend
  projects/bmake/usr.bin/smbutil/Makefile.depend
  projects/bmake/usr.bin/sockstat/Makefile.depend
  projects/bmake/usr.bin/sort/Makefile.depend
  projects/bmake/usr.bin/split/Makefile.depend
  projects/bmake/usr.bin/stat/Makefile.depend
  projects/bmake/usr.bin/stdbuf/Makefile.depend
  projects/bmake/usr.bin/su/Makefile.depend
  projects/bmake/usr.bin/systat/Makefile.depend
  projects/bmake/usr.bin/tabs/Makefile.depend
  projects/bmake/usr.bin/tail/Makefile.depend
  projects/bmake/usr.bin/talk/Makefile.depend
  projects/bmake/usr.bin/tar/Makefile.depend
  projects/bmake/usr.bin/tcopy/Makefile.depend
  projects/bmake/usr.bin/tee/Makefile.depend
  projects/bmake/usr.bin/telnet/Makefile.depend
  projects/bmake/usr.bin/tftp/Makefile.depend
  projects/bmake/usr.bin/time/Makefile.depend
  projects/bmake/usr.bin/tip/tip/Makefile.depend
  projects/bmake/usr.bin/top/Makefile.depend
  projects/bmake/usr.bin/touch/Makefile.depend
  projects/bmake/usr.bin/tput/Makefile.depend
  projects/bmake/usr.bin/tr/Makefile.depend
  projects/bmake/usr.bin/true/Makefile.depend
  projects/bmake/usr.bin/truncate/Makefile.depend
  projects/bmake/usr.bin/truss/Makefile.depend
  projects/bmake/usr.bin/tset/Makefile.depend
  projects/bmake/usr.bin/tsort/Makefile.depend
  projects/bmake/usr.bin/tty/Makefile.depend
  projects/bmake/usr.bin/ul/Makefile.depend
  projects/bmake/usr.bin/uname/Makefile.depend
  projects/bmake/usr.bin/unexpand/Makefile.depend
  projects/bmake/usr.bin/unifdef/Makefile.depend
  projects/bmake/usr.bin/uniq/Makefile.depend
  projects/bmake/usr.bin/units/Makefile.depend
  projects/bmake/usr.bin/unvis/Makefile.depend
  projects/bmake/usr.bin/unzip/Makefile.depend
  projects/bmake/usr.bin/usbhidaction/Makefile.depend
  projects/bmake/usr.bin/usbhidctl/Makefile.depend
  projects/bmake/usr.bin/users/Makefile.depend
  projects/bmake/usr.bin/uudecode/Makefile.depend
  projects/bmake/usr.bin/uuencode/Makefile.depend
  projects/bmake/usr.bin/vacation/Makefile.depend
  projects/bmake/usr.bin/vgrind/Makefile.depend
  projects/bmake/usr.bin/vgrind/RETEST/Makefile.depend
  projects/bmake/usr.bin/vi/Makefile.depend
  projects/bmake/usr.bin/vis/Makefile.depend
  projects/bmake/usr.bin/vmstat/Makefile.depend
  projects/bmake/usr.bin/w/Makefile.depend
  projects/bmake/usr.bin/wall/Makefile.depend
  projects/bmake/usr.bin/wc/Makefile.depend
  projects/bmake/usr.bin/what/Makefile.depend
  projects/bmake/usr.bin/whereis/Makefile.depend
  projects/bmake/usr.bin/which/Makefile.depend
  projects/bmake/usr.bin/who/Makefile.depend
  projects/bmake/usr.bin/whois/Makefile.depend
  projects/bmake/usr.bin/write/Makefile.depend
  projects/bmake/usr.bin/xargs/Makefile.depend
  projects/bmake/usr.bin/xinstall/Makefile.depend
  projects/bmake/usr.bin/xlint/lint1/Makefile.depend
  projects/bmake/usr.bin/xlint/lint2/Makefile.depend
  projects/bmake/usr.bin/xlint/llib/Makefile.depend
  projects/bmake/usr.bin/xlint/xlint/Makefile.depend
  projects/bmake/usr.bin/xstr/Makefile.depend
  projects/bmake/usr.bin/xz/Makefile.depend
  projects/bmake/usr.bin/xzdec/Makefile.depend
  projects/bmake/usr.bin/yacc/Makefile.depend
  projects/bmake/usr.bin/yes/Makefile.depend
  projects/bmake/usr.bin/ypcat/Makefile.depend
  projects/bmake/usr.bin/ypmatch/Makefile.depend
  projects/bmake/usr.bin/ypwhich/Makefile.depend
  projects/bmake/usr.sbin/IPXrouted/Makefile.depend
  projects/bmake/usr.sbin/ac/Makefile.depend
  projects/bmake/usr.sbin/accton/Makefile.depend
  projects/bmake/usr.sbin/acpi/acpiconf/Makefile.depend
  projects/bmake/usr.sbin/acpi/acpidb/Makefile.depend
  projects/bmake/usr.sbin/acpi/acpidump/Makefile.depend
  projects/bmake/usr.sbin/acpi/iasl/Makefile.depend
  projects/bmake/usr.sbin/adduser/Makefile.depend
  projects/bmake/usr.sbin/amd/amd/Makefile.depend
  projects/bmake/usr.sbin/amd/amq/Makefile.depend
  projects/bmake/usr.sbin/amd/fixmount/Makefile.depend
  projects/bmake/usr.sbin/amd/fsinfo/Makefile.depend
  projects/bmake/usr.sbin/amd/hlfsd/Makefile.depend
  projects/bmake/usr.sbin/amd/include/Makefile.depend
  projects/bmake/usr.sbin/amd/libamu/Makefile.depend
  projects/bmake/usr.sbin/amd/mk-amd-map/Makefile.depend
  projects/bmake/usr.sbin/amd/pawd/Makefile.depend
  projects/bmake/usr.sbin/amd/scripts/Makefile.depend
  projects/bmake/usr.sbin/amd/wire-test/Makefile.depend
  projects/bmake/usr.sbin/ancontrol/Makefile.depend
  projects/bmake/usr.sbin/apm/Makefile.depend
  projects/bmake/usr.sbin/apmd/Makefile.depend
  projects/bmake/usr.sbin/arp/Makefile.depend
  projects/bmake/usr.sbin/arpaname/Makefile.depend
  projects/bmake/usr.sbin/asf/Makefile.depend
  projects/bmake/usr.sbin/audit/Makefile.depend
  projects/bmake/usr.sbin/auditd/Makefile.depend
  projects/bmake/usr.sbin/auditreduce/Makefile.depend
  projects/bmake/usr.sbin/authpf/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/ath3kfw/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/bcmfw/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/bt3cfw/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/bthidcontrol/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/bthidd/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/btpand/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/hccontrol/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/hcsecd/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/hcseriald/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/l2control/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/l2ping/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/rfcomm_pppd/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/sdpcontrol/Makefile.depend
  projects/bmake/usr.sbin/bluetooth/sdpd/Makefile.depend
  projects/bmake/usr.sbin/boot0cfg/Makefile.depend
  projects/bmake/usr.sbin/boot98cfg/Makefile.depend
  projects/bmake/usr.sbin/bootparamd/bootparamd/Makefile.depend
  projects/bmake/usr.sbin/bootparamd/callbootd/Makefile.depend
  projects/bmake/usr.sbin/bsdinstall/Makefile.depend
  projects/bmake/usr.sbin/bsdinstall/distextract/Makefile.depend
  projects/bmake/usr.sbin/bsdinstall/distfetch/Makefile.depend
  projects/bmake/usr.sbin/bsdinstall/partedit/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/bsnmpd/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/gensnmptree/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/tools/bsnmptools/Makefile.depend
  projects/bmake/usr.sbin/bsnmpd/tools/libbsnmptools/Makefile.depend
  projects/bmake/usr.sbin/btxld/Makefile.depend
  projects/bmake/usr.sbin/burncd/Makefile.depend
  projects/bmake/usr.sbin/cdcontrol/Makefile.depend
  projects/bmake/usr.sbin/chkgrp/Makefile.depend
  projects/bmake/usr.sbin/chown/Makefile.depend
  projects/bmake/usr.sbin/chroot/Makefile.depend
  projects/bmake/usr.sbin/ckdist/Makefile.depend
  projects/bmake/usr.sbin/clear_locks/Makefile.depend
  projects/bmake/usr.sbin/config/Makefile.depend
  projects/bmake/usr.sbin/cpucontrol/Makefile.depend
  projects/bmake/usr.sbin/crashinfo/Makefile.depend
  projects/bmake/usr.sbin/cron/cron/Makefile.depend
  projects/bmake/usr.sbin/cron/crontab/Makefile.depend
  projects/bmake/usr.sbin/cron/lib/Makefile.depend
  projects/bmake/usr.sbin/crunch/crunchgen/Makefile.depend
  projects/bmake/usr.sbin/crunch/crunchide/Makefile.depend
  projects/bmake/usr.sbin/ctladm/Makefile.depend
  projects/bmake/usr.sbin/ctm/ctm/Makefile.depend
  projects/bmake/usr.sbin/ctm/ctm_dequeue/Makefile.depend
  projects/bmake/usr.sbin/ctm/ctm_rmail/Makefile.depend
  projects/bmake/usr.sbin/ctm/ctm_smail/Makefile.depend
  projects/bmake/usr.sbin/daemon/Makefile.depend
  projects/bmake/usr.sbin/dconschat/Makefile.depend
  projects/bmake/usr.sbin/ddns-confgen/Makefile.depend
  projects/bmake/usr.sbin/devinfo/Makefile.depend
  projects/bmake/usr.sbin/digictl/Makefile.depend
  projects/bmake/usr.sbin/diskinfo/Makefile.depend
  projects/bmake/usr.sbin/dnssec-dsfromkey/Makefile.depend
  projects/bmake/usr.sbin/dnssec-keyfromlabel/Makefile.depend
  projects/bmake/usr.sbin/dnssec-keygen/Makefile.depend
  projects/bmake/usr.sbin/dnssec-revoke/Makefile.depend
  projects/bmake/usr.sbin/dnssec-settime/Makefile.depend
  projects/bmake/usr.sbin/dnssec-signzone/Makefile.depend
  projects/bmake/usr.sbin/dumpcis/Makefile.depend
  projects/bmake/usr.sbin/editmap/Makefile.depend
  projects/bmake/usr.sbin/edquota/Makefile.depend
  projects/bmake/usr.sbin/eeprom/Makefile.depend
  projects/bmake/usr.sbin/extattr/Makefile.depend
  projects/bmake/usr.sbin/extattrctl/Makefile.depend
  projects/bmake/usr.sbin/faithd/Makefile.depend
  projects/bmake/usr.sbin/fdcontrol/Makefile.depend
  projects/bmake/usr.sbin/fdformat/Makefile.depend
  projects/bmake/usr.sbin/fdread/Makefile.depend
  projects/bmake/usr.sbin/fdwrite/Makefile.depend
  projects/bmake/usr.sbin/fifolog/fifolog_create/Makefile.depend
  projects/bmake/usr.sbin/fifolog/fifolog_reader/Makefile.depend
  projects/bmake/usr.sbin/fifolog/fifolog_writer/Makefile.depend
  projects/bmake/usr.sbin/fifolog/lib/Makefile.depend
  projects/bmake/usr.sbin/flowctl/Makefile.depend
  projects/bmake/usr.sbin/freebsd-update/Makefile.depend
  projects/bmake/usr.sbin/ftp-proxy/ftp-proxy/Makefile.depend
  projects/bmake/usr.sbin/ftp-proxy/libevent/Makefile.depend
  projects/bmake/usr.sbin/fwcontrol/Makefile.depend
  projects/bmake/usr.sbin/genrandom/Makefile.depend
  projects/bmake/usr.sbin/getfmac/Makefile.depend
  projects/bmake/usr.sbin/getpmac/Makefile.depend
  projects/bmake/usr.sbin/gpioctl/Makefile.depend
  projects/bmake/usr.sbin/gssd/Makefile.depend
  projects/bmake/usr.sbin/gstat/Makefile.depend
  projects/bmake/usr.sbin/i2c/Makefile.depend
  projects/bmake/usr.sbin/ifmcstat/Makefile.depend
  projects/bmake/usr.sbin/inetd/Makefile.depend
  projects/bmake/usr.sbin/iostat/Makefile.depend
  projects/bmake/usr.sbin/ip6addrctl/Makefile.depend
  projects/bmake/usr.sbin/ipfwpcap/Makefile.depend
  projects/bmake/usr.sbin/isc-hmac-fixup/Makefile.depend
  projects/bmake/usr.sbin/jail/Makefile.depend
  projects/bmake/usr.sbin/jexec/Makefile.depend
  projects/bmake/usr.sbin/jls/Makefile.depend
  projects/bmake/usr.sbin/kbdcontrol/Makefile.depend
  projects/bmake/usr.sbin/kbdmap/Makefile.depend
  projects/bmake/usr.sbin/keyserv/Makefile.depend
  projects/bmake/usr.sbin/kgmon/Makefile.depend
  projects/bmake/usr.sbin/kgzip/Makefile.depend
  projects/bmake/usr.sbin/kldxref/Makefile.depend
  projects/bmake/usr.sbin/lastlogin/Makefile.depend
  projects/bmake/usr.sbin/lmcconfig/Makefile.depend
  projects/bmake/usr.sbin/lpr/chkprintcap/Makefile.depend
  projects/bmake/usr.sbin/lpr/common_source/Makefile.depend
  projects/bmake/usr.sbin/lpr/filters.ru/Makefile.depend
  projects/bmake/usr.sbin/lpr/filters.ru/koi2855/Makefile.depend
  projects/bmake/usr.sbin/lpr/filters.ru/koi2alt/Makefile.depend
  projects/bmake/usr.sbin/lpr/filters/Makefile.depend
  projects/bmake/usr.sbin/lpr/lp/Makefile.depend
  projects/bmake/usr.sbin/lpr/lpc/Makefile.depend
  projects/bmake/usr.sbin/lpr/lpd/Makefile.depend
  projects/bmake/usr.sbin/lpr/lpq/Makefile.depend
  projects/bmake/usr.sbin/lpr/lpr/Makefile.depend
  projects/bmake/usr.sbin/lpr/lprm/Makefile.depend
  projects/bmake/usr.sbin/lpr/lptest/Makefile.depend
  projects/bmake/usr.sbin/lpr/pac/Makefile.depend
  projects/bmake/usr.sbin/lptcontrol/Makefile.depend
  projects/bmake/usr.sbin/mailstats/Makefile.depend
  projects/bmake/usr.sbin/mailwrapper/Makefile.depend
  projects/bmake/usr.sbin/makefs/Makefile.depend
  projects/bmake/usr.sbin/makemap/Makefile.depend
  projects/bmake/usr.sbin/manctl/Makefile.depend
  projects/bmake/usr.sbin/memcontrol/Makefile.depend
  projects/bmake/usr.sbin/mergemaster/Makefile.depend
  projects/bmake/usr.sbin/mfiutil/Makefile.depend
  projects/bmake/usr.sbin/mixer/Makefile.depend
  projects/bmake/usr.sbin/mld6query/Makefile.depend
  projects/bmake/usr.sbin/mlxcontrol/Makefile.depend
  projects/bmake/usr.sbin/mount_nwfs/Makefile.depend
  projects/bmake/usr.sbin/mount_portalfs/Makefile.depend
  projects/bmake/usr.sbin/mount_smbfs/Makefile.depend
  projects/bmake/usr.sbin/mountd/Makefile.depend
  projects/bmake/usr.sbin/moused/Makefile.depend
  projects/bmake/usr.sbin/mptable/Makefile.depend
  projects/bmake/usr.sbin/mptutil/Makefile.depend
  projects/bmake/usr.sbin/mtest/Makefile.depend
  projects/bmake/usr.sbin/mtree/Makefile.depend
  projects/bmake/usr.sbin/named-checkconf/Makefile.depend
  projects/bmake/usr.sbin/named-checkzone/Makefile.depend
  projects/bmake/usr.sbin/named-journalprint/Makefile.depend
  projects/bmake/usr.sbin/named/Makefile.depend
  projects/bmake/usr.sbin/ndiscvt/Makefile.depend
  projects/bmake/usr.sbin/ndp/Makefile.depend
  projects/bmake/usr.sbin/newsyslog/Makefile.depend
  projects/bmake/usr.sbin/nfscbd/Makefile.depend
  projects/bmake/usr.sbin/nfsd/Makefile.depend
  projects/bmake/usr.sbin/nfsdumpstate/Makefile.depend
  projects/bmake/usr.sbin/nfsrevoke/Makefile.depend
  projects/bmake/usr.sbin/nfsuserd/Makefile.depend
  projects/bmake/usr.sbin/ngctl/Makefile.depend
  projects/bmake/usr.sbin/nghook/Makefile.depend
  projects/bmake/usr.sbin/nologin/Makefile.depend
  projects/bmake/usr.sbin/nscd/Makefile.depend
  projects/bmake/usr.sbin/nsec3hash/Makefile.depend
  projects/bmake/usr.sbin/ntp/libntp/Makefile.depend
  projects/bmake/usr.sbin/ntp/libopts/Makefile.depend
  projects/bmake/usr.sbin/ntp/libparse/Makefile.depend
  projects/bmake/usr.sbin/ntp/ntp-keygen/Makefile.depend
  projects/bmake/usr.sbin/ntp/ntpd/Makefile.depend
  projects/bmake/usr.sbin/ntp/ntpdate/Makefile.depend
  projects/bmake/usr.sbin/ntp/ntpdc/Makefile.depend
  projects/bmake/usr.sbin/ntp/ntpq/Makefile.depend
  projects/bmake/usr.sbin/ntp/ntptime/Makefile.depend
  projects/bmake/usr.sbin/ntp/sntp/Makefile.depend
  projects/bmake/usr.sbin/ofwdump/Makefile.depend
  projects/bmake/usr.sbin/pc-sysinstall/backend-partmanager/Makefile.depend
  projects/bmake/usr.sbin/pc-sysinstall/backend-query/Makefile.depend
  projects/bmake/usr.sbin/pc-sysinstall/backend/Makefile.depend
  projects/bmake/usr.sbin/pc-sysinstall/conf/Makefile.depend
  projects/bmake/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile.depend
  projects/bmake/usr.sbin/pciconf/Makefile.depend
  projects/bmake/usr.sbin/periodic/Makefile.depend
  projects/bmake/usr.sbin/pkg/Makefile.depend
  projects/bmake/usr.sbin/pkg_install/add/Makefile.depend
  projects/bmake/usr.sbin/pkg_install/create/Makefile.depend
  projects/bmake/usr.sbin/pkg_install/delete/Makefile.depend
  projects/bmake/usr.sbin/pkg_install/info/Makefile.depend
  projects/bmake/usr.sbin/pkg_install/lib/Makefile.depend
  projects/bmake/usr.sbin/pkg_install/updating/Makefile.depend
  projects/bmake/usr.sbin/pkg_install/version/Makefile.depend
  projects/bmake/usr.sbin/pmcannotate/Makefile.depend
  projects/bmake/usr.sbin/pmccontrol/Makefile.depend
  projects/bmake/usr.sbin/pmcstat/Makefile.depend
  projects/bmake/usr.sbin/pnpinfo/Makefile.depend
  projects/bmake/usr.sbin/portsnap/make_index/Makefile.depend
  projects/bmake/usr.sbin/portsnap/phttpget/Makefile.depend
  projects/bmake/usr.sbin/portsnap/portsnap/Makefile.depend
  projects/bmake/usr.sbin/powerd/Makefile.depend
  projects/bmake/usr.sbin/ppp/Makefile.depend
  projects/bmake/usr.sbin/pppctl/Makefile.depend
  projects/bmake/usr.sbin/praliases/Makefile.depend
  projects/bmake/usr.sbin/praudit/Makefile.depend
  projects/bmake/usr.sbin/procctl/Makefile.depend
  projects/bmake/usr.sbin/pstat/Makefile.depend
  projects/bmake/usr.sbin/pw/Makefile.depend
  projects/bmake/usr.sbin/pwd_mkdb/Makefile.depend
  projects/bmake/usr.sbin/quot/Makefile.depend
  projects/bmake/usr.sbin/quotaon/Makefile.depend
  projects/bmake/usr.sbin/rarpd/Makefile.depend
  projects/bmake/usr.sbin/repquota/Makefile.depend
  projects/bmake/usr.sbin/rip6query/Makefile.depend
  projects/bmake/usr.sbin/rmt/Makefile.depend
  projects/bmake/usr.sbin/rndc-confgen/Makefile.depend
  projects/bmake/usr.sbin/rndc/Makefile.depend
  projects/bmake/usr.sbin/route6d/Makefile.depend
  projects/bmake/usr.sbin/rpc.lockd/Makefile.depend
  projects/bmake/usr.sbin/rpc.statd/Makefile.depend
  projects/bmake/usr.sbin/rpc.umntall/Makefile.depend
  projects/bmake/usr.sbin/rpc.yppasswdd/Makefile.depend
  projects/bmake/usr.sbin/rpc.ypupdated/Makefile.depend
  projects/bmake/usr.sbin/rpc.ypxfrd/Makefile.depend
  projects/bmake/usr.sbin/rpcbind/Makefile.depend
  projects/bmake/usr.sbin/rrenumd/Makefile.depend
  projects/bmake/usr.sbin/rtadvctl/Makefile.depend
  projects/bmake/usr.sbin/rtadvd/Makefile.depend
  projects/bmake/usr.sbin/rtprio/Makefile.depend
  projects/bmake/usr.sbin/rtsold/Makefile.depend
  projects/bmake/usr.sbin/rwhod/Makefile.depend
  projects/bmake/usr.sbin/sa/Makefile.depend
  projects/bmake/usr.sbin/sade/Makefile.depend
  projects/bmake/usr.sbin/sendmail/Makefile.depend
  projects/bmake/usr.sbin/service/Makefile.depend
  projects/bmake/usr.sbin/services_mkdb/Makefile.depend
  projects/bmake/usr.sbin/setfib/Makefile.depend
  projects/bmake/usr.sbin/setfmac/Makefile.depend
  projects/bmake/usr.sbin/setpmac/Makefile.depend
  projects/bmake/usr.sbin/sicontrol/Makefile.depend
  projects/bmake/usr.sbin/smbmsg/Makefile.depend
  projects/bmake/usr.sbin/snapinfo/Makefile.depend
  projects/bmake/usr.sbin/spkrtest/Makefile.depend
  projects/bmake/usr.sbin/spray/Makefile.depend
  projects/bmake/usr.sbin/syslogd/Makefile.depend
  projects/bmake/usr.sbin/tcpdchk/Makefile.depend
  projects/bmake/usr.sbin/tcpdmatch/Makefile.depend
  projects/bmake/usr.sbin/tcpdrop/Makefile.depend
  projects/bmake/usr.sbin/tcpdump/tcpdump/Makefile.depend
  projects/bmake/usr.sbin/timed/timed/Makefile.depend
  projects/bmake/usr.sbin/timed/timedc/Makefile.depend
  projects/bmake/usr.sbin/traceroute/Makefile.depend
  projects/bmake/usr.sbin/traceroute6/Makefile.depend
  projects/bmake/usr.sbin/trpt/Makefile.depend
  projects/bmake/usr.sbin/tzsetup/Makefile.depend
  projects/bmake/usr.sbin/uathload/Makefile.depend
  projects/bmake/usr.sbin/ugidfw/Makefile.depend
  projects/bmake/usr.sbin/uhsoctl/Makefile.depend
  projects/bmake/usr.sbin/usbconfig/Makefile.depend
  projects/bmake/usr.sbin/usbdump/Makefile.depend
  projects/bmake/usr.sbin/utx/Makefile.depend
  projects/bmake/usr.sbin/vidcontrol/Makefile.depend
  projects/bmake/usr.sbin/vipw/Makefile.depend
  projects/bmake/usr.sbin/wake/Makefile.depend
  projects/bmake/usr.sbin/watch/Makefile.depend
  projects/bmake/usr.sbin/watchdogd/Makefile.depend
  projects/bmake/usr.sbin/wlandebug/Makefile.depend
  projects/bmake/usr.sbin/wlconfig/Makefile.depend
  projects/bmake/usr.sbin/wpa/hostapd/Makefile.depend
  projects/bmake/usr.sbin/wpa/hostapd_cli/Makefile.depend
  projects/bmake/usr.sbin/wpa/ndis_events/Makefile.depend
  projects/bmake/usr.sbin/wpa/wpa_cli/Makefile.depend
  projects/bmake/usr.sbin/wpa/wpa_passphrase/Makefile.depend
  projects/bmake/usr.sbin/wpa/wpa_supplicant/Makefile.depend
  projects/bmake/usr.sbin/yp_mkdb/Makefile.depend
  projects/bmake/usr.sbin/ypbind/Makefile.depend
  projects/bmake/usr.sbin/yppoll/Makefile.depend
  projects/bmake/usr.sbin/yppush/Makefile.depend
  projects/bmake/usr.sbin/ypserv/Makefile.depend
  projects/bmake/usr.sbin/ypset/Makefile.depend
  projects/bmake/usr.sbin/zic/zdump/Makefile.depend
  projects/bmake/usr.sbin/zic/zic/Makefile.depend
  projects/bmake/usr.sbin/zzz/Makefile.depend
Modified:
  projects/bmake/Makefile
  projects/bmake/Makefile.inc1
  projects/bmake/external/bsd/bmake/usr.bin/bmake/Makefile
  projects/bmake/external/bsd/bmake/usr.bin/bmake/config.h
  projects/bmake/external/bsd/bmake/usr.bin/bmake/unit-tests/Makefile
  projects/bmake/gnu/usr.bin/cc/cc_int/Makefile
  projects/bmake/gnu/usr.bin/cc/include/Makefile
  projects/bmake/include/Makefile
  projects/bmake/include/arpa/Makefile
  projects/bmake/include/gssapi/Makefile
  projects/bmake/include/protocols/Makefile
  projects/bmake/include/xlocale/Makefile
  projects/bmake/kerberos5/Makefile
  projects/bmake/kerberos5/tools/asn1_compile/Makefile
  projects/bmake/kerberos5/tools/slc/Makefile
  projects/bmake/lib/clang/include/Makefile
  projects/bmake/lib/csu/i386-elf/Makefile
  projects/bmake/lib/libc/Makefile
  projects/bmake/lib/msun/Makefile
  projects/bmake/share/mk/bsd.crunchgen.mk
  projects/bmake/share/mk/bsd.dep.mk
  projects/bmake/share/mk/bsd.files.mk
  projects/bmake/share/mk/bsd.incs.mk
  projects/bmake/share/mk/bsd.init.mk
  projects/bmake/share/mk/bsd.lib.mk
  projects/bmake/share/mk/bsd.obj.mk
  projects/bmake/share/mk/bsd.own.mk
  projects/bmake/share/mk/bsd.prog.mk
  projects/bmake/share/mk/bsd.subdir.mk
  projects/bmake/share/mk/bsd.sys.mk
  projects/bmake/share/mk/sys.mk
  projects/bmake/sys/conf/kern.post.mk
  projects/bmake/sys/conf/kmod.mk
  projects/bmake/tools/build/make_check/Makefile
  projects/bmake/tools/build/mk/Makefile.boot
  projects/bmake/usr.sbin/crunch/examples/Makefile

Modified: projects/bmake/Makefile
==============================================================================
--- projects/bmake/Makefile	Wed Aug 22 19:02:07 2012	(r239571)
+++ projects/bmake/Makefile	Wed Aug 22 19:25:57 2012	(r239572)
@@ -124,9 +124,9 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH
 .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
 	(in make.conf(5)) or command-line variable.
 .endif
-MAKEPATH=	${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
+MAKEPATH=	${MAKEOBJDIRPREFIX}${.CURDIR}/${MAKE:T}.${MACHINE}
 BINMAKE= \
-	`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
+	`if [ -x ${MAKEPATH}/${MAKE:T} ]; then echo ${MAKEPATH}/${MAKE:T}; else echo ${MAKE}; fi` \
 	-m ${.CURDIR}/share/mk
 _MAKE=	PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
 
@@ -216,7 +216,7 @@ ${TGTS}:
 .MAIN:	all
 
 STARTTIME!= LC_ALL=C date
-CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s
+CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s; echo
 .if !empty(CHECK_TIME)
 .error check your date/time: ${STARTTIME}
 .endif
@@ -284,7 +284,7 @@ upgrade_checks:
 	    PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
 	    PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
 	then \
-	    (cd ${.CURDIR} && ${MAKE} make); \
+	    (cd ${.CURDIR} && ${MAKE} ${MAKE:T}); \
 	fi
 
 #
@@ -303,9 +303,20 @@ MMAKE=		${MMAKEENV} ${MAKE} \
 make: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Building an up-to-date make(1)"
+	@echo ">>> Building an up-to-date ${MAKE:T}(1)"
 	@echo "--------------------------------------------------------------"
-	${_+_}@cd ${.CURDIR}/usr.bin/make; \
+	${_+_}@cd ${.CURDIR}/usr.bin/${MAKE:T}; \
+		${MMAKE} obj && \
+		${MMAKE} depend && \
+		${MMAKE} all && \
+		${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
+
+bmake: .PHONY
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Building an up-to-date bmake(1)"
+	@echo "--------------------------------------------------------------"
+	${_+_}@cd ${.CURDIR}/external/bsd/bmake/usr.bin/bmake; \
 		${MMAKE} obj && \
 		${MMAKE} depend && \
 		${MMAKE} all && \

Modified: projects/bmake/Makefile.inc1
==============================================================================
--- projects/bmake/Makefile.inc1	Wed Aug 22 19:02:07 2012	(r239571)
+++ projects/bmake/Makefile.inc1	Wed Aug 22 19:25:57 2012	(r239572)
@@ -81,6 +81,8 @@ SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_OFED} != "no"
 SUBDIR+=contrib/ofed
 .endif
+SUBDIR+=external/bsd
+
 #
 # We must do etc/ last for install/distribute to work.
 #
@@ -240,6 +242,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
+		-DWITHOUT_META_MODE \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
@@ -251,12 +254,14 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
+		-DWITHOUT_META_MODE \
 		-DNO_LINT \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		-DWITHOUT_META_MODE \
 		-DWITHOUT_GDB
 
 # world stage
@@ -1678,3 +1683,5 @@ _xi-links:
 xdev xdev-buil xdev-install:
 	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif
+
+.MAKE.MODE= normal

Added: projects/bmake/bin/cat/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/cat/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/chflags/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/chflags/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/chio/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/chio/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/chmod/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/chmod/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/cp/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/cp/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/csh/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/csh/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,348 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/arpa \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcrypt \
+	lib/ncurses/ncurses \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+ed.chared.o: ed.defns.h
+ed.chared.o: iconv.h
+ed.chared.o: sh.err.h
+ed.chared.o: tc.const.h
+ed.chared.po: ed.defns.h
+ed.chared.po: iconv.h
+ed.chared.po: sh.err.h
+ed.chared.po: tc.const.h
+ed.defns.o: iconv.h
+ed.defns.o: sh.err.h
+ed.defns.o: tc.const.h
+ed.defns.po: iconv.h
+ed.defns.po: sh.err.h
+ed.defns.po: tc.const.h
+ed.init.o: ed.defns.h
+ed.init.o: iconv.h
+ed.init.o: sh.err.h
+ed.init.o: tc.const.h
+ed.init.po: ed.defns.h
+ed.init.po: iconv.h
+ed.init.po: sh.err.h
+ed.init.po: tc.const.h
+ed.inputl.o: ed.defns.h
+ed.inputl.o: iconv.h
+ed.inputl.o: sh.err.h
+ed.inputl.o: tc.const.h
+ed.inputl.po: ed.defns.h
+ed.inputl.po: iconv.h
+ed.inputl.po: sh.err.h
+ed.inputl.po: tc.const.h
+ed.refresh.o: iconv.h
+ed.refresh.o: sh.err.h
+ed.refresh.o: tc.const.h
+ed.refresh.po: iconv.h
+ed.refresh.po: sh.err.h
+ed.refresh.po: tc.const.h
+ed.screen.o: ed.defns.h
+ed.screen.o: iconv.h
+ed.screen.o: sh.err.h
+ed.screen.o: tc.const.h
+ed.screen.po: ed.defns.h
+ed.screen.po: iconv.h
+ed.screen.po: sh.err.h
+ed.screen.po: tc.const.h
+ed.term.o: iconv.h
+ed.term.o: sh.err.h
+ed.term.o: tc.const.h
+ed.term.po: iconv.h
+ed.term.po: sh.err.h
+ed.term.po: tc.const.h
+ed.xmap.o: ed.defns.h
+ed.xmap.o: iconv.h
+ed.xmap.o: sh.err.h
+ed.xmap.o: tc.const.h
+ed.xmap.po: ed.defns.h
+ed.xmap.po: iconv.h
+ed.xmap.po: sh.err.h
+ed.xmap.po: tc.const.h
+glob.o: iconv.h
+glob.o: sh.err.h
+glob.o: tc.const.h
+glob.po: iconv.h
+glob.po: sh.err.h
+glob.po: tc.const.h
+iconv_stub.o: iconv.h
+iconv_stub.po: iconv.h
+mi.termios.o: iconv.h
+mi.termios.o: sh.err.h
+mi.termios.o: tc.const.h
+mi.termios.po: iconv.h
+mi.termios.po: sh.err.h
+mi.termios.po: tc.const.h
+sh.char.o: iconv.h
+sh.char.o: sh.err.h
+sh.char.o: tc.const.h
+sh.char.po: iconv.h
+sh.char.po: sh.err.h
+sh.char.po: tc.const.h
+sh.dir.o: iconv.h
+sh.dir.o: sh.err.h
+sh.dir.o: tc.const.h
+sh.dir.po: iconv.h
+sh.dir.po: sh.err.h
+sh.dir.po: tc.const.h
+sh.dol.o: iconv.h
+sh.dol.o: sh.err.h
+sh.dol.o: tc.const.h
+sh.dol.po: iconv.h
+sh.dol.po: sh.err.h
+sh.dol.po: tc.const.h
+sh.err.o: iconv.h
+sh.err.o: sh.err.h
+sh.err.o: tc.const.h
+sh.err.po: iconv.h
+sh.err.po: sh.err.h
+sh.err.po: tc.const.h
+sh.exec.o: iconv.h
+sh.exec.o: sh.err.h
+sh.exec.o: tc.const.h
+sh.exec.po: iconv.h
+sh.exec.po: sh.err.h
+sh.exec.po: tc.const.h
+sh.exp.o: iconv.h
+sh.exp.o: sh.err.h
+sh.exp.o: tc.const.h
+sh.exp.po: iconv.h
+sh.exp.po: sh.err.h
+sh.exp.po: tc.const.h
+sh.file.o: iconv.h
+sh.file.o: sh.err.h
+sh.file.o: tc.const.h
+sh.file.po: iconv.h
+sh.file.po: sh.err.h
+sh.file.po: tc.const.h
+sh.func.o: iconv.h
+sh.func.o: sh.err.h
+sh.func.o: tc.const.h
+sh.func.po: iconv.h
+sh.func.po: sh.err.h
+sh.func.po: tc.const.h
+sh.glob.o: iconv.h
+sh.glob.o: sh.err.h
+sh.glob.o: tc.const.h
+sh.glob.po: iconv.h
+sh.glob.po: sh.err.h
+sh.glob.po: tc.const.h
+sh.hist.o: iconv.h
+sh.hist.o: sh.err.h
+sh.hist.o: tc.const.h
+sh.hist.po: iconv.h
+sh.hist.po: sh.err.h
+sh.hist.po: tc.const.h
+sh.init.o: iconv.h
+sh.init.o: sh.err.h
+sh.init.o: tc.const.h
+sh.init.po: iconv.h
+sh.init.po: sh.err.h
+sh.init.po: tc.const.h
+sh.lex.o: iconv.h
+sh.lex.o: sh.err.h
+sh.lex.o: tc.const.h
+sh.lex.po: iconv.h
+sh.lex.po: sh.err.h
+sh.lex.po: tc.const.h
+sh.misc.o: iconv.h
+sh.misc.o: sh.err.h
+sh.misc.o: tc.const.h
+sh.misc.po: iconv.h
+sh.misc.po: sh.err.h
+sh.misc.po: tc.const.h
+sh.o: iconv.h
+sh.o: sh.err.h
+sh.o: tc.const.h
+sh.parse.o: iconv.h
+sh.parse.o: sh.err.h
+sh.parse.o: tc.const.h
+sh.parse.po: iconv.h
+sh.parse.po: sh.err.h
+sh.parse.po: tc.const.h
+sh.po: iconv.h
+sh.po: sh.err.h
+sh.po: tc.const.h
+sh.print.o: iconv.h
+sh.print.o: sh.err.h
+sh.print.o: tc.const.h
+sh.print.po: iconv.h
+sh.print.po: sh.err.h
+sh.print.po: tc.const.h
+sh.proc.o: iconv.h
+sh.proc.o: sh.err.h
+sh.proc.o: tc.const.h
+sh.proc.po: iconv.h
+sh.proc.po: sh.err.h
+sh.proc.po: tc.const.h
+sh.sem.o: iconv.h
+sh.sem.o: sh.err.h
+sh.sem.o: tc.const.h
+sh.sem.po: iconv.h
+sh.sem.po: sh.err.h
+sh.sem.po: tc.const.h
+sh.set.o: iconv.h
+sh.set.o: sh.err.h
+sh.set.o: tc.const.h
+sh.set.po: iconv.h
+sh.set.po: sh.err.h
+sh.set.po: tc.const.h
+sh.time.o: iconv.h
+sh.time.o: sh.err.h
+sh.time.o: tc.const.h
+sh.time.po: iconv.h
+sh.time.po: sh.err.h
+sh.time.po: tc.const.h
+tc.alloc.o: iconv.h
+tc.alloc.o: sh.err.h
+tc.alloc.o: tc.const.h
+tc.alloc.po: iconv.h
+tc.alloc.po: sh.err.h
+tc.alloc.po: tc.const.h
+tc.bind.o: ed.defns.h
+tc.bind.o: iconv.h
+tc.bind.o: sh.err.h
+tc.bind.o: tc.const.h
+tc.bind.po: ed.defns.h
+tc.bind.po: iconv.h
+tc.bind.po: sh.err.h
+tc.bind.po: tc.const.h
+tc.const.o: iconv.h
+tc.const.o: sh.err.h
+tc.const.o: tc.const.h
+tc.const.po: iconv.h
+tc.const.po: sh.err.h
+tc.const.po: tc.const.h
+tc.defs.o: iconv.h
+tc.defs.o: sh.err.h
+tc.defs.o: tc.const.h
+tc.defs.o: tc.defs.c
+tc.defs.po: iconv.h
+tc.defs.po: sh.err.h
+tc.defs.po: tc.const.h
+tc.defs.po: tc.defs.c
+tc.disc.o: iconv.h
+tc.disc.o: sh.err.h
+tc.disc.o: tc.const.h
+tc.disc.po: iconv.h
+tc.disc.po: sh.err.h
+tc.disc.po: tc.const.h
+tc.func.o: ed.defns.h
+tc.func.o: iconv.h
+tc.func.o: sh.err.h
+tc.func.o: tc.const.h
+tc.func.po: ed.defns.h
+tc.func.po: iconv.h
+tc.func.po: sh.err.h
+tc.func.po: tc.const.h
+tc.nls.o: iconv.h
+tc.nls.o: sh.err.h
+tc.nls.o: tc.const.h
+tc.nls.po: iconv.h
+tc.nls.po: sh.err.h
+tc.nls.po: tc.const.h
+tc.os.o: ed.defns.h
+tc.os.o: iconv.h
+tc.os.o: sh.err.h
+tc.os.o: tc.const.h
+tc.os.po: ed.defns.h
+tc.os.po: iconv.h
+tc.os.po: sh.err.h
+tc.os.po: tc.const.h
+tc.printf.o: iconv.h
+tc.printf.o: sh.err.h
+tc.printf.o: tc.const.h
+tc.printf.po: iconv.h
+tc.printf.po: sh.err.h
+tc.printf.po: tc.const.h
+tc.prompt.o: iconv.h
+tc.prompt.o: sh.err.h
+tc.prompt.o: tc.const.h
+tc.prompt.po: iconv.h
+tc.prompt.po: sh.err.h
+tc.prompt.po: tc.const.h
+tc.sched.o: iconv.h
+tc.sched.o: sh.err.h
+tc.sched.o: tc.const.h
+tc.sched.po: iconv.h
+tc.sched.po: sh.err.h
+tc.sched.po: tc.const.h
+tc.sig.o: iconv.h
+tc.sig.o: sh.err.h
+tc.sig.o: tc.const.h
+tc.sig.po: iconv.h
+tc.sig.po: sh.err.h
+tc.sig.po: tc.const.h
+tc.str.o: iconv.h
+tc.str.o: sh.err.h
+tc.str.o: tc.const.h
+tc.str.po: iconv.h
+tc.str.po: sh.err.h
+tc.str.po: tc.const.h
+tc.vers.o: iconv.h
+tc.vers.o: sh.err.h
+tc.vers.o: tc.const.h
+tc.vers.po: iconv.h
+tc.vers.po: sh.err.h
+tc.vers.po: tc.const.h
+tc.who.o: iconv.h
+tc.who.o: sh.err.h
+tc.who.o: tc.const.h
+tc.who.po: iconv.h
+tc.who.po: sh.err.h
+tc.who.po: tc.const.h
+tw.color.o: iconv.h
+tw.color.o: sh.err.h
+tw.color.o: tc.const.h
+tw.color.po: iconv.h
+tw.color.po: sh.err.h
+tw.color.po: tc.const.h
+tw.comp.o: iconv.h
+tw.comp.o: sh.err.h
+tw.comp.o: tc.const.h
+tw.comp.po: iconv.h
+tw.comp.po: sh.err.h
+tw.comp.po: tc.const.h
+tw.help.o: iconv.h
+tw.help.o: sh.err.h
+tw.help.o: tc.const.h
+tw.help.po: iconv.h
+tw.help.po: sh.err.h
+tw.help.po: tc.const.h
+tw.init.o: iconv.h
+tw.init.o: sh.err.h
+tw.init.o: tc.const.h
+tw.init.po: iconv.h
+tw.init.po: sh.err.h
+tw.init.po: tc.const.h
+tw.parse.o: iconv.h
+tw.parse.o: sh.err.h
+tw.parse.o: tc.const.h
+tw.parse.po: iconv.h
+tw.parse.po: sh.err.h
+tw.parse.po: tc.const.h
+tw.spell.o: iconv.h
+tw.spell.o: sh.err.h
+tw.spell.o: tc.const.h
+tw.spell.po: iconv.h
+tw.spell.po: sh.err.h
+tw.spell.po: tc.const.h
+.endif

Added: projects/bmake/bin/date/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/date/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,20 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/protocols \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/dd/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/dd/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/df/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/df/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,20 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libutil \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/domainname/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/domainname/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/echo/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/echo/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/ed/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/ed/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,20 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	secure/lib/libcrypto \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/expr/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/expr/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,21 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+expr.o: expr.c
+expr.po: expr.c
+.endif

Added: projects/bmake/bin/getfacl/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/getfacl/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/hostname/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/hostname/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/kenv/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/kenv/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/kill/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/kill/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/ln/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/ln/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/ls/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/ls/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,21 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libutil \
+	lib/ncurses/ncurses \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/mkdir/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/mkdir/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/mv/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/mv/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/pax/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/pax/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/pkill/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/pkill/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,20 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libkvm \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/ps/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/ps/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,21 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libkvm \
+	lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/pwait/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/pwait/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: projects/bmake/bin/pwd/Makefile.depend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bmake/bin/pwd/Makefile.depend	Wed Aug 22 19:25:57 2012	(r239572)
@@ -0,0 +1,19 @@
+# Autogenerated - do NOT edit!
+
+DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
+
+DEP_MACHINE := ${.PARSEFILE:E}
+
+DIRDEPS = \
+	gnu/lib/libgcc \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 24 09:28:23 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 205F3106566C;
	Fri, 24 Aug 2012 09:28:23 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B4838FC12;
	Fri, 24 Aug 2012 09:28:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7O9SM6u006429;
	Fri, 24 Aug 2012 09:28:22 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7O9SMGZ006426;
	Fri, 24 Aug 2012 09:28:22 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201208240928.q7O9SMGZ006426@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 24 Aug 2012 09:28:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239644 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 09:28:23 -0000

Author: glebius
Date: Fri Aug 24 09:28:22 2012
New Revision: 239644
URL: http://svn.freebsd.org/changeset/base/239644

Log:
  Bringing pfsync0 down should really disable pfsync_input().

Modified:
  projects/pf/head/sys/contrib/pf/net/if_pfsync.c

Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Fri Aug 24 07:35:18 2012	(r239643)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Fri Aug 24 09:28:22 2012	(r239644)
@@ -594,8 +594,9 @@ pfsync_input(struct mbuf *m, __unused in
 
 	V_pfsyncstats.pfsyncs_ipackets++;
 
-	/* verify that we have a sync interface configured */
-	if (!sc || !sc->sc_sync_if || !V_pf_status.running)
+	/* Verify that we have a sync interface configured. */
+	if (!sc || !sc->sc_sync_if || !V_pf_status.running ||
+	    (sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
 		goto done;
 
 	/* verify that the packet came in on the right interface */

From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 24 14:25:58 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 35775106566B;
	Fri, 24 Aug 2012 14:25:58 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 20B008FC0A;
	Fri, 24 Aug 2012 14:25:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7OEPvnI051857;
	Fri, 24 Aug 2012 14:25:57 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7OEPvwt051855;
	Fri, 24 Aug 2012 14:25:57 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201208241425.q7OEPvwt051855@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 24 Aug 2012 14:25:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239652 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 14:25:58 -0000

Author: glebius
Date: Fri Aug 24 14:25:57 2012
New Revision: 239652
URL: http://svn.freebsd.org/changeset/base/239652

Log:
  Backout r239186 and provide correct fix.

Modified:
  projects/pf/head/sys/contrib/pf/net/pf.c

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Fri Aug 24 14:22:47 2012	(r239651)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Fri Aug 24 14:25:57 2012	(r239652)
@@ -1074,7 +1074,10 @@ pf_state_key_clone(struct pf_state_key *
 	if (sk == NULL)
 		return (NULL);
 
-	bcopy(orig, sk, sizeof(struct pf_state_key));
+	bcopy(orig, sk, sizeof(struct pf_state_key_cmp));
+
+	TAILQ_INIT(&sk->states[PF_SK_WIRE]);
+	TAILQ_INIT(&sk->states[PF_SK_STACK]);
 
 	return (sk);
 }

From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 24 17:48:55 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A21C7106566C;
	Fri, 24 Aug 2012 17:48:55 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D7758FC12;
	Fri, 24 Aug 2012 17:48:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7OHmtvE079159;
	Fri, 24 Aug 2012 17:48:55 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7OHmtbu079156;
	Fri, 24 Aug 2012 17:48:55 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201208241748.q7OHmtbu079156@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 24 Aug 2012 17:48:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239661 - projects/pf/head/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 17:48:55 -0000

Author: glebius
Date: Fri Aug 24 17:48:55 2012
New Revision: 239661
URL: http://svn.freebsd.org/changeset/base/239661

Log:
  Since r238421 caused so much pain, restore the UMA
  initialization for the key zone, but make it ctor
  method rather then init method. This doesn't provide
  any optimisation, but just reduces code duplication.

Modified:
  projects/pf/head/sys/contrib/pf/net/if_pfsync.c
  projects/pf/head/sys/contrib/pf/net/pf.c

Modified: projects/pf/head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Fri Aug 24 17:48:15 2012	(r239660)
+++ projects/pf/head/sys/contrib/pf/net/if_pfsync.c	Fri Aug 24 17:48:55 2012	(r239661)
@@ -460,23 +460,18 @@ pfsync_state_import(struct pfsync_state 
 	if ((st = uma_zalloc(V_pf_state_z, M_NOWAIT | M_ZERO)) == NULL)
 		goto cleanup;
 
-	if ((skw = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO)) == NULL)
+	if ((skw = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL)
 		goto cleanup;
 
-	TAILQ_INIT(&skw->states[PF_SK_WIRE]);
-	TAILQ_INIT(&skw->states[PF_SK_STACK]);
-
 	if (PF_ANEQ(&sp->key[PF_SK_WIRE].addr[0],
 	    &sp->key[PF_SK_STACK].addr[0], sp->af) ||
 	    PF_ANEQ(&sp->key[PF_SK_WIRE].addr[1],
 	    &sp->key[PF_SK_STACK].addr[1], sp->af) ||
 	    sp->key[PF_SK_WIRE].port[0] != sp->key[PF_SK_STACK].port[0] ||
 	    sp->key[PF_SK_WIRE].port[1] != sp->key[PF_SK_STACK].port[1]) {
-		sks = uma_zalloc(V_pf_state_key_z, M_NOWAIT | M_ZERO);
+		sks = uma_zalloc(V_pf_state_key_z, M_NOWAIT);
 		if (sks == NULL)
 			goto cleanup;
-		TAILQ_INIT(&sks->states[PF_SK_WIRE]);
-		TAILQ_INIT(&sks->states[PF_SK_STACK]);
 	} else
 		sks = skw;
 

Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c	Fri Aug 24 17:48:15 2012	(r239660)
+++ projects/pf/head/sys/contrib/pf/net/pf.c	Fri Aug 24 17:48:55 2012	(r239661)
@@ -259,6 +259,7 @@ static void		 pf_detach_state(struct pf_
 static int		 pf_state_key_attach(struct pf_state_key *,
 			    struct pf_state_key *, struct pf_state *);
 static void		 pf_state_key_detach(struct pf_state *, int);
+static int		 pf_state_key_ctor(void *, int, void *, int);
 static u_int32_t	 pf_tcp_iss(struct pf_pdesc *);
 static int		 pf_test_rule(struct pf_rule **, struct pf_state **,
 			    int, struct pfi_kif *, struct mbuf *, int,
@@ -739,7 +740,7 @@ pf_initialize()
         uma_zone_set_max(V_pf_state_z, PFSTATE_HIWAT);
 
 	V_pf_state_key_z = uma_zcreate("pf state keys",
-	    sizeof(struct pf_state_key), NULL, NULL, NULL, NULL,
+	    sizeof(struct pf_state_key), pf_state_key_ctor, NULL, NULL, NULL,
 	    UMA_ALIGN_PTR, 0);
 	V_pf_keyhash = malloc(V_pf_hashsize * sizeof(struct pf_keyhash),
 	    M_PFHASH, M_WAITOK | M_ZERO);
@@ -1042,13 +1043,25 @@ pf_state_key_detach(struct pf_state *s, 
 	}
 }
 
+static int
+pf_state_key_ctor(void *mem, int size, void *arg, int flags)
+{
+	struct pf_state_key *sk = mem;
+
+	bzero(sk, sizeof(struct pf_state_key_cmp));
+	TAILQ_INIT(&sk->states[PF_SK_WIRE]);
+	TAILQ_INIT(&sk->states[PF_SK_STACK]);
+
+	return (0);
+}
+
 struct pf_state_key *
 pf_state_key_setup(struct pf_pdesc *pd, struct pf_addr *saddr,
 	struct pf_addr *daddr, u_int16_t sport, u_int16_t dport)
 {
 	struct pf_state_key *sk;
 
-	sk = uma_zalloc(V_pf_state_key_z, M_ZERO | M_NOWAIT);
+	sk = uma_zalloc(V_pf_state_key_z, M_NOWAIT);
 	if (sk == NULL)
 		return (NULL);
 
@@ -1059,9 +1072,6 @@ pf_state_key_setup(struct pf_pdesc *pd, 
 	sk->proto = pd->proto;
 	sk->af = pd->af;
 
-	TAILQ_INIT(&sk->states[PF_SK_WIRE]);
-	TAILQ_INIT(&sk->states[PF_SK_STACK]);
-
 	return (sk);
 }
 
@@ -1076,9 +1086,6 @@ pf_state_key_clone(struct pf_state_key *
 
 	bcopy(orig, sk, sizeof(struct pf_state_key_cmp));
 
-	TAILQ_INIT(&sk->states[PF_SK_WIRE]);
-	TAILQ_INIT(&sk->states[PF_SK_STACK]);
-
 	return (sk);
 }
 

From owner-svn-src-projects@FreeBSD.ORG  Sat Aug 25 22:45:26 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ECEAC1065670;
	Sat, 25 Aug 2012 22:45:26 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BFBA28FC12;
	Sat, 25 Aug 2012 22:45:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7PMjQ1n008385;
	Sat, 25 Aug 2012 22:45:26 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7PMjQR1008381;
	Sat, 25 Aug 2012 22:45:26 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201208252245.q7PMjQR1008381@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sat, 25 Aug 2012 22:45:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239692 - projects/nfsv4.1-client/sys/rpc
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2012 22:45:27 -0000

Author: rmacklem
Date: Sat Aug 25 22:45:26 2012
New Revision: 239692
URL: http://svn.freebsd.org/changeset/base/239692

Log:
  Remove debug printfs from the rpc code.

Modified:
  projects/nfsv4.1-client/sys/rpc/clnt_rc.c
  projects/nfsv4.1-client/sys/rpc/clnt_vc.c
  projects/nfsv4.1-client/sys/rpc/svc_vc.c

Modified: projects/nfsv4.1-client/sys/rpc/clnt_rc.c
==============================================================================
--- projects/nfsv4.1-client/sys/rpc/clnt_rc.c	Sat Aug 25 22:35:29 2012	(r239691)
+++ projects/nfsv4.1-client/sys/rpc/clnt_rc.c	Sat Aug 25 22:45:26 2012	(r239692)
@@ -450,7 +450,6 @@ clnt_reconnect_control(CLIENT *cl, u_int
 		break;
 
 	case CLSET_BACKCHANNEL:
-printf("clntrc reg backch\n");
 		xprt = (SVCXPRT *)info;
 		SVC_ACQUIRE(xprt);
 		xprt_register(xprt);
@@ -498,7 +497,6 @@ clnt_reconnect_destroy(CLIENT *cl)
 	if (rc->rc_client)
 		CLNT_DESTROY(rc->rc_client);
 	if (rc->rc_backchannel) {
-printf("clntrc dereg backch\n");
 		xprt = (SVCXPRT *)rc->rc_backchannel;
 		xprt_unregister(xprt);
 		SVC_RELEASE(xprt);

Modified: projects/nfsv4.1-client/sys/rpc/clnt_vc.c
==============================================================================
--- projects/nfsv4.1-client/sys/rpc/clnt_vc.c	Sat Aug 25 22:35:29 2012	(r239691)
+++ projects/nfsv4.1-client/sys/rpc/clnt_vc.c	Sat Aug 25 22:45:26 2012	(r239692)
@@ -814,7 +814,6 @@ clnt_vc_destroy(CLIENT *cl)
 	if (xprt != NULL) {
 		sx_xunlock(&xprt->xp_lock);
 		SVC_RELEASE(xprt);
-printf("xprt rel\n");
 	}
 
 	mtx_destroy(&ct->ct_lock);
@@ -983,7 +982,6 @@ clnt_vc_soupcall(struct socket *so, void
 				/* Check message direction. */
 				if (xid_plus_direction[1] == CALL) {
 					/* This is a backchannel request. */
-printf("bc req\n");
 					mtx_lock(&ct->ct_lock);
 					xprt = ct->ct_backchannelxprt;
 					if (xprt == NULL) {
@@ -1014,7 +1012,6 @@ printf("bc req\n");
 						ct->ct_record = NULL;
 						xprt_active(xprt);
 						mtx_unlock(&ct->ct_lock);
-printf("got bmsg\n");
 					}
 				} else {
 					mtx_lock(&ct->ct_lock);

Modified: projects/nfsv4.1-client/sys/rpc/svc_vc.c
==============================================================================
--- projects/nfsv4.1-client/sys/rpc/svc_vc.c	Sat Aug 25 22:35:29 2012	(r239691)
+++ projects/nfsv4.1-client/sys/rpc/svc_vc.c	Sat Aug 25 22:45:26 2012	(r239692)
@@ -755,7 +755,6 @@ svc_vc_backchannel_recv(SVCXPRT *xprt, s
 	struct mbuf *m;
 	XDR xdrs;
 
-printf("back rcv\n");
 	sx_xlock(&xprt->xp_lock);
 	ct = (struct ct_data *)xprt->xp_p2;
 	if (ct == NULL) {

From owner-svn-src-projects@FreeBSD.ORG  Sat Aug 25 23:03:46 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0A2041065670;
	Sat, 25 Aug 2012 23:03:46 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E79588FC20;
	Sat, 25 Aug 2012 23:03:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7PN3j31010473;
	Sat, 25 Aug 2012 23:03:45 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7PN3jcN010463;
	Sat, 25 Aug 2012 23:03:45 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201208252303.q7PN3jcN010463@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sat, 25 Aug 2012 23:03:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239694 - in projects/nfsv4.1-client/sys/fs: nfs
	nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2012 23:03:46 -0000

Author: rmacklem
Date: Sat Aug 25 23:03:45 2012
New Revision: 239694
URL: http://svn.freebsd.org/changeset/base/239694

Log:
  Add support for segmented file layouts to PNFS for the NFSv4.1 client.
  Also fix up debug printfs by making them controlable via the sysctl
  vfs.nfs.debuglevel. This completes all changes for the NFSv4.1 client
  needed as a result of testing at the recent Bakeathon.

Modified:
  projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c
  projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c
  projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
  projects/nfsv4.1-client/sys/fs/nfs/nfscl.h
  projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clkrpc.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvfsops.c
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clvnops.c

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c	Sat Aug 25 23:03:45 2012	(r239694)
@@ -94,6 +94,7 @@ extern struct nfsreqhead nfsd_reqq;
 extern int nfscl_ticks;
 extern void (*ncl_call_invalcaches)(struct vnode *);
 extern int nfs_numnfscbd;
+extern int nfscl_debuglevel;
 
 SVCPOOL		*nfscbd_pool;
 static int	nfsrv_gsscallbackson = 0;
@@ -805,7 +806,9 @@ tryagain:
 		 */
 		NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
 		nd->nd_repstat = fxdr_unsigned(u_int32_t, *tl);
-if (nd->nd_repstat >= 10000) printf("proc=%d reps=%d\n",nd->nd_procnum,nd->nd_repstat);
+		if (nd->nd_repstat >= 10000)
+			NFSCL_DEBUG(1, "proc=%d reps=%d\n", (int)nd->nd_procnum,
+			    (int)nd->nd_repstat);
 
 		/*
 		 * Get rid of the tag, return count and SEQUENCE result for
@@ -821,11 +824,13 @@ if (nd->nd_repstat >= 10000) printf("pro
 			opcnt = fxdr_unsigned(int, *tl++);
 			i = fxdr_unsigned(int, *tl++);
 			j = fxdr_unsigned(int, *tl);
-if (j >= 10000) printf("fop=%d fst=%d\n",i,j);
+			if (j >= 10000)
+				NFSCL_DEBUG(1, "fop=%d fst=%d\n", i, j);
 			/*
 			 * If the first op is Sequence, free up the slot.
 			 */
-if (nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0) printf("failed seq=%d\n", j);
+			if (nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0)
+				NFSCL_DEBUG(1, "failed seq=%d\n", j);
 			if (nmp != NULL && i == NFSV4OP_SEQUENCE && j == 0) {
 				NFSM_DISSECT(tl, uint32_t *, NFSX_V4SESSIONID +
 				    5 * NFSX_UNSIGNED);
@@ -843,7 +848,6 @@ if (nmp != NULL && i == NFSV4OP_SEQUENCE
 					sep->nfsess_foreslots = (retval < 64) ?
 					    (retval + 1) : 64;
 				mtx_unlock(&sep->nfsess_mtx);
-{ static int yyuuii = 0; int yuiop; yuiop = fxdr_unsigned(int, *++tl); if (yuiop != yyuuii) { yyuuii = yuiop; printf("seqfl=0x%x\n", yuiop); } }
 
 				/* Grab the op and status for the next one. */
 				if (opcnt > 1) {
@@ -910,12 +914,15 @@ if (nmp != NULL && i == NFSV4OP_SEQUENCE
 			/*
 			 * If this op is Putfh, throw its results away.
 			 */
-if (j >= 10000) printf("nop=%d nst=%d\n",i,j);
+			if (j >= 10000)
+				NFSCL_DEBUG(1, "nop=%d nst=%d\n", i, j);
 			if (nmp != NULL && i == NFSV4OP_PUTFH && j == 0) {
 				NFSM_DISSECT(tl,u_int32_t *,2 * NFSX_UNSIGNED);
 				i = fxdr_unsigned(int, *tl++);
 				j = fxdr_unsigned(int, *tl);
-if (j >= 10000) printf("n2op=%d n2st=%d\n",i,j);
+				if (j >= 10000)
+					NFSCL_DEBUG(1, "n2op=%d n2st=%d\n", i,
+					    j);
 				/*
 				 * All Compounds that do an Op that must
 				 * be in sequence consist of NFSV4OP_PUTFH

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c	Sat Aug 25 23:03:45 2012	(r239694)
@@ -61,6 +61,7 @@ struct mount nfsv4root_mnt;
 int newnfs_numnfsd = 0;
 struct nfsstats newnfsstats;
 int nfs_numnfscbd = 0;
+int nfscl_debuglevel = 0;
 char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
 struct callout newnfsd_callout;
 void (*nfsd_call_servertimer)(void) = NULL;
@@ -77,6 +78,8 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, realign_c
 SYSCTL_STRING(_vfs_nfs, OID_AUTO, callback_addr, CTLFLAG_RW,
     nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr),
     "NFSv4 callback addr for server to use");
+SYSCTL_INT(_vfs_nfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nfscl_debuglevel,
+    0, "Debug level for newnfs client");
 
 /*
  * Defines for malloc

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Sat Aug 25 23:03:45 2012	(r239694)
@@ -459,6 +459,8 @@ int nfsrpc_layoutreturn(struct nfsmount 
 int nfsrpc_reclaimcomplete(struct nfsmount *, struct ucred *, NFSPROC_T *);
 int nfscl_doiods(vnode_t, struct uio *, int *, int *, uint32_t,
     struct ucred *, NFSPROC_T *);
+int nfscl_findlayoutforio(struct nfscllayout *, uint64_t, uint32_t,
+    struct nfsclflayout **);
 void nfscl_freenfsclds(struct nfsclds *);
 
 /* nfs_clstate.c */
@@ -525,8 +527,8 @@ int nfscl_layout(struct nfsmount *, vnod
     int, struct nfsclflayouthead *, struct nfscllayout **, struct ucred *,
     NFSPROC_T *);
 struct nfscllayout *nfscl_getlayout(struct nfsclclient *, uint8_t *, int,
-    int *);
-void nfscl_rellayout(struct nfscllayout *);
+    uint64_t, struct nfsclflayout **, int *);
+void nfscl_rellayout(struct nfscllayout *, int);
 struct nfscldevinfo *nfscl_getdevinfo(struct nfsclclient *, uint8_t *,
     struct nfscldevinfo *);
 void nfscl_reldevinfo(struct nfscldevinfo *);

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfscl.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfscl.h	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfscl.h	Sat Aug 25 23:03:45 2012	(r239694)
@@ -68,4 +68,10 @@ struct nfsv4node {
 #define	NFSSATTR_SIZENEG1	0x4
 #define	NFSSATTR_SIZERDEV	0x8
 
+/* Use this macro for debug printfs. */
+#define	NFSCL_DEBUG(level, ...)	do {					\
+	if (nfscl_debuglevel >= (level))				\
+		printf(__VA_ARGS__);					\
+	} while (0)
+
 #endif	/* _NFS_NFSCL_H */

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Sat Aug 25 23:03:45 2012	(r239694)
@@ -231,6 +231,7 @@ struct nfscllayout {
 	TAILQ_ENTRY(nfscllayout)	nfsly_list;
 	LIST_ENTRY(nfscllayout)		nfsly_hash;
 	nfsv4stateid_t			nfsly_stateid;
+	struct nfsv4lock		nfsly_lock;
 	uint64_t			nfsly_filesid[2];
 	uint64_t			nfsly_lastbyte;
 	struct nfsclflayouthead		nfsly_flayread;
@@ -238,7 +239,6 @@ struct nfscllayout {
 	struct nfsclrecalllayouthead	nfsly_recall;
 	time_t				nfsly_timestamp;
 	struct nfsclclient		*nfsly_clp;
-	uint32_t			nfsly_refcnt;
 	uint16_t			nfsly_flags;
 	uint16_t			nfsly_fhlen;
 	uint8_t				nfsly_fh[1];

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clkrpc.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clkrpc.c	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clkrpc.c	Sat Aug 25 23:03:45 2012	(r239694)
@@ -51,6 +51,7 @@ static int nfs_cbproc(struct nfsrv_descr
 
 extern u_long sb_max_adj;
 extern int nfs_numnfscbd;
+extern int nfscl_debuglevel;
 
 /*
  * NFS client system calls for handling callbacks.
@@ -90,7 +91,7 @@ nfscb_program(struct svc_req *rqst, SVCX
 	nd.nd_mreq = NULL;
 	nd.nd_cred = NULL;
 
-printf("cbproc=%d\n",nd.nd_procnum);
+	NFSCL_DEBUG(1, "cbproc=%d\n",nd.nd_procnum);
 	if (nd.nd_procnum != NFSPROC_NULL) {
 		if (!svc_getcred(rqst, &nd.nd_cred, &credflavor)) {
 			svcerr_weakauth(rqst);
@@ -134,11 +135,10 @@ printf("cbproc=%d\n",nd.nd_procnum);
 		svcerr_auth(rqst, nd.nd_repstat & ~NFSERR_AUTHERR);
 		if (nd.nd_mreq != NULL)
 			m_freem(nd.nd_mreq);
-	} else if (!svc_sendreply_mbuf(rqst, nd.nd_mreq)) {
+	} else if (!svc_sendreply_mbuf(rqst, nd.nd_mreq))
 		svcerr_systemerr(rqst);
-} else {
-printf("cbrep sent\n");
-	}
+	else
+		NFSCL_DEBUG(1, "cbrep sent\n");
 	svc_freereq(rqst);
 }
 

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Sat Aug 25 23:03:45 2012	(r239694)
@@ -56,6 +56,7 @@ extern u_int32_t newnfs_false, newnfs_tr
 extern nfstype nfsv34_type[9];
 extern int nfsrv_useacl;
 extern char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
+extern int nfscl_debuglevel;
 NFSCLSTATEMUTEX;
 int nfstest_outofseq = 0;
 int nfscl_assumeposixlocks = 1;
@@ -99,13 +100,11 @@ static int nfsrpc_locku(struct nfsrv_des
 static int nfsrpc_setaclrpc(vnode_t, struct ucred *, NFSPROC_T *,
     struct acl *, nfsv4stateid_t *, void *);
 static int nfsrpc_getlayout(struct nfsmount *, vnode_t, struct nfsfh *, int,
-    uint32_t *, nfsv4stateid_t *, struct nfscllayout **, struct ucred *,
-    NFSPROC_T *);
+    uint32_t *, nfsv4stateid_t *, uint64_t, struct nfscllayout **,
+    struct ucred *, NFSPROC_T *);
 static int nfsrpc_fillsa(struct nfsmount *, struct sockaddr_storage *,
     struct nfsclds **, NFSPROC_T *);
 static void nfscl_initsessionslots(struct nfsclsession *);
-static int nfscl_findlayoutforio(struct nfscllayout *, uint64_t, uint32_t,
-    struct nfsclflayout **);
 static int nfscl_doflayoutio(vnode_t, struct uio *, int *, int *, int *,
     nfsv4stateid_t *, int, struct nfscldevinfo *, struct nfsclflayout *,
     uint64_t, uint64_t, struct ucred *, NFSPROC_T *);
@@ -828,7 +827,7 @@ nfsrpc_setclient(struct nfsmount *nmp, s
 	if (NFSHASNFSV4N(nmp)) {
 		error = nfsrpc_exchangeid(nmp, clp, &nmp->nm_sockreq,
 		    NFSV4EXCH_USEPNFSMDS | NFSV4EXCH_USENONPNFS, &dsp, cred, p);
-if (error) printf("exch=%d\n",error);
+		NFSCL_DEBUG(1, "aft exch=%d\n", error);
 		if (error == 0) {
 			error = nfsrpc_createsession(nmp, &dsp->nfsclds_sess,
 			    &nmp->nm_sockreq,
@@ -844,11 +843,11 @@ if (error) printf("exch=%d\n",error);
 				NFSUNLOCKMNT(nmp);
 			} else
 				nfscl_freenfsclds(dsp);
-if (error) printf("aft crs=%d\n",error);
+			NFSCL_DEBUG(1, "aft createsess=%d\n", error);
 		}
 		if (error == 0 && reclaim == 0) {
 			error = nfsrpc_reclaimcomplete(nmp, cred, p);
-if (error) printf("aft reclcom=%d\n",error);
+			NFSCL_DEBUG(1, "aft reclaimcomp=%d\n", error);
 			if (error == NFSERR_COMPLETEALREADY ||
 			    error == NFSERR_NOTSUPP)
 				/* Ignore this error. */
@@ -4289,7 +4288,6 @@ nfsrpc_getdirpath(struct nfsmount *nmp, 
 		NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL);
 	if (error)
 		return (error);
-printf("dirp ret=%d\n", nd->nd_repstat);
 	if (nd->nd_repstat == 0) {
 		NFSM_DISSECT(tl, u_int32_t *, (3 + 2 * cnt) * NFSX_UNSIGNED);
 		tl += (2 + 2 * cnt);
@@ -4452,14 +4450,13 @@ nfsrpc_exchangeid(struct nfsmount *nmp, 
 	nd->nd_flag |= ND_USEGSSNAME;
 	error = newnfs_request(nd, nmp, NULL, nrp, NULL, p, cred,
 	    NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL);
-printf("exch err=%d reps=%d\n",error,nd->nd_repstat);
+	NFSCL_DEBUG(1, "exchangeid err=%d reps=%d\n", error,
+	    (int)nd->nd_repstat);
 	if (error != 0)
 		return (error);
 	if (nd->nd_repstat == 0) {
-printf("x1\n");
 		NFSM_DISSECT(tl, uint32_t *, 6 * NFSX_UNSIGNED + NFSX_HYPER);
 		len = fxdr_unsigned(int, *(tl + 7));
-printf("servlen=%d\n", len);
 		if (len < 0 || len > NFSV4_OPAQUELIMIT) {
 			error = NFSERR_BADXDR;
 			goto nfsmout;
@@ -4470,15 +4467,12 @@ printf("servlen=%d\n", len);
 		dsp->nfsclds_servownlen = len;
 		dsp->nfsclds_sess.nfsess_clientid.lval[0] = *tl++;
 		dsp->nfsclds_sess.nfsess_clientid.lval[1] = *tl++;
-printf("sess 0x%x 0x%x\n",dsp->nfsclds_sess.nfsess_clientid.lval[0],dsp->nfsclds_sess.nfsess_clientid.lval[1]);
 		dsp->nfsclds_sess.nfsess_sequenceid =
 		    fxdr_unsigned(uint32_t, *tl++);
-printf("sess seq=%d\n",dsp->nfsclds_sess.nfsess_sequenceid);
 		v41flags = fxdr_unsigned(uint32_t, *tl);
-printf("v41fl=0x%x nmfl=0x%x\n", v41flags, nmp->nm_flag);
 		if ((v41flags & NFSV4EXCH_USEPNFSMDS) != 0 &&
 		    NFSHASPNFSOPT(nmp)) {
-printf("set PNFS\n");
+			NFSCL_DEBUG(1, "set PNFS\n");
 			NFSLOCKMNT(nmp);
 			nmp->nm_state |= NFSSTA_PNFS;
 			NFSUNLOCKMNT(nmp);
@@ -4489,7 +4483,6 @@ printf("set PNFS\n");
 		if (len > 0)
 			nd->nd_repstat = nfsrv_mtostr(nd,
 			    dsp->nfsclds_serverown, len);
-{ int xxxx; for (xxxx=0; xxxx < len; xxxx++) printf("0x%x ", dsp->nfsclds_serverown[xxxx]); printf("\n"); }
 		if (nd->nd_repstat == 0) {
 			mtx_init(&dsp->nfsclds_mtx, "nfsds", NULL, MTX_DEF);
 			mtx_init(&dsp->nfsclds_sess.nfsess_mtx, "nfssession",
@@ -4522,9 +4515,7 @@ nfsrpc_createsession(struct nfsmount *nm
 	NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED);
 	*tl++ = sep->nfsess_clientid.lval[0];
 	*tl++ = sep->nfsess_clientid.lval[1];
-printf("crs clid 0x%x 0x%x\n",sep->nfsess_clientid.lval[0],sep->nfsess_clientid.lval[1]);
 	*tl++ = txdr_unsigned(sequenceid);
-printf("clseq0=0x%x\n",sequenceid);
 	crflags = (NFSMNT_RDONLY(nmp->nm_mountp) ? 0 : NFSV4CRSESS_PERSIST);
 	if (nfscl_enablecallb != 0 && nfs_numnfscbd > 0)
 		crflags |= NFSV4CRSESS_CONNBACKCHAN;
@@ -4573,8 +4564,6 @@ printf("clseq0=0x%x\n",sequenceid);
 		tl += NFSX_V4SESSIONID / NFSX_UNSIGNED;
 		sep->nfsess_sequenceid = fxdr_unsigned(uint32_t, *tl++);
 		crflags = fxdr_unsigned(uint32_t, *tl);
-printf("clseq=0x%x\n",sep->nfsess_sequenceid);
-printf("crfl=0x%x\n",crflags);
 		if ((crflags & NFSV4CRSESS_PERSIST) != 0 && mds != 0) {
 			NFSLOCKMNT(nmp);
 			nmp->nm_state |= NFSSTA_SESSPERSIST;
@@ -4583,23 +4572,20 @@ printf("crfl=0x%x\n",crflags);
 
 		/* Get the fore channel slot count. */
 		NFSM_DISSECT(tl, uint32_t *, 7 * NFSX_UNSIGNED);
-printf("cr %d %d %d %d %d\n",fxdr_unsigned(uint32_t, *tl),fxdr_unsigned(uint32_t, *(tl+1)),fxdr_unsigned(uint32_t, *(tl+2)),fxdr_unsigned(uint32_t, *(tl+3)),fxdr_unsigned(uint32_t, *(tl+4)));
 		tl += 3;		/* Skip the other counts. */		
 		sep->nfsess_maxcache = fxdr_unsigned(int, *tl++);
 		tl++;
 		sep->nfsess_foreslots = fxdr_unsigned(uint16_t, *tl++);
-printf("fore slots=%d\n", sep->nfsess_foreslots);
+		NFSCL_DEBUG(4, "fore slots=%d\n", (int)sep->nfsess_foreslots);
 		irdcnt = fxdr_unsigned(int, *tl);
-		if (irdcnt > 0) {
-printf("got an ird cnt=%d\n",irdcnt);
+		if (irdcnt > 0)
 			NFSM_DISSECT(tl, uint32_t *, irdcnt * NFSX_UNSIGNED);
-		}
 
 		/* and the back channel slot count. */
 		NFSM_DISSECT(tl, uint32_t *, 7 * NFSX_UNSIGNED);
 		tl += 5;
 		sep->nfsess_backslots = fxdr_unsigned(uint16_t, *tl);
-printf("back slots=%d\n", sep->nfsess_backslots);
+		NFSCL_DEBUG(4, "back slots=%d\n", (int)sep->nfsess_backslots);
 	}
 	error = nd->nd_repstat;
 nfsmout:
@@ -4690,7 +4676,7 @@ nfsrpc_layoutget(struct nfsmount *nmp, u
 	txdr_hyper(minlen, tl);
 	tl += 2;
 	*tl++ = txdr_unsigned(stateidp->seqid);
-printf("layget seq=%d\n", stateidp->seqid);
+	NFSCL_DEBUG(4, "layget seq=%d\n", (int)stateidp->seqid);
 	*tl++ = stateidp->other[0];
 	*tl++ = stateidp->other[1];
 	*tl++ = stateidp->other[2];
@@ -4707,12 +4693,13 @@ printf("layget seq=%d\n", stateidp->seqi
 		else
 			*retonclosep = 0;
 		stateidp->seqid = fxdr_unsigned(uint32_t, *tl++);
-printf("retoncls=%d stseq=%d\n", *retonclosep, stateidp->seqid);
+		NFSCL_DEBUG(4, "retoncls=%d stseq=%d\n", *retonclosep,
+		    (int)stateidp->seqid);
 		stateidp->other[0] = *tl++;
 		stateidp->other[1] = *tl++;
 		stateidp->other[2] = *tl++;
 		cnt = fxdr_unsigned(int, *tl);
-printf("layg cnt=%d\n", cnt);
+		NFSCL_DEBUG(4, "layg cnt=%d\n", cnt);
 		if (cnt <= 0 || cnt > 10000) {
 			/* Don't accept more than 10000 layouts in reply. */
 			error = NFSERR_BADXDR;
@@ -4724,7 +4711,7 @@ printf("layg cnt=%d\n", cnt);
 			    6 * NFSX_UNSIGNED + NFSX_V4DEVICEID);
 			fhcnt = fxdr_unsigned(int, *(tl + 11 +
 			    NFSX_V4DEVICEID / NFSX_UNSIGNED));
-printf("fhcnt=%d\n", fhcnt);
+			NFSCL_DEBUG(4, "fhcnt=%d\n", fhcnt);
 			if (fhcnt < 0 || fhcnt > 100) {
 				/* Don't accept more than 100 file handles. */
 				error = NFSERR_BADXDR;
@@ -4749,7 +4736,8 @@ printf("fhcnt=%d\n", fhcnt);
 			flp->nfsfl_iomode = fxdr_unsigned(int, *tl++);
 			if (gotiomode == -1)
 				gotiomode = flp->nfsfl_iomode;
-printf("layg reqiom=%d retiom=%d\n", iomode, flp->nfsfl_iomode);
+			NFSCL_DEBUG(4, "layg reqiom=%d retiom=%d\n", iomode,
+			    (int)flp->nfsfl_iomode);
 			if (fxdr_unsigned(int, *tl++) !=
 			    NFSLAYOUT_NFSV4_1_FILES) {
 				printf("NFSv4.1: got non-files layout\n");
@@ -4759,6 +4747,7 @@ printf("layg reqiom=%d retiom=%d\n", iom
 			NFSBCOPY(++tl, flp->nfsfl_dev, NFSX_V4DEVICEID);
 			tl += (NFSX_V4DEVICEID / NFSX_UNSIGNED);
 			flp->nfsfl_util = fxdr_unsigned(uint32_t, *tl++);
+			NFSCL_DEBUG(4, "flutil=0x%x\n", flp->nfsfl_util);
 			flp->nfsfl_stripe1 = fxdr_unsigned(uint32_t, *tl++);
 			flp->nfsfl_patoff = fxdr_hyper(tl); tl += 2;
 			if (fxdr_unsigned(int, *tl) != fhcnt) {
@@ -4852,7 +4841,7 @@ nfsrpc_getdeviceinfo(struct nfsmount *nm
 		if (layouttype != fxdr_unsigned(int, *tl++))
 			printf("EEK! devinfo layout type not same!\n");
 		stripecnt = fxdr_unsigned(int, *++tl);
-printf("stripecnt=%d\n", stripecnt);
+		NFSCL_DEBUG(4, "stripecnt=%d\n", stripecnt);
 		if (stripecnt < 1 || stripecnt > 4096) {
 			printf("NFS devinfo stripecnt %d: out of range\n",
 			    stripecnt);
@@ -4861,7 +4850,7 @@ printf("stripecnt=%d\n", stripecnt);
 		}
 		NFSM_DISSECT(tl, uint32_t *, (stripecnt + 1) * NFSX_UNSIGNED);
 		addrcnt = fxdr_unsigned(int, *(tl + stripecnt));
-printf("addrcnt=%d\n", addrcnt);
+		NFSCL_DEBUG(4, "addrcnt=%d\n", addrcnt);
 		if (addrcnt < 1 || addrcnt > 128) {
 			printf("NFS devinfo addrcnt %d: out of range\n",
 			    addrcnt);
@@ -4875,7 +4864,7 @@ printf("addrcnt=%d\n", addrcnt);
 		 */
 		i = (stripecnt * sizeof(uint8_t)) / sizeof(struct nfsclds *)
 		    + 1;
-printf("i=%d\n", i);
+		NFSCL_DEBUG(4, "stripeindices=%d\n", i);
 		ndi = malloc(sizeof(*ndi) + (addrcnt + i) *
 		    sizeof(struct nfsclds *), M_NFSDEVINFO, M_WAITOK | M_ZERO);
 		NFSBCOPY(deviceid, ndi->nfsdi_deviceid, NFSX_V4DEVICEID);
@@ -4885,7 +4874,7 @@ printf("i=%d\n", i);
 		/* Fill in the stripe indices. */
 		for (i = 0; i < stripecnt; i++) {
 			stripeindex = fxdr_unsigned(uint8_t, *tl++);
-printf("stripeind=%d\n", stripeindex);
+			NFSCL_DEBUG(4, "stripeind=%d\n", stripeindex);
 			if (stripeindex >= addrcnt) {
 				printf("NFS devinfo stripeindex %d: too big\n",
 				    (int)stripeindex);
@@ -4908,7 +4897,6 @@ printf("stripeind=%d\n", stripeindex);
 			dspp = nfsfldi_addr(ndi, i);
 			pos = arc4random() % cnt;	/* Choose one. */
 			safilled = 0;
-printf("dspp=%p pos=%d\n", dspp, pos);
 			for (j = 0; j < cnt; j++) {
 				error = nfsv4_getipaddr(nd, &ss, &isudp);
 				if (error != 0 && error != EPERM) {
@@ -4936,7 +4924,6 @@ printf("dspp=%p pos=%d\n", dspp, pos);
 						    &dsp, p);
 						if (error == 0) {
 							*dspp = dsp;
-printf("safill dsp=%p\n", dsp);
 							if (ss.ss_family ==
 							 nmp->nm_nam->sa_family)
 								safilled = 2;
@@ -5062,7 +5049,7 @@ nfsrpc_layoutreturn(struct nfsmount *nmp
 		tl += 2;
 		txdr_hyper(len, tl);
 		tl += 2;
-printf("layret stseq=%d\n", stateidp->seqid);
+		NFSCL_DEBUG(4, "layoutret stseq=%d\n", (int)stateidp->seqid);
 		*tl++ = txdr_unsigned(stateidp->seqid);
 		*tl++ = stateidp->other[0];
 		*tl++ = stateidp->other[1];
@@ -5105,60 +5092,82 @@ nfsmout:
  */
 static int
 nfsrpc_getlayout(struct nfsmount *nmp, vnode_t vp, struct nfsfh *nfhp,
-    int iomode, uint32_t *notifybitsp, nfsv4stateid_t *stateidp,
+    int iomode, uint32_t *notifybitsp, nfsv4stateid_t *stateidp, uint64_t off,
     struct nfscllayout **lypp, struct ucred *cred, NFSPROC_T *p)
 {
 	struct nfscllayout *lyp;
-	struct nfsclflayout *flp;
+	struct nfsclflayout *flp, *tflp;
 	struct nfscldevinfo *dip;
 	struct nfsclflayouthead flh;
-	int error = 0, layoutlen, recalled, retonclose;
+	int error = 0, islocked, layoutlen, recalled, retonclose;
 	nfsv4stateid_t stateid;
 
 	*lypp = NULL;
+	/*
+	 * If lyp is returned non-NULL, there will be a refcnt (shared lock)
+	 * on it, iff flp != NULL or a lock (exclusive lock) on it iff
+	 * flp == NULL.
+	 */
 	lyp = nfscl_getlayout(nmp->nm_clp, nfhp->nfh_fh, nfhp->nfh_len,
-	    &recalled);
-	if (lyp == NULL) {
+	    off, &flp, &recalled);
+	islocked = 0;
+	if (lyp == NULL || flp == NULL) {
 		if (recalled != 0)
 			return (EIO);
 		LIST_INIT(&flh);
 		layoutlen = NFSMNT_MDSSESSION(nmp)->nfsess_maxcache -
 		    (NFSX_STATEID + 3 * NFSX_UNSIGNED);
-printf("layoutlen=%d\n", layoutlen);
-		stateid.seqid = 0;
-		stateid.other[0] = stateidp->other[0];
-		stateid.other[1] = stateidp->other[1];
-		stateid.other[2] = stateidp->other[2];
-		error = nfsrpc_layoutget(nmp, nfhp->nfh_fh, nfhp->nfh_len,
-		    iomode, (uint64_t)0, INT64_MAX, (uint64_t)0, layoutlen,
-		    &stateid, &retonclose, &flh, cred, p, NULL);
+		if (lyp == NULL) {
+			stateid.seqid = 0;
+			stateid.other[0] = stateidp->other[0];
+			stateid.other[1] = stateidp->other[1];
+			stateid.other[2] = stateidp->other[2];
+			error = nfsrpc_layoutget(nmp, nfhp->nfh_fh,
+			    nfhp->nfh_len, iomode, (uint64_t)0, INT64_MAX,
+			    (uint64_t)0, layoutlen, &stateid, &retonclose,
+			    &flh, cred, p, NULL);
+		} else {
+			islocked = 1;
+			stateid.seqid = lyp->nfsly_stateid.seqid;
+			stateid.other[0] = lyp->nfsly_stateid.other[0];
+			stateid.other[1] = lyp->nfsly_stateid.other[1];
+			stateid.other[2] = lyp->nfsly_stateid.other[2];
+			error = nfsrpc_layoutget(nmp, nfhp->nfh_fh,
+			    nfhp->nfh_len, iomode, off, INT64_MAX,
+			    (uint64_t)0, layoutlen, &stateid, &retonclose,
+			    &flh, cred, p, NULL);
+		}
 		if (error == 0)
-			LIST_FOREACH(flp, &flh, nfsfl_list) {
-				error = nfscl_adddevinfo(nmp, NULL, flp);
+			LIST_FOREACH(tflp, &flh, nfsfl_list) {
+				error = nfscl_adddevinfo(nmp, NULL, tflp);
 				if (error != 0) {
 					error = nfsrpc_getdeviceinfo(nmp,
-					    flp->nfsfl_dev,
+					    tflp->nfsfl_dev,
 					    NFSLAYOUT_NFSV4_1_FILES,
 					    notifybitsp, &dip, cred, p);
 					if (error != 0)
 						break;
-					error = nfscl_adddevinfo(nmp, dip, flp);
+					error = nfscl_adddevinfo(nmp, dip,
+					    tflp);
 					if (error != 0)
 						printf(
 						    "getlayout: cannot add\n");
 				}
 			}
-		if (error == 0)
+		if (error == 0) {
+			/*
+			 * nfscl_layout() always returns with the nfsly_lock
+			 * set to a refcnt (shared lock).
+			 */
 			error = nfscl_layout(nmp, vp, nfhp->nfh_fh,
 			    nfhp->nfh_len, &stateid, retonclose, &flh, &lyp,
 			    cred, p);
-	}
-	if (lyp != NULL) {
-		if (error == 0)
-			*lypp = lyp;
-		else
-			nfscl_rellayout(lyp);
-	}
+			if (error == 0)
+				*lypp = lyp;
+		} else if (islocked != 0)
+			nfsv4_unlock(&lyp->nfsly_lock, 0);
+	} else
+		*lypp = lyp;
 	return (error);
 }
 
@@ -5189,7 +5198,6 @@ nfsrpc_fillsa(struct nfsmount *nmp, stru
 		return (EPERM);
 	if (ssp->ss_family == AF_INET) {
 		ssd = (struct sockaddr_in *)ssp;
-printf("ds addr=0x%x ", ssd->sin_addr.s_addr);
 		NFSLOCKMNT(nmp);
 
 		/*
@@ -5199,8 +5207,6 @@ printf("ds addr=0x%x ", ssd->sin_addr.s_
 		 * than the sessions already acquired for DS's.
 		 */
 		msad = (struct sockaddr_in *)nmp->nm_sockreq.nr_nam;
-if (msad != NULL) printf("maddr=0x%x", msad->sin_addr.s_addr);
-printf("\n");
 		tdsp = TAILQ_FIRST(&nmp->nm_sess);
 		while (tdsp != NULL) {
 			if (msad != NULL && msad->sin_family == AF_INET &&
@@ -5209,7 +5215,7 @@ printf("\n");
 			    (tdsp->nfsclds_flags & NFSCLDS_DS) != 0) {
 				*dspp = tdsp;
 				NFSUNLOCKMNT(nmp);
-printf("fnd same addr\n");
+				NFSCL_DEBUG(4, "fnd same addr\n");
 				return (0);
 			}
 			tdsp = TAILQ_NEXT(tdsp, nfsclds_list);
@@ -5286,18 +5292,18 @@ printf("fnd same addr\n");
 	 */
 	nrp->nr_cred = crhold(nmp->nm_sockreq.nr_cred);
 	error = newnfs_connect(nmp, nrp, NULL, p, 0);
-printf("ds conn=%d\n", error);
+	NFSCL_DEBUG(3, "DS connect=%d\n", error);
 
 	/* Now, do the exchangeid and create session. */
 	if (error == 0)
 		error = nfsrpc_exchangeid(nmp, clp, nrp, NFSV4EXCH_USEPNFSDS,
 		    &dsp, nrp->nr_cred, p);
-printf("ds exch=%d\n", error);
+	NFSCL_DEBUG(3, "DS exchangeid=%d\n", error);
 	if (error == 0) {
 		dsp->nfsclds_sockp = nrp;
 		NFSLOCKMNT(nmp);
 		retv = nfscl_getsameserver(nmp, dsp, &tdsp);
-printf("getsame ret=%d\n", retv);
+		NFSCL_DEBUG(3, "getsame ret=%d\n", retv);
 		if (retv == NFSDSP_USETHISSESSION) {
 			NFSUNLOCKMNT(nmp);
 			/*
@@ -5316,7 +5322,7 @@ printf("getsame ret=%d\n", retv);
 		NFSUNLOCKMNT(nmp);
 		error = nfsrpc_createsession(nmp, &dsp->nfsclds_sess,
 		    nrp, sequenceid, 0, nrp->nr_cred, p);
-printf("dscrsess=%d\n", error);
+		NFSCL_DEBUG(3, "DS createsess=%d\n", error);
 	} else {
 		NFSFREECRED(nrp->nr_cred);
 		NFSFREEMUTEX(&nrp->nr_mtx);
@@ -5324,7 +5330,7 @@ printf("dscrsess=%d\n", error);
 		free(nrp, M_NFSSOCKREQ);
 	}
 	if (error == 0) {
-printf("add dssess\n");
+		NFSCL_DEBUG(3, "add DS session\n");
 		/*
 		 * Put it at the end of the list. That way the list
 		 * is ordered by when the entry was added. This matters
@@ -5412,15 +5418,24 @@ nfscl_doiods(vnode_t vp, struct uio *uio
 	error = nfscl_getstateid(vp, np->n_fhp->nfh_fh, np->n_fhp->nfh_len,
 	    rwaccess, 1, newcred, p, &stateid, &lckp);
 	if (error != 0) {
-if (error == 2) printf("rwacc=0x%x\n", rwaccess);
 		NFSFREECRED(newcred);
 		nfscl_relref(nmp);
 		return (error);
 	}
 	/* Search for a layout for this file. */
+	off = uiop->uio_offset;
 	layp = nfscl_getlayout(nmp->nm_clp, np->n_fhp->nfh_fh,
-	    np->n_fhp->nfh_len, &recalled);
-	if (layp == NULL) {
+	    np->n_fhp->nfh_len, off, &rflp, &recalled);
+	if (layp == NULL || rflp == NULL) {
+		if (recalled != 0) {
+			NFSFREECRED(newcred);
+			nfscl_relref(nmp);
+			return (EIO);
+		}
+		if (layp != NULL) {
+			nfscl_rellayout(layp, (rflp == NULL) ? 1 : 0);
+			layp = NULL;
+		}
 		/* Try and get a Layout, if it is supported. */
 		if (rwaccess == NFSV4OPEN_ACCESSWRITE ||
 		    (np->n_flag & NWRITEOPENED) != 0)
@@ -5428,7 +5443,7 @@ if (error == 2) printf("rwacc=0x%x\n", r
 		else
 			iolaymode = NFSLAYOUTIOMODE_READ;
 		error = nfsrpc_getlayout(nmp, vp, np->n_fhp, iolaymode,
-		    NULL, &stateid, &layp, newcred, p);
+		    NULL, &stateid, off, &layp, newcred, p);
 		if (error != 0) {
 			NFSLOCKNODE(np);
 			np->n_flag |= NNOLAYOUT;
@@ -5437,7 +5452,7 @@ if (error == 2) printf("rwacc=0x%x\n", r
 				nfscl_lockderef(lckp);
 			NFSFREECRED(newcred);
 			if (layp != NULL)
-				nfscl_rellayout(layp);
+				nfscl_rellayout(layp, 0);
 			nfscl_relref(nmp);
 			return (error);
 		}
@@ -5470,7 +5485,6 @@ if (error == 2) printf("rwacc=0x%x\n", r
 					if (lastbyte > layp->nfsly_lastbyte)
 						layp->nfsly_lastbyte = lastbyte;
 					NFSUNLOCKCLSTATE();
-printf("lastb=%qd\n", layp->nfsly_lastbyte);
 				}
 			} else
 				error = EIO;
@@ -5481,7 +5495,7 @@ printf("lastb=%qd\n", layp->nfsly_lastby
 	if (lckp != NULL)
 		nfscl_lockderef(lckp);
 	NFSFREECRED(newcred);
-	nfscl_rellayout(layp);
+	nfscl_rellayout(layp, 0);
 	nfscl_relref(nmp);
 	return (error);
 }
@@ -5490,7 +5504,7 @@ printf("lastb=%qd\n", layp->nfsly_lastby
  * Find a file layout that will handle the first bytes of the requested
  * range and return the information from it needed to to the I/O operation.
  */
-static int
+int
 nfscl_findlayoutforio(struct nfscllayout *lyp, uint64_t off, uint32_t rwaccess,
     struct nfsclflayout **retflpp)
 {
@@ -5792,7 +5806,9 @@ nfscl_getsameserver(struct nfsmount *nmp
 		    dsp->nfsclds_servownlen != 0 &&
 		    !NFSBCMP(dsp->nfsclds_serverown, newdsp->nfsclds_serverown,
 		    dsp->nfsclds_servownlen)) {
-printf("fnd same fdsp=%p dsp=%p flg=0x%x\n", TAILQ_FIRST(&nmp->nm_sess), dsp, dsp->nfsclds_flags);
+			NFSCL_DEBUG(4, "fnd same fdsp=%p dsp=%p flg=0x%x\n",
+			    TAILQ_FIRST(&nmp->nm_sess), dsp,
+			    dsp->nfsclds_flags);
 			/* Server major id matches. */
 			if ((dsp->nfsclds_flags & NFSCLDS_DS) != 0) {
 				*retdspp = dsp;

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Sat Aug 25 23:01:57 2012	(r239693)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Sat Aug 25 23:03:45 2012	(r239694)
@@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
 extern struct nfsstats newnfsstats;
 extern struct nfsreqhead nfsd_reqq;
 extern u_int32_t newnfs_false, newnfs_true;
+extern int nfscl_debuglevel;
 NFSREQSPINLOCK;
 NFSCLSTATEMUTEX;
 int nfscl_inited = 0;
@@ -2633,13 +2634,21 @@ tryagain2:
 				/*
 				 * Wait for outstanding I/O ops to be done.
 				 */
-				if (lyp->nfsly_refcnt > 0) {
-printf("layrec io=%d\n", lyp->nfsly_refcnt);
-					(void)mtx_sleep(&lyp->nfsly_refcnt,
-					    NFSCLSTATEMUTEXPTR, PZERO, "nfslyd",
-					    0);
+				if (lyp->nfsly_lock.nfslock_usecnt > 0 ||
+				    (lyp->nfsly_lock.nfslock_lock &
+				     NFSV4LOCK_LOCK) != 0) {
+					lyp->nfsly_lock.nfslock_lock |=
+					    NFSV4LOCK_WANTED;
+					(void)nfsmsleep(&lyp->nfsly_lock,
+					    NFSCLSTATEMUTEXPTR, PZERO, "nfslyp",
+					    NULL);
 					goto tryagain2;
 				}
+				/* Move the layout to the recall list. */
+				TAILQ_REMOVE(&clp->nfsc_layout, lyp,
+				    nfsly_list);
+				LIST_REMOVE(lyp, nfsly_hash);
+				TAILQ_INSERT_HEAD(&rlh, lyp, nfsly_list);
 
 				/* Handle any layout commits. */
 				if (!NFSHASNOLAYOUTCOMMIT(clp->nfsc_nmp)) {
@@ -2647,40 +2656,32 @@ printf("layrec io=%d\n", lyp->nfsly_refc
 					    nfsfl_list) {
 						if ((flp->nfsfl_flags &
 						    NFSFL_WRITTEN) != 0) {
-							lyp->nfsly_refcnt++;
 							flp->nfsfl_flags &=
 							    ~NFSFL_WRITTEN;
 							NFSUNLOCKCLSTATE();
-printf("do layoutcommit\n");
+							NFSCL_DEBUG(3,
+							   "do layoutcommit\n");
 							nfscl_dolayoutcommit(
 							    clp->nfsc_nmp, lyp,
 							    flp, cred, p);
 							NFSLOCKCLSTATE();
-							lyp->nfsly_refcnt--;
-							if (lyp->nfsly_refcnt ==
-							    0)
-							    wakeup(&lyp->
-								nfsly_refcnt);
 							goto tryagain2;
 						}
 					}
 				}
-
-				/* Move the layout to the recall list. */
-				TAILQ_REMOVE(&clp->nfsc_layout, lyp,
-				    nfsly_list);
-				LIST_REMOVE(lyp, nfsly_hash);
-				TAILQ_INSERT_HEAD(&rlh, lyp, nfsly_list);
 			}
 		}
+
 		/* Now, look for stale layouts. */
 		lyp = TAILQ_LAST(&clp->nfsc_layout, nfscllayouthead);
 		while (lyp != NULL) {
 			nlyp = TAILQ_PREV(lyp, nfscllayouthead, nfsly_list);
 			if (lyp->nfsly_timestamp < NFSD_MONOSEC &&
 			    (lyp->nfsly_flags & NFSLY_RECALL) == 0 &&
-			    lyp->nfsly_refcnt == 0) {
-printf("ret stale lay=%d\n", nfscl_layoutcnt);
+			    lyp->nfsly_lock.nfslock_usecnt == 0 &&
+			    lyp->nfsly_lock.nfslock_lock == 0) {
+				NFSCL_DEBUG(4, "ret stale lay=%d\n",
+				    nfscl_layoutcnt);
 				recallp = malloc(sizeof(*recallp),
 				    M_NFSLAYRECALL, M_NOWAIT);
 				if (recallp == NULL)
@@ -2698,7 +2699,7 @@ printf("ret stale lay=%d\n", nfscl_layou
 		LIST_FOREACH_SAFE(dip, &clp->nfsc_devinfo, nfsdi_list, ndip) {
 			if (dip->nfsdi_layoutrefs == 0 &&
 			    dip->nfsdi_refcnt == 0) {
-printf("freeing devinfo\n");
+				NFSCL_DEBUG(4, "freeing devinfo\n");
 				LIST_REMOVE(dip, nfsdi_list);
 				nfscl_freedevinfo(dip);
 			}
@@ -2708,7 +2709,7 @@ printf("freeing devinfo\n");
 		/* Do layout return(s), as required. */
 		TAILQ_FOREACH_SAFE(lyp, &rlh, nfsly_list, nlyp) {
 			TAILQ_REMOVE(&rlh, lyp, nfsly_list);
-printf("ret layout\n");
+			NFSCL_DEBUG(4, "ret layout\n");
 			nfscl_layoutreturn(clp->nfsc_nmp, lyp, cred, p);
 			nfscl_freelayout(lyp);
 		}
@@ -3229,7 +3230,7 @@ nfscl_docb(struct nfsrv_descript *nd, NF
 			newnfsstats.cbrpccnt[nd->nd_procnum]++;
 		switch (op) {
 		case NFSV4OP_CBGETATTR:
-printf("cbgetattr\n");
+			NFSCL_DEBUG(4, "cbgetattr\n");
 			mp = NULL;
 			vp = NULL;
 			error = nfsm_getfh(nd, &nfhp);
@@ -3293,7 +3294,7 @@ printf("cbgetattr\n");
 				    (uint64_t)0);
 			break;
 		case NFSV4OP_CBRECALL:
-printf("cbrecall\n");
+			NFSCL_DEBUG(4, "cbrecall\n");
 			NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID +
 			    NFSX_UNSIGNED);
 			stateid.seqid = *tl++;
@@ -3329,7 +3330,7 @@ printf("cbrecall\n");
 				FREE((caddr_t)nfhp, M_NFSFH);
 			break;
 		case NFSV4OP_CBLAYOUTRECALL:
-printf("cblayrec\n");
+			NFSCL_DEBUG(4, "cblayrec\n");
 			nfhp = NULL;
 			NFSM_DISSECT(tl, uint32_t *, 4 * NFSX_UNSIGNED);
 			laytype = fxdr_unsigned(int, *tl++);
@@ -3345,7 +3346,7 @@ printf("cblayrec\n");
 				error = NFSERR_NOMATCHLAYOUT;
 			else if (recalltype == NFSLAYOUTRETURN_FILE) {
 				error = nfsm_getfh(nd, &nfhp);
-printf("retfile getfh=%d\n", error);
+				NFSCL_DEBUG(4, "retfile getfh=%d\n", error);
 				if (error != 0)
 					goto nfsmout;
 				NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_HYPER +
@@ -3361,12 +3362,13 @@ printf("retfile getfh=%d\n", error);
 				if (error == 0) {
 					NFSLOCKCLSTATE();
 					clp = nfscl_getclntsess(sessionid);
-printf("cbly clp=%p\n", clp);
+					NFSCL_DEBUG(4, "cbly clp=%p\n", clp);
 					if (clp != NULL) {
 						lyp = nfscl_findlayout(clp,
 						    nfhp->nfh_fh,
 						    nfhp->nfh_len);
-printf("cblyp=%p\n", lyp);
+						NFSCL_DEBUG(4, "cblyp=%p\n",
+						    lyp);
 						if (lyp != NULL &&
 						    (lyp->nfsly_flags &
 						     NFSLY_FILES) != 0 &&
@@ -3381,7 +3383,9 @@ printf("cblyp=%p\n", lyp);
 							    recallp);
 							recallp = NULL;
 							wakeup(clp);
-printf("aft layrec=%d\n", error);
+							NFSCL_DEBUG(4,
+							    "aft layrcal=%d\n",
+							    error);
 						} else
 							error =
 							  NFSERR_NOMATCHLAYOUT;
@@ -3490,7 +3494,7 @@ printf("aft layrec=%d\n", error);
 			if (error == 0) {
 				gotseq_ok = 1;
 				if (rep != NULL) {
-printf("Got cbretry\n");
+					NFSCL_DEBUG(4, "Got cbretry\n");
 					m_freem(nd->nd_mreq);
 					nd->nd_mreq = rep;
 					rep = NULL;
@@ -3509,11 +3513,10 @@ printf("Got cbretry\n");
 		default:
 			if (i == 0 && minorvers == NFSV41_MINORVERSION)
 				error = NFSERR_OPNOTINSESS;
-			else
-{
-printf("unsupp callback %d\n", op);
+			else {
+				NFSCL_DEBUG(1, "unsupp callback %d\n", op);
 				error = NFSERR_NOTSUPP;
-}
+			}
 			break;
 		};
 		if (error) {
@@ -4678,6 +4681,10 @@ nfscl_errmap(struct nfsrv_descript *nd)
 
 /*
  * Called to find/add a layout to a client.
+ * This function returns the layout with a refcnt (shared lock) upon
+ * success (returns 0) or with no lock/refcnt on the layout when an
+ * error is returned.
+ * If a layout is passed in via lypp, it is locked (exclusively locked).
  */
 APPLESTATIC int
 nfscl_layout(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen,
@@ -4689,50 +4696,76 @@ nfscl_layout(struct nfsmount *nmp, vnode
 	struct nfscllayout *lyp, *tlyp;
 	struct nfsclflayout *flp;
 	struct nfsnode *np = VTONFS(vp);
+	mount_t mp;
+	int layout_passed_in;
 
-	*lypp = NULL;
-	tlyp = malloc(sizeof(*tlyp) + fhlen - 1, M_NFSLAYOUT, M_WAITOK);
+	mp = nmp->nm_mountp;
+	layout_passed_in = 1;
+	tlyp = NULL;
+	lyp = *lypp;
+	if (lyp == NULL) {
+		layout_passed_in = 0;
+		tlyp = malloc(sizeof(*tlyp) + fhlen - 1, M_NFSLAYOUT,
+		    M_WAITOK | M_ZERO);
+	}
 
 	NFSLOCKCLSTATE();
 	clp = nmp->nm_clp;
 	if (clp == NULL) {
+		if (layout_passed_in != 0)
+			nfsv4_unlock(&lyp->nfsly_lock, 0);
 		NFSUNLOCKCLSTATE();
-		free(tlyp, M_NFSLAYOUT);
+		if (tlyp != NULL)
+			free(tlyp, M_NFSLAYOUT);
 		return (EPERM);
 	}
-	lyp = nfscl_findlayout(clp, fhp, fhlen);
 	if (lyp == NULL) {
-		lyp = tlyp;
-		tlyp = NULL;
+		/*
+		 * Although no lyp was passed in, another thread might have
+		 * allocated one. If one is found, just increment it's ref
+		 * count and return it.
+		 */
+		lyp = nfscl_findlayout(clp, fhp, fhlen);
+		if (lyp == NULL) {
+			lyp = tlyp;
+			tlyp = NULL;
+			lyp->nfsly_stateid.seqid = stateidp->seqid;
+			lyp->nfsly_stateid.other[0] = stateidp->other[0];
+			lyp->nfsly_stateid.other[1] = stateidp->other[1];
+			lyp->nfsly_stateid.other[2] = stateidp->other[2];
+			lyp->nfsly_lastbyte = 0;
+			LIST_INIT(&lyp->nfsly_flayread);
+			LIST_INIT(&lyp->nfsly_flayrw);
+			LIST_INIT(&lyp->nfsly_recall);
+			lyp->nfsly_filesid[0] = np->n_vattr.na_filesid[0];
+			lyp->nfsly_filesid[1] = np->n_vattr.na_filesid[1];
+			lyp->nfsly_clp = clp;
+			lyp->nfsly_flags = (retonclose != 0) ?
+			    (NFSLY_FILES | NFSLY_RETONCLOSE) : NFSLY_FILES;
+			lyp->nfsly_fhlen = fhlen;
+			NFSBCOPY(fhp, lyp->nfsly_fh, fhlen);
+			TAILQ_INSERT_HEAD(&clp->nfsc_layout, lyp, nfsly_list);
+			LIST_INSERT_HEAD(NFSCLLAYOUTHASH(clp, fhp, fhlen), lyp,
+			    nfsly_hash);
+			lyp->nfsly_timestamp = NFSD_MONOSEC + 120;
+			nfscl_layoutcnt++;
+		} else {
+			if (retonclose != 0)
+				lyp->nfsly_flags |= NFSLY_RETONCLOSE;
+			TAILQ_REMOVE(&clp->nfsc_layout, lyp, nfsly_list);
+			TAILQ_INSERT_HEAD(&clp->nfsc_layout, lyp, nfsly_list);
+			lyp->nfsly_timestamp = NFSD_MONOSEC + 120;
+		}
+		nfsv4_getref(&lyp->nfsly_lock, NULL, NFSCLSTATEMUTEXPTR, mp);
+		if ((mp->mnt_kern_flag & MNTK_UNMOUNTF) != 0) {
+			NFSUNLOCKCLSTATE();
+			if (tlyp != NULL)
+				free(tlyp, M_NFSLAYOUT);
+			return (EPERM);
+		}
+		*lypp = lyp;
+	} else
 		lyp->nfsly_stateid.seqid = stateidp->seqid;
-		lyp->nfsly_stateid.other[0] = stateidp->other[0];
-		lyp->nfsly_stateid.other[1] = stateidp->other[1];
-		lyp->nfsly_stateid.other[2] = stateidp->other[2];
-		lyp->nfsly_lastbyte = 0;
-		LIST_INIT(&lyp->nfsly_flayread);
-		LIST_INIT(&lyp->nfsly_flayrw);
-		LIST_INIT(&lyp->nfsly_recall);
-		lyp->nfsly_filesid[0] = np->n_vattr.na_filesid[0];
-		lyp->nfsly_filesid[1] = np->n_vattr.na_filesid[1];
-		lyp->nfsly_clp = clp;
-		lyp->nfsly_flags = (retonclose != 0) ?
-		    (NFSLY_FILES | NFSLY_RETONCLOSE) : NFSLY_FILES;
-		lyp->nfsly_refcnt = 1;	/* Return with a reference cnt. */
-		lyp->nfsly_fhlen = fhlen;
-		NFSBCOPY(fhp, lyp->nfsly_fh, fhlen);
-		TAILQ_INSERT_HEAD(&clp->nfsc_layout, lyp, nfsly_list);
-		LIST_INSERT_HEAD(NFSCLLAYOUTHASH(clp, fhp, fhlen), lyp,
-		    nfsly_hash);
-		lyp->nfsly_timestamp = NFSD_MONOSEC + 120;
-		nfscl_layoutcnt++;
-	} else {
-		lyp->nfsly_refcnt++;
-		if (retonclose != 0)
-			lyp->nfsly_flags |= NFSLY_RETONCLOSE;
-		TAILQ_REMOVE(&clp->nfsc_layout, lyp, nfsly_list);
-		TAILQ_INSERT_HEAD(&clp->nfsc_layout, lyp, nfsly_list);
-		lyp->nfsly_timestamp = NFSD_MONOSEC + 120;
-	}
 
 	/* Merge the new list of File Layouts into the list. */
 	flp = LIST_FIRST(fhlp);
@@ -4742,32 +4775,55 @@ nfscl_layout(struct nfsmount *nmp, vnode
 		else
 			nfscl_mergeflayouts(&lyp->nfsly_flayrw, fhlp);
 	}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***