svn commit: r211652 - in user/imp/tbemd: etc etc/defaults etc/mtree etc/namedb etc/periodic/daily etc/periodic/security etc/rc.d games/fortune/datfiles games/grdc games/pom games/random gnu/lib/csu...

Sun Aug 22 21:44:08 UTC 2010

Author: imp
Date: Sun Aug 22 21:44:05 2010
New Revision: 211652
URL: http://svn.freebsd.org/changeset/base/211652

Log:
  Merge to head @211636 -- with hand tweaks hoping for the best

Added:
  user/imp/tbemd/etc/periodic/daily/490.status-pkg-changes
     - copied unchanged from r211636, head/etc/periodic/daily/490.status-pkg-changes
  user/imp/tbemd/etc/periodic/daily/800.scrub-zfs
     - copied unchanged from r211636, head/etc/periodic/daily/800.scrub-zfs
  user/imp/tbemd/etc/periodic/security/460.chkportsum
     - copied unchanged from r211636, head/etc/periodic/security/460.chkportsum
  user/imp/tbemd/gnu/usr.bin/binutils/as/powerpc64-freebsd/
     - copied from r211636, head/gnu/usr.bin/binutils/as/powerpc64-freebsd/
  user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile.powerpc64
     - copied unchanged from r211636, head/gnu/usr.bin/binutils/gdb/Makefile.powerpc64
  user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.powerpc64
     - copied unchanged from r211636, head/gnu/usr.bin/binutils/ld/Makefile.powerpc64
  user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64
     - copied unchanged from r211636, head/gnu/usr.bin/binutils/libbfd/Makefile.powerpc64
  user/imp/tbemd/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
     - copied unchanged from r211636, head/gnu/usr.bin/binutils/libopcodes/Makefile.powerpc64
  user/imp/tbemd/gnu/usr.bin/gdb/arch/powerpc64/
     - copied from r211636, head/gnu/usr.bin/gdb/arch/powerpc64/
  user/imp/tbemd/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c
     - copied unchanged from r211636, head/gnu/usr.bin/gdb/kgdb/trgt_powerpc64.c
  user/imp/tbemd/lib/clang/include/clang/AST/Attrs.inc
     - copied unchanged from r211636, head/lib/clang/include/clang/AST/Attrs.inc
  user/imp/tbemd/lib/clang/include/clang/AST/DeclNodes.inc
     - copied unchanged from r211636, head/lib/clang/include/clang/AST/DeclNodes.inc
  user/imp/tbemd/lib/clang/include/clang/Basic/AttrList.inc
     - copied unchanged from r211636, head/lib/clang/include/clang/Basic/AttrList.inc
  user/imp/tbemd/lib/clang/include/clang/Basic/Version.inc
     - copied unchanged from r211636, head/lib/clang/include/clang/Basic/Version.inc
  user/imp/tbemd/lib/clang/include/clang/Basic/arm_neon.inc
     - copied unchanged from r211636, head/lib/clang/include/clang/Basic/arm_neon.inc
  user/imp/tbemd/lib/clang/libllvmasmparser/
     - copied from r211636, head/lib/clang/libllvmasmparser/
  user/imp/tbemd/lib/csu/powerpc64/
     - copied from r211636, head/lib/csu/powerpc64/
  user/imp/tbemd/lib/libc/gen/aux.c
     - copied unchanged from r211636, head/lib/libc/gen/aux.c
  user/imp/tbemd/lib/libc/mips/gen/_ctx_start.S
     - copied unchanged from r211636, head/lib/libc/mips/gen/_ctx_start.S
  user/imp/tbemd/lib/libc/posix1e/acl_id_to_name.c
     - copied unchanged from r211636, head/lib/libc/posix1e/acl_id_to_name.c
  user/imp/tbemd/lib/libc/powerpc64/
     - copied from r211636, head/lib/libc/powerpc64/
  user/imp/tbemd/lib/libedit/filecomplete.c
     - copied unchanged from r211636, head/lib/libedit/filecomplete.c
  user/imp/tbemd/lib/libedit/filecomplete.h
     - copied unchanged from r211636, head/lib/libedit/filecomplete.h
  user/imp/tbemd/lib/libelf/elf_getphdrnum.3
     - copied unchanged from r211636, head/lib/libelf/elf_getphdrnum.3
  user/imp/tbemd/lib/libelf/elf_getshdrnum.3
     - copied unchanged from r211636, head/lib/libelf/elf_getshdrnum.3
  user/imp/tbemd/lib/libelf/elf_getshdrstrndx.3
     - copied unchanged from r211636, head/lib/libelf/elf_getshdrstrndx.3
  user/imp/tbemd/lib/libelf/libelf_ar_util.c
     - copied unchanged from r211636, head/lib/libelf/libelf_ar_util.c
  user/imp/tbemd/lib/libkvm/kvm_powerpc64.c
     - copied unchanged from r211636, head/lib/libkvm/kvm_powerpc64.c
  user/imp/tbemd/lib/libproc/proc_bkpt.c
     - copied unchanged from r211636, head/lib/libproc/proc_bkpt.c
  user/imp/tbemd/lib/libproc/proc_regs.c
     - copied unchanged from r211636, head/lib/libproc/proc_regs.c
  user/imp/tbemd/lib/libproc/proc_rtld.c
     - copied unchanged from r211636, head/lib/libproc/proc_rtld.c
  user/imp/tbemd/lib/libproc/test/
     - copied from r211636, head/lib/libproc/test/
  user/imp/tbemd/lib/librtld_db/
     - copied from r211636, head/lib/librtld_db/
  user/imp/tbemd/lib/libthr/arch/powerpc64/
     - copied from r211636, head/lib/libthr/arch/powerpc64/
  user/imp/tbemd/lib/libthread_db/arch/powerpc64/
     - copied from r211636, head/lib/libthread_db/arch/powerpc64/
  user/imp/tbemd/libexec/rtld-elf/powerpc64/
     - copied from r211636, head/libexec/rtld-elf/powerpc64/
  user/imp/tbemd/secure/lib/libcrypto/opensslconf-powerpc64.h
     - copied unchanged from r211636, head/secure/lib/libcrypto/opensslconf-powerpc64.h
  user/imp/tbemd/share/doc/psd/15.yacc/ss10
     - copied unchanged from r211636, head/share/doc/psd/15.yacc/ss10
  user/imp/tbemd/share/doc/psd/15.yacc/ss11
     - copied unchanged from r211636, head/share/doc/psd/15.yacc/ss11
  user/imp/tbemd/share/doc/psd/15.yacc/ss_
     - copied unchanged from r211636, head/share/doc/psd/15.yacc/ss_
  user/imp/tbemd/share/man/man4/aibs.4
     - copied unchanged from r211636, head/share/man/man4/aibs.4
  user/imp/tbemd/share/man/man4/fdt.4
     - copied unchanged from r211636, head/share/man/man4/fdt.4
  user/imp/tbemd/share/man/man4/fdtbus.4
     - copied unchanged from r211636, head/share/man/man4/fdtbus.4
  user/imp/tbemd/share/man/man4/siftr.4
     - copied unchanged from r211636, head/share/man/man4/siftr.4
  user/imp/tbemd/share/man/man4/simplebus.4
     - copied unchanged from r211636, head/share/man/man4/simplebus.4
  user/imp/tbemd/share/man/man4/tpm.4
     - copied unchanged from r211636, head/share/man/man4/tpm.4
  user/imp/tbemd/share/man/man7/c99.7
     - copied unchanged from r211636, head/share/man/man7/c99.7
  user/imp/tbemd/share/syscons/keymaps/swissgerman.macbook.acc.kbd
     - copied unchanged from r211636, head/share/syscons/keymaps/swissgerman.macbook.acc.kbd
  user/imp/tbemd/tools/build/options/WITH_GNU_GREP
     - copied unchanged from r211636, head/tools/build/options/WITH_GNU_GREP
  user/imp/tbemd/tools/regression/bin/sh/builtins/break1.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/builtins/break1.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/break2.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/builtins/break2.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/break2.0.stdout
     - copied unchanged from r211636, head/tools/regression/bin/sh/builtins/break2.0.stdout
  user/imp/tbemd/tools/regression/bin/sh/builtins/break3.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/builtins/break3.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/eval4.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/builtins/eval4.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/eval5.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/builtins/eval5.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/return5.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/builtins/return5.0
  user/imp/tbemd/tools/regression/bin/sh/expansion/ifs2.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/expansion/ifs2.0
  user/imp/tbemd/tools/regression/bin/sh/expansion/ifs3.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/expansion/ifs3.0
  user/imp/tbemd/tools/regression/bin/sh/expansion/pathname3.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/expansion/pathname3.0
  user/imp/tbemd/tools/regression/bin/sh/expansion/plus-minus4.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/expansion/plus-minus4.0
  user/imp/tbemd/tools/regression/bin/sh/parser/heredoc7.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/parser/heredoc7.0
  user/imp/tbemd/tools/regression/bin/sh/parser/heredoc8.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/parser/heredoc8.0
  user/imp/tbemd/tools/regression/bin/sh/parser/only-redir1.0
     - copied unchanged from r211636, head/tools/regression/bin/sh/parser/only-redir1.0
  user/imp/tbemd/tools/regression/pjdfstest/
     - copied from r211636, head/tools/regression/pjdfstest/
  user/imp/tbemd/tools/regression/usr.sbin/newsyslog/
     - copied from r211636, head/tools/regression/usr.sbin/newsyslog/
  user/imp/tbemd/tools/test/auxinfo/
     - copied from r211636, head/tools/test/auxinfo/
  user/imp/tbemd/tools/tools/netrate/tcpp/parallelism.csh
     - copied unchanged from r211636, head/tools/tools/netrate/tcpp/parallelism.csh
  user/imp/tbemd/tools/tools/netrate/tcpp/runit.pl
     - copied unchanged from r211636, head/tools/tools/netrate/tcpp/runit.pl
  user/imp/tbemd/tools/tools/vhba/mptest/
     - copied from r211636, head/tools/tools/vhba/mptest/
Deleted:
  user/imp/tbemd/lib/libcompat/4.1/ascftime.c
  user/imp/tbemd/lib/libcompat/4.1/cftime.3
  user/imp/tbemd/lib/libcompat/4.1/cftime.c
  user/imp/tbemd/lib/libcompat/4.1/getpw.3
  user/imp/tbemd/lib/libcompat/4.1/getpw.c
  user/imp/tbemd/lib/libcompat/4.3/cfree.3
  user/imp/tbemd/lib/libcompat/4.3/cfree.c
  user/imp/tbemd/sbin/iscontrol/pdu.h
  user/imp/tbemd/share/doc/psd/15.yacc/ss..
  user/imp/tbemd/share/doc/psd/15.yacc/ssA
  user/imp/tbemd/share/doc/psd/15.yacc/ssB
  user/imp/tbemd/share/man/man4/acpi_aiboost.4
  user/imp/tbemd/tools/build/options/WITHOUT_GNU_GREP
  user/imp/tbemd/tools/regression/fstest/
