svn commit: r228285 - in projects/geom-events: . bin/sh bin/test cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/zs...

Mon Dec 5 17:44:14 UTC 2011

Author: lev (ports committer)
Date: Mon Dec  5 17:44:12 2011
New Revision: 228285
URL: http://svn.freebsd.org/changeset/base/228285

Log:
  Merge from head

Added:
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
     - copied unchanged from r228284, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
  projects/geom-events/contrib/gperf/configure.ac
     - copied unchanged from r228284, head/contrib/gperf/configure.ac
  projects/geom-events/contrib/gperf/doc/configure.ac
     - copied unchanged from r228284, head/contrib/gperf/doc/configure.ac
  projects/geom-events/contrib/gperf/lib/configure.ac
     - copied unchanged from r228284, head/contrib/gperf/lib/configure.ac
  projects/geom-events/contrib/gperf/lib/getline.cc
     - copied unchanged from r228284, head/contrib/gperf/lib/getline.cc
  projects/geom-events/contrib/gperf/lib/getline.h
     - copied unchanged from r228284, head/contrib/gperf/lib/getline.h
  projects/geom-events/contrib/gperf/src/config.h_vms
     - copied unchanged from r228284, head/contrib/gperf/src/config.h_vms
  projects/geom-events/contrib/gperf/src/configure.ac
     - copied unchanged from r228284, head/contrib/gperf/src/configure.ac
  projects/geom-events/contrib/gperf/src/input.cc
     - copied unchanged from r228284, head/contrib/gperf/src/input.cc
  projects/geom-events/contrib/gperf/src/input.h
     - copied unchanged from r228284, head/contrib/gperf/src/input.h
  projects/geom-events/contrib/gperf/src/keyword-list.cc
     - copied unchanged from r228284, head/contrib/gperf/src/keyword-list.cc
  projects/geom-events/contrib/gperf/src/keyword-list.h
     - copied unchanged from r228284, head/contrib/gperf/src/keyword-list.h
  projects/geom-events/contrib/gperf/src/keyword-list.icc
     - copied unchanged from r228284, head/contrib/gperf/src/keyword-list.icc
  projects/geom-events/contrib/gperf/src/keyword.cc
     - copied unchanged from r228284, head/contrib/gperf/src/keyword.cc
  projects/geom-events/contrib/gperf/src/keyword.h
     - copied unchanged from r228284, head/contrib/gperf/src/keyword.h
  projects/geom-events/contrib/gperf/src/keyword.icc
     - copied unchanged from r228284, head/contrib/gperf/src/keyword.icc
  projects/geom-events/contrib/gperf/src/output.cc
     - copied unchanged from r228284, head/contrib/gperf/src/output.cc
  projects/geom-events/contrib/gperf/src/output.h
     - copied unchanged from r228284, head/contrib/gperf/src/output.h
  projects/geom-events/contrib/gperf/src/positions.cc
     - copied unchanged from r228284, head/contrib/gperf/src/positions.cc
  projects/geom-events/contrib/gperf/src/positions.h
     - copied unchanged from r228284, head/contrib/gperf/src/positions.h
  projects/geom-events/contrib/gperf/src/positions.icc
     - copied unchanged from r228284, head/contrib/gperf/src/positions.icc
  projects/geom-events/contrib/gperf/src/search.cc
     - copied unchanged from r228284, head/contrib/gperf/src/search.cc
  projects/geom-events/contrib/gperf/src/search.h
     - copied unchanged from r228284, head/contrib/gperf/src/search.h
  projects/geom-events/contrib/libc++/
     - copied from r228284, head/contrib/libc++/
     - copied from r228284, head/contrib/libcxxrt/
  projects/geom-events/lib/libc++/
     - copied from r228284, head/lib/libc++/
  projects/geom-events/lib/libcxxrt/
     - copied from r228284, head/lib/libcxxrt/
  projects/geom-events/sbin/camcontrol/fwdownload.c
     - copied unchanged from r228284, head/sbin/camcontrol/fwdownload.c
  projects/geom-events/share/man/man4/capsicum.4
     - copied unchanged from r228284, head/share/man/man4/capsicum.4
  projects/geom-events/share/man/man4/ffclock.4
     - copied unchanged from r228284, head/share/man/man4/ffclock.4
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype2s.c
     - copied unchanged from r228284, head/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmresrcl2.c
     - copied unchanged from r228284, head/sys/contrib/dev/acpica/disassembler/dmresrcl2.c
  projects/geom-events/sys/contrib/dev/acpica/include/actbl3.h
     - copied unchanged from r228284, head/sys/contrib/dev/acpica/include/actbl3.h
  projects/geom-events/sys/contrib/dev/acpica/os_specific/
     - copied from r228284, head/sys/contrib/dev/acpica/os_specific/
  projects/geom-events/sys/contrib/dev/acpica/resources/rsserial.c
     - copied unchanged from r228284, head/sys/contrib/dev/acpica/resources/rsserial.c
  projects/geom-events/sys/contrib/dev/acpica/utilities/utxfmutex.c
     - copied unchanged from r228284, head/sys/contrib/dev/acpica/utilities/utxfmutex.c
  projects/geom-events/sys/sparc64/sparc64/cam_machdep.c
     - copied unchanged from r228284, head/sys/sparc64/sparc64/cam_machdep.c
  projects/geom-events/tools/build/options/WITH_CTF
     - copied unchanged from r228284, head/tools/build/options/WITH_CTF
  projects/geom-events/tools/build/options/WITH_LIBCPLUSPLUS
     - copied unchanged from r228284, head/tools/build/options/WITH_LIBCPLUSPLUS
  projects/geom-events/tools/regression/bin/sh/builtins/case11.0
     - copied unchanged from r228284, head/tools/regression/bin/sh/builtins/case11.0
  projects/geom-events/tools/regression/bin/sh/builtins/case12.0
     - copied unchanged from r228284, head/tools/regression/bin/sh/builtins/case12.0
  projects/geom-events/tools/regression/pipe/pipe-ino.c
     - copied unchanged from r228284, head/tools/regression/pipe/pipe-ino.c
  projects/geom-events/tools/regression/sbin/dhclient/
     - copied from r228284, head/tools/regression/sbin/dhclient/
  projects/geom-events/tools/regression/usr.bin/make/execution/
     - copied from r228284, head/tools/regression/usr.bin/make/execution/
  projects/geom-events/tools/tinder.sh
     - copied unchanged from r228284, head/tools/tinder.sh
  projects/geom-events/usr.bin/m4/lib/
     - copied from r228284, head/usr.bin/m4/lib/
  projects/geom-events/usr.bin/m4/parser.y
     - copied unchanged from r228284, head/usr.bin/m4/parser.y
  projects/geom-events/usr.bin/m4/tokenizer.l
     - copied unchanged from r228284, head/usr.bin/m4/tokenizer.l
  projects/geom-events/usr.bin/procstat/procstat_rlimit.c
     - copied unchanged from r228284, head/usr.bin/procstat/procstat_rlimit.c
Directory Properties:
  projects/geom-events/contrib/libcxxrt/   (props changed)
Replaced:
  projects/geom-events/contrib/gperf/doc/gperf.texi
     - copied unchanged from r228284, head/contrib/gperf/doc/gperf.texi
  projects/geom-events/contrib/gperf/doc/gpl.texinfo
     - copied unchanged from r228284, head/contrib/gperf/doc/gpl.texinfo
