svn commit: r243175 - in projects/bhyve: . bin/df bin/mv bin/sh cddl/contrib/opensolaris/cmd/zpool cddl/sbin/zpool contrib/atf contrib/atf/atf-c contrib/atf/atf-run contrib/atf/atf-sh contrib/atf/d...

Neel Natu neel at FreeBSD.org
Sat Nov 17 02:55:49 UTC 2012 

Author: neel
Date: Sat Nov 17 02:55:47 2012
New Revision: 243175
URL: http://svnweb.freebsd.org/changeset/base/243175

Log:
  IFC @ r243164

Added:
  projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
     - copied unchanged from r243164, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/bhyve/contrib/atf/FREEBSD-Xlist
     - copied unchanged from r243164, head/contrib/atf/FREEBSD-Xlist
  projects/bhyve/contrib/atf/FREEBSD-upgrade
     - copied unchanged from r243164, head/contrib/atf/FREEBSD-upgrade
  projects/bhyve/contrib/bmake/unit-tests/order
     - copied unchanged from r243164, head/contrib/bmake/unit-tests/order
  projects/bhyve/lib/libc/gen/waitid.c
     - copied unchanged from r243164, head/lib/libc/gen/waitid.c
  projects/bhyve/sys/mips/cavium/octeon_pci_console.c
     - copied unchanged from r243164, head/sys/mips/cavium/octeon_pci_console.c
Deleted:
  projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