Modified:
  user/imp/tbemd/etc/Makefile
  user/imp/tbemd/etc/defaults/periodic.conf
  user/imp/tbemd/etc/gettytab
  user/imp/tbemd/etc/login.conf
  user/imp/tbemd/etc/mtree/BSD.include.dist
  user/imp/tbemd/etc/mtree/BSD.usr.dist
  user/imp/tbemd/etc/namedb/named.root
  user/imp/tbemd/etc/netstart
  user/imp/tbemd/etc/periodic/daily/Makefile
  user/imp/tbemd/etc/periodic/security/Makefile
  user/imp/tbemd/etc/rc.d/ipmon
  user/imp/tbemd/etc/rc.resume
  user/imp/tbemd/etc/rc.subr
  user/imp/tbemd/etc/rc.suspend
  user/imp/tbemd/etc/snmpd.config
  user/imp/tbemd/games/fortune/datfiles/fortunes
  user/imp/tbemd/games/fortune/datfiles/fortunes-o.real
  user/imp/tbemd/games/fortune/datfiles/freebsd-tips
  user/imp/tbemd/games/grdc/grdc.c
  user/imp/tbemd/games/pom/pom.6
  user/imp/tbemd/games/pom/pom.c
  user/imp/tbemd/games/random/random.c
  user/imp/tbemd/games/random/randomize_fd.c
  user/imp/tbemd/gnu/lib/csu/Makefile
  user/imp/tbemd/gnu/lib/libdialog/TESTS/check3.c
  user/imp/tbemd/gnu/lib/libdialog/TESTS/menu3.c
  user/imp/tbemd/gnu/lib/libdialog/TESTS/radio1.c
  user/imp/tbemd/gnu/lib/libdialog/TESTS/radio3.c
  user/imp/tbemd/gnu/lib/libgcc/Makefile
  user/imp/tbemd/gnu/lib/libobjc/Makefile
  user/imp/tbemd/gnu/lib/libreadline/history/Makefile
  user/imp/tbemd/gnu/lib/libreadline/readline/doc/Makefile
  user/imp/tbemd/gnu/usr.bin/Makefile
  user/imp/tbemd/gnu/usr.bin/binutils/as/Makefile
  user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile
  user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh
  user/imp/tbemd/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh
  user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile
  user/imp/tbemd/gnu/usr.bin/cc/Makefile.tgt
  user/imp/tbemd/gnu/usr.bin/cc/cc_tools/Makefile
  user/imp/tbemd/gnu/usr.bin/cc/include/Makefile
  user/imp/tbemd/gnu/usr.bin/cvs/contrib/Makefile
  user/imp/tbemd/gnu/usr.bin/dialog/dialog.1
  user/imp/tbemd/gnu/usr.bin/dtc/Makefile
  user/imp/tbemd/gnu/usr.bin/gdb/doc/Makefile
  user/imp/tbemd/gnu/usr.bin/gdb/kgdb/kgdb.h
  user/imp/tbemd/gnu/usr.bin/gdb/kgdb/kld.c
  user/imp/tbemd/gnu/usr.bin/gdb/kgdb/kthr.c
  user/imp/tbemd/gnu/usr.bin/gdb/kgdb/trgt_amd64.c
  user/imp/tbemd/gnu/usr.bin/gdb/kgdb/trgt_i386.c
  user/imp/tbemd/gnu/usr.bin/gdb/libgdb/fbsd-threads.c
  user/imp/tbemd/gnu/usr.bin/groff/tmac/mdoc.local
  user/imp/tbemd/include/Makefile
  user/imp/tbemd/include/arpa/inet.h
  user/imp/tbemd/include/histedit.h
  user/imp/tbemd/include/stdio.h
  user/imp/tbemd/include/unistd.h
  user/imp/tbemd/lib/Makefile
  user/imp/tbemd/lib/bind/config.mk
  user/imp/tbemd/lib/clang/Makefile
  user/imp/tbemd/lib/clang/clang.build.mk
  user/imp/tbemd/lib/clang/include/Makefile
  user/imp/tbemd/lib/clang/include/llvm/Config/AsmParsers.def
  user/imp/tbemd/lib/clang/include/llvm/Config/AsmPrinters.def
  user/imp/tbemd/lib/clang/include/llvm/Config/Disassemblers.def
  user/imp/tbemd/lib/clang/include/llvm/Config/Targets.def
  user/imp/tbemd/lib/clang/include/llvm/Config/config.h
  user/imp/tbemd/lib/clang/libclanganalysis/Makefile
  user/imp/tbemd/lib/clang/libclangast/Makefile
  user/imp/tbemd/lib/clang/libclangbasic/Makefile
  user/imp/tbemd/lib/clang/libclangchecker/Makefile
  user/imp/tbemd/lib/clang/libclangcodegen/Makefile
  user/imp/tbemd/lib/clang/libclangdriver/Makefile
  user/imp/tbemd/lib/clang/libclangfrontend/Makefile
  user/imp/tbemd/lib/clang/libclanglex/Makefile
  user/imp/tbemd/lib/clang/libclangparse/Makefile
  user/imp/tbemd/lib/clang/libclangrewrite/Makefile
  user/imp/tbemd/lib/clang/libclangsema/Makefile
  user/imp/tbemd/lib/clang/libllvmanalysis/Makefile
  user/imp/tbemd/lib/clang/libllvmarmasmparser/Makefile
  user/imp/tbemd/lib/clang/libllvmarmasmprinter/Makefile
  user/imp/tbemd/lib/clang/libllvmarmcodegen/Makefile
  user/imp/tbemd/lib/clang/libllvmarminfo/Makefile
  user/imp/tbemd/lib/clang/libllvmasmprinter/Makefile
  user/imp/tbemd/lib/clang/libllvmbitreader/Makefile
  user/imp/tbemd/lib/clang/libllvmbitwriter/Makefile
  user/imp/tbemd/lib/clang/libllvmcodegen/Makefile
  user/imp/tbemd/lib/clang/libllvmcore/Makefile
  user/imp/tbemd/lib/clang/libllvminstcombine/Makefile
  user/imp/tbemd/lib/clang/libllvmipa/Makefile
  user/imp/tbemd/lib/clang/libllvmipo/Makefile
  user/imp/tbemd/lib/clang/libllvmmc/Makefile
  user/imp/tbemd/lib/clang/libllvmmcparser/Makefile
  user/imp/tbemd/lib/clang/libllvmmipsasmprinter/Makefile
  user/imp/tbemd/lib/clang/libllvmmipscodegen/Makefile
  user/imp/tbemd/lib/clang/libllvmmipsinfo/Makefile
  user/imp/tbemd/lib/clang/libllvmpowerpcasmprinter/Makefile
  user/imp/tbemd/lib/clang/libllvmpowerpccodegen/Makefile
  user/imp/tbemd/lib/clang/libllvmpowerpcinfo/Makefile
  user/imp/tbemd/lib/clang/libllvmscalaropts/Makefile
  user/imp/tbemd/lib/clang/libllvmselectiondag/Makefile
  user/imp/tbemd/lib/clang/libllvmsupport/Makefile
  user/imp/tbemd/lib/clang/libllvmsystem/Makefile
  user/imp/tbemd/lib/clang/libllvmtarget/Makefile
  user/imp/tbemd/lib/clang/libllvmtransformutils/Makefile
  user/imp/tbemd/lib/clang/libllvmx86asmparser/Makefile
  user/imp/tbemd/lib/clang/libllvmx86asmprinter/Makefile
  user/imp/tbemd/lib/clang/libllvmx86codegen/Makefile
  user/imp/tbemd/lib/clang/libllvmx86info/Makefile
  user/imp/tbemd/lib/csu/i386-elf/crt1_s.S
  user/imp/tbemd/lib/libarchive/archive_entry.3
  user/imp/tbemd/lib/libarchive/archive_read.3
  user/imp/tbemd/lib/libarchive/archive_read_disk.3
  user/imp/tbemd/lib/libarchive/archive_util.3
  user/imp/tbemd/lib/libarchive/archive_write.3
  user/imp/tbemd/lib/libarchive/archive_write_disk.3
  user/imp/tbemd/lib/libarchive/libarchive-formats.5
  user/imp/tbemd/lib/libarchive/libarchive.3
  user/imp/tbemd/lib/libarchive/libarchive_internals.3
  user/imp/tbemd/lib/libarchive/tar.5
  user/imp/tbemd/lib/libbluetooth/bluetooth.3
  user/imp/tbemd/lib/libc/Makefile
  user/imp/tbemd/lib/libc/compat-43/sigcompat.c
  user/imp/tbemd/lib/libc/gen/Makefile.inc
  user/imp/tbemd/lib/libc/gen/Symbol.map
  user/imp/tbemd/lib/libc/gen/__getosreldate.c
  user/imp/tbemd/lib/libc/gen/_thread_init.c
  user/imp/tbemd/lib/libc/gen/dlopen.3
  user/imp/tbemd/lib/libc/gen/getcap.3
  user/imp/tbemd/lib/libc/gen/getosreldate.c
  user/imp/tbemd/lib/libc/gen/getpagesize.c
  user/imp/tbemd/lib/libc/gen/getpagesizes.c
  user/imp/tbemd/lib/libc/gen/getutxent.3
  user/imp/tbemd/lib/libc/gmon/gmon.c
  user/imp/tbemd/lib/libc/include/libc_private.h
  user/imp/tbemd/lib/libc/locale/isgraph.3
  user/imp/tbemd/lib/libc/locale/mbrtowc.3
  user/imp/tbemd/lib/libc/locale/setlocale.3
  user/imp/tbemd/lib/libc/locale/tolower.3
  user/imp/tbemd/lib/libc/locale/toupper.3
  user/imp/tbemd/lib/libc/mips/Makefile.inc
  user/imp/tbemd/lib/libc/mips/SYS.h
  user/imp/tbemd/lib/libc/mips/Symbol.map
  user/imp/tbemd/lib/libc/mips/gen/Makefile.inc
  user/imp/tbemd/lib/libc/mips/gen/_setjmp.S
  user/imp/tbemd/lib/libc/mips/gen/makecontext.c
  user/imp/tbemd/lib/libc/mips/gen/setjmp.S
  user/imp/tbemd/lib/libc/mips/gen/sigsetjmp.S
  user/imp/tbemd/lib/libc/mips/string/bcmp.S
  user/imp/tbemd/lib/libc/mips/string/bcopy.S
  user/imp/tbemd/lib/libc/mips/string/bzero.S
  user/imp/tbemd/lib/libc/mips/string/ffs.S
  user/imp/tbemd/lib/libc/mips/string/index.S
  user/imp/tbemd/lib/libc/mips/string/rindex.S
  user/imp/tbemd/lib/libc/mips/string/strcmp.S
  user/imp/tbemd/lib/libc/mips/string/strlen.S
  user/imp/tbemd/lib/libc/mips/sys/Makefile.inc
  user/imp/tbemd/lib/libc/mips/sys/Ovfork.S
  user/imp/tbemd/lib/libc/mips/sys/brk.S
  user/imp/tbemd/lib/libc/mips/sys/cerror.S
  user/imp/tbemd/lib/libc/mips/sys/exect.S
  user/imp/tbemd/lib/libc/mips/sys/fork.S
  user/imp/tbemd/lib/libc/mips/sys/pipe.S
  user/imp/tbemd/lib/libc/mips/sys/ptrace.S
  user/imp/tbemd/lib/libc/mips/sys/sbrk.S
  user/imp/tbemd/lib/libc/net/gethostbydns.c
  user/imp/tbemd/lib/libc/net/gethostbyht.c
  user/imp/tbemd/lib/libc/net/gethostbynis.c
  user/imp/tbemd/lib/libc/net/gethostnamadr.c
  user/imp/tbemd/lib/libc/net/getnetbydns.c
  user/imp/tbemd/lib/libc/net/getnetbyht.c
  user/imp/tbemd/lib/libc/net/getnetbynis.c
  user/imp/tbemd/lib/libc/net/getnetnamadr.c
  user/imp/tbemd/lib/libc/net/getproto.c
  user/imp/tbemd/lib/libc/net/getprotoent.c
  user/imp/tbemd/lib/libc/net/getprotoname.c
  user/imp/tbemd/lib/libc/net/inet6_rth_space.3
  user/imp/tbemd/lib/libc/net/sctp_getaddrlen.3
  user/imp/tbemd/lib/libc/net/sctp_recvmsg.3
  user/imp/tbemd/lib/libc/net/sctp_send.3
  user/imp/tbemd/lib/libc/net/sctp_sendmsg.3
  user/imp/tbemd/lib/libc/net/sctp_sys_calls.c
  user/imp/tbemd/lib/libc/nls/ru_RU.KOI8-R.msg   (contents, props changed)
  user/imp/tbemd/lib/libc/posix1e/Makefile.inc
  user/imp/tbemd/lib/libc/posix1e/acl_from_text.c
  user/imp/tbemd/lib/libc/posix1e/acl_from_text_nfs4.c
  user/imp/tbemd/lib/libc/posix1e/acl_strip_np.3
  user/imp/tbemd/lib/libc/posix1e/acl_support.c
  user/imp/tbemd/lib/libc/posix1e/acl_support.h
  user/imp/tbemd/lib/libc/posix1e/mac.3
  user/imp/tbemd/lib/libc/rpc/publickey.3
  user/imp/tbemd/lib/libc/stdlib/atexit.c
  user/imp/tbemd/lib/libc/stdlib/getopt.3
  user/imp/tbemd/lib/libc/stdlib/getopt_long.3
  user/imp/tbemd/lib/libc/stdlib/malloc.3
  user/imp/tbemd/lib/libc/stdlib/malloc.c
  user/imp/tbemd/lib/libc/stdlib/realpath.3
  user/imp/tbemd/lib/libc/sys/getfh.2
  user/imp/tbemd/lib/libc/sys/getgroups.2
  user/imp/tbemd/lib/libc/sys/jail.2
  user/imp/tbemd/lib/libc/sys/kldstat.2
  user/imp/tbemd/lib/libc/sys/kqueue.2
  user/imp/tbemd/lib/libc/sys/mlock.2
  user/imp/tbemd/lib/libc/sys/mlockall.2
  user/imp/tbemd/lib/libc/sys/ntp_adjtime.2
  user/imp/tbemd/lib/libc/sys/open.2
  user/imp/tbemd/lib/libc/sys/ptrace.2
  user/imp/tbemd/lib/libc/sys/sctp_peeloff.2
  user/imp/tbemd/lib/libc/sys/shm_open.2
  user/imp/tbemd/lib/libc/sys/stack_protector.c
  user/imp/tbemd/lib/libcam/cam.3
  user/imp/tbemd/lib/libcompat/4.1/ftime.c
  user/imp/tbemd/lib/libcompat/Makefile
  user/imp/tbemd/lib/libdevstat/devstat.3
  user/imp/tbemd/lib/libedit/Makefile
  user/imp/tbemd/lib/libedit/editline.3
  user/imp/tbemd/lib/libefi/libefi.3
  user/imp/tbemd/lib/libelf/Makefile
  user/imp/tbemd/lib/libelf/Version.map
  user/imp/tbemd/lib/libelf/_libelf.h
  user/imp/tbemd/lib/libelf/elf.3
  user/imp/tbemd/lib/libelf/elf_begin.3
  user/imp/tbemd/lib/libelf/elf_begin.c
  user/imp/tbemd/lib/libelf/elf_data.c
  user/imp/tbemd/lib/libelf/elf_getbase.3
  user/imp/tbemd/lib/libelf/elf_getbase.c
  user/imp/tbemd/lib/libelf/elf_getdata.3
  user/imp/tbemd/lib/libelf/elf_getphnum.3
  user/imp/tbemd/lib/libelf/elf_getshnum.3
  user/imp/tbemd/lib/libelf/elf_getshstrndx.3
  user/imp/tbemd/lib/libelf/elf_phnum.c
  user/imp/tbemd/lib/libelf/elf_scn.c
  user/imp/tbemd/lib/libelf/elf_shnum.c
  user/imp/tbemd/lib/libelf/elf_shstrndx.c
  user/imp/tbemd/lib/libelf/elf_strptr.3
  user/imp/tbemd/lib/libelf/elf_types.m4
  user/imp/tbemd/lib/libelf/elf_update.c
  user/imp/tbemd/lib/libelf/gelf_ehdr.c
  user/imp/tbemd/lib/libelf/gelf_fsize.3
  user/imp/tbemd/lib/libelf/gelf_phdr.c
  user/imp/tbemd/lib/libelf/gelf_shdr.c
  user/imp/tbemd/lib/libelf/libelf.h
  user/imp/tbemd/lib/libelf/libelf_align.c
  user/imp/tbemd/lib/libelf/libelf_ar.c
  user/imp/tbemd/lib/libelf/libelf_convert.m4
  user/imp/tbemd/lib/libelf/libelf_data.c
  user/imp/tbemd/lib/libelf/libelf_ehdr.c
  user/imp/tbemd/lib/libelf/libelf_fsize.m4
  user/imp/tbemd/lib/libelf/libelf_msize.m4
  user/imp/tbemd/lib/libelf/libelf_phdr.c
  user/imp/tbemd/lib/libelf/libelf_xlate.c
  user/imp/tbemd/lib/libexpat/Makefile
  user/imp/tbemd/lib/libfetch/common.c
  user/imp/tbemd/lib/libfetch/http.c
  user/imp/tbemd/lib/libgeom/libgeom.3
  user/imp/tbemd/lib/libgpib/gpib.3
  user/imp/tbemd/lib/libgssapi/gss_accept_sec_context.3
  user/imp/tbemd/lib/libgssapi/gss_acquire_cred.3
  user/imp/tbemd/lib/libgssapi/gssapi.3
  user/imp/tbemd/lib/libjail/jail.c
  user/imp/tbemd/lib/libjail/jail_getid.c
  user/imp/tbemd/lib/libkse/Makefile
  user/imp/tbemd/lib/libkse/arch/amd64/Makefile.inc
  user/imp/tbemd/lib/libkse/arch/arm/Makefile.inc
  user/imp/tbemd/lib/libkse/arch/i386/Makefile.inc
  user/imp/tbemd/lib/libkse/arch/ia64/Makefile.inc
  user/imp/tbemd/lib/libkse/arch/powerpc/Makefile.inc
  user/imp/tbemd/lib/libkse/arch/sparc64/Makefile.inc
  user/imp/tbemd/lib/libkvm/kvm_getloadavg.3
  user/imp/tbemd/lib/libkvm/kvm_proc.c
  user/imp/tbemd/lib/liblzma/config.h
  user/imp/tbemd/lib/libmagic/Makefile
  user/imp/tbemd/lib/libmemstat/libmemstat.3
  user/imp/tbemd/lib/libmemstat/memstat.c
  user/imp/tbemd/lib/libmemstat/memstat.h
  user/imp/tbemd/lib/libmemstat/memstat_internal.h
  user/imp/tbemd/lib/libmemstat/memstat_uma.c
  user/imp/tbemd/lib/libpmc/pmc.3
  user/imp/tbemd/lib/libpmc/pmc.corei7.3
  user/imp/tbemd/lib/libpmc/pmc.corei7uc.3
  user/imp/tbemd/lib/libpmc/pmc.mips.3
  user/imp/tbemd/lib/libpmc/pmc.westmere.3
  user/imp/tbemd/lib/libpmc/pmc.westmereuc.3
  user/imp/tbemd/lib/libpmc/pmc.xscale.3
  user/imp/tbemd/lib/libpmc/pmc_event_names_of_class.3
  user/imp/tbemd/lib/libpmc/pmc_read.3
  user/imp/tbemd/lib/libproc/Makefile
  user/imp/tbemd/lib/libproc/_libproc.h
  user/imp/tbemd/lib/libproc/libproc.h
  user/imp/tbemd/lib/libproc/proc_create.c
  user/imp/tbemd/lib/libproc/proc_sym.c
  user/imp/tbemd/lib/libproc/proc_util.c
  user/imp/tbemd/lib/libradius/libradius.3
  user/imp/tbemd/lib/librpcsec_gss/rpcsec_gss.3
  user/imp/tbemd/lib/libsdp/sdp.3
  user/imp/tbemd/lib/libstand/Makefile
  user/imp/tbemd/lib/libstand/printf.c
  user/imp/tbemd/lib/libthr/thread/thr_cancel.c
  user/imp/tbemd/lib/libthr/thread/thr_cond.c
  user/imp/tbemd/lib/libthr/thread/thr_exit.c
  user/imp/tbemd/lib/libthr/thread/thr_join.c
  user/imp/tbemd/lib/libthr/thread/thr_private.h
  user/imp/tbemd/lib/libthr/thread/thr_sig.c
  user/imp/tbemd/lib/libthr/thread/thr_syscalls.c
  user/imp/tbemd/lib/libthread_db/Symbol.map
  user/imp/tbemd/lib/libthread_db/libpthread_db.c
  user/imp/tbemd/lib/libthread_db/libthr_db.c
  user/imp/tbemd/lib/libthread_db/thread_db.c
  user/imp/tbemd/lib/libthread_db/thread_db.h
  user/imp/tbemd/lib/libthread_db/thread_db_int.h
  user/imp/tbemd/lib/libusb/libusb.3
  user/imp/tbemd/lib/libusb/libusb20.3
  user/imp/tbemd/lib/libutil/expand_number.3
  user/imp/tbemd/lib/libutil/expand_number.c
  user/imp/tbemd/lib/libutil/kinfo_getfile.3
  user/imp/tbemd/lib/libutil/kinfo_getvmmap.3
  user/imp/tbemd/lib/libutil/kld.c
  user/imp/tbemd/lib/libutil/libutil.h
  user/imp/tbemd/lib/libutil/login_class.c
  user/imp/tbemd/lib/libutil/property.3
  user/imp/tbemd/lib/libutil/pw_util.c
  user/imp/tbemd/lib/libutil/quotafile.3
  user/imp/tbemd/lib/msun/Makefile
  user/imp/tbemd/lib/msun/Symbol.map
  user/imp/tbemd/lib/msun/man/fdim.3
  user/imp/tbemd/lib/msun/src/math.h
  user/imp/tbemd/lib/msun/src/s_isnan.c
  user/imp/tbemd/libexec/rtld-elf/Makefile
  user/imp/tbemd/libexec/rtld-elf/Symbol.map
  user/imp/tbemd/libexec/rtld-elf/malloc.c
  user/imp/tbemd/libexec/rtld-elf/mips/reloc.c
  user/imp/tbemd/libexec/rtld-elf/mips/rtld_start.S
  user/imp/tbemd/libexec/rtld-elf/rtld.c
  user/imp/tbemd/libexec/talkd/announce.c
  user/imp/tbemd/libexec/talkd/table.c
  user/imp/tbemd/libexec/ypxfr/ypxfr.8
  user/imp/tbemd/release/Makefile
  user/imp/tbemd/release/picobsd/qemu/PICOBSD
  user/imp/tbemd/release/picobsd/qemu/crunch.conf
  user/imp/tbemd/release/picobsd/tinyware/login/pico-login.c
  user/imp/tbemd/release/scripts/ports-install.sh
  user/imp/tbemd/sbin/bsdlabel/bsdlabel.c
  user/imp/tbemd/sbin/camcontrol/camcontrol.8
  user/imp/tbemd/sbin/camcontrol/camcontrol.c
  user/imp/tbemd/sbin/camcontrol/modeedit.c
  user/imp/tbemd/sbin/ccdconfig/ccdconfig.c
  user/imp/tbemd/sbin/devd/devd.cc
  user/imp/tbemd/sbin/devd/devd.conf.5
  user/imp/tbemd/sbin/devd/devd.hh
  user/imp/tbemd/sbin/dhclient/dhclient.c
  user/imp/tbemd/sbin/fsck/fsck.8
  user/imp/tbemd/sbin/fsck_ffs/fsck_ffs.8
  user/imp/tbemd/sbin/fsck_ffs/main.c
  user/imp/tbemd/sbin/fsck_ffs/suj.c
  user/imp/tbemd/sbin/fsck_msdosfs/Makefile
  user/imp/tbemd/sbin/fsck_msdosfs/boot.c
  user/imp/tbemd/sbin/fsck_msdosfs/check.c
  user/imp/tbemd/sbin/fsck_msdosfs/dir.c
  user/imp/tbemd/sbin/fsck_msdosfs/fat.c
  user/imp/tbemd/sbin/gbde/Makefile
  user/imp/tbemd/sbin/gbde/gbde.c
  user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c
  user/imp/tbemd/sbin/geom/class/part/geom_part.c
  user/imp/tbemd/sbin/geom/class/part/gpart.8
  user/imp/tbemd/sbin/geom/class/sched/gsched.8
  user/imp/tbemd/sbin/geom/class/virstor/geom_virstor.c
  user/imp/tbemd/sbin/geom/core/geom.8
  user/imp/tbemd/sbin/geom/core/geom.c
  user/imp/tbemd/sbin/geom/core/geom.h
  user/imp/tbemd/sbin/geom/misc/subr.c
  user/imp/tbemd/sbin/geom/misc/subr.h
  user/imp/tbemd/sbin/gvinum/gvinum.c
  user/imp/tbemd/sbin/hastctl/hastctl.8
  user/imp/tbemd/sbin/hastctl/hastctl.c
  user/imp/tbemd/sbin/hastd/control.c
  user/imp/tbemd/sbin/hastd/control.h
  user/imp/tbemd/sbin/hastd/ebuf.c
  user/imp/tbemd/sbin/hastd/hast.conf.5
  user/imp/tbemd/sbin/hastd/hast.h
  user/imp/tbemd/sbin/hastd/hast_proto.c
  user/imp/tbemd/sbin/hastd/hastd.c
  user/imp/tbemd/sbin/hastd/hastd.h
  user/imp/tbemd/sbin/hastd/metadata.c
  user/imp/tbemd/sbin/hastd/nv.c
  user/imp/tbemd/sbin/hastd/parse.y
  user/imp/tbemd/sbin/hastd/pjdlog.c
  user/imp/tbemd/sbin/hastd/pjdlog.h
  user/imp/tbemd/sbin/hastd/primary.c
  user/imp/tbemd/sbin/hastd/proto.c
  user/imp/tbemd/sbin/hastd/proto_common.c
  user/imp/tbemd/sbin/hastd/proto_impl.h
  user/imp/tbemd/sbin/hastd/proto_socketpair.c
  user/imp/tbemd/sbin/hastd/proto_tcp4.c
  user/imp/tbemd/sbin/hastd/proto_uds.c
  user/imp/tbemd/sbin/hastd/secondary.c
  user/imp/tbemd/sbin/ifconfig/af_link.c
  user/imp/tbemd/sbin/ifconfig/ifconfig.8
  user/imp/tbemd/sbin/ifconfig/ifconfig.c
  user/imp/tbemd/sbin/ipfw/dummynet.c
  user/imp/tbemd/sbin/ipfw/ipfw.8
  user/imp/tbemd/sbin/iscontrol/Makefile
  user/imp/tbemd/sbin/iscontrol/auth_subr.c
  user/imp/tbemd/sbin/iscontrol/config.c
  user/imp/tbemd/sbin/iscontrol/fsm.c
  user/imp/tbemd/sbin/iscontrol/iscontrol.8
  user/imp/tbemd/sbin/iscontrol/iscontrol.c
  user/imp/tbemd/sbin/iscontrol/iscontrol.h
  user/imp/tbemd/sbin/iscontrol/iscsi.conf.5
  user/imp/tbemd/sbin/iscontrol/login.c
  user/imp/tbemd/sbin/iscontrol/misc.c
  user/imp/tbemd/sbin/iscontrol/pdu.c
  user/imp/tbemd/sbin/kldload/kldload.8
  user/imp/tbemd/sbin/kldload/kldload.c
  user/imp/tbemd/sbin/mca/mca.c
  user/imp/tbemd/sbin/newfs_msdos/newfs_msdos.8
  user/imp/tbemd/sbin/ping/ping.c
  user/imp/tbemd/sbin/ping6/ping6.8
  user/imp/tbemd/sbin/ping6/ping6.c
  user/imp/tbemd/sbin/reboot/boot_i386.8
  user/imp/tbemd/sbin/sunlabel/sunlabel.8
  user/imp/tbemd/secure/lib/libcrypto/Makefile
  user/imp/tbemd/secure/lib/libcrypto/opensslconf-mips.h
  user/imp/tbemd/share/doc/psd/15.yacc/Makefile
  user/imp/tbemd/share/examples/etc/make.conf
  user/imp/tbemd/share/examples/kld/syscall/test/call.c
  user/imp/tbemd/share/examples/perfmon/perfmon.c
  user/imp/tbemd/share/man/man1/builtin.1
  user/imp/tbemd/share/man/man3/pthread_join.3
  user/imp/tbemd/share/man/man3/queue.3
  user/imp/tbemd/share/man/man3/siginfo.3
  user/imp/tbemd/share/man/man3/tree.3
  user/imp/tbemd/share/man/man4/Makefile
  user/imp/tbemd/share/man/man4/ae.4
  user/imp/tbemd/share/man/man4/alc.4
  user/imp/tbemd/share/man/man4/asmc.4
  user/imp/tbemd/share/man/man4/ata.4
  user/imp/tbemd/share/man/man4/ath.4
  user/imp/tbemd/share/man/man4/bge.4
  user/imp/tbemd/share/man/man4/bktr.4
  user/imp/tbemd/share/man/man4/blackhole.4
  user/imp/tbemd/share/man/man4/bpf.4
  user/imp/tbemd/share/man/man4/bridge.4
  user/imp/tbemd/share/man/man4/bt.4
  user/imp/tbemd/share/man/man4/bwi.4
  user/imp/tbemd/share/man/man4/cmx.4
  user/imp/tbemd/share/man/man4/dc.4
  user/imp/tbemd/share/man/man4/enc.4
  user/imp/tbemd/share/man/man4/gbde.4
  user/imp/tbemd/share/man/man4/gre.4
  user/imp/tbemd/share/man/man4/hwpmc.4
  user/imp/tbemd/share/man/man4/icmp6.4
  user/imp/tbemd/share/man/man4/iic.4
  user/imp/tbemd/share/man/man4/io.4
  user/imp/tbemd/share/man/man4/ip.4
  user/imp/tbemd/share/man/man4/ipsec.4
  user/imp/tbemd/share/man/man4/isp.4
  user/imp/tbemd/share/man/man4/iwn.4
  user/imp/tbemd/share/man/man4/iwnfw.4
  user/imp/tbemd/share/man/man4/ksyms.4
  user/imp/tbemd/share/man/man4/linux.4
  user/imp/tbemd/share/man/man4/lmc.4
  user/imp/tbemd/share/man/man4/mac_lomac.4
  user/imp/tbemd/share/man/man4/man4.i386/glxsb.4
  user/imp/tbemd/share/man/man4/meteor.4
  user/imp/tbemd/share/man/man4/mk48txx.4
  user/imp/tbemd/share/man/man4/net80211.4
  user/imp/tbemd/share/man/man4/netgraph.4
  user/imp/tbemd/share/man/man4/ng_atm.4
  user/imp/tbemd/share/man/man4/ng_btsocket.4
  user/imp/tbemd/share/man/man4/ng_car.4
  user/imp/tbemd/share/man/man4/ngatmbase.4
  user/imp/tbemd/share/man/man4/pcii.4
  user/imp/tbemd/share/man/man4/pcm.4
  user/imp/tbemd/share/man/man4/sctp.4
  user/imp/tbemd/share/man/man4/snd_hda.4
  user/imp/tbemd/share/man/man4/termios.4
  user/imp/tbemd/share/man/man4/textdump.4
  user/imp/tbemd/share/man/man4/u3g.4
  user/imp/tbemd/share/man/man4/uep.4
  user/imp/tbemd/share/man/man4/uhso.4
  user/imp/tbemd/share/man/man4/vpo.4
  user/imp/tbemd/share/man/man5/device.hints.5
  user/imp/tbemd/share/man/man5/mqueuefs.5
  user/imp/tbemd/share/man/man5/periodic.conf.5
  user/imp/tbemd/share/man/man5/rc.conf.5
  user/imp/tbemd/share/man/man5/src.conf.5
  user/imp/tbemd/share/man/man7/Makefile
  user/imp/tbemd/share/man/man7/bsd.snmpmod.mk.7
  user/imp/tbemd/share/man/man7/tuning.7
  user/imp/tbemd/share/man/man9/BUS_NEW_PASS.9
  user/imp/tbemd/share/man/man9/DEVICE_PROBE.9
  user/imp/tbemd/share/man/man9/Makefile
  user/imp/tbemd/share/man/man9/VFS_VGET.9
  user/imp/tbemd/share/man/man9/VOP_LISTEXTATTR.9
  user/imp/tbemd/share/man/man9/VOP_VPTOCNP.9
  user/imp/tbemd/share/man/man9/alloc_unr.9
  user/imp/tbemd/share/man/man9/bios.9
  user/imp/tbemd/share/man/man9/bus_generic_new_pass.9
  user/imp/tbemd/share/man/man9/bus_set_pass.9
  user/imp/tbemd/share/man/man9/crypto.9
  user/imp/tbemd/share/man/man9/g_geom.9
  user/imp/tbemd/share/man/man9/g_wither_geom.9
  user/imp/tbemd/share/man/man9/ieee80211.9
  user/imp/tbemd/share/man/man9/ieee80211_vap.9
  user/imp/tbemd/share/man/man9/ifnet.9
  user/imp/tbemd/share/man/man9/insmntque.9
  user/imp/tbemd/share/man/man9/kproc.9
  user/imp/tbemd/share/man/man9/locking.9
  user/imp/tbemd/share/man/man9/make_dev.9
  user/imp/tbemd/share/man/man9/mbuf.9
  user/imp/tbemd/share/man/man9/memguard.9
  user/imp/tbemd/share/man/man9/netisr.9
  user/imp/tbemd/share/man/man9/rman.9
  user/imp/tbemd/share/man/man9/runqueue.9
  user/imp/tbemd/share/man/man9/sglist.9
  user/imp/tbemd/share/man/man9/style.9
  user/imp/tbemd/share/man/man9/taskqueue.9
  user/imp/tbemd/share/man/man9/timeout.9
  user/imp/tbemd/share/man/man9/usbdi.9
  user/imp/tbemd/share/man/man9/vfs_busy.9
  user/imp/tbemd/share/man/man9/vfs_mountedfrom.9
  user/imp/tbemd/share/man/man9/vfs_unbusy.9
  user/imp/tbemd/share/man/man9/vm_page_alloc.9
  user/imp/tbemd/share/man/man9/vm_page_bits.9
  user/imp/tbemd/share/misc/bsd-family-tree
  user/imp/tbemd/share/misc/committers-doc.dot
  user/imp/tbemd/share/misc/committers-ports.dot
  user/imp/tbemd/share/misc/committers-src.dot
  user/imp/tbemd/share/mk/Makefile
  user/imp/tbemd/share/mk/bsd.cpu.mk
  user/imp/tbemd/share/mk/bsd.dep.mk
  user/imp/tbemd/share/mk/bsd.endian.mk
  user/imp/tbemd/share/mk/bsd.lib.mk
  user/imp/tbemd/share/mk/bsd.libnames.mk
  user/imp/tbemd/share/mk/bsd.own.mk
  user/imp/tbemd/share/mk/bsd.prog.mk
  user/imp/tbemd/share/mk/bsd.sys.mk
  user/imp/tbemd/share/mk/sys.mk
  user/imp/tbemd/share/syscons/keymaps/INDEX.keymaps
  user/imp/tbemd/share/syscons/keymaps/Makefile
  user/imp/tbemd/share/termcap/termcap.5
  user/imp/tbemd/share/termcap/termcap.src
  user/imp/tbemd/share/timedef/fr_FR.ISO8859-1.src
  user/imp/tbemd/share/timedef/fr_FR.UTF-8.src
  user/imp/tbemd/tools/build/mk/OptionalObsoleteFiles.inc
  user/imp/tbemd/tools/debugscripts/README
  user/imp/tbemd/tools/regression/bin/sh/builtins/command3.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/command5.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/command6.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/fc1.0
  user/imp/tbemd/tools/regression/bin/sh/builtins/fc2.0
  user/imp/tbemd/tools/regression/bin/sh/execution/func2.0
  user/imp/tbemd/tools/regression/bin/sh/execution/redir1.0
  user/imp/tbemd/tools/regression/bin/sh/execution/redir2.0
  user/imp/tbemd/tools/regression/bin/sh/expansion/arith2.0
  user/imp/tbemd/tools/regression/bin/sh/parser/heredoc2.0
  user/imp/tbemd/tools/regression/bin/sh/set-e/elif1.0
  user/imp/tbemd/tools/regression/bin/sh/set-e/elif2.0
  user/imp/tbemd/tools/regression/bin/sh/set-e/if1.0
  user/imp/tbemd/tools/regression/bin/sh/set-e/if3.0
  user/imp/tbemd/tools/regression/bin/sh/set-e/while1.0
  user/imp/tbemd/tools/regression/bin/sh/set-e/while2.0
  user/imp/tbemd/tools/regression/usr.sbin/Makefile
  user/imp/tbemd/tools/test/dtrace/Makefile
  user/imp/tbemd/tools/tools/nanobsd/nanobsd.sh
  user/imp/tbemd/tools/tools/ncpus/biosmptable.c
  user/imp/tbemd/tools/tools/netrate/tcpp/README
  user/imp/tbemd/tools/tools/tinybsd/conf/default/TINYBSD
  user/imp/tbemd/tools/tools/tinybsd/conf/vpn/TINYBSD
  user/imp/tbemd/tools/tools/vhba/Makefile
  user/imp/tbemd/tools/tools/vhba/vhba.c