Deleted:
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
  projects/geom-events/contrib/gperf/acconfig.h
  projects/geom-events/contrib/gperf/configure.in
  projects/geom-events/contrib/gperf/doc/configure.in
  projects/geom-events/contrib/gperf/doc/texinfo.tex
  projects/geom-events/contrib/gperf/lib/configure.in
  projects/geom-events/contrib/gperf/src/configure.in
  projects/geom-events/contrib/gperf/src/gen-perf.cc
  projects/geom-events/contrib/gperf/src/gen-perf.h
  projects/geom-events/contrib/gperf/src/iterator.cc
  projects/geom-events/contrib/gperf/src/iterator.h
  projects/geom-events/contrib/gperf/src/key-list.cc
  projects/geom-events/contrib/gperf/src/key-list.h
  projects/geom-events/contrib/gperf/src/list-node.cc
  projects/geom-events/contrib/gperf/src/list-node.h
  projects/geom-events/contrib/gperf/src/new.cc
  projects/geom-events/contrib/gperf/src/read-line.cc
  projects/geom-events/contrib/gperf/src/read-line.h
  projects/geom-events/contrib/gperf/src/read-line.icc
  projects/geom-events/contrib/gperf/src/trace.cc
  projects/geom-events/contrib/gperf/src/trace.h
  projects/geom-events/contrib/gperf/src/vectors.cc
  projects/geom-events/contrib/gperf/src/vectors.h
  projects/geom-events/contrib/gperf/tests/
  projects/geom-events/gnu/lib/libodialog/
  projects/geom-events/share/man/man4/amd.4
  projects/geom-events/sys/contrib/dev/acpica/osunixxf.c
  projects/geom-events/sys/contrib/dev/acpica/tools/
  projects/geom-events/sys/dev/amd/
  projects/geom-events/sys/modules/amd/
  projects/geom-events/usr.sbin/sade/config.c
  projects/geom-events/usr.sbin/sade/dispatch.c