Modified:
  projects/bhyve/ObsoleteFiles.inc
  projects/bhyve/bin/df/df.1
  projects/bhyve/bin/df/df.c
  projects/bhyve/bin/mv/mv.c
  projects/bhyve/bin/sh/input.c
  projects/bhyve/bin/sh/input.h
  projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/bhyve/cddl/sbin/zpool/Makefile
  projects/bhyve/contrib/atf/atf-c/macros.h
  projects/bhyve/contrib/atf/atf-run/requirements_test.cpp
  projects/bhyve/contrib/atf/atf-sh/atf_check_test.sh
  projects/bhyve/contrib/atf/doc/atf-test-case.4
  projects/bhyve/contrib/bmake/ChangeLog
  projects/bhyve/contrib/bmake/FILES
  projects/bhyve/contrib/bmake/Makefile.in
  projects/bhyve/contrib/bmake/cond.c
  projects/bhyve/contrib/bmake/make.c
  projects/bhyve/contrib/bmake/unit-tests/Makefile.in
  projects/bhyve/contrib/bmake/unit-tests/test.exp
  projects/bhyve/contrib/gdb/gdb/frame.c
  projects/bhyve/contrib/libc++/include/__config
  projects/bhyve/contrib/libc++/include/__functional_base
  projects/bhyve/contrib/libc++/include/__functional_base_03
  projects/bhyve/contrib/libc++/include/__locale
  projects/bhyve/contrib/libc++/include/__mutex_base
  projects/bhyve/contrib/libc++/include/algorithm
  projects/bhyve/contrib/libc++/include/cmath
  projects/bhyve/contrib/libc++/include/complex
  projects/bhyve/contrib/libc++/include/condition_variable
  projects/bhyve/contrib/libc++/include/cstddef
  projects/bhyve/contrib/libc++/include/ext/__hash
  projects/bhyve/contrib/libc++/include/future
  projects/bhyve/contrib/libc++/include/ios
  projects/bhyve/contrib/libc++/include/istream
  projects/bhyve/contrib/libc++/include/iterator
  projects/bhyve/contrib/libc++/include/locale
  projects/bhyve/contrib/libc++/include/memory
  projects/bhyve/contrib/libc++/include/ostream
  projects/bhyve/contrib/libc++/include/random
  projects/bhyve/contrib/libc++/include/streambuf
  projects/bhyve/contrib/libc++/include/string
  projects/bhyve/contrib/libc++/include/system_error
  projects/bhyve/contrib/libc++/include/tuple
  projects/bhyve/contrib/libc++/include/type_traits
  projects/bhyve/contrib/libc++/include/utility
  projects/bhyve/contrib/libc++/include/valarray
  projects/bhyve/contrib/libc++/include/vector
  projects/bhyve/contrib/libc++/src/memory.cpp
  projects/bhyve/contrib/tzdata/africa
  projects/bhyve/contrib/tzdata/asia
  projects/bhyve/contrib/tzdata/australasia
  projects/bhyve/contrib/tzdata/europe
  projects/bhyve/contrib/tzdata/northamerica
  projects/bhyve/contrib/tzdata/southamerica
  projects/bhyve/crypto/heimdal/lib/sl/slc-lex.l
  projects/bhyve/etc/Makefile
  projects/bhyve/etc/rc.d/jail
  projects/bhyve/games/fortune/datfiles/fortunes
  projects/bhyve/games/fortune/fortune/fortune.c
  projects/bhyve/include/xlocale/_ctype.h
  projects/bhyve/lib/libc/gen/Makefile.inc
  projects/bhyve/lib/libc/gen/Symbol.map
  projects/bhyve/lib/libc/gen/getbsize.3
  projects/bhyve/lib/libc/include/namespace.h
  projects/bhyve/lib/libc/include/un-namespace.h
  projects/bhyve/lib/libc/net/getnetent.3
  projects/bhyve/lib/libc/net/getprotoent.3
  projects/bhyve/lib/libc/net/getservent.3
  projects/bhyve/lib/libc/sys/Makefile.inc
  projects/bhyve/lib/libc/sys/Symbol.map
  projects/bhyve/lib/libc/sys/rtprio.2
  projects/bhyve/lib/libc/sys/sendfile.2
  projects/bhyve/lib/libc/sys/wait.2
  projects/bhyve/lib/libfetch/http.c
  projects/bhyve/sbin/fsck_ffs/suj.c
  projects/bhyve/sbin/route/route.c
  projects/bhyve/sbin/umount/umount.c
  projects/bhyve/share/man/man4/lagg.4
  projects/bhyve/share/man/man4/ng_UI.4
  projects/bhyve/share/man/man4/ng_async.4
  projects/bhyve/share/man/man4/ng_atmllc.4
  projects/bhyve/share/man/man4/ng_bluetooth.4
  projects/bhyve/share/man/man4/ng_bpf.4
  projects/bhyve/share/man/man4/ng_bridge.4
  projects/bhyve/share/man/man4/ng_bt3c.4
  projects/bhyve/share/man/man4/ng_btsocket.4
  projects/bhyve/share/man/man4/ng_car.4
  projects/bhyve/share/man/man4/ng_ccatm.4
  projects/bhyve/share/man/man4/ng_cisco.4
  projects/bhyve/share/man/man4/ng_deflate.4
  projects/bhyve/share/man/man4/ng_eiface.4
  projects/bhyve/share/man/man4/ng_etf.4
  projects/bhyve/share/man/man4/ng_ether.4
  projects/bhyve/share/man/man4/ng_fec.4
  projects/bhyve/share/man/man4/ng_frame_relay.4
  projects/bhyve/share/man/man4/ng_gif.4
  projects/bhyve/share/man/man4/ng_gif_demux.4
  projects/bhyve/share/man/man4/ng_h4.4
  projects/bhyve/share/man/man4/ng_hci.4
  projects/bhyve/share/man/man4/ng_hole.4
  projects/bhyve/share/man/man4/ng_hub.4
  projects/bhyve/share/man/man4/ng_iface.4
  projects/bhyve/share/man/man4/ng_ksocket.4
  projects/bhyve/share/man/man4/ng_l2cap.4
  projects/bhyve/share/man/man4/ng_l2tp.4
  projects/bhyve/share/man/man4/ng_lmi.4
  projects/bhyve/share/man/man4/ng_mppc.4
  projects/bhyve/share/man/man4/ng_nat.4
  projects/bhyve/share/man/man4/ng_netflow.4
  projects/bhyve/share/man/man4/ng_one2many.4
  projects/bhyve/share/man/man4/ng_patch.4
  projects/bhyve/share/man/man4/ng_ppp.4
  projects/bhyve/share/man/man4/ng_pppoe.4
  projects/bhyve/share/man/man4/ng_pptpgre.4
  projects/bhyve/share/man/man4/ng_pred1.4
  projects/bhyve/share/man/man4/ng_rfc1490.4
  projects/bhyve/share/man/man4/ng_source.4
  projects/bhyve/share/man/man4/ng_split.4
  projects/bhyve/share/man/man4/ng_sppp.4
  projects/bhyve/share/man/man4/ng_sscfu.4
  projects/bhyve/share/man/man4/ng_sscop.4
  projects/bhyve/share/man/man4/ng_tag.4
  projects/bhyve/share/man/man4/ng_tcpmss.4
  projects/bhyve/share/man/man4/ng_tee.4
  projects/bhyve/share/man/man4/ng_tty.4
  projects/bhyve/share/man/man4/ng_ubt.4
  projects/bhyve/share/man/man4/ng_uni.4
  projects/bhyve/share/man/man4/ng_vjc.4
  projects/bhyve/share/man/man4/ng_vlan.4
  projects/bhyve/share/man/man4/unix.4
  projects/bhyve/share/man/man7/environ.7
  projects/bhyve/share/man/man7/tuning.7
  projects/bhyve/share/man/man9/firmware.9
  projects/bhyve/share/man/man9/malloc.9
  projects/bhyve/share/man/man9/mbuf.9
  projects/bhyve/share/man/man9/mi_switch.9
  projects/bhyve/share/man/man9/pfil.9
  projects/bhyve/share/misc/flowers   (contents, props changed)
  projects/bhyve/share/termcap/termcap.src
  projects/bhyve/sys/amd64/amd64/minidump_machdep.c
  projects/bhyve/sys/amd64/amd64/uma_machdep.c
  projects/bhyve/sys/arm/arm/busdma_machdep-v6.c
  projects/bhyve/sys/arm/arm/cpufunc.c
  projects/bhyve/sys/arm/arm/cpufunc_asm_armv7.S
  projects/bhyve/sys/arm/arm/pmap-v6.c
  projects/bhyve/sys/arm/arm/pmap.c
  projects/bhyve/sys/arm/arm/vm_machdep.c
  projects/bhyve/sys/boot/forth/menu-commands.4th
  projects/bhyve/sys/boot/forth/menu.4th
  projects/bhyve/sys/boot/i386/common/edd.h
  projects/bhyve/sys/bsm/audit_kevents.h
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h
  projects/bhyve/sys/compat/freebsd32/freebsd32.h
  projects/bhyve/sys/compat/freebsd32/freebsd32_misc.c
  projects/bhyve/sys/compat/freebsd32/freebsd32_proto.h
  projects/bhyve/sys/compat/freebsd32/freebsd32_syscall.h
  projects/bhyve/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/bhyve/sys/compat/freebsd32/freebsd32_sysent.c
  projects/bhyve/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/bhyve/sys/compat/freebsd32/syscalls.master
  projects/bhyve/sys/conf/files
  projects/bhyve/sys/contrib/octeon-sdk/octeon-pci-console.c
  projects/bhyve/sys/dev/adb/adb_mouse.c
  projects/bhyve/sys/dev/agp/agp.c
  projects/bhyve/sys/dev/agp/agp_ali.c
  projects/bhyve/sys/dev/agp/agp_amd.c
  projects/bhyve/sys/dev/agp/agp_amd64.c
  projects/bhyve/sys/dev/agp/agp_apple.c
  projects/bhyve/sys/dev/agp/agp_ati.c
  projects/bhyve/sys/dev/agp/agp_i810.c
  projects/bhyve/sys/dev/agp/agp_intel.c
  projects/bhyve/sys/dev/agp/agp_nvidia.c
  projects/bhyve/sys/dev/agp/agp_sis.c
  projects/bhyve/sys/dev/agp/agp_via.c
  projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_gram.y
  projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416desc.h
  projects/bhyve/sys/dev/ath/if_ath.c
  projects/bhyve/sys/dev/ath/if_ath_alq.c
  projects/bhyve/sys/dev/ath/if_ath_alq.h
  projects/bhyve/sys/dev/ath/if_ath_rx.c
  projects/bhyve/sys/dev/ath/if_ath_sysctl.c
  projects/bhyve/sys/dev/ath/if_ath_tx.c
  projects/bhyve/sys/dev/ath/if_ath_tx.h
  projects/bhyve/sys/dev/ath/if_ath_tx_edma.c
  projects/bhyve/sys/dev/cxgbe/tom/t4_listen.c
  projects/bhyve/sys/dev/iicbus/iic.c
  projects/bhyve/sys/dev/mfi/mfi_syspd.c
  projects/bhyve/sys/dev/sio/sio_isa.c
  projects/bhyve/sys/dev/sound/pcm/channel.c
  projects/bhyve/sys/dev/sound/pcm/feeder_matrix.c
  projects/bhyve/sys/dev/sound/pcm/matrix.h
  projects/bhyve/sys/dev/sound/pcm/matrix_map.h
  projects/bhyve/sys/dev/uart/uart_bus_isa.c
  projects/bhyve/sys/fs/devfs/devfs_devs.c
  projects/bhyve/sys/fs/nfsclient/nfs_clport.c
  projects/bhyve/sys/fs/smbfs/smbfs_node.c
  projects/bhyve/sys/fs/smbfs/smbfs_vnops.c
  projects/bhyve/sys/ia64/ia64/uma_machdep.c
  projects/bhyve/sys/kern/init_sysent.c
  projects/bhyve/sys/kern/kern_exit.c
  projects/bhyve/sys/kern/kern_ktr.c
  projects/bhyve/sys/kern/kern_proc.c
  projects/bhyve/sys/kern/kern_prot.c
  projects/bhyve/sys/kern/kern_racct.c
  projects/bhyve/sys/kern/sched_ule.c
  projects/bhyve/sys/kern/subr_lock.c
  projects/bhyve/sys/kern/subr_smp.c
  projects/bhyve/sys/kern/sys_procdesc.c
  projects/bhyve/sys/kern/syscalls.c
  projects/bhyve/sys/kern/syscalls.master
  projects/bhyve/sys/kern/systrace_args.c
  projects/bhyve/sys/kern/uipc_usrreq.c
  projects/bhyve/sys/mips/cavium/files.octeon1
  projects/bhyve/sys/mips/conf/OCTEON1
  projects/bhyve/sys/mips/include/pmap.h
  projects/bhyve/sys/mips/mips/pmap.c
  projects/bhyve/sys/mips/mips/uma_machdep.c
  projects/bhyve/sys/modules/agp/Makefile
  projects/bhyve/sys/netinet/sctp_constants.h
  projects/bhyve/sys/netinet/sctp_indata.c
  projects/bhyve/sys/netinet/sctp_input.c
  projects/bhyve/sys/netinet/sctp_output.c
  projects/bhyve/sys/netinet/sctp_pcb.c
  projects/bhyve/sys/netinet/sctp_timer.c
  projects/bhyve/sys/netinet/sctputil.c
  projects/bhyve/sys/netinet6/icmp6.c
  projects/bhyve/sys/netinet6/in6_src.c
  projects/bhyve/sys/netinet6/ip6_input.c
  projects/bhyve/sys/netinet6/nd6.c
  projects/bhyve/sys/netinet6/nd6_rtr.c
  projects/bhyve/sys/netinet6/scope6.c
  projects/bhyve/sys/powerpc/aim/mmu_oea64.c
  projects/bhyve/sys/powerpc/aim/slb.c
  projects/bhyve/sys/powerpc/aim/uma_machdep.c
  projects/bhyve/sys/sparc64/include/ktr.h
  projects/bhyve/sys/sparc64/sparc64/pmap.c
  projects/bhyve/sys/sparc64/sparc64/vm_machdep.c
  projects/bhyve/sys/sys/ktr.h
  projects/bhyve/sys/sys/lock.h
  projects/bhyve/sys/sys/param.h
  projects/bhyve/sys/sys/proc.h
  projects/bhyve/sys/sys/resource.h
  projects/bhyve/sys/sys/smp.h
  projects/bhyve/sys/sys/syscall.h
  projects/bhyve/sys/sys/syscall.mk
  projects/bhyve/sys/sys/syscallsubr.h
  projects/bhyve/sys/sys/sysproto.h
  projects/bhyve/sys/sys/vmmeter.h
  projects/bhyve/sys/sys/wait.h
  projects/bhyve/sys/ufs/ffs/ffs_softdep.c
  projects/bhyve/sys/vm/device_pager.c
  projects/bhyve/sys/vm/sg_pager.c
  projects/bhyve/sys/vm/vm_fault.c
  projects/bhyve/sys/vm/vm_kern.c
  projects/bhyve/sys/vm/vm_page.c
  projects/bhyve/sys/vm/vm_page.h
  projects/bhyve/sys/vm/vm_pageout.c
  projects/bhyve/sys/vm/vm_phys.h
  projects/bhyve/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve/usr.bin/bc/bc.y
  projects/bhyve/usr.bin/bmake/Makefile
  projects/bhyve/usr.bin/bmake/Makefile.inc
  projects/bhyve/usr.bin/bmake/unit-tests/Makefile
  projects/bhyve/usr.bin/chpass/chpass.c
  projects/bhyve/usr.bin/fetch/fetch.c
  projects/bhyve/usr.bin/ktrdump/ktrdump.c
  projects/bhyve/usr.bin/ministat/ministat.1
  projects/bhyve/usr.bin/ministat/ministat.c
  projects/bhyve/usr.bin/mkcsmapper/Makefile.inc
  projects/bhyve/usr.bin/ssh-copy-id/ssh-copy-id.1
  projects/bhyve/usr.sbin/bsdconfig/bsdconfig
  projects/bhyve/usr.sbin/bsdconfig/console/console
  projects/bhyve/usr.sbin/bsdconfig/console/font
  projects/bhyve/usr.sbin/bsdconfig/console/keymap
  projects/bhyve/usr.sbin/bsdconfig/console/repeat
  projects/bhyve/usr.sbin/bsdconfig/console/saver
  projects/bhyve/usr.sbin/bsdconfig/console/screenmap
  projects/bhyve/usr.sbin/bsdconfig/console/ttys
  projects/bhyve/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  projects/bhyve/usr.sbin/bsdconfig/docsinstall/docsinstall
  projects/bhyve/usr.sbin/bsdconfig/dot/dot
  projects/bhyve/usr.sbin/bsdconfig/mouse/disable
  projects/bhyve/usr.sbin/bsdconfig/mouse/enable
  projects/bhyve/usr.sbin/bsdconfig/mouse/flags
  projects/bhyve/usr.sbin/bsdconfig/mouse/mouse
  projects/bhyve/usr.sbin/bsdconfig/mouse/port
  projects/bhyve/usr.sbin/bsdconfig/mouse/type
  projects/bhyve/usr.sbin/bsdconfig/networking/defaultrouter
  projects/bhyve/usr.sbin/bsdconfig/networking/devices
  projects/bhyve/usr.sbin/bsdconfig/networking/hostname
  projects/bhyve/usr.sbin/bsdconfig/networking/nameservers
  projects/bhyve/usr.sbin/bsdconfig/networking/networking
  projects/bhyve/usr.sbin/bsdconfig/password/password
  projects/bhyve/usr.sbin/bsdconfig/security/kern_securelevel
  projects/bhyve/usr.sbin/bsdconfig/security/security
  projects/bhyve/usr.sbin/bsdconfig/share/common.subr
  projects/bhyve/usr.sbin/bsdconfig/startup/misc
  projects/bhyve/usr.sbin/bsdconfig/startup/rcadd
  projects/bhyve/usr.sbin/bsdconfig/startup/rcconf
  projects/bhyve/usr.sbin/bsdconfig/startup/rcdelete
  projects/bhyve/usr.sbin/bsdconfig/startup/rcedit
  projects/bhyve/usr.sbin/bsdconfig/startup/rcvar
  projects/bhyve/usr.sbin/bsdconfig/startup/startup
  projects/bhyve/usr.sbin/bsdconfig/timezone/timezone
  projects/bhyve/usr.sbin/bsdconfig/ttys/ttys
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/groupadd
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/groupdel
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/groupedit
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/groupinput
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/useradd
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/userdel
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/useredit
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/userinput
  projects/bhyve/usr.sbin/bsdconfig/usermgmt/usermgmt
  projects/bhyve/usr.sbin/chkgrp/chkgrp.8
  projects/bhyve/usr.sbin/chkgrp/chkgrp.c
  projects/bhyve/usr.sbin/ndiscvt/ndiscvt.c