Directory Properties:
  user/imp/tbemd/lib/libc/   (props changed)
  user/imp/tbemd/lib/libc/stdtime/   (props changed)
  user/imp/tbemd/lib/libutil/   (props changed)
  user/imp/tbemd/lib/libz/   (props changed)
  user/imp/tbemd/sbin/   (props changed)
  user/imp/tbemd/sbin/ipfw/   (props changed)
  user/imp/tbemd/share/zoneinfo/   (props changed)

Modified: user/imp/tbemd/etc/Makefile
==============================================================================

--- user/imp/tbemd/etc/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -22,8 +22,12 @@ BIN1=	auth.conf \
 
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
 BIN1+=	etc.${MACHINE}/ttys
-.else
+.elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)
+BIN1+=	etc.${MACHINE_ARCH}/ttys
+.elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys)
 BIN1+=	etc.${MACHINE_CPUARCH}/ttys
+.else
+.error etc.MACHINE/ttys missing
 .endif
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
@@ -249,11 +253,13 @@ distribution:
 	    ${DESTDIR}/var/crash
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FREEBSD} ${DESTDIR}/
+.if ${MK_BOOT} != "no"
 .if exists(${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints)
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \
 	    ${DESTDIR}/boot/device.hints
 .endif
+.endif
 
 distrib-dirs:
 	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/

Modified: user/imp/tbemd/etc/defaults/periodic.conf
==============================================================================
--- user/imp/tbemd/etc/defaults/periodic.conf	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/defaults/periodic.conf	Sun Aug 22 21:44:05 2010	(r211652)
@@ -136,6 +136,9 @@ daily_status_named_usedns="YES"				# DNS
 # 480.status-ntpd
 daily_status_ntpd_enable="NO"				# Check NTP status
 
+# 490.status-pkg-changes
+daily_status_pkg_changes_enable="NO"			# Show package changes
+
 # 500.queuerun
 daily_queuerun_enable="YES"				# Run mail queue
 daily_submit_queuerun="YES"				# Also submit queue
@@ -171,6 +174,9 @@ daily_status_security_passwdless_enable=
 # 410.logincheck
 daily_status_security_logincheck_enable="YES"
 
+# 460.chkportsum
+daily_status_security_chkportsum_enable="NO"	# Check ports w/ wrong checksum
+
 # 500.ipfwdenied
 daily_status_security_ipfwdenied_enable="YES"
 

Modified: user/imp/tbemd/etc/gettytab
==============================================================================
--- user/imp/tbemd/etc/gettytab	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/gettytab	Sun Aug 22 21:44:05 2010	(r211652)
@@ -165,7 +165,7 @@ P|Pc|Pc console:\
 	:ht:np:sp#9600:
 
 #
-# Wierdo special case for fast crt's with hardcopy devices
+# Weirdo special case for fast crt's with hardcopy devices
 #
 8|T9600|CRT with hardcopy:\
 	:nx=T300:tc=9600-baud:

Modified: user/imp/tbemd/etc/login.conf
==============================================================================
--- user/imp/tbemd/etc/login.conf	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/login.conf	Sun Aug 22 21:44:05 2010	(r211652)
@@ -228,7 +228,7 @@ russian|Russian Users Accounts:\
 #
 #
 ##
-## The dialer class should be used for a dialup PPP/SLIP accounts
+## The dialer class should be used for a dialup PPP account
 ## Welcome messages/news suppressed
 ##
 #dialer:\
@@ -247,7 +247,7 @@ russian|Russian Users Accounts:\
 #
 #
 ##
-## Site full-time 24/7 PPP/SLIP connections
+## Site full-time 24/7 PPP connection
 ## - no time accounting, restricted to access via dialin lines
 ##
 #site:\
@@ -306,11 +306,6 @@ russian|Russian Users Accounts:\
 #	:tc=subscriber:
 #
 #
-#subslip|SLIP Subscriber Accounts:\
-#	:tc=dialer:\
-#	:tc=subscriber:
-#
-#
 #subshell|Shell Subscriber Accounts:\
 #	:tc=subscriber:
 #

Modified: user/imp/tbemd/etc/mtree/BSD.include.dist
==============================================================================
--- user/imp/tbemd/etc/mtree/BSD.include.dist	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/mtree/BSD.include.dist	Sun Aug 22 21:44:05 2010	(r211652)
@@ -84,7 +84,7 @@
         ..
     ..
     clang
-        2.0
+        2.8
         ..
     ..
     crypto

Modified: user/imp/tbemd/etc/mtree/BSD.usr.dist
==============================================================================
--- user/imp/tbemd/etc/mtree/BSD.usr.dist	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/mtree/BSD.usr.dist	Sun Aug 22 21:44:05 2010	(r211652)
@@ -261,6 +261,8 @@
             ..
             nwclient
             ..
+            pc-sysinstall
+            ..
             perfmon
             ..
             pf
@@ -1226,6 +1228,20 @@
                 ..
             ..
         ..
+        pc-sysinstall
+            backend
+            ..
+            backend-partmanager
+            ..
+            backend-query
+            ..
+            conf
+                license
+                ..
+            ..
+            doc
+            ..
+        ..
         security
         ..
         sendmail

Modified: user/imp/tbemd/etc/namedb/named.root
==============================================================================
--- user/imp/tbemd/etc/namedb/named.root	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/namedb/named.root	Sun Aug 22 21:44:05 2010	(r211652)
@@ -13,8 +13,8 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    Dec 12, 2008
-;       related version of root zone:   2008121200
+;       last update:    Jun 17, 2010
+;       related version of root zone:   2010061700
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -63,6 +63,7 @@ H.ROOT-SERVERS.NET.      3600000      AA
 ;
 .                        3600000      NS    I.ROOT-SERVERS.NET.
 I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
+I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
 ;
 ; OPERATED BY VERISIGN, INC.
 ;

Modified: user/imp/tbemd/etc/netstart
==============================================================================
--- user/imp/tbemd/etc/netstart	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/netstart	Sun Aug 22 21:44:05 2010	(r211652)
@@ -55,8 +55,6 @@ _start=quietstart
 /etc/rc.d/dhclient ${_start}
 /etc/rc.d/ppp ${_start}
 /etc/rc.d/ipfw ${_start}
-/etc/rc.d/ip6fw ${_start}
-/etc/rc.d/network_ipv6 ${_start}
 /etc/rc.d/routing ${_start}
 /etc/rc.d/mroute6d ${_start}
 /etc/rc.d/route6d ${_start}

Copied: user/imp/tbemd/etc/periodic/daily/490.status-pkg-changes (from r211636, head/etc/periodic/daily/490.status-pkg-changes)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/etc/periodic/daily/490.status-pkg-changes	Sun Aug 22 21:44:05 2010	(r211652, copy of r211636, head/etc/periodic/daily/490.status-pkg-changes)
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]; then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+case "$daily_status_pkg_changes_enable" in
+    [Yy][Ee][Ss])
+	if [ ! -f /usr/sbin/pkg_info ]; then
+	    echo '$daily_status_pkg_changes_enable is enabled but' \
+		 "/usr/sbin/pkg_info doesn't exist"
+	    rc=2
+	else
+	    bak=/var/backups
+	    rc=0
+
+	    if [ -f $bak/pkg_info.bak ]; then
+	    	mv -f $bak/pkg_info.bak $bak/pkg_info.bak2
+	    fi
+	    /usr/sbin/pkg_info > $bak/pkg_info.bak
+
+	    cmp -sz $bak/pkg_info.bak $bak/pkg_info.bak2
+	    if [ $? -eq 1 ]; then
+		echo ""
+		echo "Changes in installed packages:"
+		diff -U 0 $bak/pkg_info.bak2 $bak/pkg_info.bak \
+		| grep '^[-+][^-+]' | sort -k 1.2
+	    fi
+	fi
+	;;
+
+    *)
+	rc=0
+	;;
+esac
+
+exit $rc