Modified:
  projects/geom-events/Makefile.inc1
  projects/geom-events/ObsoleteFiles.inc
  projects/geom-events/UPDATING
  projects/geom-events/bin/sh/eval.c
  projects/geom-events/bin/test/test.c
  projects/geom-events/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/geom-events/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/geom-events/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/geom-events/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
  projects/geom-events/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/geom-events/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/geom-events/cddl/lib/drti/Makefile
  projects/geom-events/cddl/lib/libzfs/Makefile
  projects/geom-events/contrib/gperf/AUTHORS
  projects/geom-events/contrib/gperf/COPYING
  projects/geom-events/contrib/gperf/ChangeLog
  projects/geom-events/contrib/gperf/FREEBSD-Xlist
  projects/geom-events/contrib/gperf/INSTALL
  projects/geom-events/contrib/gperf/Makefile.devel
  projects/geom-events/contrib/gperf/Makefile.in
  projects/geom-events/contrib/gperf/NEWS
  projects/geom-events/contrib/gperf/README
  projects/geom-events/contrib/gperf/aclocal.m4
  projects/geom-events/contrib/gperf/configure
  projects/geom-events/contrib/gperf/doc/Makefile.in
  projects/geom-events/contrib/gperf/doc/configure
  projects/geom-events/contrib/gperf/doc/gperf.1
  projects/geom-events/contrib/gperf/doc/help2man
  projects/geom-events/contrib/gperf/lib/Makefile.in
  projects/geom-events/contrib/gperf/lib/configure
  projects/geom-events/contrib/gperf/lib/hash.cc
  projects/geom-events/contrib/gperf/lib/hash.h
  projects/geom-events/contrib/gperf/src/Makefile.in
  projects/geom-events/contrib/gperf/src/bool-array.cc
  projects/geom-events/contrib/gperf/src/bool-array.h
  projects/geom-events/contrib/gperf/src/bool-array.icc
  projects/geom-events/contrib/gperf/src/config.h.in
  projects/geom-events/contrib/gperf/src/configure
  projects/geom-events/contrib/gperf/src/hash-table.cc
  projects/geom-events/contrib/gperf/src/hash-table.h
  projects/geom-events/contrib/gperf/src/main.cc
  projects/geom-events/contrib/gperf/src/options.cc
  projects/geom-events/contrib/gperf/src/options.h
  projects/geom-events/contrib/gperf/src/options.icc
  projects/geom-events/contrib/gperf/src/version.cc
  projects/geom-events/contrib/gperf/src/version.h
  projects/geom-events/etc/devd/apple.conf
  projects/geom-events/etc/mtree/BSD.include.dist
  projects/geom-events/etc/rc.d/kld
  projects/geom-events/gnu/lib/Makefile
  projects/geom-events/gnu/usr.bin/dialog/Makefile
  projects/geom-events/gnu/usr.bin/gperf/Makefile
  projects/geom-events/gnu/usr.bin/gperf/config.h
  projects/geom-events/kerberos5/Makefile.inc
  projects/geom-events/kerberos5/lib/libhdb/Makefile
  projects/geom-events/kerberos5/usr.bin/kadmin/Makefile
  projects/geom-events/kerberos5/usr.sbin/ktutil/Makefile
  projects/geom-events/lib/Makefile
  projects/geom-events/lib/libc/gen/_pthread_stubs.c
  projects/geom-events/lib/libc/gen/syslog.c
  projects/geom-events/lib/libc/locale/duplocale.3
  projects/geom-events/lib/libc/locale/freelocale.3
  projects/geom-events/lib/libc/locale/localeconv.3
  projects/geom-events/lib/libc/locale/newlocale.3
  projects/geom-events/lib/libc/locale/querylocale.3
  projects/geom-events/lib/libc/locale/uselocale.3
  projects/geom-events/lib/libc/locale/wctype.c
  projects/geom-events/lib/libc/locale/xlocale.3
  projects/geom-events/lib/libc/string/strcasecmp.c
  projects/geom-events/lib/libc/string/strcmp.c
  projects/geom-events/lib/libc/string/strcoll.c
  projects/geom-events/lib/libc/string/strncmp.c
  projects/geom-events/lib/libc/sys/cap_enter.2
  projects/geom-events/lib/libc/sys/cap_new.2
  projects/geom-events/lib/libedit/edit/readline/Makefile
  projects/geom-events/lib/libedit/edit/readline/readline.h
  projects/geom-events/lib/libpam/modules/Makefile.inc
  projects/geom-events/lib/libpam/modules/pam_unix/Makefile
  projects/geom-events/lib/libusb/libusb10.c
  projects/geom-events/release/doc/en_US.ISO8859-1/hardware/article.sgml
  projects/geom-events/rescue/rescue/Makefile
  projects/geom-events/sbin/camcontrol/Makefile
  projects/geom-events/sbin/camcontrol/camcontrol.8
  projects/geom-events/sbin/camcontrol/camcontrol.c
  projects/geom-events/sbin/camcontrol/camcontrol.h
  projects/geom-events/sbin/camcontrol/util.c
  projects/geom-events/sbin/dhclient/clparse.c
  projects/geom-events/sbin/dhclient/dhclient-script
  projects/geom-events/sbin/dhclient/dhclient.c
  projects/geom-events/sbin/dhclient/dhcp-options.5
  projects/geom-events/sbin/dhclient/dhcp.h
  projects/geom-events/sbin/dhclient/options.c
  projects/geom-events/sbin/dhclient/tables.c
  projects/geom-events/sbin/sysctl/sysctl.c
  projects/geom-events/share/man/man4/Makefile
  projects/geom-events/share/man/man4/ahci.4
  projects/geom-events/share/man/man4/bge.4
  projects/geom-events/share/man/man4/netmap.4
  projects/geom-events/share/man/man5/src.conf.5
  projects/geom-events/share/misc/committers-src.dot
  projects/geom-events/share/mk/bsd.lib.mk
  projects/geom-events/share/mk/bsd.libnames.mk
  projects/geom-events/share/mk/bsd.own.mk
  projects/geom-events/share/mk/bsd.prog.mk
  projects/geom-events/share/mk/sys.mk
  projects/geom-events/sys/amd64/conf/NOTES
  projects/geom-events/sys/arm/mv/common.c
  projects/geom-events/sys/arm/mv/mv_machdep.c
  projects/geom-events/sys/boot/i386/zfsboot/zfsboot.c
  projects/geom-events/sys/boot/zfs/zfsimpl.c
  projects/geom-events/sys/cam/cam_xpt.c
  projects/geom-events/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/geom-events/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h
  projects/geom-events/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/geom-events/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
  projects/geom-events/sys/compat/linprocfs/linprocfs.c
  projects/geom-events/sys/conf/NOTES
  projects/geom-events/sys/conf/files
  projects/geom-events/sys/conf/files.amd64
  projects/geom-events/sys/conf/files.sparc64
  projects/geom-events/sys/conf/kern.mk
  projects/geom-events/sys/conf/kern.post.mk
  projects/geom-events/sys/conf/kern.pre.mk
  projects/geom-events/sys/conf/kmod.mk
  projects/geom-events/sys/conf/makeLINT.mk
  projects/geom-events/sys/conf/newvers.sh
  projects/geom-events/sys/conf/options
  projects/geom-events/sys/contrib/dev/acpica/acpica_prep.sh
  projects/geom-events/sys/contrib/dev/acpica/changes.txt
  projects/geom-events/sys/contrib/dev/acpica/common/adisasm.c
  projects/geom-events/sys/contrib/dev/acpica/common/adwalk.c
  projects/geom-events/sys/contrib/dev/acpica/common/dmrestag.c
  projects/geom-events/sys/contrib/dev/acpica/common/dmtable.c
  projects/geom-events/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/geom-events/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/geom-events/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/geom-events/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslload.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/asltree.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/aslwalks.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/geom-events/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/dtsubtable.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/dttable.c
  projects/geom-events/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/geom-events/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/geom-events/sys/contrib/dev/acpica/debugger/dbcmds.c
  projects/geom-events/sys/contrib/dev/acpica/debugger/dbdisply.c
  projects/geom-events/sys/contrib/dev/acpica/debugger/dbfileio.c
  projects/geom-events/sys/contrib/dev/acpica/debugger/dbinput.c
  projects/geom-events/sys/contrib/dev/acpica/debugger/dbutils.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmbuffer.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmopcode.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmresrc.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmresrcl.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmresrcs.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmutils.c
  projects/geom-events/sys/contrib/dev/acpica/disassembler/dmwalk.c
  projects/geom-events/sys/contrib/dev/acpica/dispatcher/dsargs.c
  projects/geom-events/sys/contrib/dev/acpica/dispatcher/dsfield.c
  projects/geom-events/sys/contrib/dev/acpica/events/evevent.c
  projects/geom-events/sys/contrib/dev/acpica/events/evglock.c
  projects/geom-events/sys/contrib/dev/acpica/events/evregion.c
  projects/geom-events/sys/contrib/dev/acpica/executer/exconfig.c
  projects/geom-events/sys/contrib/dev/acpica/executer/excreate.c
  projects/geom-events/sys/contrib/dev/acpica/executer/exdump.c
  projects/geom-events/sys/contrib/dev/acpica/executer/exfield.c
  projects/geom-events/sys/contrib/dev/acpica/executer/exfldio.c
  projects/geom-events/sys/contrib/dev/acpica/executer/exprep.c
  projects/geom-events/sys/contrib/dev/acpica/executer/exutils.c
  projects/geom-events/sys/contrib/dev/acpica/hardware/hwvalid.c
  projects/geom-events/sys/contrib/dev/acpica/include/acapps.h
  projects/geom-events/sys/contrib/dev/acpica/include/acconfig.h
  projects/geom-events/sys/contrib/dev/acpica/include/acdebug.h
  projects/geom-events/sys/contrib/dev/acpica/include/acdisasm.h
  projects/geom-events/sys/contrib/dev/acpica/include/acevents.h
  projects/geom-events/sys/contrib/dev/acpica/include/acglobal.h
  projects/geom-events/sys/contrib/dev/acpica/include/acinterp.h
  projects/geom-events/sys/contrib/dev/acpica/include/aclocal.h
  projects/geom-events/sys/contrib/dev/acpica/include/acnames.h
  projects/geom-events/sys/contrib/dev/acpica/include/acobject.h
  projects/geom-events/sys/contrib/dev/acpica/include/acopcode.h
  projects/geom-events/sys/contrib/dev/acpica/include/acpixf.h
  projects/geom-events/sys/contrib/dev/acpica/include/acpredef.h
  projects/geom-events/sys/contrib/dev/acpica/include/acresrc.h
  projects/geom-events/sys/contrib/dev/acpica/include/acrestyp.h
  projects/geom-events/sys/contrib/dev/acpica/include/actbl.h
  projects/geom-events/sys/contrib/dev/acpica/include/actbl1.h
  projects/geom-events/sys/contrib/dev/acpica/include/actypes.h
  projects/geom-events/sys/contrib/dev/acpica/include/acutils.h
  projects/geom-events/sys/contrib/dev/acpica/include/amlcode.h
  projects/geom-events/sys/contrib/dev/acpica/include/amlresrc.h
  projects/geom-events/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/geom-events/sys/contrib/dev/acpica/namespace/nspredef.c
  projects/geom-events/sys/contrib/dev/acpica/namespace/nsrepair.c
  projects/geom-events/sys/contrib/dev/acpica/namespace/nsrepair2.c
  projects/geom-events/sys/contrib/dev/acpica/parser/psargs.c
  projects/geom-events/sys/contrib/dev/acpica/parser/psopcode.c
  projects/geom-events/sys/contrib/dev/acpica/parser/pstree.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rscalc.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rscreate.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rsdump.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rsinfo.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rsirq.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rslist.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rsmisc.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rsutils.c
  projects/geom-events/sys/contrib/dev/acpica/resources/rsxface.c
  projects/geom-events/sys/contrib/dev/acpica/tables/tbfadt.c
  projects/geom-events/sys/contrib/dev/acpica/tables/tbutils.c
  projects/geom-events/sys/contrib/dev/acpica/utilities/utdecode.c
  projects/geom-events/sys/contrib/dev/acpica/utilities/utmutex.c
  projects/geom-events/sys/contrib/dev/acpica/utilities/utresrc.c
  projects/geom-events/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/geom-events/sys/contrib/ipfilter/netinet/ip_proxy.c
  projects/geom-events/sys/contrib/pf/net/pf.c
  projects/geom-events/sys/dev/acpica/acpi_battery.c
  projects/geom-events/sys/dev/ahci/ahci.c
  projects/geom-events/sys/dev/arcmsr/arcmsr.c
  projects/geom-events/sys/dev/ata/chipsets/ata-ati.c
  projects/geom-events/sys/dev/ata/chipsets/ata-nvidia.c
  projects/geom-events/sys/dev/dc/dcphy.c
  projects/geom-events/sys/dev/dc/pnphy.c
  projects/geom-events/sys/dev/e1000/if_em.c
  projects/geom-events/sys/dev/e1000/if_igb.c
  projects/geom-events/sys/dev/e1000/if_lem.c
  projects/geom-events/sys/dev/fdt/fdt_common.c
  projects/geom-events/sys/dev/fdt/fdt_powerpc.c
  projects/geom-events/sys/dev/fdt/fdtbus.c
  projects/geom-events/sys/dev/gpio/gpioiic.c
  projects/geom-events/sys/dev/hptiop/hptiop.c
  projects/geom-events/sys/dev/hptmv/entry.c
  projects/geom-events/sys/dev/hptrr/hptrr_osm_bsd.c
  projects/geom-events/sys/dev/hwpmc/hwpmc_core.c
  projects/geom-events/sys/dev/iicbus/iicbus.c
  projects/geom-events/sys/dev/iicbus/iicbus.h
  projects/geom-events/sys/dev/iicbus/iiconf.c
  projects/geom-events/sys/dev/ixgbe/ixgbe.c
  projects/geom-events/sys/dev/mii/acphy.c
  projects/geom-events/sys/dev/mii/amphy.c
  projects/geom-events/sys/dev/mii/atphy.c
  projects/geom-events/sys/dev/mii/axphy.c
  projects/geom-events/sys/dev/mii/bmtphy.c
  projects/geom-events/sys/dev/mii/brgphy.c
  projects/geom-events/sys/dev/mii/ciphy.c
  projects/geom-events/sys/dev/mii/e1000phy.c
  projects/geom-events/sys/dev/mii/gentbi.c
  projects/geom-events/sys/dev/mii/icsphy.c
  projects/geom-events/sys/dev/mii/ip1000phy.c
  projects/geom-events/sys/dev/mii/jmphy.c
  projects/geom-events/sys/dev/mii/lxtphy.c
  projects/geom-events/sys/dev/mii/miidevs
  projects/geom-events/sys/dev/mii/mlphy.c
  projects/geom-events/sys/dev/mii/nsgphy.c
  projects/geom-events/sys/dev/mii/nsphy.c
  projects/geom-events/sys/dev/mii/nsphyter.c
  projects/geom-events/sys/dev/mii/pnaphy.c
  projects/geom-events/sys/dev/mii/qsphy.c
  projects/geom-events/sys/dev/mii/rgephy.c
  projects/geom-events/sys/dev/mii/rlphy.c
  projects/geom-events/sys/dev/mii/rlswitch.c
  projects/geom-events/sys/dev/mii/smcphy.c
  projects/geom-events/sys/dev/mii/tdkphy.c
  projects/geom-events/sys/dev/mii/tlphy.c
  projects/geom-events/sys/dev/mii/truephy.c
  projects/geom-events/sys/dev/mii/ukphy.c
  projects/geom-events/sys/dev/mii/xmphy.c
  projects/geom-events/sys/dev/netmap/if_em_netmap.h
  projects/geom-events/sys/dev/netmap/if_igb_netmap.h
  projects/geom-events/sys/dev/netmap/if_lem_netmap.h
  projects/geom-events/sys/dev/netmap/if_re_netmap.h
  projects/geom-events/sys/dev/netmap/ixgbe_netmap.h
  projects/geom-events/sys/dev/netmap/netmap.c
  projects/geom-events/sys/dev/netmap/netmap_kern.h
  projects/geom-events/sys/dev/ofw/ofw_fdt.c
  projects/geom-events/sys/dev/ofw/openfirm.c
  projects/geom-events/sys/dev/pci/pcireg.h
  projects/geom-events/sys/dev/re/if_re.c
  projects/geom-events/sys/dev/sfxge/common/efsys.h
  projects/geom-events/sys/dev/sfxge/common/efx.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_bootcfg.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_ev.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_filter.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_impl.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_intr.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_mac.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_mcdi.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_mcdi.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_mon.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_nic.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_nvram.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_phy.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_port.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_regs.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_regs_ef10.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_regs_mcdi.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_regs_pci.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_rx.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_sram.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_tx.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_types.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_vpd.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/efx_wol.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_flash.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_impl.h   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_mac.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_mon.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_nic.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_nvram.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_phy.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_sram.c   (contents, props changed)
  projects/geom-events/sys/dev/sfxge/common/siena_vpd.c   (contents, props changed)
  projects/geom-events/sys/dev/uart/uart_bus_fdt.c
  projects/geom-events/sys/dev/usb/net/ruephy.c
  projects/geom-events/sys/dev/usb/quirk/usb_quirk.c
  projects/geom-events/sys/dev/usb/usb_msctest.c
  projects/geom-events/sys/dev/usb/usb_transfer.h
  projects/geom-events/sys/dev/usb/usbdevs
  projects/geom-events/sys/dev/usb/wlan/if_urtw.c
  projects/geom-events/sys/dev/vr/if_vr.c
  projects/geom-events/sys/dev/vr/if_vrreg.h
  projects/geom-events/sys/dev/xl/xlphy.c
  projects/geom-events/sys/fs/fifofs/fifo_vnops.c
  projects/geom-events/sys/fs/nfs/nfsclstate.h
  projects/geom-events/sys/fs/nfsclient/nfs_clbio.c
  projects/geom-events/sys/fs/nfsclient/nfs_clstate.c
  projects/geom-events/sys/fs/nfsserver/nfs_nfsdport.c
  projects/geom-events/sys/fs/nfsserver/nfs_nfsdsubs.c
  projects/geom-events/sys/fs/ntfs/ntfs_subr.c
  projects/geom-events/sys/fs/ntfs/ntfs_subr.h
  projects/geom-events/sys/fs/ntfs/ntfs_vnops.c
  projects/geom-events/sys/fs/nwfs/nwfs_io.c
  projects/geom-events/sys/fs/smbfs/smbfs_io.c
  projects/geom-events/sys/geom/geom_vfs.c
  projects/geom-events/sys/geom/part/g_part_apm.c
  projects/geom-events/sys/i386/conf/PAE
  projects/geom-events/sys/kern/kern_cpuset.c
  projects/geom-events/sys/kern/kern_ffclock.c
  projects/geom-events/sys/kern/kern_proc.c
  projects/geom-events/sys/kern/kern_resource.c
  projects/geom-events/sys/kern/kern_switch.c
  projects/geom-events/sys/kern/kern_synch.c
  projects/geom-events/sys/kern/kern_tc.c
  projects/geom-events/sys/kern/kern_thr.c
  projects/geom-events/sys/kern/kern_umtx.c
  projects/geom-events/sys/kern/subr_blist.c
  projects/geom-events/sys/kern/subr_bus.c
  projects/geom-events/sys/kern/sys_pipe.c
  projects/geom-events/sys/kern/uipc_shm.c
  projects/geom-events/sys/kern/vfs_bio.c
  projects/geom-events/sys/kern/vfs_syscalls.c
  projects/geom-events/sys/mips/atheros/ar71xx_chip.c
  projects/geom-events/sys/mips/atheros/ar71xx_cpudef.h
  projects/geom-events/sys/mips/atheros/ar71xx_machdep.c
  projects/geom-events/sys/mips/atheros/ar724x_chip.c
  projects/geom-events/sys/mips/atheros/ar91xx_chip.c
  projects/geom-events/sys/mips/atheros/if_arge.c
  projects/geom-events/sys/mips/cavium/octeon_machdep.c
  projects/geom-events/sys/mips/conf/AR91XX_BASE
  projects/geom-events/sys/mips/conf/AR91XX_BASE.hints
  projects/geom-events/sys/mips/conf/OCTEON1
  projects/geom-events/sys/mips/conf/PB92
  projects/geom-events/sys/mips/conf/TP-WN1043ND
  projects/geom-events/sys/mips/conf/TP-WN1043ND.hints
  projects/geom-events/sys/mips/conf/XLPN32
  projects/geom-events/sys/mips/mips/db_trace.c
  projects/geom-events/sys/mips/nlm/hal/cpucontrol.h
  projects/geom-events/sys/mips/nlm/xlp_machdep.c
  projects/geom-events/sys/modules/Makefile
  projects/geom-events/sys/modules/acpi/acpi/Makefile
  projects/geom-events/sys/modules/cam/Makefile
  projects/geom-events/sys/net/bpf.c
  projects/geom-events/sys/net/bpf.h
  projects/geom-events/sys/net/if_clone.c
  projects/geom-events/sys/net/if_clone.h
  projects/geom-events/sys/net/if_vlan.c
  projects/geom-events/sys/net/netmap.h
  projects/geom-events/sys/netinet/in.c
  projects/geom-events/sys/netinet/sctp_header.h
  projects/geom-events/sys/netinet/sctp_output.c
  projects/geom-events/sys/netinet/sctp_pcb.c
  projects/geom-events/sys/netinet/sctp_uio.h
  projects/geom-events/sys/netinet/tcp_reass.c
  projects/geom-events/sys/netipsec/xform_ah.c
  projects/geom-events/sys/netipsec/xform_esp.c
  projects/geom-events/sys/nfsclient/nfs_bio.c
  projects/geom-events/sys/nfsserver/nfs_serv.c
  projects/geom-events/sys/pc98/include/md_var.h
  projects/geom-events/sys/pc98/pc98/pc98_machdep.h
  projects/geom-events/sys/pci/if_rlreg.h
  projects/geom-events/sys/powerpc/booke/platform_bare.c
  projects/geom-events/sys/powerpc/powermac/platform_powermac.c
  projects/geom-events/sys/powerpc/powermac/pmu.c
  projects/geom-events/sys/powerpc/powermac/pmuvar.h
  projects/geom-events/sys/sparc64/conf/GENERIC
  projects/geom-events/sys/sparc64/include/atomic.h
  projects/geom-events/sys/sparc64/include/md_var.h
  projects/geom-events/sys/sparc64/pci/schizo.c
  projects/geom-events/sys/sparc64/sparc64/ata_machdep.c
  projects/geom-events/sys/sparc64/sparc64/ofw_machdep.c
  projects/geom-events/sys/sparc64/sparc64/vm_machdep.c
  projects/geom-events/sys/sys/resource.h
  projects/geom-events/sys/sys/sysctl.h
  projects/geom-events/sys/sys/timeffc.h
  projects/geom-events/sys/sys/umtx.h
  projects/geom-events/sys/vm/vm_page.c
  projects/geom-events/sys/vm/vm_page.h
  projects/geom-events/sys/vm/vnode_pager.c
  projects/geom-events/sys/x86/acpica/acpi_apm.c
  projects/geom-events/sys/xen/evtchn/evtchn_dev.c
  projects/geom-events/tools/regression/bin/test/regress.sh
  projects/geom-events/tools/regression/pipe/pipe-fstatbug.c
  projects/geom-events/tools/regression/pipe/pipe-reverse.c
  projects/geom-events/tools/regression/pipe/pipe-wraparound.c
  projects/geom-events/tools/regression/sbin/Makefile
  projects/geom-events/tools/tools/netmap/pkt-gen.c
  projects/geom-events/usr.bin/grep/Makefile
  projects/geom-events/usr.bin/grep/util.c
  projects/geom-events/usr.bin/m4/Makefile
  projects/geom-events/usr.bin/m4/eval.c
  projects/geom-events/usr.bin/m4/expr.c
  projects/geom-events/usr.bin/m4/extern.h
  projects/geom-events/usr.bin/m4/gnum4.c
  projects/geom-events/usr.bin/m4/look.c
  projects/geom-events/usr.bin/m4/m4.1
  projects/geom-events/usr.bin/m4/main.c
  projects/geom-events/usr.bin/m4/mdef.h
  projects/geom-events/usr.bin/m4/misc.c
  projects/geom-events/usr.bin/m4/pathnames.h
  projects/geom-events/usr.bin/m4/stdd.h
  projects/geom-events/usr.bin/m4/trace.c
  projects/geom-events/usr.bin/make/Makefile
  projects/geom-events/usr.bin/make/job.c
  projects/geom-events/usr.bin/procstat/Makefile
  projects/geom-events/usr.bin/procstat/procstat.1
  projects/geom-events/usr.bin/procstat/procstat.c
  projects/geom-events/usr.bin/procstat/procstat.h
  projects/geom-events/usr.bin/procstat/procstat_auxv.c
  projects/geom-events/usr.bin/truss/setup.c
  projects/geom-events/usr.sbin/acpi/Makefile.inc
  projects/geom-events/usr.sbin/acpi/acpidb/Makefile
  projects/geom-events/usr.sbin/acpi/acpidb/acpidb.c
  projects/geom-events/usr.sbin/acpi/iasl/Makefile
  projects/geom-events/usr.sbin/bsdinstall/distextract/distextract.c
  projects/geom-events/usr.sbin/bsdinstall/distfetch/distfetch.c
  projects/geom-events/usr.sbin/bsdinstall/partedit/gpart_ops.c
  projects/geom-events/usr.sbin/bsdinstall/scripts/auto
  projects/geom-events/usr.sbin/bsdinstall/scripts/services
  projects/geom-events/usr.sbin/config/mkmakefile.c
  projects/geom-events/usr.sbin/cron/crontab/crontab.5
  projects/geom-events/usr.sbin/mergemaster/mergemaster.sh
  projects/geom-events/usr.sbin/mfiutil/mfi_config.c
  projects/geom-events/usr.sbin/mfiutil/mfi_evt.c
  projects/geom-events/usr.sbin/sade/Makefile
  projects/geom-events/usr.sbin/sade/devices.c
  projects/geom-events/usr.sbin/sade/disks.c
  projects/geom-events/usr.sbin/sade/dmenu.c
  projects/geom-events/usr.sbin/sade/install.c
  projects/geom-events/usr.sbin/sade/label.c
  projects/geom-events/usr.sbin/sade/main.c
  projects/geom-events/usr.sbin/sade/menus.c
  projects/geom-events/usr.sbin/sade/misc.c
  projects/geom-events/usr.sbin/sade/msg.c
  projects/geom-events/usr.sbin/sade/sade.h
  projects/geom-events/usr.sbin/sade/system.c
  projects/geom-events/usr.sbin/tzsetup/Makefile
  projects/geom-events/usr.sbin/tzsetup/tzsetup.c