Directory Properties:
  projects/bhyve/   (props changed)
  projects/bhyve/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve/contrib/atf/   (props changed)
  projects/bhyve/contrib/bmake/   (props changed)
  projects/bhyve/contrib/gdb/   (props changed)
  projects/bhyve/contrib/libc++/   (props changed)
  projects/bhyve/contrib/tzdata/   (props changed)
  projects/bhyve/crypto/heimdal/   (props changed)
  projects/bhyve/lib/libc/   (props changed)
  projects/bhyve/sbin/   (props changed)
  projects/bhyve/share/man/man4/   (props changed)
  projects/bhyve/sys/   (props changed)
  projects/bhyve/sys/boot/   (props changed)
  projects/bhyve/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve/sys/conf/   (props changed)
  projects/bhyve/sys/contrib/octeon-sdk/   (props changed)
  projects/bhyve/usr.sbin/ndiscvt/   (props changed)

Modified: projects/bhyve/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve/ObsoleteFiles.inc	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/ObsoleteFiles.inc	Sat Nov 17 02:55:47 2012	(r243175)
@@ -38,6 +38,12 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20121114: zpool-features manual page moved from section 5 to 7
+OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
+# 20121022: remove harp, hfa and idt man page
+OLD_FILES+=share/man/man4/harp.4
+OLD_FILES+=share/man/man4/hfa.4
+OLD_FILES+=share/man/man4/idt.4
 # 20121022: VFS_LOCK_GIANT elimination
 OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz

Modified: projects/bhyve/bin/df/df.1
==============================================================================
--- projects/bhyve/bin/df/df.1	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/bin/df/df.1	Sat Nov 17 02:55:47 2012	(r243175)
@@ -29,7 +29,7 @@
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
 .\" $FreeBSD$
 .\"
-.Dd March 3, 2012
+.Dd November 16, 2012
 .Dt DF 1
 .Os
 .Sh NAME
@@ -50,7 +50,8 @@ displays statistics about the amount of 
 or on the file system of which
 .Ar file
 is a part.
-Values are displayed in 512-byte per block counts.
+By default block counts are displayed with an assumed block size of
+512 bytes.
 If neither a file or a file system operand is specified,
 statistics for all mounted file systems are displayed
 (subject to the
@@ -65,48 +66,54 @@ Show all mount points, including those t
 flag.
 This is implied for file systems specified on the command line.
 .It Fl b
-Use 512-byte blocks rather than the default.
-Note that
-this overrides the
+Explicitly use 512 byte blocks, overriding any
 .Ev BLOCKSIZE
 specification from the environment.
+This is the same as the
+.Fl P
+option.
+The
+.Fl k
+option overrides this option.
 .It Fl c
 Display a grand total.
 .It Fl g
-Use 1073741824-byte (1-Gbyte) blocks rather than the default.
-Note that
-this overrides the
+Use 1073741824 byte (1 Gibibyte) blocks rather than the default.
+This overrides any
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl H
 .Dq Human-readable
 output.
-Use unit suffixes: Byte, Kilobyte, Megabyte,
-Gigabyte, Terabyte and Petabyte in order to reduce the number of
-digits to four or fewer using base 10 for sizes.
+Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and
+Pebibyte (based on powers of 1024) in order to reduce the number of
+digits to four or fewer.
 .It Fl h
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
-Gigabyte, Terabyte and Petabyte in order to reduce the number of
-digits to four or fewer using base 2 for sizes.
-Inodes statistics, if enabled with
-.Fl i ,
-are always printed in base 10.
+Gigabyte, Terabyte and Petabyte (based on powers of 1000) in order to
+reduce the number of
+digits to four or fewer.
 .It Fl i
-Include statistics on the number of free inodes.
+Include statistics on the number of free and used inodes.
+In conjunction with the
+.Fl h
+or
+.Fl H
+options, the number of inodes is scaled by powers of 1000.
 .It Fl k
-Use 1024-byte (1-Kbyte) blocks rather than the default.
-Note that
-this overrides the
+Use 1024 byte (1 Kibibyte) blocks rather than the default.
+This overrides the
+.Fl P
+option and any
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl l
 Only display information about locally-mounted file systems.
 .It Fl m
-Use 1048576-byte (1-Mbyte) blocks rather than the default.
-Note that
-this overrides the
+Use 1048576 byte (1 Mebibyte) blocks rather than the default.
+This overrides any
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl n
@@ -119,10 +126,15 @@ When this option is specified,
 will not request new statistics from the file systems, but will respond
 with the possibly stale statistics that were previously obtained.
 .It Fl P
-Use POSIX compliant output of 512-byte blocks rather than the default.
-Note that this overrides the
+Explicitly use 512 byte blocks, overriding any
 .Ev BLOCKSIZE
 specification from the environment.
+This is the same as the
+.Fl b
+option.
+The
+.Fl k
+option overrides this option.
 .It Fl t
 Only print out statistics for file systems of the specified types.
 More than one type may be specified in a comma separated list.
@@ -148,26 +160,53 @@ command can be used to find out the type
 that are available on the system.
 .It Fl T
 Include file system type.
+.It Fl ,
+(Comma) Print sizes grouped and separated by thousands using the
+non-monetary separator returned by
+.Xr localeconv 3 ,
+typically a comma or period.
+If no locale is set, or the locale does not have a non-monetary separator, this
+option has no effect.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
-If the environment variable
-.Ev BLOCKSIZE
-is set, the block counts will be displayed in units of that size block.
+Specifies the units in which to report block counts.
+This uses
+.Xr getbsize 3 ,
+which allows units of bytes or numbers scaled with the letters
+.Em k
+(for multiples of 1024 bytes),
+.Em m
+(for multiples of 1048576 bytes) or
+.Em g
+(for gibibytes).
+The allowed range is 512 bytes to 1 GB.
+If the value is outside, it will be set to the appropriate limit.
 .El
 .Sh SEE ALSO
 .Xr lsvfs 1 ,
-.Xr pstat 1 ,
 .Xr quota 1 ,
-.Xr swapinfo 1 ,
 .Xr fstatfs 2 ,
 .Xr getfsstat 2 ,
 .Xr statfs 2 ,
+.Xr getbsize 3 ,
 .Xr getmntinfo 3 ,
+.Xr localeconv 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8
+.Xr quot 8 .
+.Sh STANDARDS
+With the exception of most options,
+the
+.Nm
+utility conforms to
+.St -p1003.1-2004 ,
+which defines only the
+.Fl k , P
+and
+.Fl t
+options.
 .Sh HISTORY
 A
 .Nm
@@ -180,3 +219,13 @@ flag is ignored if a file or file system
 Also, if a mount
 point is not accessible by the user, it is possible that the file system
 information could be stale.
+.Pp
+The
+.Fl b
+and
+.Fl P
+options are identical.
+The former comes from the BSD tradition, and the latter is required
+for
+.St -p1003.1-2004
+conformity.

Modified: projects/bhyve/bin/df/df.c
==============================================================================
--- projects/bhyve/bin/df/df.c	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/bin/df/df.c	Sat Nov 17 02:55:47 2012	(r243175)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <ufs/ufs/ufsmount.h>
 #include <err.h>
 #include <libutil.h>
+#include <locale.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -95,6 +96,7 @@ imax(int a, int b)
 }
 
 static int	aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag, Tflag;
+static int	thousands;
 static struct	ufs_args mdev;
 
 int
@@ -111,12 +113,12 @@ main(int argc, char *argv[])
 	int ch, rv;
 
 	fstype = "ufs";
-
+	(void)setlocale(LC_ALL, "");
 	memset(&totalbuf, 0, sizeof(totalbuf));
 	totalbuf.f_bsize = DEV_BSIZE;
 	strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN);
 	vfslist = NULL;