Copied: user/imp/tbemd/etc/periodic/daily/800.scrub-zfs (from r211636, head/etc/periodic/daily/800.scrub-zfs)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/etc/periodic/daily/800.scrub-zfs	Sun Aug 22 21:44:05 2010	(r211652, copy of r211636, head/etc/periodic/daily/800.scrub-zfs)
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+: ${daily_scrub_zfs_default_threshold=30}
+
+case "$daily_scrub_zfs_enable" in
+    [Yy][Ee][Ss])
+	echo
+	echo 'Scrubbing of zfs pools:'
+
+	if [ -z "${daily_scrub_zfs_pools}" ]; then
+		daily_scrub_zfs_pools="$(zpool list -H -o name)"
+	fi
+
+	for pool in ${daily_scrub_zfs_pools}; do
+		# sanity check
+		zpool list ${pool} >/dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			echo "   WARNING: pool '${pool}' specified in"
+			echo "            '/etc/periodic.conf:daily_scrub_zfs_pools'"
+			echo "            does not exist"
+			continue
+		fi
+
+		# successful only if there is at least one pool to scrub
+		rc=0
+
+		# determine how many days shall be between scrubs
+		eval _pool_threshold=\${daily_scrub_zfs_${pool}_threshold}
+		if [ -z "${_pool_threshold}" ];then
+			_pool_threshold=${daily_scrub_zfs_default_threshold}
+		fi
+
+		_last_scrub=$(zpool history ${pool} | \
+		    egrep "^[0-9\.\:\-]{19} zpool scrub ${pool}\$" | tail -1 |\
+		    cut -d ' ' -f 1)
+		if [ -z "${_last_scrub}" ]; then
+			# creation time of the pool if no scrub was done
+			_last_scrub=$(zpool history ${pool} | \
+			    sed -ne '2s/ .*$//p')
+		fi
+
+		# Now minus last scrub (both in seconds) converted to days.
+		_scrub_diff=$(expr -e \( $(date +%s) - \
+		    $(date -j -f %F.%T ${_last_scrub} +%s) \) / 60 / 60 / 24)
+		if [ ${_scrub_diff} -le ${_pool_threshold} ]; then
+			echo "   skipping scrubbing of pool '${pool}':"
+			echo "      last scrubbing is ${_scrub_diff} days ago, threshold is set to ${_pool_threshold} days"
+			continue
+		fi
+
+		_status="$(zpool status ${pool} | grep scrub:)"
+		case "${_status}" in
+			*"scrub in progress"*)
+				echo "   scrubbing of pool '${pool}' already in progress, skipping:"
+				;;
+			*"none requested"*)
+				echo "   starting first scrubbing (after reboot) of pool '${pool}':"
+				zpool scrub ${pool}
+				;;
+			*)
+				echo "   starting scrubbing of pool '${pool}':"
+				zpool scrub ${pool}
+				;;
+		esac
+
+		echo "      consult 'zpool status ${pool}' for the result"
+	done
+	;;
+
+    *)
+	rc=0
+	;;
+esac
+
+exit $rc