Directory Properties:
  projects/geom-events/   (props changed)
  projects/geom-events/cddl/contrib/opensolaris/   (props changed)
  projects/geom-events/gnu/lib/   (props changed)
  projects/geom-events/lib/libc/   (props changed)
  projects/geom-events/sbin/   (props changed)
  projects/geom-events/sys/   (props changed)
  projects/geom-events/sys/boot/   (props changed)
  projects/geom-events/sys/cddl/contrib/opensolaris/   (props changed)
  projects/geom-events/sys/conf/   (props changed)
  projects/geom-events/sys/contrib/dev/acpica/   (props changed)
  projects/geom-events/sys/contrib/pf/   (props changed)
  projects/geom-events/tools/build/options/WITHOUT_GPIO   (props changed)
  projects/geom-events/tools/build/options/WITH_OFED   (props changed)
  projects/geom-events/usr.bin/procstat/   (props changed)

Modified: projects/geom-events/Makefile.inc1
==============================================================================

--- projects/geom-events/Makefile.inc1	Mon Dec  5 16:38:52 2011	(r228284)
+++ projects/geom-events/Makefile.inc1	Mon Dec  5 17:44:12 2011	(r228285)
@@ -59,8 +59,6 @@ SUBDIR+=games
 .endif
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
-.else
-NO_CTF=1
 .endif
 SUBDIR+=gnu include
 .if ${MK_KERBEROS} != "no"