-	while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T")) != -1)
+	while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1)
 		switch (ch) {
 		case 'a':
 			aflag = 1;
@@ -180,6 +182,9 @@ main(int argc, char *argv[])
 		case 'T':
 			Tflag = 1;
 			break;
+		case ',':
+			thousands = 1;
+			break;
 		case '?':
 		default:
 			usage();
@@ -388,16 +393,11 @@ prthumanvalinode(int64_t bytes)
 
 /*
  * Convert statfs returned file system size into BLOCKSIZE units.
- * Attempts to avoid overflow for large file systems.
  */
 static intmax_t
 fsbtoblk(int64_t num, uint64_t fsbs, u_long bs)
 {
-
-	if (fsbs != 0 && fsbs < bs)
-		return (num / (intmax_t)(bs / fsbs));
-	else
-		return (num * (intmax_t)(fsbs / bs));
+	return (num * (intmax_t) fsbs / bs);
 }
 
 /*
@@ -410,10 +410,18 @@ prtstat(struct statfs *sfsp, struct maxw
 	static int headerlen, timesthrough = 0;
 	static const char *header;
 	int64_t used, availblks, inodes;
+	const char *format;
 
 	if (++timesthrough == 1) {
 		mwp->mntfrom = imax(mwp->mntfrom, (int)strlen("Filesystem"));
 		mwp->fstype = imax(mwp->fstype, (int)strlen("Type"));
+		if (thousands) {		/* make space for commas */
+		    mwp->total += (mwp->total - 1) / 3;
+		    mwp->used  += (mwp->used - 1) / 3;
+		    mwp->avail += (mwp->avail - 1) / 3;
+		    mwp->iused += (mwp->iused - 1) / 3;
+		    mwp->ifree += (mwp->ifree - 1) / 3;
+		}
 		if (hflag) {
 			header = "   Size";
 			mwp->total = mwp->used = mwp->avail =
@@ -428,7 +436,7 @@ prtstat(struct statfs *sfsp, struct maxw
 		(void)printf("%-*s", mwp->mntfrom, "Filesystem");
 		if (Tflag)
 			(void)printf("  %-*s", mwp->fstype, "Type");
-		(void)printf(" %-*s %*s %*s Capacity", mwp->total, header,
+		(void)printf(" %*s %*s %*s Capacity", mwp->total, header,
 		    mwp->used, "Used", mwp->avail, "Avail");
 		if (iflag) {
 			mwp->iused = imax(hflag ? 0 : mwp->iused,
@@ -440,6 +448,12 @@ prtstat(struct statfs *sfsp, struct maxw
 		}
 		(void)printf("  Mounted on\n");
 	}
+	/* Check for 0 block size.  Can this happen? */
+	if (sfsp->f_bsize == 0) {
+		warnx ("File system %s does not have a block size, assuming 512.",
+		    sfsp->f_mntonname);
+		sfsp->f_bsize = 512;
+	}
 	(void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname);
 	if (Tflag)
 		(void)printf("  %-*s", mwp->fstype, sfsp->f_fstypename);
@@ -448,7 +462,11 @@ prtstat(struct statfs *sfsp, struct maxw
 	if (hflag) {
 		prthuman(sfsp, used);
 	} else {
-		(void)printf(" %*jd %*jd %*jd",
+		if (thousands)
+		    format = " %*j'd %*j'd %*j'd";
+		else
+		    format = " %*jd %*jd %*jd";
+		(void)printf(format,
 		    mwp->total, fsbtoblk(sfsp->f_blocks,
 		    sfsp->f_bsize, blocksize),
 		    mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize),
@@ -465,7 +483,11 @@ prtstat(struct statfs *sfsp, struct maxw
 			prthumanvalinode(used);
 			prthumanvalinode(sfsp->f_ffree);
 		} else {
-			(void)printf(" %*jd %*jd", mwp->iused, (intmax_t)used,
+			if (thousands)
+			    format = " %*j'd %*j'd";
+			else
+			    format = " %*jd %*jd";
+			(void)printf(format, mwp->iused, (intmax_t)used,
 			    mwp->ifree, (intmax_t)sfsp->f_ffree);
 		}
 		(void)printf(" %4.0f%% ", inodes == 0 ? 100.0 :
@@ -542,7 +564,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [file | filesystem ...]\n");
+"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [-,] [file | filesystem ...]\n");
 	exit(EX_USAGE);
 }
 

Modified: projects/bhyve/bin/mv/mv.c
==============================================================================
--- projects/bhyve/bin/mv/mv.c	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/bin/mv/mv.c	Sat Nov 17 02:55:47 2012	(r243175)
@@ -199,7 +199,7 @@ do_move(const char *from, const char *to
 		} else if (iflg) {
 			(void)fprintf(stderr, "overwrite %s? %s", to, YESNO);
 			ask = 1;
-		} else if (access(to, W_OK) && !stat(to, &sb)) {
+		} else if (access(to, W_OK) && !stat(to, &sb) && isatty(STDIN_FILENO)) {
 			strmode(sb.st_mode, modep);
 			(void)fprintf(stderr, "override %s%s%s/%s for %s? %s",
 			    modep + 1, modep[9] == ' ' ? "" : " ",

Modified: projects/bhyve/bin/sh/input.c
==============================================================================
--- projects/bhyve/bin/sh/input.c	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/bin/sh/input.c	Sat Nov 17 02:55:47 2012	(r243175)
@@ -99,7 +99,6 @@ char *parsenextc;		/* copy of parsefile-
 MKINIT struct parsefile basepf;	/* top level input file */
 char basebuf[BUFSIZ + 1];	/* buffer for top level input file */
 static struct parsefile *parsefile = &basepf;	/* current input file */
-int init_editline = 0;		/* editline library initialized? */
 int whichprompt;		/* 1 == PS1, 2 == PS2 */
 
 EditLine *el;			/* cookie for editline package */

Modified: projects/bhyve/bin/sh/input.h
==============================================================================
--- projects/bhyve/bin/sh/input.h	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/bin/sh/input.h	Sat Nov 17 02:55:47 2012	(r243175)
@@ -43,7 +43,6 @@
 extern int plinno;
 extern int parsenleft;		/* number of characters left in input buffer */
 extern char *parsenextc;	/* next character in input buffer */
-extern int init_editline;	/* 0 == not setup, 1 == OK, -1 == failed */
 
 struct alias;
 struct parsefile;

Copied: projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 (from r243164, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Sat Nov 17 02:55:47 2012	(r243175, copy of r243164, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7)
@@ -0,0 +1,206 @@
+'\" te
+.\" Copyright (c) 2012, 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) 2012 by Delphix. All rights reserved.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd Aug 28, 2012
+.Dt ZPOOL-FEATURES 7
+.Os
+.Sh NAME
+.Nm zpool-features
+.Nd ZFS pool feature descriptions
+.Sh DESCRIPTION
+ZFS pool on\-disk format versions are specified via "features" which replace
+the old on\-disk format numbers (the last supported on\-disk format number is
+28).
+To enable a feature on a pool use the
+.Cm upgrade
+subcommand of the
+.Xr zpool 8
+command, or set the
+.Sy feature at feature_name
+property to
+.Ar enabled .
+.Pp
+The pool format does not affect file system version compatibility or the ability
+to send file systems between pools.
+.Pp
+Since most features can be enabled independently of each other the on\-disk
+format of the pool is specified by the set of all features marked as
+.Sy active
+on the pool. If the pool was created by another software version this set may
+include unsupported features.
+.Ss Identifying features
+Every feature has a guid of the form
+.Sy com.example:feature_name .
+The reverse DNS name ensures that the feature's guid is unique across all ZFS
+implementations. When unsupported features are encountered on a pool they will
+be identified by their guids.
+Refer to the documentation for the ZFS implementation that created the pool
+for information about those features.
+.Pp
+Each supported feature also has a short name.
+By convention a feature's short name is the portion of its guid which follows
+the ':' (e.g.
+.Sy com.example:feature_name
+would have the short name
+.Sy feature_name ),
+however a feature's short name may differ across ZFS implementations if
+following the convention would result in name conflicts.
+.Ss Feature states
+Features can be in one of three states:
+.Bl -tag -width "XXXXXXXX"
+.It Sy active
+This feature's on\-disk format changes are in effect on the pool.
+Support for this feature is required to import the pool in read\-write mode.
+If this feature is not read-only compatible, support is also required to
+import the pool in read\-only mode (see "Read\-only compatibility").
+.It Sy enabled
+An administrator has marked this feature as enabled on the pool, but the
+feature's on\-disk format changes have not been made yet.
+The pool can still be imported by software that does not support this feature,
+but changes may be made to the on\-disk format at any time which will move
+the feature to the
+.Sy active
+state.
+Some features may support returning to the
+.Sy enabled
+state after becoming
+.Sy active .
+See feature\-specific documentation for details.
+.It Sy disabled
+This feature's on\-disk format changes have not been made and will not be made
+unless an administrator moves the feature to the
+.Sy enabled
+state.
+Features cannot be disabled once they have been enabled.
+.El
+.Pp
+The state of supported features is exposed through pool properties of the form
+.Sy feature at short_name .
+.Ss Read\-only compatibility
+Some features may make on\-disk format changes that do not interfere with other
+software's ability to read from the pool.
+These features are referred to as "read\-only compatible".
+If all unsupported features on a pool are read\-only compatible, the pool can
+be imported in read\-only mode by setting the
+.Sy readonly
+property during import (see
+.Xr zpool 8
+for details on importing pools).
+.Ss Unsupported features
+For each unsupported feature enabled on an imported pool a pool property
+named
+.Sy unsupported at feature_guid
+will indicate why the import was allowed despite the unsupported feature.
+Possible values for this property are:
+.Bl -tag -width "XXXXXXXX"
+.It Sy inactive
+The feature is in the
+.Sy enabled
+state and therefore the pool's on\-disk format is still compatible with
+software that does not support this feature.
+.It Sy readonly
+The feature is read\-only compatible and the pool has been imported in
+read\-only mode.
+.El
+.Ss Feature dependencies
+Some features depend on other features being enabled in order to function
+properly.
+Enabling a feature will automatically enable any features it depends on.
+.Sh FEATURES
+The following features are supported on this system:
+.Bl -tag -width "XXXXXXXX"
+.It Sy async_destroy
+.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:async_destroy"
+.It GUID Ta com.delphix:async_destroy
+.It READ\-ONLY COMPATIBLE Ta yes
+.It DEPENDENCIES Ta none
+.El
+.Pp
+Destroying a file system requires traversing all of its data in order to
+return its used space to the pool.
+Without
+.Sy async_destroy
+the file system is not fully removed until all space has been reclaimed.
+If the destroy operation is interrupted by a reboot or power outage the next
+attempt to open the pool will need to complete the destroy operation
+synchronously.
+.Pp
+When
+.Sy async_destroy
+is enabled the file system's data will be reclaimed by a background process,
+allowing the destroy operation to complete without traversing the entire file
+system.
+The background process is able to resume interrupted destroys after the pool
+has been opened, eliminating the need to finish interrupted destroys as part
+of the open operation.
+The amount of space remaining to be reclaimed by the background process is
+available through the
+.Sy freeing
+property.
+.Pp
+This feature is only
+.Sy active
+while
+.Sy freeing
+is non\-zero.
+.It Sy empty_bpobj
+.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:empty_bpobj"
+.It GUID Ta com.delphix:empty_bpobj
+.It READ\-ONLY COMPATIBLE Ta yes
+.It DEPENDENCIES Ta none
+.El
+.Pp
+This feature increases the performance of creating and using a large number
+of snapshots of a single filesystem or volume, and also reduces the disk
+space required.
+.Pp
+When there are many snapshots, each snapshot uses many Block Pointer Objects
+.Pq bpobj's
+to track blocks associated with that snapshot.
+However, in common use cases, most of these bpobj's are empty.
+This feature allows us to create each bpobj on-demand, thus eliminating the
+empty bpobjs.
+.Pp
+This feature is
+.Sy active
+while there are any filesystems, volumes, or snapshots which were created
+after enabling this feature.
+.El
+.Sh SEE ALSO
+.Xr zpool 8
+.Sh AUTHORS
+This manual page is a
+.Xr mdoc 7
+reimplementation of the
+.Tn illumos
+manual page
+.Em zpool-features(5) ,
+modified and customized for
+.Fx
+and licensed under the 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/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sat Nov 17 02:55:47 2012	(r243175)
@@ -567,7 +567,7 @@ Total size of the storage pool.
 .It Sy unsupported@ Ns Ar feature_guid
 Information about unsupported features that are enabled on the pool.
 See
-.Xr zpool-features 5
+.Xr zpool-features 7
 for details.
 .It Sy used
 Amount of storage space used within the pool.
@@ -717,7 +717,7 @@ which moves
 .Ar feature_name
 to the enabled state.
 See
-.Xr zpool-features 5
+.Xr zpool-features 7
 for details on feature states.
 .It Sy listsnaps Ns = Ns Cm on No | Cm off
 Controls whether information about snapshots associated with this pool is
@@ -915,7 +915,7 @@ with the
 .Fl o
 option.
 See
-.Xr zpool-features 5
+.Xr zpool-features 7
 for details about feature properties.
 .It Xo
 .Fl o Ar property Ns = Ns Ar value
@@ -1651,7 +1651,7 @@ Displays legacy
 .Tn ZFS
 versions supported by the current software.
 See
-.Xr zpool-features.5
+.Xr zpool-features 7
 for a description of feature flags features supported by the current software.
 .El
 .It Xo
@@ -1665,7 +1665,7 @@ Enables all supported features on the gi
 Once this is done, the pool will no longer be accessible on systems that do
 not support feature flags.
 See
-.Xr zpool-features.5
+.Xr zpool-features 7
 for details on compatability with system sthat support feature flags, but do
 not support all features enabled on the pool.
 .Bl -tag -width indent
@@ -1927,8 +1927,8 @@ Discarded approximately 29 seconds of tr
 .Ed
 .El
 .Sh SEE ALSO
+.Xr zpool-features 7 ,
 .Xr zfs 8
-.Xr zpool-features 5
 .Sh AUTHORS
 This manual page is a
 .Xr mdoc 7

Modified: projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Nov 17 02:55:47 2012	(r243175)
@@ -345,7 +345,7 @@ usage(boolean_t requested)
 		(void) fprintf(fp, "YES   disabled | enabled | active\n");
 
 		(void) fprintf(fp, gettext("\nThe feature@ properties must be "
-		    "appended with a feature name.\nSee zpool-features(5).\n"));
+		    "appended with a feature name.\nSee zpool-features(7).\n"));
 	}
 
 	/*
@@ -4170,7 +4170,7 @@ status_callback(zpool_handle_t *zhp, voi
 		(void) printf(gettext("action: Enable all features using "
 		    "'zpool upgrade'. Once this is done,\n\tthe pool may no "
 		    "longer be accessible by software that does not support\n\t"
-		    "the features. See zpool-features(5) for details.\n"));
+		    "the features. See zpool-features(7) for details.\n"));
 		break;
 
 	case ZPOOL_STATUS_UNSUP_FEAT_READ:
@@ -4630,7 +4630,7 @@ upgrade_list_disabled_cb(zpool_handle_t 
 					    "pool may become incompatible with "
 					    "software\nthat does not support "
 					    "the feature. See "
-					    "zpool-features(5) for "
+					    "zpool-features(7) for "
 					    "details.\n\n"));
 					(void) printf(gettext("POOL  "
 					    "FEATURE\n"));

Modified: projects/bhyve/cddl/sbin/zpool/Makefile
==============================================================================
--- projects/bhyve/cddl/sbin/zpool/Makefile	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/cddl/sbin/zpool/Makefile	Sat Nov 17 02:55:47 2012	(r243175)
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 
 PROG=	zpool
-MAN=	zpool.8 zpool-features.5
+MAN=	zpool.8 zpool-features.7
 SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c
 SRCS+=	timestamp.c
 

Copied: projects/bhyve/contrib/atf/FREEBSD-Xlist (from r243164, head/contrib/atf/FREEBSD-Xlist)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve/contrib/atf/FREEBSD-Xlist	Sat Nov 17 02:55:47 2012	(r243175, copy of r243164, head/contrib/atf/FREEBSD-Xlist)
@@ -0,0 +1,8 @@
+bootstrap/
+config.log
+config.status
+libtool
+Makefile
+stamp-h1
+*/*/.deps/
+*/.deps/

Copied: projects/bhyve/contrib/atf/FREEBSD-upgrade (from r243164, head/contrib/atf/FREEBSD-upgrade)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve/contrib/atf/FREEBSD-upgrade	Sat Nov 17 02:55:47 2012	(r243175, copy of r243164, head/contrib/atf/FREEBSD-upgrade)
@@ -0,0 +1,28 @@
+$FreeBSD$
+
+atf
+
+The source code is hosted on GoogleCode as a subcomponent of the Kyua project:
+
+	http://code.google.com/p/kyua/downloads/list
+
+For the contrib directory, the sources were initially prepared like so:
+
+	./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share
+
+For the contrib directory, files and directories were pruned by:
+
+sh -c 'for F in `cat FREEBSD-Xlist`; do rm -rf ./$F ; done'
+
+You may check if there are any new files that we don't need.
+
+The instructions for importing new release and merging to HEAD can be found
+at FreeBSD wiki:
+
+	http://wiki.freebsd.org/SubversionPrimer/VendorImports
+
+To make local changes to atf, simply patch and commit to the trunk
+branch (aka HEAD).  Never make local changes on the vendor branch.
+
+gcooper at FreeBSD.org
+5-August-2012

Modified: projects/bhyve/contrib/atf/atf-c/macros.h
==============================================================================
--- projects/bhyve/contrib/atf/atf-c/macros.h	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/atf/atf-c/macros.h	Sat Nov 17 02:55:47 2012	(r243175)
@@ -30,6 +30,8 @@
 #if !defined(ATF_C_MACROS_H)
 #define ATF_C_MACROS_H
 
+#include <string.h>
+
 #include <atf-c/defs.h>
 #include <atf-c/error.h>
 #include <atf-c/tc.h>

Modified: projects/bhyve/contrib/atf/atf-run/requirements_test.cpp
==============================================================================
--- projects/bhyve/contrib/atf/atf-run/requirements_test.cpp	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/atf/atf-run/requirements_test.cpp	Sat Nov 17 02:55:47 2012	(r243175)
@@ -239,7 +239,8 @@ ATF_TEST_CASE_WITHOUT_HEAD(require_memor
 ATF_TEST_CASE_BODY(require_memory_not_enough) {
     atf::tests::vars_map metadata;
     metadata["require.memory"] = "128t";
-#if defined(__APPLE__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__DragonFly__) || \
+    defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
     do_check("Not enough memory; needed 140737488355328, available [0-9]*",
              metadata);
 #else

Modified: projects/bhyve/contrib/atf/atf-sh/atf_check_test.sh
==============================================================================
--- projects/bhyve/contrib/atf/atf-sh/atf_check_test.sh	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/atf/atf-sh/atf_check_test.sh	Sat Nov 17 02:55:47 2012	(r243175)
@@ -54,7 +54,7 @@ atf_test_case expout_mismatch
 expout_mismatch_head()
 {
     atf_set "descr" "Verifies that atf_check prints a diff of the" \
-                    "stdout and the expected stdout if the two do no" \
+                    "stdout and the expected stdout of the two do not" \
                     "match"
 }
 expout_mismatch_body()
@@ -79,7 +79,7 @@ atf_test_case experr_mismatch
 experr_mismatch_head()
 {
     atf_set "descr" "Verifies that atf_check prints a diff of the" \
-                    "stderr and the expected stderr if the two do no" \
+                    "stderr and the expected stderr of the two do not" \
                     "match"
 }
 experr_mismatch_body()

Modified: projects/bhyve/contrib/atf/doc/atf-test-case.4
==============================================================================
--- projects/bhyve/contrib/atf/doc/atf-test-case.4	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/atf/doc/atf-test-case.4	Sat Nov 17 02:55:47 2012	(r243175)
@@ -61,7 +61,7 @@ failures.
 This body is only executed if the abstract conditions specified by the
 header are met.
 The
-.Em cleanup routine
+.Em cleanup
 routine is a piece of code always executed after the body, regardless of
 the exit status of the test case.
 It can be used to undo side-effects of the test case.

Modified: projects/bhyve/contrib/bmake/ChangeLog
==============================================================================
--- projects/bhyve/contrib/bmake/ChangeLog	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/bmake/ChangeLog	Sat Nov 17 02:55:47 2012	(r243175)
@@ -1,3 +1,28 @@
+2012-11-11  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile.in (MAKE_VERSION): 20121111
+	  fix generation of bmake.cat1
+
+2012-11-09  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile.in (MAKE_VERSION): 20121109
+	  Merge with NetBSD make, pick up
+	  o make.c: MakeBuildChild: return 0 so search continues if a
+	    .ORDER dependency is detected.
+	  o unit-tests/order: test the above
+	
+2012-11-02  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile.in (MAKE_VERSION): 20121102
+	  Merge with NetBSD make, pick up
+	  o cond.c: allow cond_state[] to grow.
+	    In meta mode with a very large tree, we can hit the limit
+	    while processing dirdeps.
+	
+2012-10-25  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile.in: we need to use ${srcdir} not ${.CURDIR}
+
 2012-10-10  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile.in (MAKE_VERSION): 20121010

Modified: projects/bhyve/contrib/bmake/FILES
==============================================================================
--- projects/bhyve/contrib/bmake/FILES	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/bmake/FILES	Sat Nov 17 02:55:47 2012	(r243175)
@@ -110,6 +110,7 @@ unit-tests/modmisc
 unit-tests/modorder
 unit-tests/modts
 unit-tests/modword
+unit-tests/order
 unit-tests/phony-end
 unit-tests/posix
 unit-tests/qequals

Modified: projects/bhyve/contrib/bmake/Makefile.in
==============================================================================
--- projects/bhyve/contrib/bmake/Makefile.in	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/bmake/Makefile.in	Sat Nov 17 02:55:47 2012	(r243175)
@@ -1,7 +1,7 @@
 #	$NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
-#	$Id: Makefile.in,v 1.174 2012/10/10 18:46:24 sjg Exp $
+#	$Id: Makefile.in,v 1.178 2012/11/15 16:48:59 sjg Exp $
 
 PROG=	bmake
 SRCS=	arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
 CC?= @CC@
 
 # Base version on src date
-MAKE_VERSION= 20121010
+MAKE_VERSION= 20121111
 MACHINE=@machine@
 MACHINE_ARCH=@machine_arch@
 DEFAULT_SYS_PATH = @default_sys_path@
@@ -114,7 +114,7 @@ ${MAN}:	make.1 my.history
 	@echo making ${PROG}.1
 	@sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \
 	-e '/^.Sh HISTORY/rmy.history' \
-	-e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${.CURDIR}/make.1 > $@
+	-e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${srcdir}/make.1 > $@
 
 .endif
 

Modified: projects/bhyve/contrib/bmake/cond.c
==============================================================================
--- projects/bhyve/contrib/bmake/cond.c	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/bmake/cond.c	Sat Nov 17 02:55:47 2012	(r243175)
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $	*/
+/*	$NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.64 2012/06/12 19:21:50 joerg Exp $");
+__RCSID("$NetBSD: cond.c,v 1.67 2012/11/03 13:59:27 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1227,7 +1227,8 @@ do_Cond_EvalExpression(Boolean *value)
 int
 Cond_Eval(char *line)
 {
-    #define	    MAXIF      128	/* maximum depth of .if'ing */
+#define	    MAXIF      128	/* maximum depth of .if'ing */
+#define	    MAXIF_BUMP  32	/* how much to grow by */
     enum if_states {
 	IF_ACTIVE,		/* .if or .elif part active */
 	ELSE_ACTIVE,		/* .else part active */
@@ -1235,7 +1236,8 @@ Cond_Eval(char *line)
 	SKIP_TO_ELSE,           /* has been true, but not seen '.else' */
 	SKIP_TO_ENDIF		/* nothing else to execute */
     };
-    static enum if_states cond_state[MAXIF + 1] = { IF_ACTIVE };
+    static enum if_states *cond_state = NULL;
+    static unsigned int max_if_depth = MAXIF;
 
     const struct If *ifp;
     Boolean 	    isElif;
@@ -1244,7 +1246,10 @@ Cond_Eval(char *line)
     enum if_states  state;
 
     level = PARSE_FATAL;
-
+    if (!cond_state) {
+	cond_state = bmake_malloc(max_if_depth * sizeof(*cond_state));
+	cond_state[0] = IF_ACTIVE;
+    }
     /* skip leading character (the '.') and any whitespace */
     for (line++; *line == ' ' || *line == '\t'; line++)
 	continue;
@@ -1261,8 +1266,6 @@ Cond_Eval(char *line)
 	    }
 	    /* Return state for previous conditional */
 	    cond_depth--;
-	    if (cond_depth > MAXIF)
-		return COND_SKIP;
 	    return cond_state[cond_depth] <= ELSE_ACTIVE ? COND_PARSE : COND_SKIP;
 	}
 
@@ -1275,8 +1278,6 @@ Cond_Eval(char *line)
 		return COND_PARSE;
 	    }
 
-	    if (cond_depth > MAXIF)
-		return COND_SKIP;
 	    state = cond_state[cond_depth];
 	    switch (state) {
 	    case SEARCH_FOR_ELIF:
@@ -1325,9 +1326,6 @@ Cond_Eval(char *line)
 	    Parse_Error(level, "if-less elif");
 	    return COND_PARSE;
 	}
-	if (cond_depth > MAXIF)
-	    /* Error reported when we saw the .if ... */
-	    return COND_SKIP;
 	state = cond_state[cond_depth];
 	if (state == SKIP_TO_ENDIF || state == ELSE_ACTIVE) {
 	    Parse_Error(PARSE_WARNING, "extra elif");
@@ -1341,10 +1339,15 @@ Cond_Eval(char *line)
 	}
     } else {
 	/* Normal .if */
-	if (cond_depth >= MAXIF) {
-	    cond_depth++;
-	    Parse_Error(PARSE_FATAL, "Too many nested if's. %d max.", MAXIF);
-	    return COND_SKIP;
+	if (cond_depth + 1 >= max_if_depth) {
+	    /*
+	     * This is rare, but not impossible.
+	     * In meta mode, dirdeps.mk (only runs at level 0)
+	     * can need more than the default.
+	     */
+	    max_if_depth += MAXIF_BUMP;
+	    cond_state = bmake_realloc(cond_state, max_if_depth *
+		sizeof(*cond_state));
 	}
 	state = cond_state[cond_depth];
 	cond_depth++;

Modified: projects/bhyve/contrib/bmake/make.c
==============================================================================
--- projects/bhyve/contrib/bmake/make.c	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/bmake/make.c	Sat Nov 17 02:55:47 2012	(r243175)
@@ -1,4 +1,4 @@
-/*	$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $	*/
+/*	$NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $";
+static char rcsid[] = "$NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $");
+__RCSID("$NetBSD: make.c,v 1.88 2012/11/09 18:53:05 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1032,7 +1032,7 @@ MakeBuildChild(void *v_cn, void *toBeMad
     if (cn->order_pred && Lst_ForEach(cn->order_pred, MakeCheckOrder, 0)) {
 	/* Can't build this (or anything else in this child list) yet */
 	cn->made = DEFERRED;
-	return 1;
+	return 0;			/* but keep looking */
     }
 
     if (DEBUG(MAKE))
@@ -1055,7 +1055,7 @@ MakeBuildChild(void *v_cn, void *toBeMad
     return cn->type & OP_WAIT && cn->unmade > 0;
 }
 
-/* When a .ORDER RHS node completes we do this on each LHS */
+/* When a .ORDER LHS node completes we do this on each RHS */
 static int
 MakeBuildParent(void *v_pn, void *toBeMade_next)
 {

Modified: projects/bhyve/contrib/bmake/unit-tests/Makefile.in
==============================================================================
--- projects/bhyve/contrib/bmake/unit-tests/Makefile.in	Sat Nov 17 02:39:37 2012	(r243174)
+++ projects/bhyve/contrib/bmake/unit-tests/Makefile.in	Sat Nov 17 02:55:47 2012	(r243175)
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.38 2012/06/19 23:38:48 sjg Exp $
+# $Id: Makefile.in,v 1.39 2012/11/09 19:16:10 sjg Exp $
 #
-# $NetBSD: Makefile,v 1.34 2012/06/19 23:25:53 sjg Exp $
+# $NetBSD: Makefile,v 1.35 2012/11/09 19:08:28 sjg Exp $

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

More information about the svn-src-projects mailing list