Modified: user/imp/tbemd/etc/periodic/daily/Makefile
==============================================================================
--- user/imp/tbemd/etc/periodic/daily/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/periodic/daily/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -8,7 +8,6 @@ FILES=	100.clean-disks \
 	200.backup-passwd \
 	330.news \
 	400.status-disks \
-	404.status-zfs \
 	405.status-ata-raid \
 	406.status-gmirror \
 	407.status-graid3 \
@@ -40,6 +39,10 @@ FILES+=	130.clean-msgs
 FILES+=	480.status-ntpd
 .endif
 
+.if ${MK_PKGTOOLS} != "no"
+FILES+=	490.status-pkg-changes
+.endif
+
 .if ${MK_RCMDS} != "no"
 FILES+=	140.clean-rwho \
 	430.status-rwho
@@ -53,4 +56,9 @@ FILES+=	150.clean-hoststat \
 	500.queuerun
 .endif
 
+.if ${MK_ZFS} != "no"
+FILES+=	404.status-zfs \
+	800.scrub-zfs
+.endif
+
 .include <bsd.prog.mk>

Copied: user/imp/tbemd/etc/periodic/security/460.chkportsum (from r211636, head/etc/periodic/security/460.chkportsum)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/etc/periodic/security/460.chkportsum	Sun Aug 22 21:44:05 2010	(r211652, copy of r211636, head/etc/periodic/security/460.chkportsum)
@@ -0,0 +1,68 @@
+#!/bin/sh -
+#
+# Copyright (c) 2010  The FreeBSD Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+. /etc/periodic/security/security.functions
+
+rc=0
+
+echo ""
+echo 'Checking for ports with mismatched checksums:'
+
+case "${daily_status_security_chkportsum_enable}" in
+	[Yy][Ee][Ss])
+	set -f
+	pkg_info -ga 2>/dev/null | \
+	while IFS= read -r line; do
+		set -- $line
+		case $1 in
+			Information)
+			case $2 in
+				for) name="${3%%:}" ;;
+				*) name='??' ;;
+			esac
+			;;
+			Mismatched|'') ;;
+			*) [ -n "${name}" ] &&
+				echo "${name}: ${line%% fails the original MD5 checksum}"
+			;;
+		esac
+	done
+	;;
+	*)
+	rc=0
+	;;
+esac
+
+exit $rc