@@ -239,7 +237,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-		-DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
+		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
 
 # build-tools stage
@@ -438,7 +436,7 @@ _libraries:
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	    -DWITHOUT_MAN -DWITHOUT_PROFILE libraries
+	    -DWITHOUT_MAN -DNO_PROFILE libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1218,6 +1216,9 @@ _startup_libs+=	lib/csu/${MACHINE_CPUARC
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
+.if ${MK_LIBCPLUSPLUS} != "no"
+_startup_libs+=	lib/libcxxrt
+.endif
 
 gnu/lib/libgcc__L: lib/libc__L
 
@@ -1230,7 +1231,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie ${_lib_libthr} \
+		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		${_cddl_lib_libumem} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
@@ -1318,12 +1319,12 @@ ${_lib}__PL: .PHONY
 		cd ${.CURDIR}/${_lib}; \
 		${MAKE} DIRPRFX=${_lib}/ obj; \
 		${MAKE} DIRPRFX=${_lib}/ depend; \
-		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
-		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
+		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
-.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs}
+.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
@@ -1335,6 +1336,17 @@ ${_lib}__L: .PHONY
 .endif
 .endfor
 
+# libpam is special: we need to build static PAM modules before
+# static PAM library, and dynamic PAM library before dynamic PAM
+# modules.
+lib/libpam__L: .PHONY
+	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
+		cd ${.CURDIR}/lib/libpam; \
+		${MAKE} DIRPRFX=lib/libpam/ obj; \
+		${MAKE} DIRPRFX=lib/libpam/ depend; \
+		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
+		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
 _prebuild_libs: ${_prebuild_libs:S/$/__L/}