Modified: user/imp/tbemd/etc/periodic/security/Makefile
==============================================================================
--- user/imp/tbemd/etc/periodic/security/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/periodic/security/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -7,6 +7,7 @@ FILES=	100.chksetuid \
 	300.chkuid0 \
 	400.passwdless \
 	410.logincheck \
+	460.chkportsum \
 	700.kernelmsg \
 	800.loginfail \
 	900.tcpwrap \

Modified: user/imp/tbemd/etc/rc.d/ipmon
==============================================================================
--- user/imp/tbemd/etc/rc.d/ipmon	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/rc.d/ipmon	Sun Aug 22 21:44:05 2010	(r211652)
@@ -20,7 +20,7 @@ ipmon_precmd()
 	# Continue only if ipfilter or ipnat is enabled and the
 	# ipfilter module is loaded.
 	#
-	if ! checkyesno ipfilter_enable -o ! checkyesno ipnat_enable ; then
+	if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then
 		err 1  "${name} requires either ipfilter or ipnat enabled"
 	fi
 	if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then

Modified: user/imp/tbemd/etc/rc.resume
==============================================================================
--- user/imp/tbemd/etc/rc.resume	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/rc.resume	Sun Aug 22 21:44:05 2010	(r211652)
@@ -39,10 +39,16 @@ state=$2
 
 if [ -r /var/run/rc.suspend.pid ]; then
 	kill -9 `cat /var/run/rc.suspend.pid`
-	rm -f /var/run/rc.suspend.pid
+	/bin/rm -f /var/run/rc.suspend.pid
 	echo 'rc.resume: killed rc.suspend that was still around'
 fi
 
+if [ -r /var/run/rc.suspend.tch ]; then
+	_t=`cat /var/run/rc.suspend.tch`
+	/sbin/sysctl -n kern.timecounter.hardware=$_t > /dev/null 2>&1
+	/bin/rm -f /var/run/rc.suspend.tch
+fi
+
 # Turns on a power supply of a card in the slot inactivated.
 # See also contrib/pccardq.c (only for PAO users).
 # pccardq | awk -F '~' '$5 == "inactive" \
@@ -56,7 +62,7 @@ fi
 # the following to signal it to reassociate.
 # /usr/sbin/wpa_cli reassociate
 
-logger -t $subsystem resumed at `date +'%Y%m%d %H:%M:%S'`
-sync && sync && sync
+/usr/bin/logger -t $subsystem resumed at `/bin/date +'%Y%m%d %H:%M:%S'`
+/bin/sync && /bin/sync && /bin/sync
 
 exit 0

Modified: user/imp/tbemd/etc/rc.subr
==============================================================================
--- user/imp/tbemd/etc/rc.subr	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/rc.subr	Sun Aug 22 21:44:05 2010	(r211652)
@@ -1016,9 +1016,9 @@ load_rc_config()
 		. /etc/rc.conf.d/"$_name"
 	fi
 
-	# Old variable names support
+	# Old variable name support -- Remove before 9.0-RELEASE
 	#
-	[ -n "$enable_quotas" ] && quota_enable="$enable_quotas"
+	[ -n "$enable_quotas" ] && err 1 "enable_quotas is deprecated, use quota_enable"
 
 	# Set defaults if defined.
 	for _var in $rcvar $rcvars; do

Modified: user/imp/tbemd/etc/rc.suspend
==============================================================================
--- user/imp/tbemd/etc/rc.suspend	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/rc.suspend	Sun Aug 22 21:44:05 2010	(r211652)
@@ -43,6 +43,18 @@ fi
 
 echo $$ 2> /dev/null > /var/run/rc.suspend.pid
 
+_t=`/sbin/sysctl -n kern.timecounter.hardware 2> /dev/null`
+case ${_t#ACPI-} in
+fast|safe)
+	/bin/rm -f /var/run/rc.suspend.tch
+	;;
+*)
+	{ /sbin/sysctl -n kern.timecounter.hardware=ACPI-fast || \
+	    /sbin/sysctl -n kern.timecounter.hardware=ACPI-safe; } \
+	    > /dev/null 2>&1 && echo $_t > /var/run/rc.suspend.tch
+	;;
+esac
+
 # If you have troubles on suspending with PC-CARD modem, try this.
 # See also contrib/pccardq.c (Only for PAO users).
 # pccardq | awk -F '~' '$5 == "filled" && $4 ~ /uart/ \
@@ -52,11 +64,11 @@ echo $$ 2> /dev/null > /var/run/rc.suspe
 # suspend and reloading it on resume.  Example:
 # kldunload usb
 
-logger -t $subsystem suspend at `date +'%Y%m%d %H:%M:%S'`
-sync && sync && sync
-sleep 3
+/usr/bin/logger -t $subsystem suspend at `/bin/date +'%Y%m%d %H:%M:%S'`
+/bin/sync && /bin/sync && /bin/sync
+/bin/sleep 3
 
-rm -f /var/run/rc.suspend.pid
+/bin/rm -f /var/run/rc.suspend.pid
 if [ $subsystem = "apm" ]; then
 	/usr/sbin/zzz
 else

Modified: user/imp/tbemd/etc/snmpd.config
==============================================================================
--- user/imp/tbemd/etc/snmpd.config	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/etc/snmpd.config	Sun Aug 22 21:44:05 2010	(r211652)
@@ -95,3 +95,9 @@ begemotSnmpdModulePath."mibII"	= "/usr/l
 #  This requires the mibII module.
 #
 #begemotSnmpdModulePath."bridge" = "/usr/lib/snmp_bridge.so"
+
+#
+# Wireless module
+#  This requires the mibII module.
+#
+#begemotSnmpdModulePath."wlan" = "/usr/lib/snmp_wlan.so"

Modified: user/imp/tbemd/games/fortune/datfiles/fortunes
==============================================================================
--- user/imp/tbemd/games/fortune/datfiles/fortunes	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/fortune/datfiles/fortunes	Sun Aug 22 21:44:05 2010	(r211652)
@@ -2110,7 +2110,7 @@ self-propagating.
 	He who receives ideas from me, receives instruction himself without
 lessening mine; as he who lights his taper at mine receives light
 without darkening me.
-	-- Thomas Jefferson on patents on ideas
+		-- Thomas Jefferson on patents on ideas
 %
 	"Heard you were moving your piano, so I came over to help."
 	"Thanks.  Got it upstairs already."
@@ -37880,7 +37880,7 @@ behave very differently from those who n
 order to get power we would have to become very much like them.  (Lenin's
 fatal mistake, both in theory and in practice.)
 %
-Perhaps the world's second words crime is boredom.  The first is
+Perhaps the world's second-worst crime is boredom.  The first is
 being a bore.
 		-- Cecil Beaton
 %
@@ -57546,11 +57546,11 @@ LII:
 		-- Norman Augustine
 %
 XML is a giant step in no direction at all.
-	-- Erik Naggum
+		-- Erik Naggum
 %
 XML is like violence: if it doesn't solve your problem, you aren't using
 enough of it.
-	-- XML guru Chris Maden
+		-- XML guru Chris Maden
 %
 X-rated movies are all alike -- the only thing
 they leave to the imagination is the plot.

Modified: user/imp/tbemd/games/fortune/datfiles/fortunes-o.real
==============================================================================
--- user/imp/tbemd/games/fortune/datfiles/fortunes-o.real	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/fortune/datfiles/fortunes-o.real	Sun Aug 22 21:44:05 2010	(r211652)
@@ -12433,6 +12433,39 @@ And sure enough she'll take you home and
 	(chorus)
 		-- Crosby, Stills, Nash, "Fair Game"
 %
+Taken from actual police car videos:
+
+(15) Relax!  The handcuffs are tight because they're new.  They'll
+     stretch out after you wear them awhile.
+(14) Take your hands off the car and I'll make your birth certificate
+     a worthless document.
+(13) If you run you'll only go to jail tired.
+(12) Can you run faster than 1200 feet per second?  In case you didn't
+     know that's the average speed of a 9 mm bullet fired from my gun.
+(11) So you don't know how fast you were going.  I guess that means I
+     can write anything I want on the ticket, huh?
+(10) Yes, sir, you can talk to the shift supervisor, but I don't think
+     it will help.  Oh, did I mention that I AM the shift supervisor?
+(9)  Warning? You want a warning?  OK, I'm warning you not to do that
+     again or I'll give you another ticket.
+(8)  The answer to this last question will determine whether you are
+     drunk or not.  Is Mickey Mouse a cat or a dog?
+%
+Taken from actual police car videos:
+
+(7) Fair?  You want me to be fair?  Listen, fair is a place where you
+    go to ride on rides, eat cotton candy, and step in monkey poop.
+(6) Yeah, we have a quota.  Two more tickets and my wife gets a toaster
+    oven.
+(5) No, sir, we don't have quotas anymore.  We used to have quotas but
+    now we're allowed to write as many tickets as we want.
+(4) Just how big were those two beers?
+(3) In God we trust, all others we run through CPIC/NCIC.
+(2) I'm glad to hear the Chief of Police is a good personal friend of
+    yours.  At least you know someone who can post your bail.
+(1) You didn't think we gave pretty women tickets?
+    You're right, we don't -- sign here.
+%
 Taoism: Shit Happens.
 Confucianism: Confucius say, "Shit Happens".
 Buddhism: If shit happens, it isn't really shit.

Modified: user/imp/tbemd/games/fortune/datfiles/freebsd-tips
==============================================================================
--- user/imp/tbemd/games/fortune/datfiles/freebsd-tips	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/fortune/datfiles/freebsd-tips	Sun Aug 22 21:44:05 2010	(r211652)
@@ -476,6 +476,6 @@ You can use "whereis" to search standard
 directories for the specified programs. This can be particularly handy
 when you are trying to find where in the ports tree an application is.
 
-Try "whereis netscape" and "whereis whereis".
+Try "whereis firefox" and "whereis whereis".
 		-- Konstantinos Konstantinidis <kkonstan at duth.gr>
 %

Modified: user/imp/tbemd/games/grdc/grdc.c
==============================================================================
--- user/imp/tbemd/games/grdc/grdc.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/grdc/grdc.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -15,21 +15,18 @@
  */
 
 #include <err.h>
-#include <time.h>
-#include <signal.h>
 #include <ncurses.h>
+#include <signal.h>
 #include <stdlib.h>
-#ifndef NONPOSIX
+#include <time.h>
 #include <unistd.h>
-#endif
 
 #define YBASE	10
 #define XBASE	10
 #define XLENGTH 58
 #define YDEPTH  7
 
-/* it won't be */
-time_t now; /* yeah! */
+struct timespec now;
 struct tm *tm;
 
 short disp[11] = {
@@ -57,7 +54,8 @@ sighndl(int signo)
 int
 main(int argc, char *argv[])
 {
-	struct timespec ts;
+	struct timespec delay;
+	time_t prev_sec;
 	long t, a;
 	int i, j, s, k;
 	int n;
@@ -88,9 +86,14 @@ main(int argc, char *argv[])
 		/* NOTREACHED */
 	}
 
-	if (argc > 0)
-		n = atoi(*argv);
-	else
+	if (argc > 0) {
+		n = atoi(*argv) + 1;
+		if (n < 1) {
+			warnx("number of seconds is out of range");
+			usage();
+			/* NOTREACHED */
+		}
+	} else
 		n = 0;
 
 	initscr();
@@ -135,10 +138,11 @@ main(int argc, char *argv[])
 
 		attrset(COLOR_PAIR(2));
 	}
-	time(&now);
+	clock_gettime(CLOCK_REALTIME_FAST, &now);
+	prev_sec = now.tv_sec;
 	do {
 		mask = 0;
-		tm = localtime(&now);
+		tm = localtime(&now.tv_sec);
 		set(tm->tm_sec%10, 0);
 		set(tm->tm_sec/10, 4);
 		set(tm->tm_min%10, 10);
@@ -192,19 +196,20 @@ main(int argc, char *argv[])
 		}
 		movto(6, 0);
 		refresh();
-		clock_gettime(CLOCK_REALTIME_FAST, &ts);
-		if (ts.tv_sec == now) {
-			if (ts.tv_nsec > 0) {
-				ts.tv_sec = 0;
-				ts.tv_nsec = 1000000000 - ts.tv_nsec;
+		clock_gettime(CLOCK_REALTIME_FAST, &now);
+		if (now.tv_sec == prev_sec) {
+			if (delay.tv_nsec > 0) {
+				delay.tv_sec = 0;
+				delay.tv_nsec = 1000000000 - now.tv_nsec;
 			} else {
-				ts.tv_sec = 1;
-				ts.tv_nsec = 0;
+				delay.tv_sec = 1;
+				delay.tv_nsec = 0;
 			}
-			nanosleep(&ts, NULL);
-			now = ts.tv_sec + 1;
-		} else
-			now = ts.tv_sec;
+			nanosleep(&delay, NULL);
+			clock_gettime(CLOCK_REALTIME_FAST, &now);
+		}
+		n -= now.tv_sec - prev_sec;
+		prev_sec = now.tv_sec;
 		if (sigtermed) {
 			standend();
 			clear();
@@ -212,7 +217,7 @@ main(int argc, char *argv[])
 			endwin();
 			errx(1, "terminated by signal %d", (int)sigtermed);
 		}
-	} while(--n);
+	} while (n);
 	standend();
 	clear();
 	refresh();

Modified: user/imp/tbemd/games/pom/pom.6
==============================================================================
--- user/imp/tbemd/games/pom/pom.6	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/pom/pom.6	Sun Aug 22 21:44:05 2010	(r211652)
@@ -32,7 +32,7 @@
 .\"	@(#)pom.6	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd May 31, 1993
+.Dd July 14, 2010
 .Dt POM 6
 .Os
 .Sh NAME
@@ -40,6 +40,7 @@
 .Nd display the phase of the moon
 .Sh SYNOPSIS
 .Nm 
+.Op Fl p
 .Op Fl d Ar yyyy.mm.dd
 .Op Fl t Ar hh:mm:ss
 .Sh DESCRIPTION
@@ -49,10 +50,14 @@ utility displays the current phase of th
 Useful for selecting software completion target dates and predicting
 managerial behavior.
 .Pp
+Use the
+.Fl p
+option to print just the phase as a percentage.
+.Pp
 Use the arguments
 .Fl d
 and