@@ -1541,7 +1553,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
 NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
+	-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
 	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
@@ -1625,4 +1637,7 @@ _xi-links:
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
+.else
+xdev xdev-buil xdev-install:
+	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif

Modified: projects/geom-events/ObsoleteFiles.inc
==============================================================================
--- projects/geom-events/ObsoleteFiles.inc	Mon Dec  5 16:38:52 2011	(r228284)
+++ projects/geom-events/ObsoleteFiles.inc	Mon Dec  5 17:44:12 2011	(r228285)
@@ -38,6 +38,19 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20111125: amd(4) removed
+OLD_FILES+=usr/share/man/man4/amd.4.gz
+# 20111125: libodialog removed
+OLD_FILES+=usr/lib/libodialog.a
+OLD_FILES+=usr/lib/libodialog.so
+OLD_LIBS+=usr/lib/libodialog.so.7
+OLD_FILES+=usr/lib/libodialog_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libodialog.a
+OLD_FILES+=usr/lib32/libodialog.so
+OLD_LIBS+=usr/lib32/libodialog.so.7
+OLD_FILES+=usr/lib32/libodialog_p.a
+.endif
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz

Modified: projects/geom-events/UPDATING
==============================================================================
--- projects/geom-events/UPDATING	Mon Dec  5 16:38:52 2011	(r228284)
+++ projects/geom-events/UPDATING	Mon Dec  5 17:44:12 2011	(r228285)
@@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20111122:
+	The acpi_wmi(4) status device /dev/wmistat has been renamed to
+	/dev/wmistat0.
+
 20111108:
 	The option VFS_ALLOW_NONMPSAFE option has been added in order to
 	explicitely support non-MPSAFE filesystems.