-.Fl o
+.Fl t
 to specify a specific date and time for which the phase of the moon
 has to be calculated.
 If

Modified: user/imp/tbemd/games/pom/pom.c
==============================================================================
--- user/imp/tbemd/games/pom/pom.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/pom/pom.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -84,14 +84,17 @@ main(int argc, char **argv)
 	time_t tt;
 	struct tm GMT, tmd;
 	double days, today, tomorrow;
-	int ch, cnt;
+	int ch, cnt, pflag = 0;
 	char *odate = NULL, *otime = NULL;
 
-	while ((ch = getopt(argc, argv, "d:t:")) != -1)
+	while ((ch = getopt(argc, argv, "d:pt:")) != -1)
 		switch (ch) {
 		case 'd':
 			odate = optarg;
 			break;
+		case 'p':
+			pflag = 1;
+			break;
 		case 't':
 			otime = optarg;
 			break;
@@ -134,6 +137,10 @@ main(int argc, char **argv)
 	for (cnt = EPOCH; cnt < GMT.tm_year; ++cnt)
 		days += isleap(1900 + cnt) ? 366 : 365;
 	today = potm(days) + .5;
+	if (pflag) {
+		(void)printf("%1.0f\n", today);
+		return (0);
+	}
 	(void)printf("The Moon is ");
 	if ((int)today == 100)
 		(void)printf("Full\n");
@@ -227,6 +234,7 @@ static void
 usage(char *progname)
 {
 
-	fprintf(stderr, "Usage: %s [-d yyyy.mm.dd] [-t hh:mm:ss]\n", progname);
+	fprintf(stderr, "Usage: %s [-p] [-d yyyy.mm.dd] [-t hh:mm:ss]\n",
+	    progname);
 	exit(EX_USAGE);
 }

Modified: user/imp/tbemd/games/random/random.c
==============================================================================
--- user/imp/tbemd/games/random/random.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/random/random.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
 	denom = 0;
 	filename = "/dev/fd/0";
 	random_type = RANDOM_TYPE_UNSET;
-	random_exit = randomize_lines = random_type = unbuffer_output = 0;
+	random_exit = randomize_lines = unbuffer_output = 0;
 	unique_output = 1;
 
 	(void)setlocale(LC_CTYPE, "");

Modified: user/imp/tbemd/games/random/randomize_fd.c
==============================================================================
--- user/imp/tbemd/games/random/randomize_fd.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/games/random/randomize_fd.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -104,7 +104,7 @@ randomize_fd(int fd, int type, int uniqu
 
 	rand_root = rand_tail = NULL;
 	bufc = i = 0;
-	bufleft = eof = fndstr = numnode = ret = 0;
+	bufleft = eof = fndstr = numnode = 0;
 
 	if (type == RANDOM_TYPE_UNSET)
 		type = RANDOM_TYPE_LINES;

Modified: user/imp/tbemd/gnu/lib/csu/Makefile
==============================================================================
--- user/imp/tbemd/gnu/lib/csu/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/csu/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -17,7 +17,8 @@ CSTD?=		gnu89
 CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3
 CFLAGS+=	-finhibit-size-directive -fno-inline-functions \
 		-fno-exceptions -fno-zero-initialized-in-bss \
-		-fno-zero-initialized-in-bss -fno-toplevel-reorder
+		-fno-zero-initialized-in-bss -fno-toplevel-reorder \
+		-fno-asynchronous-unwind-tables -fno-omit-frame-pointer
 CFLAGS+=	-I${GCCLIB}/include -I${GCCDIR}/config -I${GCCDIR} -I. \
 		-I${CCDIR}/cc_tools
 CRTS_CFLAGS=	-DCRTSTUFFS_O -DSHARED ${PICFLAG}

Modified: user/imp/tbemd/gnu/lib/libdialog/TESTS/check3.c
==============================================================================
--- user/imp/tbemd/gnu/lib/libdialog/TESTS/check3.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libdialog/TESTS/check3.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -47,13 +47,13 @@ static int spending;
 static int
 check(dialogMenuItem *self)
 {
-    return ((int)self->data == spending);
+    return ((int)(intptr_t)self->data == spending);
 }
 
 static int
 spend(dialogMenuItem *self)
 {
-    spending = (int)self->data;
+    spending = (int)(intptr_t)self->data;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 

Modified: user/imp/tbemd/gnu/lib/libdialog/TESTS/menu3.c
==============================================================================
--- user/imp/tbemd/gnu/lib/libdialog/TESTS/menu3.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libdialog/TESTS/menu3.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -44,7 +44,7 @@ maybe(dialogMenuItem *self)
 static char *insurance[] = {
     "1,000,000",	"Mondo insurance policy", "Off",
     "5,000,000",	"Mega insurance policy", "Off",
-    "10,000,000",	"Friend!  Most Favored customer!"
+    "10,000,000",	"Friend!  Most Favored customer!", "On"
 };
 
 static void

Modified: user/imp/tbemd/gnu/lib/libdialog/TESTS/radio1.c
==============================================================================
--- user/imp/tbemd/gnu/lib/libdialog/TESTS/radio1.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libdialog/TESTS/radio1.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -31,13 +31,13 @@ static int spending;
 static int
 check(dialogMenuItem *self)
 {
-    return ((int)self->data == spending);
+    return ((int)(intptr_t)self->data == spending);
 }
 
 static int
 spend(dialogMenuItem *self)
 {
-    spending = (int)self->data;
+    spending = (int)(intptr_t)self->data;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 

Modified: user/imp/tbemd/gnu/lib/libdialog/TESTS/radio3.c
==============================================================================
--- user/imp/tbemd/gnu/lib/libdialog/TESTS/radio3.c	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libdialog/TESTS/radio3.c	Sun Aug 22 21:44:05 2010	(r211652)
@@ -31,13 +31,13 @@ static int spending;
 static int
 check(dialogMenuItem *self)
 {
-    return ((int)self->data == spending);
+    return ((int)(intptr_t)self->data == spending);
 }
 
 static int
 spend(dialogMenuItem *self)
 {
-    spending = (int)self->data;
+    spending = (int)(intptr_t)self->data;
     return DITEM_SUCCESS | DITEM_REDRAW;
 }
 

Modified: user/imp/tbemd/gnu/lib/libgcc/Makefile
==============================================================================
--- user/imp/tbemd/gnu/lib/libgcc/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libgcc/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -143,6 +143,11 @@ LIB2FUNCS_EXTRA = tramp.asm
 LIB2FUNCS_STATIC_EXTRA = eabi.asm
 .endif
 
+.if ${TARGET_CPUARCH} == "powerpc64"
+#	from config/rs6000/t-ppccomm
+LIB2FUNCS_EXTRA = tramp.asm
+.endif
+
 .if ${TARGET_CPUARCH} == "sparc64"
 #	from config/sparc/t-elf
 LIB1ASMSRC =   lb1spc.asm

Modified: user/imp/tbemd/gnu/lib/libobjc/Makefile
==============================================================================
--- user/imp/tbemd/gnu/lib/libobjc/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libobjc/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 OBJCDIR=${.CURDIR}/../../../contrib/libobjc
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
@@ -13,6 +15,9 @@ SRCS=	archive.c class.c encoding.c gc.c 
 	nil_method.c NXConstStr.m Object.m objects.c Protocol.m sarray.c \
 	selector.c sendmsg.c thr.c thr-objc.c exception.c
 
+# XXX: clang cannot compile libobjc yet
+CC:=${CC:C/^cc|^clang/gcc/}
+
 INCS=	encoding.h hash.h objc-api.h objc-decls.h objc-list.h objc.h runtime.h \
 	sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h
 INCSDIR=${INCLUDEDIR}/objc

Modified: user/imp/tbemd/gnu/lib/libreadline/history/Makefile
==============================================================================
--- user/imp/tbemd/gnu/lib/libreadline/history/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libreadline/history/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -8,7 +8,7 @@ MAN=    rlhistory.3
 SRCS= $(HISTSRC) xmalloc.c
 
 rlhistory.3: doc/history.3
-	cp ${.ALLSRC} ${.TARGET}
+	cp -f ${.ALLSRC} ${.TARGET}
 
 CLEANFILES+= rlhistory.3
 

Modified: user/imp/tbemd/gnu/lib/libreadline/readline/doc/Makefile
==============================================================================
--- user/imp/tbemd/gnu/lib/libreadline/readline/doc/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/lib/libreadline/readline/doc/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -13,7 +13,7 @@ CLEANFILES += readline.texi
 readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi
 
 readline.texi: rlman.texi
-	cp ${SRCDIR}/rlman.texi ${.TARGET}
+	cp -f ${SRCDIR}/rlman.texi ${.TARGET}
 
 rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi
 

Modified: user/imp/tbemd/gnu/usr.bin/Makefile
==============================================================================
--- user/imp/tbemd/gnu/usr.bin/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/usr.bin/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -8,6 +8,7 @@ SUBDIR= ${_binutils} \
 	dialog \
 	diff \
 	diff3 \
+	${_dtc} \
 	${_gdb} \
 	${_gperf} \
 	${_grep} \
@@ -31,6 +32,10 @@ _groff=		groff
 _cvs=		cvs
 .endif
 
+.if ${MK_FDT}	!= "no"
+_dtc=		dtc
+.endif
+
 .if ${MK_GNU_GREP} != "no"
 _grep=		grep
 .endif

Modified: user/imp/tbemd/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- user/imp/tbemd/gnu/usr.bin/binutils/as/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/usr.bin/binutils/as/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -26,7 +26,7 @@ SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.
 
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
-.elif ${TARGET_ARCH} == "powerpc"
+.elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 SRCS+=	tc-ppc.c
 .elif ${TARGET_ARCH} == "sparc64"
 # change back to tc-sparc.c when new binutils is imported

Modified: user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile
==============================================================================
--- user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile	Sun Aug 22 21:42:30 2010	(r211651)
+++ user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile	Sun Aug 22 21:44:05 2010	(r211652)
@@ -8,8 +8,7 @@ GDBDIR= ${.CURDIR}/../../../../contrib/g
 .PATH: ${SRCDIR}/opcodes ${SRCDIR}/binutils
 
 #	For FSF GDB files, use their CPU (arch) name; for our files use ours.
-GDB_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc/rs6000/:C/sparc64/sparc/}
-
+GDB_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc.*/rs6000/:C/sparc64/sparc/}
 NO_SHARED?=yes
 PROG=	gdb
 XSRCS=	annotate.c arch-utils.c ax-general.c ax-gdb.c bcache.c		\

Copied: user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile.powerpc64 (from r211636, head/gnu/usr.bin/binutils/gdb/Makefile.powerpc64)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile.powerpc64	Sun Aug 22 21:44:05 2010	(r211652, copy of r211636, head/gnu/usr.bin/binutils/gdb/Makefile.powerpc64)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+XSRCS+=	ppcnbsd-nat.c ppc-tdep.c \
+	core-regset.c

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