Modified: projects/geom-events/bin/sh/eval.c
==============================================================================
--- projects/geom-events/bin/sh/eval.c	Mon Dec  5 16:38:52 2011	(r228284)
+++ projects/geom-events/bin/sh/eval.c	Mon Dec  5 17:44:12 2011	(r228285)
@@ -89,7 +89,7 @@ int oexitstatus;		/* saved exit status *
 
 static void evalloop(union node *, int);
 static void evalfor(union node *, int);
-static void evalcase(union node *, int);
+static union node *evalcase(union node *, int);
 static void evalsubshell(union node *, int);
 static void evalredir(union node *, int);
 static void expredir(union node *);
@@ -256,7 +256,7 @@ evaltree(union node *n, int flags)
 			evalfor(n, flags & ~EV_EXIT);
 			break;
 		case NCASE:
-			evalcase(n, flags);
+			next = evalcase(n, flags);
 			break;
 		case NDEFUN:
 			defun(n->narg.text, n->narg.next);
@@ -343,8 +343,6 @@ evalfor(union node *n, int flags)
 	for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
 		oexitstatus = exitstatus;
 		expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
-		if (evalskip)
-			goto out;
 	}
 	*arglist.lastp = NULL;
 
@@ -364,13 +362,12 @@ evalfor(union node *n, int flags)
 		}
 	}
 	loopnest--;
-out:
 	popstackmark(&smark);
 }
 
 
 
-static void
+static union node *
 evalcase(union node *n, int flags)
 {
 	union node *cp;
@@ -383,26 +380,24 @@ evalcase(union node *n, int flags)
 	oexitstatus = exitstatus;
 	exitstatus = 0;
 	expandarg(n->ncase.expr, &arglist, EXP_TILDE);
-	for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) {
+	for (cp = n->ncase.cases ; cp ; cp = cp->nclist.next) {
 		for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {
 			if (casematch(patp, arglist.list->text)) {
+				popstackmark(&smark);
 				while (cp->nclist.next &&
 				    cp->type == NCLISTFALLTHRU) {
-					if (evalskip != 0)
-						break;
 					evaltree(cp->nclist.body,
 					    flags & ~EV_EXIT);
+					if (evalskip != 0)
+						return (NULL);
 					cp = cp->nclist.next;
 				}
-				if (evalskip == 0) {
-					evaltree(cp->nclist.body, flags);
-				}
-				goto out;
+				return (cp->nclist.body);
 			}
 		}
 	}
-out:
 	popstackmark(&smark);
+	return (NULL);
 }
 
 

Modified: projects/geom-events/bin/test/test.c
==============================================================================
--- projects/geom-events/bin/test/test.c	Mon Dec  5 16:38:52 2011	(r228284)
+++ projects/geom-events/bin/test/test.c	Mon Dec  5 17:44:12 2011	(r228285)
@@ -119,7 +119,7 @@ enum token_types {
 };
 
 static struct t_op {
-	const char *op_text;
+	char op_text[4];
 	short op_num, op_type;
 } const ops [] = {
 	{"-r",	FILRD,	UNOP},
@@ -162,7 +162,7 @@ static struct t_op {
 	{"-o",	BOR,	BBINOP},
 	{"(",	LPAREN,	PAREN},
 	{")",	RPAREN,	PAREN},
-	{0,	0,	0}
+	{"",	0,	0}
 };
 
 static struct t_op const *t_wp_op;
@@ -427,7 +427,7 @@ t_lex(char *s)
 		t_wp_op = NULL;
 		return EOI;
 	}
-	while (op->op_text) {
+	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0) {
 			if (((op->op_type == UNOP || op->op_type == BUNOP)
 						&& isunopoperand()) ||
@@ -456,7 +456,7 @@ isunopoperand(void)
 	if (nargc == 2)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	t = *(t_wp + 2);
-	while (op->op_text) {
+	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
 			return op->op_type == BINOP &&
 			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
@@ -478,7 +478,7 @@ islparenoperand(void)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	if (nargc != 3)
 		return 0;
-	while (op->op_text) {
+	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
 			return op->op_type == BINOP;
 		op++;

Modified: projects/geom-events/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- projects/geom-events/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Mon Dec  5 16:38:52 2011	(r228284)
+++ projects/geom-events/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Mon Dec  5 17:44:12 2011	(r228285)
@@ -1,65 +1,79 @@
 '\" te
+.\" Copyright (c) 2011, Martin Matuska <mm at FreeBSD.org>.
+.\" All Rights Reserved.
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
 .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
-.TH ZDB 8 "Oct 31, 2005"
-.SH NAME
-zdb \- ZFS debugger
-.SH SYNOPSIS
-.LP
-.nf
-\fBzdb\fR \fIpool\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBzdb\fR command is used by support engineers to diagnose failures and
-gather statistics. Since the \fBZFS\fR file system is always consistent on disk
-and is self-repairing, \fBzdb\fR should only be run under the direction by a
-support engineer.
-.sp
-.LP
-If no arguments are specified, \fBzdb\fR, performs basic consistency checks on
-the pool and associated datasets, and report any problems detected.
-.sp
-.LP
+.\"
+.\" $FreeBSD$
+.\"
+.Dd November 26, 2011
+.Dt ZDB 8
+.Os
+.Sh NAME
+.Nm zdb
+.Nd ZFS debugger
+.Sh SYNOPSIS
+.Nm
+.Ar pool
+.Sh DESCRIPTION
+The
+.Nm
+command is used by support engineers to diagnose failures and
+gather statistics. Since the
+.Tn ZFS
+file system is always consistent on disk and is self-repairing,
+.Nm
+should only be run under the direction by a support engineer.
+.Pp
+If no arguments are specified,
+.Nm
+performs basic consistency checks on the pool and associated datasets, and
+report any problems detected.
+.Nm
 Any options supported by this command are internal to Sun and subject to change
 at any time.
-.SH EXIT STATUS
-.sp
-.LP
+.Sh EXIT STATUS
 The following exit values are returned:
-.sp
-.ne 2
-.na
-\fB\fB0\fR\fR
-.ad
-.RS 5n
+.Bl -tag -offset 2n -width 2n
+.It 0
 The pool is consistent.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB1\fR\fR
-.ad
-.RS 5n
+.It 1
 An error was detected.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fB2\fR\fR
-.ad
-.RS 5n
+.It 2
 Invalid command line options were specified.
-.RE
-
-.SH SEE ALSO
-.sp
-.LP
-zfs(8), zpool(8)
+.El
+.Sh SEE ALSO
+.Xr zfs 8 ,
+.Xr zpool 8
+.Sh AUTHORS
+This manual page is a
+.Xr mdoc 7
+reimplementation of the
+.Tn OpenSolaris
+manual page
+.Em zdb(1M) ,
+modified and customized for
+.Fx
+and licensed under the
+.Tn Common Development and Distribution License
+.Pq Tn CDDL .
+.Pp
+The
+.Xr mdoc 7
+implementation of this manual page was initially written by
+.An Martin Matuska Aq mm at FreeBSD.org .

Modified: projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Dec  5 16:38:52 2011	(r228284)
+++ projects/geom-events/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Dec  5 17:44:12 2011	(r228285)
@@ -1,561 +1,543 @@
 '\" te
-.\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
-.\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
-.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
-.\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
-.\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+.\" Copyright (c) 2011, Martin Matuska <mm at FreeBSD.org>.
+.\" All Rights Reserved.
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
+.\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
-.\" Copyright 2011 by Delphix.  All rights reserved.
-.\" Portions Copyright 2011 Pawel Jakub Dawidek <pjd at FreeBSD.org>
-.\" Portions Copyright 2011 Martin Matuska <mm at FreeBSD.org>
-.TH ZFS 8 "September 24, 2009" FreeBSD
-.SH NAME
-zfs \- configures ZFS file systems
-.SH SYNOPSIS
-.LP
-.nf
-\fBzfs\fR [\fB-?\fR]
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBcreate\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBcreate\fR [\fB-ps\fR] [\fB-b\fR \fIblocksize\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fB-V\fR \fIsize\fR \fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBdestroy\fR [\fB-rRf\fR] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBdestroy\fR [\fB-rRd\fR] \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBsnapshot\fR [\fB-r\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR]...
-      \fIfilesystem at snapname\fR|\fIvolume at snapname\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrollback\fR [\fB-rRf\fR] \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBclone\fR [\fB-p\fR] [\fB-o\fR \fIproperty\fR=\fIvalue\fR] ... \fIsnapshot\fR \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBpromote\fR \fIclone-filesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
-     \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR [\fB-p\fR] \fIfilesystem\fR|\fIvolume\fR \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR \fB-r\fR \fIsnapshot\fR \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrename\fR \fB-u\fR [\fB-p\fR] \fIfilesystem\fR \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBlist\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-H\fR][\fB-o\fR \fIproperty\fR[,...]] [\fB-t\fR \fItype\fR[,...]]
-     [\fB-s\fR \fIproperty\fR] ... [\fB-S\fR \fIproperty\fR] ... [\fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR] ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBset\fR \fIproperty\fR=\fIvalue\fR \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBget\fR [\fB-r\fR|\fB-d\fR \fIdepth\fR][\fB-Hp\fR][\fB-o\fR \fIfield\fR[,...]] [\fB-s\fR \fIsource\fR[,...]]
-     "\fIall\fR" | \fIproperty\fR[,...] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR ...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBupgrade\fR [\fB-v\fR]
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBupgrade\fR [\fB-r\fR] [\fB-V\fR \fIversion\fR] \fB-a\fR | \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBuserspace\fR [\fB-niHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-sS\fR \fIfield\fR] ...
-     [\fB-t\fR \fItype\fR [,...]] \fIfilesystem\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBgroupspace\fR [\fB-niHp\fR] [\fB-o\fR \fIfield\fR[,...]] [\fB-sS\fR \fIfield\fR] ...
-     [\fB-t\fR \fItype\fR [,...]] \fIfilesystem\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBmount\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBmount\fR [\fB-vO\fR] [\fB-o \fIoptions\fR\fR] \fB-a\fR | \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunmount\fR [\fB-f\fR] \fB-a\fR | \fIfilesystem\fR|\fImountpoint\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBshare\fR \fB-a\fR | \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunshare\fR \fB-a\fR \fIfilesystem\fR|\fImountpoint\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBsend\fR [\fB-vR\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBreceive\fR [\fB-vnFu\fR] \fB-d\fR \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR [\fB-ldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] \fIperm\fR|\fI at setname\fR[,...]
-     \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR [\fB-ld\fR] \fB-e\fR \fIperm\fR|@\fIsetname\fR[,...] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR \fB-c\fR \fIperm\fR|@\fIsetname\fR[,...] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBallow\fR \fB-s\fR @\fIsetname\fR \fIperm\fR|@\fIsetname\fR[,...] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-rldug\fR] "\fIeveryone\fR"|\fIuser\fR|\fIgroup\fR[,...] [\fIperm\fR|@\fIsetname\fR[,... ]]
-     \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-rld\fR] \fB-e\fR [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-c\fR [\fIperm\fR|@\fIsetname\fR[ ... ]] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunallow\fR [\fB-r\fR] \fB-s\fR @\fIsetname\fR [\fIperm\fR|@\fIsetname\fR[,... ]] \fIfilesystem\fR|\fIvolume\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBhold\fR [\fB-r\fR] \fItag\fR \fIsnapshot\fR...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBholds\fR [\fB-r\fR] \fIsnapshot\fR...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBrelease\fR [\fB-r\fR] \fItag\fR \fIsnapshot\fR...
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBjail\fR \fIjailid\fR \fIfilesystem\fR
-.fi
-
-.LP
-.nf
-\fBzfs\fR \fBunjail\fR \fIjailid\fR \fIfilesystem\fR
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBzfs\fR command configures \fBZFS\fR datasets within a \fBZFS\fR storage
-pool, as described in \fBzpool\fR(8). A dataset is identified by a unique path
-within the \fBZFS\fR namespace. For example:
-.sp
-.in +2
-.nf
-pool/{filesystem,volume,snapshot}
-.fi
-.in -2
-.sp
-
-.sp
-.LP
-where the maximum length of a dataset name is \fBMAXNAMELEN\fR (256 bytes).
-.sp
-.LP
+.\" Copyright (c) 2011 by Delphix. All rights reserved.
+.\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
+.\"
+.\" $FreeBSD$
+.\"
+.Dd November 26, 2011
+.Dt ZFS 8
+.Os
+.Sh NAME
+.Nm zfs
+.Nd configures ZFS file systems
+.Sh SYNOPSIS
+.Nm
+.Op Fl \&?
+.Nm
+.Cm create
+.Op Fl p
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ... filesystem
+.Nm
+.Cm create
+.Op Fl ps
+.Op Fl b Ar blocksize
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ...
+.Fl V
+.Ar size volume
+.Nm
+.Cm destroy
+.Op Fl fnpRrv
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm destroy
+.Op Fl dnpRrv
+.Sm off
+.Ar snapshot
+.Ns Op % Ns Ar snapname
+.Ns Op , Ns Ar ...
+.Sm on
+.Nm
+.Cm snapshot
+.Op Fl r
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ... filesystem at snapname Ns | Ns Ar volume at snapname
+.Nm
+.Cm rollback
+.Op Fl rRf
+.Ar snapshot
+.Nm
+.Cm clone
+.Op Fl p
+.Op Fl o Ar property Ns = Ns Ar value
+.Ar ... snapshot filesystem Ns | Ns Ar volume
+.Nm
+.Cm promote
+.Ar clone-filesystem
+.Nm
+.Cm rename
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm rename
+.Fl p
+.Ar filesystem Ns | Ns Ar volume
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm rename
+.Fl r
+.Ar snapshot snapshot
+.Nm
+.Cm rename
+.Fl u
+.Op Fl p
+.Ar filesystem filesystem
+.Nm
+.Cm list
+.Op Fl r Ns | Ns Fl d Ar depth
+.Op Fl H
+.Op Fl o Ar property Ns Op , Ns Ar ...
+.Op Fl t Ar type Ns Op , Ns Ar ...
+.Op Fl s Ar property
+.Ar ...
+.Op Fl S Ar property
+.Ar ...
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm set
+.Ar property Ns = Ns Ar value
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm get
+.Op Fl r Ns | Ns Fl d Ar depth
+.Op Fl Hp
+.Op Fl o Ar all | field Ns Op , Ns Ar ...
+.Op Fl s Ar source Ns Op , Ns Ar ...
+.Ar all | property Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm inherit
+.Op Fl rS
+.Ar property
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm upgrade
+.Op Fl v
+.Nm
+.Cm upgrade
+.Op Fl r
+.Op Fl V Ar version
+.Fl a | Ar filesystem
+.Nm
+.Cm userspace
+.Op Fl niHp
+.Op Fl o Ar field Ns Op , Ns Ar ...
+.Op Fl sS Ar field
+.Ar ...
+.Op Fl t Ar type Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar snapshot
+.Nm
+.Cm groupspace
+.Op Fl niHp
+.Op Fl o Ar field Ns Op , Ns Ar ...
+.Op Fl sS Ar field
+.Ar ...
+.Op Fl t Ar type Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar snapshot
+.Nm
+.Cm mount
+.Nm
+.Cm mount
+.Op Fl vO
+.Op Fl o Ar property Ns Op , Ns Ar ...
+.Fl a | Ar filesystem
+.Nm
+.Cm unmount
+.Op Fl f
+.Fl a | Ar filesystem Ns | Ns Ar mountpoint
+.Nm
+.Cm share
+.Fl a | Ar filesystem
+.Nm
+.Cm unshare
+.Fl a | Ar filesystem Ns | Ns Ar mountpoint
+.Nm
+.Cm send
+.Op Fl DnPpRrv
+.Op Fl i Ar snapshot | Fl I Ar snapshot
+.Ar snapshot
+.Nm
+.Cm receive
+.Op Fl vnFu
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
+.Cm receive
+.Op Fl vnFu
+.Op Fl d | e
+.Ar filesystem
+.Nm
+.Cm allow
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Op Fl ldug
+.Cm everyone Ns | Ns Ar user Ns | Ns Ar group Ns Op , Ns Ar ...
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Op Fl ld
+.Fl e
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Fl c
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm allow
+.Fl s
+.Ar @setname
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl rldug
+.Cm everyone Ns | Ns Ar user Ns | Ns Ar group Ns Op , Ns Ar ...
+.Op Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl rld
+.Fl e
+.Op Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl r
+.Fl c
+.Op Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm unallow
+.Op Fl r
+.Fl s
+.Ar @setname
+.Ar perm Ns | Ns Ar @setname Ns Op , Ns Ar ...
+.Ar filesystem Ns | Ns Ar volume
+.Nm
+.Cm hold
+.Op Fl r
+.Ar tag snapshot ...
+.Nm
+.Cm holds
+.Op Fl r
+.Ar snapshot ...
+.Nm
+.Cm release
+.Op Fl r
+.Ar tag snapshot ...
+.Nm
+.Cm diff
+.Op Fl FHt
+.Ar snapshot
+.Op Ar snapshot Ns | Ns Ar filesystem
+.Nm
+.Cm jail
+.Ar jailid filesystem
+.Nm
+.Cm unjail
+.Ar jailid filesystem
+.Sh DESCRIPTION
+The
+.Nm
+command configures
+.Tn ZFS
+datasets within a
+.Tn ZFS
+storage pool, as described in
+.Xr zpool 8 .
+A dataset is identified by a unique path within the
+.Tn ZFS
+namespace. For example:
+.Bd -ragged -offset 4n
+.No pool/ Ns Brq filesystem,volume,snapshot
+.Ed
+.Pp
+where the maximum length of a dataset name is
+.Dv MAXNAMELEN
+(256 bytes).
+.Pp
 A dataset can be one of the following:
-.sp
-.ne 2
-.na
-\fB\fIfile system\fR\fR
-.ad
-.sp .6
-.RS 4n
-A \fBZFS\fR dataset of type \fBfilesystem\fR can be mounted within the standard
-system namespace and behaves like other file systems. While \fBZFS\fR file
-systems are designed to be \fBPOSIX\fR compliant, known issues exist that
-prevent compliance in some cases. Applications that depend on standards
-conformance might fail due to nonstandard behavior when checking file system
-free space.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIvolume\fR\fR
-.ad
-.sp .6
-.RS 4n
+.Bl -hang -width 12n
+.It Sy file system
+A
+.Tn ZFS
+dataset of type
+.Em filesystem
+can be mounted within the standard system namespace and behaves like other file
+systems. While
+.Tn ZFS
+file systems are designed to be
+.Tn POSIX
+compliant, known issues exist that prevent compliance in some cases.
+Applications that depend on standards conformance might fail due to nonstandard
+behavior when checking file system free space.
+.It Sy volume
 A logical volume exported as a raw or block device. This type of dataset should
 only be used under special circumstances. File systems are typically used in
 most environments.
-.RE
-
-.sp
-.ne 2
-.na
-\fB\fIsnapshot\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Sy snapshot
 A read-only version of a file system or volume at a given point in time. It is
-specified as \fIfilesystem at name\fR or \fIvolume at name\fR.
-.RE
-
-.SS "ZFS File System Hierarchy"
-.sp
-.LP
-A \fBZFS\fR storage pool is a logical collection of devices that provide space
-for datasets. A storage pool is also the root of the \fBZFS\fR file system
-hierarchy.
-.sp
-.LP
+specified as
+.Em filesystem at name
+or
+.Em volume at name .
+.El
+.Ss ZFS File System Hierarchy
+A
+.Tn ZFS
+storage pool is a logical collection of devices that provide space for

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