svn commit: r319779 - in projects/clang500-import: . bin/cat/tests bin/chmod bin/chmod/tests bin/dd/tests bin/echo bin/echo/tests bin/ln bin/ln/tests bin/pkill bin/sh bin/sh/tests/errors cddl/contr...

Sat Jun 10 13:22:52 UTC 2017

Author: dim
Date: Sat Jun 10 13:22:49 2017
New Revision: 319779
URL: https://svnweb.freebsd.org/changeset/base/319779

Log:
  Merge ^/head r319548 through r319778.

Added:
  projects/clang500-import/bin/chmod/tests/
     - copied from r319778, head/bin/chmod/tests/
  projects/clang500-import/bin/echo/tests/
     - copied from r319778, head/bin/echo/tests/
  projects/clang500-import/bin/ln/tests/
     - copied from r319778, head/bin/ln/tests/
  projects/clang500-import/bin/sh/tests/errors/redirection-error8.0
     - copied unchanged from r319778, head/bin/sh/tests/errors/redirection-error8.0
  projects/clang500-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.normalize.d
     - copied unchanged from r319778, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.normalize.d
  projects/clang500-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.normalize.d.out
     - copied unchanged from r319778, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.normalize.d.out
  projects/clang500-import/contrib/mdocml/mdoc_markdown.c
     - copied unchanged from r319778, head/contrib/mdocml/mdoc_markdown.c
  projects/clang500-import/contrib/mdocml/roff_html.c
     - copied unchanged from r319778, head/contrib/mdocml/roff_html.c
  projects/clang500-import/contrib/mdocml/roff_term.c
     - copied unchanged from r319778, head/contrib/mdocml/roff_term.c
  projects/clang500-import/contrib/mdocml/roff_validate.c
     - copied unchanged from r319778, head/contrib/mdocml/roff_validate.c
  projects/clang500-import/contrib/mdocml/term_tab.c
     - copied unchanged from r319778, head/contrib/mdocml/term_tab.c
  projects/clang500-import/contrib/netbsd-tests/bin/cat/d_b_output.in
     - copied unchanged from r319778, head/contrib/netbsd-tests/bin/cat/d_b_output.in
  projects/clang500-import/contrib/netbsd-tests/bin/cat/d_b_output.out
     - copied unchanged from r319778, head/contrib/netbsd-tests/bin/cat/d_b_output.out
  projects/clang500-import/contrib/netbsd-tests/bin/cat/d_s_output.in
     - copied unchanged from r319778, head/contrib/netbsd-tests/bin/cat/d_s_output.in
  projects/clang500-import/contrib/netbsd-tests/bin/cat/d_s_output.out
     - copied unchanged from r319778, head/contrib/netbsd-tests/bin/cat/d_s_output.out
  projects/clang500-import/contrib/netbsd-tests/bin/cat/d_vt_output.in
     - copied unchanged from r319778, head/contrib/netbsd-tests/bin/cat/d_vt_output.in
  projects/clang500-import/contrib/netbsd-tests/bin/cat/d_vt_output.out
     - copied unchanged from r319778, head/contrib/netbsd-tests/bin/cat/d_vt_output.out
  projects/clang500-import/sys/arm/allwinner/aw_console.c
     - copied unchanged from r319778, head/sys/arm/allwinner/aw_console.c
  projects/clang500-import/sys/arm/annapurna/alpine/alpine_common.c
     - copied unchanged from r319778, head/sys/arm/annapurna/alpine/alpine_common.c
  projects/clang500-import/sys/arm/freescale/imx/imx_console.c
     - copied unchanged from r319778, head/sys/arm/freescale/imx/imx_console.c
  projects/clang500-import/sys/arm/mv/mv_pci_ctrl.c
     - copied unchanged from r319778, head/sys/arm/mv/mv_pci_ctrl.c
  projects/clang500-import/sys/arm/samsung/exynos/exynos5_mp.h
     - copied unchanged from r319778, head/sys/arm/samsung/exynos/exynos5_mp.h
  projects/clang500-import/sys/arm/xilinx/zy7_mp.h
     - copied unchanged from r319778, head/sys/arm/xilinx/zy7_mp.h
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_schedule.c
     - copied unchanged from r319778, head/sys/compat/linuxkpi/common/src/linux_schedule.c
  projects/clang500-import/sys/conf/kmod_syms_prefix.awk
     - copied unchanged from r319778, head/sys/conf/kmod_syms_prefix.awk
  projects/clang500-import/sys/contrib/dev/iwm/iwm-7265D-22.fw.uu
     - copied unchanged from r319778, head/sys/contrib/dev/iwm/iwm-7265D-22.fw.uu
  projects/clang500-import/sys/contrib/dev/iwm/iwm-8000C-22.fw.uu
     - copied unchanged from r319778, head/sys/contrib/dev/iwm/iwm-8000C-22.fw.uu
  projects/clang500-import/sys/dev/iwm/if_iwm_sf.c
     - copied unchanged from r319778, head/sys/dev/iwm/if_iwm_sf.c
  projects/clang500-import/sys/dev/iwm/if_iwm_sf.h
     - copied unchanged from r319778, head/sys/dev/iwm/if_iwm_sf.h
Deleted:
  projects/clang500-import/contrib/groff/
  projects/clang500-import/contrib/mdocml/man_hash.c
  projects/clang500-import/contrib/mdocml/manpage.c
  projects/clang500-import/contrib/mdocml/mdoc_hash.c
  projects/clang500-import/etc/mtree/BSD.groff.dist
  projects/clang500-import/gnu/usr.bin/groff/
  projects/clang500-import/lib/libc/sys/futimens.c
  projects/clang500-import/lib/libc/sys/utimensat.c
  projects/clang500-import/share/me/
  projects/clang500-import/sys/arm/allwinner/console.c
  projects/clang500-import/sys/arm/annapurna/alpine/common.c
  projects/clang500-import/sys/arm/freescale/imx/console.c
  projects/clang500-import/sys/arm/freescale/vybrid/vf_common.c
  projects/clang500-import/sys/arm/samsung/exynos/exynos5_common.c
  projects/clang500-import/sys/fs/msdosfs/msdosfs_fileno.c
  projects/clang500-import/tools/build/options/WITHOUT_GROFF
  projects/clang500-import/tools/build/options/WITH_GROFF
  projects/clang500-import/usr.bin/checknr/
  projects/clang500-import/usr.bin/colcrt/
Modified:
  projects/clang500-import/Makefile
  projects/clang500-import/Makefile.inc1
  projects/clang500-import/ObsoleteFiles.inc
  projects/clang500-import/UPDATING
  projects/clang500-import/bin/cat/tests/Makefile
  projects/clang500-import/bin/chmod/Makefile
  projects/clang500-import/bin/dd/tests/dd2_test.sh
  projects/clang500-import/bin/echo/Makefile
  projects/clang500-import/bin/ln/Makefile
  projects/clang500-import/bin/pkill/pkill.1
  projects/clang500-import/bin/sh/builtins.def
  projects/clang500-import/bin/sh/error.h
  projects/clang500-import/bin/sh/eval.c
  projects/clang500-import/bin/sh/histedit.c
  projects/clang500-import/bin/sh/mkbuiltins
  projects/clang500-import/bin/sh/tests/errors/Makefile
  projects/clang500-import/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/clang500-import/cddl/usr.sbin/dtrace/tests/common/aggs/Makefile
  projects/clang500-import/contrib/libxo/Makefile.am
  projects/clang500-import/contrib/libxo/configure.ac
  projects/clang500-import/contrib/libxo/doc/libxo-manual.html
  projects/clang500-import/contrib/libxo/doc/libxo.txt
  projects/clang500-import/contrib/libxo/encoder/cbor/enc_cbor.c
  projects/clang500-import/contrib/libxo/encoder/test/enc_test.c
  projects/clang500-import/contrib/libxo/libxo/libxo.c
  projects/clang500-import/contrib/libxo/libxo/xo.h
  projects/clang500-import/contrib/libxo/libxo/xo_buf.h
  projects/clang500-import/contrib/libxo/libxo/xo_encoder.c
  projects/clang500-import/contrib/libxo/libxo/xo_encoder.h
  projects/clang500-import/contrib/libxo/libxo/xo_syslog.c
  projects/clang500-import/contrib/libxo/tests/core/Makefile.am
  projects/clang500-import/contrib/libxo/tests/core/saved/test_01.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_02.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_03.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_04.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_05.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_06.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_07.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_08.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_09.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_10.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_11.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_11.HIPx.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.E.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.H.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.HIPx.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.HP.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.J.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.JP.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.T.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.X.out
  projects/clang500-import/contrib/libxo/tests/core/saved/test_12.XP.out
  projects/clang500-import/contrib/libxo/tests/core/test_12.c
  projects/clang500-import/contrib/libxo/tests/gettext/Makefile.am
  projects/clang500-import/contrib/libxo/tests/xo/Makefile.am
  projects/clang500-import/contrib/libxo/xo/xo.1
  projects/clang500-import/contrib/libxo/xohtml/xohtml.1
  projects/clang500-import/contrib/libxo/xopo/xopo.1
  projects/clang500-import/contrib/libxo/xopo/xopo.c
  projects/clang500-import/contrib/mdocml/LICENSE
  projects/clang500-import/contrib/mdocml/Makefile
  projects/clang500-import/contrib/mdocml/Makefile.depend
  projects/clang500-import/contrib/mdocml/NEWS
  projects/clang500-import/contrib/mdocml/TODO
  projects/clang500-import/contrib/mdocml/apropos.1
  projects/clang500-import/contrib/mdocml/catman.8
  projects/clang500-import/contrib/mdocml/cgi.c
  projects/clang500-import/contrib/mdocml/cgi.h.example
  projects/clang500-import/contrib/mdocml/chars.c
  projects/clang500-import/contrib/mdocml/configure
  projects/clang500-import/contrib/mdocml/configure.local.example
  projects/clang500-import/contrib/mdocml/eqn.c
  projects/clang500-import/contrib/mdocml/gmdiff
  projects/clang500-import/contrib/mdocml/html.c
  projects/clang500-import/contrib/mdocml/html.h
  projects/clang500-import/contrib/mdocml/libman.h
  projects/clang500-import/contrib/mdocml/libmandoc.h
  projects/clang500-import/contrib/mdocml/libmdoc.h
  projects/clang500-import/contrib/mdocml/main.c
  projects/clang500-import/contrib/mdocml/main.h
  projects/clang500-import/contrib/mdocml/makewhatis.8
  projects/clang500-import/contrib/mdocml/man.1
  projects/clang500-import/contrib/mdocml/man.7
  projects/clang500-import/contrib/mdocml/man.c
  projects/clang500-import/contrib/mdocml/man.cgi.3
  projects/clang500-import/contrib/mdocml/man.cgi.8
  projects/clang500-import/contrib/mdocml/man.h
  projects/clang500-import/contrib/mdocml/man_html.c
  projects/clang500-import/contrib/mdocml/man_macro.c
  projects/clang500-import/contrib/mdocml/man_term.c
  projects/clang500-import/contrib/mdocml/man_validate.c
  projects/clang500-import/contrib/mdocml/mandoc.1
  projects/clang500-import/contrib/mdocml/mandoc.3
  projects/clang500-import/contrib/mdocml/mandoc.c
  projects/clang500-import/contrib/mdocml/mandoc.css
  projects/clang500-import/contrib/mdocml/mandoc.h
  projects/clang500-import/contrib/mdocml/mandoc_char.7
  projects/clang500-import/contrib/mdocml/mandoc_headers.3
  projects/clang500-import/contrib/mdocml/mandoc_html.3
  projects/clang500-import/contrib/mdocml/mandocd.8
  projects/clang500-import/contrib/mdocml/mandocdb.c
  projects/clang500-import/contrib/mdocml/mansearch.3
  projects/clang500-import/contrib/mdocml/mansearch.c
  projects/clang500-import/contrib/mdocml/mansearch.h
  projects/clang500-import/contrib/mdocml/mdoc.7
  projects/clang500-import/contrib/mdocml/mdoc.c
  projects/clang500-import/contrib/mdocml/mdoc.h
  projects/clang500-import/contrib/mdocml/mdoc_argv.c
  projects/clang500-import/contrib/mdocml/mdoc_html.c
  projects/clang500-import/contrib/mdocml/mdoc_macro.c
  projects/clang500-import/contrib/mdocml/mdoc_man.c
  projects/clang500-import/contrib/mdocml/mdoc_state.c
  projects/clang500-import/contrib/mdocml/mdoc_term.c
  projects/clang500-import/contrib/mdocml/mdoc_validate.c
  projects/clang500-import/contrib/mdocml/out.c
  projects/clang500-import/contrib/mdocml/out.h
  projects/clang500-import/contrib/mdocml/read.c
  projects/clang500-import/contrib/mdocml/roff.7
  projects/clang500-import/contrib/mdocml/roff.c
  projects/clang500-import/contrib/mdocml/roff.h
  projects/clang500-import/contrib/mdocml/soelim.1
  projects/clang500-import/contrib/mdocml/tbl.7
  projects/clang500-import/contrib/mdocml/tbl.c
  projects/clang500-import/contrib/mdocml/tbl_data.c
  projects/clang500-import/contrib/mdocml/tbl_html.c
  projects/clang500-import/contrib/mdocml/tbl_layout.c
  projects/clang500-import/contrib/mdocml/tbl_term.c
  projects/clang500-import/contrib/mdocml/term.c
  projects/clang500-import/contrib/mdocml/term.h
  projects/clang500-import/contrib/mdocml/term_ascii.c
  projects/clang500-import/contrib/mdocml/term_ps.c
  projects/clang500-import/contrib/mdocml/tree.c
  projects/clang500-import/contrib/netbsd-tests/bin/cat/t_cat.sh
  projects/clang500-import/contrib/smbfs/lib/smb/subr.c
  projects/clang500-import/etc/Makefile
  projects/clang500-import/etc/mtree/BSD.tests.dist
  projects/clang500-import/etc/mtree/BSD.usr.dist
  projects/clang500-import/etc/mtree/Makefile
  projects/clang500-import/gnu/usr.bin/Makefile
  projects/clang500-import/lib/libc/sys/Makefile.inc
  projects/clang500-import/lib/libc/sys/utimensat.2
  projects/clang500-import/lib/libc/tests/stdlib/tsearch_test.c
  projects/clang500-import/lib/libmd/md5c.c
  projects/clang500-import/lib/libsysdecode/flags.c
  projects/clang500-import/lib/libxo/add.man
  projects/clang500-import/lib/libxo/xo_config.h
  projects/clang500-import/libexec/atf/atf-sh/Makefile
  projects/clang500-import/release/Makefile
  projects/clang500-import/release/Makefile.vm
  projects/clang500-import/release/arm/CUBIEBOARD2.conf
  projects/clang500-import/sbin/mount_msdosfs/mount_msdosfs.8
  projects/clang500-import/share/Makefile
  projects/clang500-import/share/man/man4/Makefile
  projects/clang500-import/share/man/man5/src.conf.5
  projects/clang500-import/share/man/man7/hier.7
  projects/clang500-import/share/man/man9/Makefile
  projects/clang500-import/share/man/man9/tcp_functions.9
  projects/clang500-import/share/misc/committers-ports.dot
  projects/clang500-import/share/mk/src.opts.mk
  projects/clang500-import/share/mk/sys.mk
  projects/clang500-import/sys/arm/allwinner/files.allwinner
  projects/clang500-import/sys/arm/annapurna/alpine/files.alpine
  projects/clang500-import/sys/arm/conf/EXYNOS5.common
  projects/clang500-import/sys/arm/conf/VYBRID
  projects/clang500-import/sys/arm/conf/ZEDBOARD
  projects/clang500-import/sys/arm/freescale/imx/files.imx5
  projects/clang500-import/sys/arm/freescale/imx/files.imx6
  projects/clang500-import/sys/arm/freescale/vybrid/files.vybrid
  projects/clang500-import/sys/arm/freescale/vybrid/vf_machdep.c
  projects/clang500-import/sys/arm/mv/armada38x/rtc.c
  projects/clang500-import/sys/arm/mv/files.mv
  projects/clang500-import/sys/arm/mv/mv_common.c
  projects/clang500-import/sys/arm/mv/mv_pci.c
  projects/clang500-import/sys/arm/samsung/exynos/exynos5_machdep.c
  projects/clang500-import/sys/arm/samsung/exynos/exynos5_mp.c
  projects/clang500-import/sys/arm/samsung/exynos/files.exynos5
  projects/clang500-import/sys/arm/xilinx/zy7_machdep.c
  projects/clang500-import/sys/arm/xilinx/zy7_mp.c
  projects/clang500-import/sys/arm64/arm64/genassym.c
  projects/clang500-import/sys/arm64/arm64/swtch.S
  projects/clang500-import/sys/arm64/include/pcb.h
  projects/clang500-import/sys/arm64/include/vfp.h
  projects/clang500-import/sys/boot/fdt/dts/arm/armada-380.dtsi
  projects/clang500-import/sys/boot/fdt/dts/arm/armada-385.dtsi
  projects/clang500-import/sys/boot/fdt/dts/arm/armada-388-gp.dts
  projects/clang500-import/sys/boot/fdt/dts/arm/armada-38x.dtsi
  projects/clang500-import/sys/cam/ctl/ctl_ha.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/clang500-import/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
  projects/clang500-import/sys/compat/freebsd32/freebsd32_misc.c
  projects/clang500-import/sys/compat/linux/linux_misc.c
  projects/clang500-import/sys/compat/linuxkpi/common/include/asm/atomic.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/asm/atomic64.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/io.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/pci.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/sched.h
  projects/clang500-import/sys/compat/linuxkpi/common/include/linux/wait.h
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_idr.c
  projects/clang500-import/sys/compat/linuxkpi/common/src/linux_kthread.c
  projects/clang500-import/sys/conf/NOTES
  projects/clang500-import/sys/conf/config.mk
  projects/clang500-import/sys/conf/files
  projects/clang500-import/sys/conf/kmod.mk
  projects/clang500-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
  projects/clang500-import/sys/dev/cxgbe/crypto/t4_crypto.c
  projects/clang500-import/sys/dev/etherswitch/e6000sw/e6000sw.c
  projects/clang500-import/sys/dev/hyperv/pcib/vmbus_pcib.c
  projects/clang500-import/sys/dev/iscsi/icl_soft_proxy.c
  projects/clang500-import/sys/dev/iwm/if_iwm.c
  projects/clang500-import/sys/dev/iwm/if_iwm_binding.c
  projects/clang500-import/sys/dev/iwm/if_iwm_debug.h
  projects/clang500-import/sys/dev/iwm/if_iwm_phy_db.c
  projects/clang500-import/sys/dev/iwm/if_iwmreg.h
  projects/clang500-import/sys/dev/iwm/if_iwmvar.h
  projects/clang500-import/sys/dev/rtwn/rtl8188e/r88e_rom_defs.h
  projects/clang500-import/sys/dev/vt/vt_core.c
  projects/clang500-import/sys/fs/ext2fs/ext2_acl.c
  projects/clang500-import/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/clang500-import/sys/fs/msdosfs/msdosfs_vnops.c
  projects/clang500-import/sys/fs/msdosfs/msdosfsmount.h
  projects/clang500-import/sys/kern/kern_descrip.c
  projects/clang500-import/sys/kern/kern_jail.c
  projects/clang500-import/sys/kern/subr_blist.c
  projects/clang500-import/sys/kern/subr_param.c
  projects/clang500-import/sys/kern/sys_socket.c
  projects/clang500-import/sys/kern/uipc_accf.c
  projects/clang500-import/sys/kern/uipc_debug.c
  projects/clang500-import/sys/kern/uipc_sockbuf.c
  projects/clang500-import/sys/kern/uipc_socket.c
  projects/clang500-import/sys/kern/uipc_syscalls.c
  projects/clang500-import/sys/kern/uipc_usrreq.c
  projects/clang500-import/sys/kern/vfs_syscalls.c
  projects/clang500-import/sys/libkern/arm64/crc32c_armv8.S
  projects/clang500-import/sys/mips/mips/stack_machdep.c
  projects/clang500-import/sys/mips/mips/tlb.c
  projects/clang500-import/sys/modules/iwm/Makefile
  projects/clang500-import/sys/modules/iwmfw/iwm7265Dfw/Makefile
  projects/clang500-import/sys/modules/iwmfw/iwm8000Cfw/Makefile
  projects/clang500-import/sys/modules/linux/Makefile
  projects/clang500-import/sys/modules/linux64/Makefile
  projects/clang500-import/sys/modules/linuxkpi/Makefile
  projects/clang500-import/sys/modules/msdosfs/Makefile
  projects/clang500-import/sys/modules/rtwn/Makefile
  projects/clang500-import/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  projects/clang500-import/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  projects/clang500-import/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
  projects/clang500-import/sys/netgraph/ng_ksocket.c
  projects/clang500-import/sys/netinet/sctp_input.c
  projects/clang500-import/sys/netinet/sctp_pcb.c
  projects/clang500-import/sys/netinet/sctp_syscalls.c
  projects/clang500-import/sys/netinet/sctp_sysctl.c
  projects/clang500-import/sys/netinet/sctp_usrreq.c
  projects/clang500-import/sys/netinet/sctputil.c
  projects/clang500-import/sys/netinet/tcp_subr.c
  projects/clang500-import/sys/netinet/tcp_syncache.c
  projects/clang500-import/sys/netinet/tcp_syncache.h
  projects/clang500-import/sys/netinet/tcp_timewait.c
  projects/clang500-import/sys/netinet/tcp_var.h
  projects/clang500-import/sys/ofed/drivers/infiniband/core/iwcm.c
  projects/clang500-import/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
  projects/clang500-import/sys/rpc/svc_vc.c
  projects/clang500-import/sys/sys/blist.h
  projects/clang500-import/sys/sys/jail.h
  projects/clang500-import/sys/sys/module.h
  projects/clang500-import/sys/sys/param.h
  projects/clang500-import/sys/sys/sockbuf.h
  projects/clang500-import/sys/sys/socket.h
  projects/clang500-import/sys/sys/socketvar.h
  projects/clang500-import/sys/sys/systm.h
  projects/clang500-import/sys/sys/vnode.h
  projects/clang500-import/sys/vm/swap_pager.c
  projects/clang500-import/sys/vm/uma_core.c
  projects/clang500-import/sys/vm/vm_page.c
  projects/clang500-import/sys/vm/vm_pageout.c
  projects/clang500-import/sys/x86/x86/identcpu.c
  projects/clang500-import/tests/sys/aio/aio_test.c
  projects/clang500-import/tests/sys/opencrypto/cryptotest.py
  projects/clang500-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang500-import/tools/build/options/makeman
  projects/clang500-import/tools/regression/sockets/accf_data_attach/accf_data_attach.c
  projects/clang500-import/tools/tools/sysdoc/tunables.mdoc
  projects/clang500-import/usr.bin/Makefile
  projects/clang500-import/usr.bin/calendar/calendars/calendar.freebsd
  projects/clang500-import/usr.bin/factor/factor.6
  projects/clang500-import/usr.bin/kdump/kdump.c
  projects/clang500-import/usr.bin/mandoc/Makefile
  projects/clang500-import/usr.bin/netstat/inet.c
  projects/clang500-import/usr.bin/patch/pch.c
  projects/clang500-import/usr.bin/primes/primes.c
  projects/clang500-import/usr.bin/primes/primes.h
  projects/clang500-import/usr.bin/primes/spsp.c
  projects/clang500-import/usr.bin/truss/syscall.h
  projects/clang500-import/usr.bin/truss/syscalls.c
  projects/clang500-import/usr.bin/tset/map.c
  projects/clang500-import/usr.sbin/bhyve/rfb.c   (contents, props changed)
  projects/clang500-import/usr.sbin/bluetooth/hccontrol/hccontrol.c
  projects/clang500-import/usr.sbin/jail/jail.8
  projects/clang500-import/usr.sbin/newsyslog/tests/legacy_test.sh
  projects/clang500-import/usr.sbin/ppp/iface.c
  projects/clang500-import/usr.sbin/sesutil/sesutil.c
Directory Properties:
  projects/clang500-import/   (props changed)
  projects/clang500-import/cddl/   (props changed)
  projects/clang500-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang500-import/contrib/libxo/   (props changed)
  projects/clang500-import/contrib/mdocml/   (props changed)
  projects/clang500-import/contrib/netbsd-tests/   (props changed)
  projects/clang500-import/sys/cddl/contrib/opensolaris/   (props changed)

Modified: projects/clang500-import/Makefile
==============================================================================

--- projects/clang500-import/Makefile	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/Makefile	Sat Jun 10 13:22:49 2017	(r319779)
@@ -127,7 +127,7 @@ TGTS=	all all-man buildenv buildenvvars buildkernel bu
 	installworld kernel-toolchain libraries lint maninstall \
 	obj objlink rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
-	_build-tools _compiler-metadata _cross-tools _includes _libraries \
+	_build-tools _build-metadata _cross-tools _includes _libraries \
 	build32 distribute32 install32 buildsoft distributesoft installsoft \
 	builddtb xdev xdev-build xdev-install \
 	xdev-links native-xtools stageworld stagekernel stage-packages \

Modified: projects/clang500-import/Makefile.inc1
==============================================================================
--- projects/clang500-import/Makefile.inc1	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/Makefile.inc1	Sat Jun 10 13:22:49 2017	(r319779)
@@ -643,6 +643,51 @@ LIBCOMPAT= SOFT
 .include "Makefile.libcompat"
 .endif
 
+# META_MODE normally ignores host file changes since every build updates
+# timestamps (see NO_META_IGNORE_HOST in sys.mk).  There are known times
+# when the ABI breaks though that we want to force rebuilding WORLDTMP
+# to get updated host tools.
+.if ${MK_META_MODE} == "yes" && defined(NO_CLEAN) && \
+    !defined(NO_META_IGNORE_HOST) && !defined(NO_META_IGNORE_HOST_HEADERS)
+# r318736 - ino64 major ABI breakage
+META_MODE_BAD_ABI_VERS+=	1200031
+
+.if !defined(OBJDIR_HOST_OSRELDATE)
+.if exists(${OBJTREE}${.CURDIR}/host-osreldate.h)
+OBJDIR_HOST_OSRELDATE!=	\
+    awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+    ${OBJTREE}${.CURDIR}/host-osreldate.h
+.else
+OBJDIR_HOST_OSRELDATE=	0
+.endif
+.export OBJDIR_HOST_OSRELDATE
+.endif
+
+# Note that this logic is the opposite of normal BOOTSTRAP handling.  We want
+# to compare the WORLDTMP's OSRELDATE to the host's OSRELDATE.  If the WORLDTMP
+# is older than the ABI-breakage OSRELDATE of the HOST then we rebuild.
+.for _ver in ${META_MODE_BAD_ABI_VERS}
+.if ${OSRELDATE} >= ${_ver} && ${OBJDIR_HOST_OSRELDATE} < ${_ver}
+_meta_mode_need_rebuild=	${_ver}
+.endif
+.endfor
+.if defined(_meta_mode_need_rebuild)
+.info META_MODE: Rebuilding host tools due to ABI breakage in __FreeBSD_version ${_meta_mode_need_rebuild}.
+NO_META_IGNORE_HOST_HEADERS=	1
+.export NO_META_IGNORE_HOST_HEADERS
+.endif
+.endif
+# This is only used for META_MODE+filemon to track what the oldest
+# __FreeBSD_version is in WORLDTMP.  This purposely does NOT have
+# a make dependency on /usr/include/osreldate.h as the file should
+# only be copied when it is missing or meta mode determines it has changed.
+# Since host files are normally ignored without NO_META_IGNORE_HOST
+# the file will never be updated unless that flag is specified.  This
+# allows tracking the oldest osreldate to force rebuilds via
+# META_MODE_BADABI_REVS above.
+host-osreldate.h: # DO NOT ADD /usr/include/osreldate.h here
+	@cp -f /usr/include/osreldate.h ${.TARGET}
+
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 IMAKEENV=	${CROSSENV}
@@ -820,12 +865,13 @@ _cross-tools:
 	@rm -f ${.OBJDIR}/compiler-metadata.mk
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
 	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
-_compiler-metadata:
+_build-metadata:
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 3.1: recording compiler metadata"
+	@echo ">>> stage 3.1: recording build metadata"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} compiler-metadata.mk
+	${_+_}cd ${.CURDIR}; ${WMAKE} host-osreldate.h
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -864,7 +910,7 @@ WMAKE_TGTS+=	_cleanobj
 WMAKE_TGTS+=	_obj
 .endif
 WMAKE_TGTS+=	_build-tools _cross-tools
-WMAKE_TGTS+=	_compiler-metadata
+WMAKE_TGTS+=	_build-metadata
 WMAKE_TGTS+=	_includes
 .endif
 .if !defined(NO_LIBS)
@@ -1964,7 +2010,7 @@ NXBMAKE=	${NXBENV} ${MAKE} \
 		MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
 		MK_GDB=no MK_TESTS=no \
 		SSP_CFLAGS= \
-		MK_HTML=no NO_LINT=yes MK_MAN=no \
+		MK_HTML=no NO_LINT=yes MK_MAN=no MK_MAN_UTILS=yes \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
@@ -2038,6 +2084,8 @@ native-xtools: .PHONY
     usr.bin/lex \
     usr.bin/limits \
     usr.bin/lorder \
+    ${_libopenbsd} \
+    ${_makewhatis} \
     usr.bin/mktemp \
     usr.bin/mt \
     usr.bin/patch \
@@ -2528,8 +2576,8 @@ check-old: check-old-files check-old-libs check-old-di
 # showconfig - show build configuration.
 #
 showconfig: .PHONY
-	@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \
-	  ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u
+	@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes; \
+	  ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes) 2>&1 | grep ^MK_ | sort -u
 
 .if !empty(KRNLOBJDIR) && !empty(KERNCONF)
 DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/

Modified: projects/clang500-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang500-import/ObsoleteFiles.inc	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/ObsoleteFiles.inc	Sat Jun 10 13:22:49 2017	(r319779)
@@ -150,6 +150,492 @@ OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt
 OLD_DIRS+=usr/lib/clang/4.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/4.0.0/lib
 OLD_DIRS+=usr/lib/clang/4.0.0
+# 20170609: drop obsolete manpage link (if_rtwn.ko -> rtwn.ko)
+OLD_FILES+=usr/share/man/man4/if_rtwn.4.gz
+# 20170531: removal of groff
+OLD_FILES+=usr/bin/addftinfo
+OLD_FILES+=usr/bin/afmtodit
+OLD_FILES+=usr/bin/checknr
+OLD_FILES+=usr/bin/colcrt
+OLD_FILES+=usr/bin/eqn
+OLD_FILES+=usr/bin/grn
+OLD_FILES+=usr/bin/grodvi
+OLD_FILES+=usr/bin/groff
+OLD_FILES+=usr/bin/grog
+OLD_FILES+=usr/bin/grolbp
+OLD_FILES+=usr/bin/grolj4
+OLD_FILES+=usr/bin/grops
+OLD_FILES+=usr/bin/grotty
+OLD_FILES+=usr/bin/hpftodit
+OLD_FILES+=usr/bin/indxbib
+OLD_FILES+=usr/bin/lkbib
+OLD_FILES+=usr/bin/lookbib
+OLD_FILES+=usr/bin/mmroff
+OLD_FILES+=usr/bin/neqn
+OLD_FILES+=usr/bin/nroff
+OLD_FILES+=usr/bin/pfbtops
+OLD_FILES+=usr/bin/pic
+OLD_FILES+=usr/bin/post-grohtml
+OLD_FILES+=usr/bin/pre-grohtml
+OLD_FILES+=usr/bin/psroff
+OLD_FILES+=usr/bin/refer
+OLD_FILES+=usr/bin/tbl
+OLD_FILES+=usr/bin/tfmtodit
+OLD_FILES+=usr/bin/troff
+OLD_FILES+=usr/bin/vgrind
+OLD_FILES+=usr/libexec/vfontedpr
+OLD_FILES+=usr/share/dict/eign
+OLD_FILES+=usr/share/groff_font/devX100-12/CB
+OLD_FILES+=usr/share/groff_font/devX100-12/CBI
+OLD_FILES+=usr/share/groff_font/devX100-12/CI
+OLD_FILES+=usr/share/groff_font/devX100-12/CR
+OLD_FILES+=usr/share/groff_font/devX100-12/DESC
+OLD_FILES+=usr/share/groff_font/devX100-12/HB
+OLD_FILES+=usr/share/groff_font/devX100-12/HBI
+OLD_FILES+=usr/share/groff_font/devX100-12/HI
+OLD_FILES+=usr/share/groff_font/devX100-12/HR
+OLD_FILES+=usr/share/groff_font/devX100-12/NB
+OLD_FILES+=usr/share/groff_font/devX100-12/NBI
+OLD_FILES+=usr/share/groff_font/devX100-12/NI
+OLD_FILES+=usr/share/groff_font/devX100-12/NR
+OLD_FILES+=usr/share/groff_font/devX100-12/S
+OLD_FILES+=usr/share/groff_font/devX100-12/TB
+OLD_FILES+=usr/share/groff_font/devX100-12/TBI
+OLD_FILES+=usr/share/groff_font/devX100-12/TI
+OLD_FILES+=usr/share/groff_font/devX100-12/TR
+OLD_DIRS+=usr/share/groff_font/devX100-12
+OLD_FILES+=usr/share/groff_font/devX100/CB
+OLD_FILES+=usr/share/groff_font/devX100/CBI
+OLD_FILES+=usr/share/groff_font/devX100/CI
+OLD_FILES+=usr/share/groff_font/devX100/CR
+OLD_FILES+=usr/share/groff_font/devX100/DESC
+OLD_FILES+=usr/share/groff_font/devX100/HB
+OLD_FILES+=usr/share/groff_font/devX100/HBI
+OLD_FILES+=usr/share/groff_font/devX100/HI
+OLD_FILES+=usr/share/groff_font/devX100/HR
+OLD_FILES+=usr/share/groff_font/devX100/NB
+OLD_FILES+=usr/share/groff_font/devX100/NBI
+OLD_FILES+=usr/share/groff_font/devX100/NI
+OLD_FILES+=usr/share/groff_font/devX100/NR
+OLD_FILES+=usr/share/groff_font/devX100/S
+OLD_FILES+=usr/share/groff_font/devX100/TB
+OLD_FILES+=usr/share/groff_font/devX100/TBI
+OLD_FILES+=usr/share/groff_font/devX100/TI
+OLD_FILES+=usr/share/groff_font/devX100/TR
+OLD_DIRS+=usr/share/groff_font/devX100
+OLD_FILES+=usr/share/groff_font/devX75-12/CB
+OLD_FILES+=usr/share/groff_font/devX75-12/CBI
+OLD_FILES+=usr/share/groff_font/devX75-12/CI
+OLD_FILES+=usr/share/groff_font/devX75-12/CR
+OLD_FILES+=usr/share/groff_font/devX75-12/DESC
+OLD_FILES+=usr/share/groff_font/devX75-12/HB
+OLD_FILES+=usr/share/groff_font/devX75-12/HBI
+OLD_FILES+=usr/share/groff_font/devX75-12/HI
+OLD_FILES+=usr/share/groff_font/devX75-12/HR
+OLD_FILES+=usr/share/groff_font/devX75-12/NB
+OLD_FILES+=usr/share/groff_font/devX75-12/NBI
+OLD_FILES+=usr/share/groff_font/devX75-12/NI
+OLD_FILES+=usr/share/groff_font/devX75-12/NR
+OLD_FILES+=usr/share/groff_font/devX75-12/S
+OLD_FILES+=usr/share/groff_font/devX75-12/TB
+OLD_FILES+=usr/share/groff_font/devX75-12/TBI
+OLD_FILES+=usr/share/groff_font/devX75-12/TI
+OLD_FILES+=usr/share/groff_font/devX75-12/TR
+OLD_DIRS+=usr/share/groff_font/devX75-12
+OLD_FILES+=usr/share/groff_font/devX75/CB
+OLD_FILES+=usr/share/groff_font/devX75/CBI
+OLD_FILES+=usr/share/groff_font/devX75/CI
+OLD_FILES+=usr/share/groff_font/devX75/CR
+OLD_FILES+=usr/share/groff_font/devX75/DESC
+OLD_FILES+=usr/share/groff_font/devX75/HB
+OLD_FILES+=usr/share/groff_font/devX75/HBI
+OLD_FILES+=usr/share/groff_font/devX75/HI
+OLD_FILES+=usr/share/groff_font/devX75/HR
+OLD_FILES+=usr/share/groff_font/devX75/NB
+OLD_FILES+=usr/share/groff_font/devX75/NBI
+OLD_FILES+=usr/share/groff_font/devX75/NI
+OLD_FILES+=usr/share/groff_font/devX75/NR
+OLD_FILES+=usr/share/groff_font/devX75/S
+OLD_FILES+=usr/share/groff_font/devX75/TB
+OLD_FILES+=usr/share/groff_font/devX75/TBI
+OLD_FILES+=usr/share/groff_font/devX75/TI
+OLD_FILES+=usr/share/groff_font/devX75/TR
+OLD_DIRS+=usr/share/groff_font/devX75
+OLD_FILES+=usr/share/groff_font/devascii/B
+OLD_FILES+=usr/share/groff_font/devascii/BI
+OLD_FILES+=usr/share/groff_font/devascii/CW
+OLD_FILES+=usr/share/groff_font/devascii/DESC
+OLD_FILES+=usr/share/groff_font/devascii/I
+OLD_FILES+=usr/share/groff_font/devascii/L
+OLD_FILES+=usr/share/groff_font/devascii/R
+OLD_FILES+=usr/share/groff_font/devascii/S
+OLD_DIRS+=usr/share/groff_font/devascii
+OLD_FILES+=usr/share/groff_font/devcp1047/B
+OLD_FILES+=usr/share/groff_font/devcp1047/BI
+OLD_FILES+=usr/share/groff_font/devcp1047/CW
+OLD_FILES+=usr/share/groff_font/devcp1047/DESC
+OLD_FILES+=usr/share/groff_font/devcp1047/I
+OLD_FILES+=usr/share/groff_font/devcp1047/L
+OLD_FILES+=usr/share/groff_font/devcp1047/R
+OLD_FILES+=usr/share/groff_font/devcp1047/S
+OLD_DIRS+=usr/share/groff_font/devcp1047
+OLD_FILES+=usr/share/groff_font/devdvi/CW
+OLD_FILES+=usr/share/groff_font/devdvi/CWEC
+OLD_FILES+=usr/share/groff_font/devdvi/CWI
+OLD_FILES+=usr/share/groff_font/devdvi/CWIEC
+OLD_FILES+=usr/share/groff_font/devdvi/CWITC
+OLD_FILES+=usr/share/groff_font/devdvi/CWTC
+OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts
+OLD_FILES+=usr/share/groff_font/devdvi/DESC
+OLD_FILES+=usr/share/groff_font/devdvi/EX
+OLD_FILES+=usr/share/groff_font/devdvi/HB
+OLD_FILES+=usr/share/groff_font/devdvi/HBEC
+OLD_FILES+=usr/share/groff_font/devdvi/HBI
+OLD_FILES+=usr/share/groff_font/devdvi/HBIEC
+OLD_FILES+=usr/share/groff_font/devdvi/HBITC
+OLD_FILES+=usr/share/groff_font/devdvi/HBTC
+OLD_FILES+=usr/share/groff_font/devdvi/HI
+OLD_FILES+=usr/share/groff_font/devdvi/HIEC
+OLD_FILES+=usr/share/groff_font/devdvi/HITC
+OLD_FILES+=usr/share/groff_font/devdvi/HR
+OLD_FILES+=usr/share/groff_font/devdvi/HREC
+OLD_FILES+=usr/share/groff_font/devdvi/HRTC
+OLD_FILES+=usr/share/groff_font/devdvi/MI
+OLD_FILES+=usr/share/groff_font/devdvi/Makefile
+OLD_FILES+=usr/share/groff_font/devdvi/S
+OLD_FILES+=usr/share/groff_font/devdvi/SA
+OLD_FILES+=usr/share/groff_font/devdvi/SB
+OLD_FILES+=usr/share/groff_font/devdvi/SC
+OLD_FILES+=usr/share/groff_font/devdvi/TB
+OLD_FILES+=usr/share/groff_font/devdvi/TBEC
+OLD_FILES+=usr/share/groff_font/devdvi/TBI
+OLD_FILES+=usr/share/groff_font/devdvi/TBIEC
+OLD_FILES+=usr/share/groff_font/devdvi/TBITC
+OLD_FILES+=usr/share/groff_font/devdvi/TBTC
+OLD_FILES+=usr/share/groff_font/devdvi/TI
+OLD_FILES+=usr/share/groff_font/devdvi/TIEC
+OLD_FILES+=usr/share/groff_font/devdvi/TITC
+OLD_FILES+=usr/share/groff_font/devdvi/TR
+OLD_FILES+=usr/share/groff_font/devdvi/TREC
+OLD_FILES+=usr/share/groff_font/devdvi/TRTC
+OLD_FILES+=usr/share/groff_font/devdvi/ec.map
+OLD_FILES+=usr/share/groff_font/devdvi/msam.map
+OLD_FILES+=usr/share/groff_font/devdvi/msbm.map
+OLD_FILES+=usr/share/groff_font/devdvi/tc.map
+OLD_FILES+=usr/share/groff_font/devdvi/texb.map
+OLD_FILES+=usr/share/groff_font/devdvi/texex.map
+OLD_FILES+=usr/share/groff_font/devdvi/texi.map
+OLD_FILES+=usr/share/groff_font/devdvi/texmi.map
+OLD_FILES+=usr/share/groff_font/devdvi/texr.map
+OLD_FILES+=usr/share/groff_font/devdvi/texsy.map
+OLD_FILES+=usr/share/groff_font/devdvi/textex.map
+OLD_FILES+=usr/share/groff_font/devdvi/textt.map
+OLD_DIRS+=usr/share/groff_font/devdvi
+OLD_FILES+=usr/share/groff_font/devhtml/B
+OLD_FILES+=usr/share/groff_font/devhtml/BI
+OLD_FILES+=usr/share/groff_font/devhtml/CB
+OLD_FILES+=usr/share/groff_font/devhtml/CBI
+OLD_FILES+=usr/share/groff_font/devhtml/CI
+OLD_FILES+=usr/share/groff_font/devhtml/CR
+OLD_FILES+=usr/share/groff_font/devhtml/DESC
+OLD_FILES+=usr/share/groff_font/devhtml/I
+OLD_FILES+=usr/share/groff_font/devhtml/R
+OLD_FILES+=usr/share/groff_font/devhtml/S
+OLD_DIRS+=usr/share/groff_font/devhtml
+OLD_FILES+=usr/share/groff_font/devkoi8-r/B
+OLD_FILES+=usr/share/groff_font/devkoi8-r/BI
+OLD_FILES+=usr/share/groff_font/devkoi8-r/CW
+OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC
+OLD_FILES+=usr/share/groff_font/devkoi8-r/I
+OLD_FILES+=usr/share/groff_font/devkoi8-r/L
+OLD_FILES+=usr/share/groff_font/devkoi8-r/R
+OLD_FILES+=usr/share/groff_font/devkoi8-r/S
+OLD_DIRS+=usr/share/groff_font/devkoi8-r
+OLD_FILES+=usr/share/groff_font/devlatin1/B
+OLD_FILES+=usr/share/groff_font/devlatin1/BI
+OLD_FILES+=usr/share/groff_font/devlatin1/CW
+OLD_FILES+=usr/share/groff_font/devlatin1/DESC
+OLD_FILES+=usr/share/groff_font/devlatin1/I
+OLD_FILES+=usr/share/groff_font/devlatin1/L
+OLD_FILES+=usr/share/groff_font/devlatin1/R
+OLD_FILES+=usr/share/groff_font/devlatin1/S
+OLD_DIRS+=usr/share/groff_font/devlatin1
+OLD_FILES+=usr/share/groff_font/devlbp/CB
+OLD_FILES+=usr/share/groff_font/devlbp/CI
+OLD_FILES+=usr/share/groff_font/devlbp/CR
+OLD_FILES+=usr/share/groff_font/devlbp/DESC
+OLD_FILES+=usr/share/groff_font/devlbp/EB
+OLD_FILES+=usr/share/groff_font/devlbp/EI
+OLD_FILES+=usr/share/groff_font/devlbp/ER
+OLD_FILES+=usr/share/groff_font/devlbp/HB
+OLD_FILES+=usr/share/groff_font/devlbp/HBI
+OLD_FILES+=usr/share/groff_font/devlbp/HI
+OLD_FILES+=usr/share/groff_font/devlbp/HNB
+OLD_FILES+=usr/share/groff_font/devlbp/HNBI
+OLD_FILES+=usr/share/groff_font/devlbp/HNI
+OLD_FILES+=usr/share/groff_font/devlbp/HNR
+OLD_FILES+=usr/share/groff_font/devlbp/HR
+OLD_FILES+=usr/share/groff_font/devlbp/TB
+OLD_FILES+=usr/share/groff_font/devlbp/TBI
+OLD_FILES+=usr/share/groff_font/devlbp/TI
+OLD_FILES+=usr/share/groff_font/devlbp/TR
+OLD_DIRS+=usr/share/groff_font/devlbp
+OLD_FILES+=usr/share/groff_font/devlj4/AB
+OLD_FILES+=usr/share/groff_font/devlj4/ABI
+OLD_FILES+=usr/share/groff_font/devlj4/AI
+OLD_FILES+=usr/share/groff_font/devlj4/ALBB
+OLD_FILES+=usr/share/groff_font/devlj4/ALBR
+OLD_FILES+=usr/share/groff_font/devlj4/AOB
+OLD_FILES+=usr/share/groff_font/devlj4/AOI
+OLD_FILES+=usr/share/groff_font/devlj4/AOR
+OLD_FILES+=usr/share/groff_font/devlj4/AR
+OLD_FILES+=usr/share/groff_font/devlj4/CB
+OLD_FILES+=usr/share/groff_font/devlj4/CBI
+OLD_FILES+=usr/share/groff_font/devlj4/CI
+OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON
+OLD_FILES+=usr/share/groff_font/devlj4/CORONET
+OLD_FILES+=usr/share/groff_font/devlj4/CR
+OLD_FILES+=usr/share/groff_font/devlj4/DESC
+OLD_FILES+=usr/share/groff_font/devlj4/GB
+OLD_FILES+=usr/share/groff_font/devlj4/GBI
+OLD_FILES+=usr/share/groff_font/devlj4/GI
+OLD_FILES+=usr/share/groff_font/devlj4/GR
+OLD_FILES+=usr/share/groff_font/devlj4/LGB
+OLD_FILES+=usr/share/groff_font/devlj4/LGI
+OLD_FILES+=usr/share/groff_font/devlj4/LGR
+OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD
+OLD_FILES+=usr/share/groff_font/devlj4/OB
+OLD_FILES+=usr/share/groff_font/devlj4/OBI
+OLD_FILES+=usr/share/groff_font/devlj4/OI
+OLD_FILES+=usr/share/groff_font/devlj4/OR
+OLD_FILES+=usr/share/groff_font/devlj4/S
+OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL
+OLD_FILES+=usr/share/groff_font/devlj4/TB
+OLD_FILES+=usr/share/groff_font/devlj4/TBI
+OLD_FILES+=usr/share/groff_font/devlj4/TI
+OLD_FILES+=usr/share/groff_font/devlj4/TNRB
+OLD_FILES+=usr/share/groff_font/devlj4/TNRBI
+OLD_FILES+=usr/share/groff_font/devlj4/TNRI
+OLD_FILES+=usr/share/groff_font/devlj4/TNRR
+OLD_FILES+=usr/share/groff_font/devlj4/TR
+OLD_FILES+=usr/share/groff_font/devlj4/UB
+OLD_FILES+=usr/share/groff_font/devlj4/UBI
+OLD_FILES+=usr/share/groff_font/devlj4/UCB
+OLD_FILES+=usr/share/groff_font/devlj4/UCBI
+OLD_FILES+=usr/share/groff_font/devlj4/UCI
+OLD_FILES+=usr/share/groff_font/devlj4/UCR
+OLD_FILES+=usr/share/groff_font/devlj4/UI
+OLD_FILES+=usr/share/groff_font/devlj4/UR
+OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS
+OLD_DIRS+=usr/share/groff_font/devlj4
+OLD_FILES+=usr/share/groff_font/devps/AB
+OLD_FILES+=usr/share/groff_font/devps/ABI
+OLD_FILES+=usr/share/groff_font/devps/AI
+OLD_FILES+=usr/share/groff_font/devps/AR
+OLD_FILES+=usr/share/groff_font/devps/BMB
+OLD_FILES+=usr/share/groff_font/devps/BMBI
+OLD_FILES+=usr/share/groff_font/devps/BMI
+OLD_FILES+=usr/share/groff_font/devps/BMR
+OLD_FILES+=usr/share/groff_font/devps/CB
+OLD_FILES+=usr/share/groff_font/devps/CBI
+OLD_FILES+=usr/share/groff_font/devps/CI
+OLD_FILES+=usr/share/groff_font/devps/CR
+OLD_FILES+=usr/share/groff_font/devps/DESC
+OLD_FILES+=usr/share/groff_font/devps/EURO
+OLD_FILES+=usr/share/groff_font/devps/HB
+OLD_FILES+=usr/share/groff_font/devps/HBI
+OLD_FILES+=usr/share/groff_font/devps/HI
+OLD_FILES+=usr/share/groff_font/devps/HNB
+OLD_FILES+=usr/share/groff_font/devps/HNBI
+OLD_FILES+=usr/share/groff_font/devps/HNI
+OLD_FILES+=usr/share/groff_font/devps/HNR
+OLD_FILES+=usr/share/groff_font/devps/HR
+OLD_FILES+=usr/share/groff_font/devps/Makefile
+OLD_FILES+=usr/share/groff_font/devps/NB
+OLD_FILES+=usr/share/groff_font/devps/NBI
+OLD_FILES+=usr/share/groff_font/devps/NI
+OLD_FILES+=usr/share/groff_font/devps/NR
+OLD_FILES+=usr/share/groff_font/devps/PB
+OLD_FILES+=usr/share/groff_font/devps/PBI
+OLD_FILES+=usr/share/groff_font/devps/PI
+OLD_FILES+=usr/share/groff_font/devps/PR
+OLD_FILES+=usr/share/groff_font/devps/S
+OLD_FILES+=usr/share/groff_font/devps/SS
+OLD_FILES+=usr/share/groff_font/devps/TB
+OLD_FILES+=usr/share/groff_font/devps/TBI
+OLD_FILES+=usr/share/groff_font/devps/TI
+OLD_FILES+=usr/share/groff_font/devps/TR
+OLD_FILES+=usr/share/groff_font/devps/ZCMI
+OLD_FILES+=usr/share/groff_font/devps/ZD
+OLD_FILES+=usr/share/groff_font/devps/ZDR
+OLD_FILES+=usr/share/groff_font/devps/afmname
+OLD_FILES+=usr/share/groff_font/devps/dingbats.map
+OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap
+OLD_FILES+=usr/share/groff_font/devps/download
+OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa
+OLD_FILES+=usr/share/groff_font/devps/lgreekmap
+OLD_FILES+=usr/share/groff_font/devps/prologue
+OLD_FILES+=usr/share/groff_font/devps/symbol.sed
+OLD_FILES+=usr/share/groff_font/devps/symbolchars
+OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm
+OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa
+OLD_FILES+=usr/share/groff_font/devps/text.enc
+OLD_FILES+=usr/share/groff_font/devps/textmap
+OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa
+OLD_DIRS+=usr/share/groff_font/devps
+OLD_FILES+=usr/share/groff_font/devutf8/B
+OLD_FILES+=usr/share/groff_font/devutf8/BI
+OLD_FILES+=usr/share/groff_font/devutf8/CW
+OLD_FILES+=usr/share/groff_font/devutf8/DESC
+OLD_FILES+=usr/share/groff_font/devutf8/I
+OLD_FILES+=usr/share/groff_font/devutf8/L
+OLD_FILES+=usr/share/groff_font/devutf8/R
+OLD_FILES+=usr/share/groff_font/devutf8/S
+OLD_DIRS+=usr/share/groff_font/devutf8
+OLD_DIRS+=usr/share/groff_font
+OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
+OLD_FILES+=usr/share/man/man1/afmtodit.1.gz
+OLD_FILES+=usr/share/man/man1/checknr.1.gz
+OLD_FILES+=usr/share/man/man1/colcrt.1.gz
+OLD_FILES+=usr/share/man/man1/eqn.1.gz
+OLD_FILES+=usr/share/man/man1/grn.1.gz
+OLD_FILES+=usr/share/man/man1/grodvi.1.gz
+OLD_FILES+=usr/share/man/man1/groff.1.gz
+OLD_FILES+=usr/share/man/man1/grog.1.gz
+OLD_FILES+=usr/share/man/man1/grolbp.1.gz
+OLD_FILES+=usr/share/man/man1/grolj4.1.gz
+OLD_FILES+=usr/share/man/man1/grops.1.gz
+OLD_FILES+=usr/share/man/man1/grotty.1.gz
+OLD_FILES+=usr/share/man/man1/hpftodit.1.gz
+OLD_FILES+=usr/share/man/man1/indxbib.1.gz
+OLD_FILES+=usr/share/man/man1/lkbib.1.gz
+OLD_FILES+=usr/share/man/man1/lookbib.1.gz
+OLD_FILES+=usr/share/man/man1/mmroff.1.gz
+OLD_FILES+=usr/share/man/man1/neqn.1.gz
+OLD_FILES+=usr/share/man/man1/nroff.1.gz
+OLD_FILES+=usr/share/man/man1/pfbtops.1.gz
+OLD_FILES+=usr/share/man/man1/pic.1.gz
+OLD_FILES+=usr/share/man/man1/psroff.1.gz
+OLD_FILES+=usr/share/man/man1/refer.1.gz
+OLD_FILES+=usr/share/man/man1/tbl.1.gz
+OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz
+OLD_FILES+=usr/share/man/man1/troff.1.gz
+OLD_FILES+=usr/share/man/man1/vgrind.1.gz
+OLD_FILES+=usr/share/man/man5/groff_font.5.gz
+OLD_FILES+=usr/share/man/man5/groff_out.5.gz
+OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz
+OLD_FILES+=usr/share/man/man5/lj4_font.5.gz
+OLD_FILES+=usr/share/man/man5/tmac.5.gz
+OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz
+OLD_FILES+=usr/share/man/man7/ditroff.7.gz
+OLD_FILES+=usr/share/man/man7/groff.7.gz
+OLD_FILES+=usr/share/man/man7/groff_char.7.gz
+OLD_FILES+=usr/share/man/man7/groff_diff.7.gz
+OLD_FILES+=usr/share/man/man7/groff_man.7.gz
+OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz
+OLD_FILES+=usr/share/man/man7/groff_me.7.gz
+OLD_FILES+=usr/share/man/man7/groff_mm.7.gz
+OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz
+OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
+OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
+OLD_FILES+=usr/share/man/man7/groff_www.7.gz
+OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
+OLD_FILES+=usr/share/man/man7/me.7.gz
+OLD_FILES+=usr/share/man/man7/mm.7.gz
+OLD_FILES+=usr/share/man/man7/mmse.7.gz
+OLD_FILES+=usr/share/man/man7/ms.7.gz
+OLD_FILES+=usr/share/man/man7/orig_me.7.gz
+OLD_FILES+=usr/share/man/man7/roff.7.gz
+OLD_FILES+=usr/share/me/acm.me
+OLD_FILES+=usr/share/me/chars.me
+OLD_FILES+=usr/share/me/deltext.me
+OLD_FILES+=usr/share/me/eqn.me
+OLD_FILES+=usr/share/me/float.me
+OLD_FILES+=usr/share/me/footnote.me
+OLD_FILES+=usr/share/me/index.me
+OLD_FILES+=usr/share/me/letterhead.me
+OLD_FILES+=usr/share/me/local.me
+OLD_FILES+=usr/share/me/null.me
+OLD_FILES+=usr/share/me/refer.me
+OLD_FILES+=usr/share/me/revisions
+OLD_FILES+=usr/share/me/sh.me
+OLD_FILES+=usr/share/me/tbl.me
+OLD_FILES+=usr/share/me/thesis.me
+OLD_DIRS+=usr/share/me
+OLD_FILES+=usr/share/misc/vgrindefs
+OLD_FILES+=usr/share/misc/vgrindefs.db
+OLD_FILES+=usr/share/tmac/X.tmac
+OLD_FILES+=usr/share/tmac/Xps.tmac
+OLD_FILES+=usr/share/tmac/a4.tmac
+OLD_FILES+=usr/share/tmac/an-old.tmac
+OLD_FILES+=usr/share/tmac/an.tmac
+OLD_FILES+=usr/share/tmac/andoc.tmac
+OLD_FILES+=usr/share/tmac/composite.tmac
+OLD_FILES+=usr/share/tmac/cp1047.tmac
+OLD_FILES+=usr/share/tmac/devtag.tmac
+OLD_FILES+=usr/share/tmac/doc.tmac
+OLD_FILES+=usr/share/tmac/dvi.tmac
+OLD_FILES+=usr/share/tmac/e.tmac
+OLD_FILES+=usr/share/tmac/ec.tmac
+OLD_FILES+=usr/share/tmac/eqnrc
+OLD_FILES+=usr/share/tmac/europs.tmac
+OLD_FILES+=usr/share/tmac/html-end.tmac
+OLD_FILES+=usr/share/tmac/html.tmac
+OLD_FILES+=usr/share/tmac/hyphen.ru
+OLD_FILES+=usr/share/tmac/hyphen.us
+OLD_FILES+=usr/share/tmac/hyphenex.us
+OLD_FILES+=usr/share/tmac/koi8-r.tmac
+OLD_FILES+=usr/share/tmac/latin1.tmac
+OLD_FILES+=usr/share/tmac/latin2.tmac
+OLD_FILES+=usr/share/tmac/latin9.tmac
+OLD_FILES+=usr/share/tmac/lbp.tmac
+OLD_FILES+=usr/share/tmac/lj4.tmac
+OLD_FILES+=usr/share/tmac/m.tmac
+OLD_FILES+=usr/share/tmac/man.local
+OLD_FILES+=usr/share/tmac/man.tmac
+OLD_FILES+=usr/share/tmac/mandoc.tmac
+OLD_FILES+=usr/share/tmac/mdoc.local
+OLD_FILES+=usr/share/tmac/mdoc.tmac
+OLD_FILES+=usr/share/tmac/mdoc/doc-common
+OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff
+OLD_FILES+=usr/share/tmac/mdoc/doc-nroff
+OLD_FILES+=usr/share/tmac/mdoc/doc-syms
+OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1
+OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R
+OLD_DIRS+=usr/share/tmac/mdoc
+OLD_FILES+=usr/share/tmac/me.tmac
+OLD_FILES+=usr/share/tmac/mm/0.MT
+OLD_FILES+=usr/share/tmac/mm/4.MT
+OLD_FILES+=usr/share/tmac/mm/5.MT
+OLD_FILES+=usr/share/tmac/mm/locale
+OLD_FILES+=usr/share/tmac/mm/mm.tmac
+OLD_FILES+=usr/share/tmac/mm/mmse.tmac
+OLD_FILES+=usr/share/tmac/mm/ms.cov
+OLD_FILES+=usr/share/tmac/mm/se_locale
+OLD_FILES+=usr/share/tmac/mm/se_ms.cov
+OLD_DIRS+=usr/share/tmac/mm
+OLD_FILES+=usr/share/tmac/ms.tmac
+OLD_FILES+=usr/share/tmac/mse.tmac
+OLD_FILES+=usr/share/tmac/papersize.tmac
+OLD_FILES+=usr/share/tmac/pic.tmac
+OLD_FILES+=usr/share/tmac/ps.tmac
+OLD_FILES+=usr/share/tmac/psatk.tmac
+OLD_FILES+=usr/share/tmac/psold.tmac
+OLD_FILES+=usr/share/tmac/pspic.tmac
+OLD_FILES+=usr/share/tmac/s.tmac
+OLD_FILES+=usr/share/tmac/safer.tmac
+OLD_FILES+=usr/share/tmac/tmac.orig_me
+OLD_FILES+=usr/share/tmac/tmac.vgrind
+OLD_FILES+=usr/share/tmac/trace.tmac
+OLD_FILES+=usr/share/tmac/troffrc
+OLD_FILES+=usr/share/tmac/troffrc-end
+OLD_FILES+=usr/share/tmac/tty-char.tmac
+OLD_FILES+=usr/share/tmac/tty.tmac
+OLD_FILES+=usr/share/tmac/unicode.tmac
+OLD_FILES+=usr/share/tmac/www.tmac
+OLD_DIRS+=usr/share/tmac
+# 20170607: remove incorrect atf_check(1) manpage link
+OLD_FILES+=usr/share/man/man1/atf_check.1.gz
 # 20170601: remove stale manpage
 OLD_FILES+=usr/share/man/man2/cap_rights_get.2.gz
 # 20170601: old libifconfig and libifc
@@ -177,60 +663,109 @@ OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz
 OLD_FILES+=usr/share/doc/papers/releng.ascii.gz
 OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz
+OLD_DIRS+=usr/share/doc/papers
 OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/01.cacm
 OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/02.implement
 OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/03.iosys
 OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/04.uprog
 OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/05.sysman
 OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/06.Clang
 OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/12.make
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/15.yacc
 OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/16.lex
 OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/17.m4
 OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/18.gprof
 OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/20.ipctut
 OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/21.ipc
 OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/22.rpcgen
 OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/23.rpc
 OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/24.xdr
 OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/25.xdrrfc
 OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/26.rpcrfc
 OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/27.nfsrfc
 OLD_FILES+=usr/share/doc/psd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/psd/contents.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/
 OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/01.setup
 OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/02.config
 OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/03.fsck
 OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/04.quotas
 OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/05.fastfs
 OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/06.nfs
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/11.timedop
 OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/12.timed
 OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/18.net
 OLD_FILES+=usr/share/doc/smm/Title.ascii.gz
 OLD_FILES+=usr/share/doc/smm/contents.ascii.gz
+OLD_DIRS+=usr/share/doc/smm
 OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/04.csh
 OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/05.dc
 OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/06.bc
 OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/07.mail
 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/10.exref
 OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/11.edit
 OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/12.vi
 OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/13.viref
 OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/18.msdiffs
 OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/19.memacros
 OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/20.meref
 OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/21.troff
 OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/usd/22.trofftut
 OLD_FILES+=usr/share/doc/usd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/usd/contents.ascii.gz
+OLD_DIRS+=usr/share/doc/usd
 # 20170523: 64-bit inode support, library version bumps
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=usr/lib/libarchive.so.6

Modified: projects/clang500-import/UPDATING
==============================================================================
--- projects/clang500-import/UPDATING	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/UPDATING	Sat Jun 10 13:22:49 2017	(r319779)
@@ -81,6 +81,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 	For further comments/feedback, poke adrian@ .
 
+20170531:
+	The GNU roff toolchain has been removed from base. To render manpages
+	which are not supported by mandoc(1), man(1) can fallback on GNU roff
+	from ports (and recommends to install it).
+	To render roff(7) documents, consider using GNU roff from ports or the
+	heirloom doctools roff toolchain from ports via pkg install groff or
+	via pkg install heirloom-doctools.
+
 20170523:
 	The "ino64" 64-bit inode project has been committed, which extends
 	a number of types to 64 bits.  Upgrading in place requires care and

Modified: projects/clang500-import/bin/cat/tests/Makefile
==============================================================================
--- projects/clang500-import/bin/cat/tests/Makefile	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/cat/tests/Makefile	Sat Jun 10 13:22:49 2017	(r319779)
@@ -6,8 +6,14 @@ NETBSD_ATF_TESTS_SH=		cat_test
 
 ${PACKAGE}FILES+=		d_align.in
 ${PACKAGE}FILES+=		d_align.out
+${PACKAGE}FILES+=		d_b_output.in
+${PACKAGE}FILES+=		d_b_output.out
 ${PACKAGE}FILES+=		d_se_output.in
 ${PACKAGE}FILES+=		d_se_output.out
+${PACKAGE}FILES+=		d_s_output.in
+${PACKAGE}FILES+=		d_s_output.out
+${PACKAGE}FILES+=		d_vt_output.in
+${PACKAGE}FILES+=		d_vt_output.out
 
 .include <netbsd-tests.test.mk>
 

Modified: projects/clang500-import/bin/chmod/Makefile
==============================================================================
--- projects/clang500-import/bin/chmod/Makefile	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/chmod/Makefile	Sat Jun 10 13:22:49 2017	(r319779)
@@ -1,7 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PACKAGE=runtime
 PROG=	chmod
+
+SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.prog.mk>

Modified: projects/clang500-import/bin/dd/tests/dd2_test.sh
==============================================================================
--- projects/clang500-import/bin/dd/tests/dd2_test.sh	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/dd/tests/dd2_test.sh	Sat Jun 10 13:22:49 2017	(r319779)
@@ -26,21 +26,35 @@
 # $FreeBSD$
 
 
-atf_test_case seek_overflow
-seek_overflow_head()
+atf_test_case max_seek
+max_seek_head()
 {
-	atf_set "descr" "dd(1) should reject too-large seek values"
+	atf_set "descr" "dd(1) can seek by the maximum amount"
 }
-seek_overflow_body()
+max_seek_body()
 {
-	atf_expect_fail "fails with 'dd: truncating f.out: File too large' - bug 219757"
+	case `df -T . | tail -n 1 | cut -wf 2` in
+		"ufs")
+			atf_skip "UFS's maximum file size is too small";;
+		"zfs") ;; # ZFS is fine
+		"tmpfs")
+			atf_skip "tmpfs can't create arbitrarily large spare files";;
+		*) atf_skip "Unknown file system";;
+	esac
 
 	touch f.in
-	# Positive tests
 	seek=`echo "2^63 / 4096 - 1" | bc`
 	atf_check -s exit:0 -e ignore dd if=f.in of=f.out bs=4096 seek=$seek
+}
 
-	# Negative tests
+atf_test_case seek_overflow
+seek_overflow_head()
+{
+	atf_set "descr" "dd(1) should reject too-large seek values"
+}
+seek_overflow_body()
+{
+	touch f.in
 	seek=`echo "2^63 / 4096" | bc`
 	atf_check -s not-exit:0 -e match:"seek offsets cannot be larger than" \
 		dd if=f.in of=f.out bs=4096 seek=$seek
@@ -50,5 +64,6 @@ seek_overflow_body()
 
 atf_init_test_cases()
 {
-        atf_add_test_case seek_overflow
+	atf_add_test_case max_seek
+	atf_add_test_case seek_overflow
 }

Modified: projects/clang500-import/bin/echo/Makefile
==============================================================================
--- projects/clang500-import/bin/echo/Makefile	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/echo/Makefile	Sat Jun 10 13:22:49 2017	(r319779)
@@ -1,7 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PACKAGE=runtime
 PROG=	echo
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= 	tests
+.endif
 
 .include <bsd.prog.mk>

Modified: projects/clang500-import/bin/ln/Makefile
==============================================================================
--- projects/clang500-import/bin/ln/Makefile	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/ln/Makefile	Sat Jun 10 13:22:49 2017	(r319779)
@@ -1,11 +1,17 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PACKAGE=runtime
 PROG=	ln
 MAN=	ln.1 symlink.7
 
 LINKS=	${BINDIR}/ln ${BINDIR}/link
 MLINKS=	ln.1 link.1
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= 	tests
+.endif
 
 .include <bsd.prog.mk>

Modified: projects/clang500-import/bin/pkill/pkill.1
==============================================================================
--- projects/clang500-import/bin/pkill/pkill.1	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/pkill/pkill.1	Sat Jun 10 13:22:49 2017	(r319779)
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 21, 2015
+.Dd June 5, 2017
 .Dt PKILL 1
 .Os
 .Sh NAME
@@ -176,6 +176,8 @@ Select only the newest (most recently started) of the 
 .It Fl o
 Select only the oldest (least recently started) of the matching processes.
 .It Fl q
+For
+.Nm pgrep ,
 Do not write anything to standard output.
 .It Fl s Ar sid
 Restrict matches to processes with a session ID in the comma-separated

Modified: projects/clang500-import/bin/sh/builtins.def
==============================================================================
--- projects/clang500-import/bin/sh/builtins.def	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/sh/builtins.def	Sat Jun 10 13:22:49 2017	(r319779)
@@ -41,6 +41,9 @@
 # without job control.
 # The -h flag specifies that this command is to be excluded from systems
 # based on the NO_HISTORY compile-time symbol.
+# The -n flag specifies that this command can safely be run in the same
+# process when it is the only command in a command substitution.  Some
+# commands have special logic defined in safe_builtin().
 # The -s flag specifies that this is a POSIX 'special built-in' command.
 # The rest of the line specifies the command name or names used to run the
 # command.  The entry for bltincmd, which is run when the user does not specify
@@ -48,43 +51,43 @@
 #
 # NOTE: bltincmd must come first!
 
-bltincmd	builtin
+bltincmd -n	builtin
 aliascmd	alias
 bgcmd -j	bg
 bindcmd		bind
 breakcmd	-s break -s continue
 cdcmd		cd chdir
-commandcmd	command
+commandcmd -n	command
 dotcmd		-s .
-echocmd		echo
+echocmd -n	echo
 evalcmd		-s eval
 execcmd		-s exec
 exitcmd		-s exit
 letcmd		let
 exportcmd	-s export -s readonly
 #exprcmd		expr
-falsecmd	false
+falsecmd -n	false
 fgcmd -j	fg
 freebsd_wordexpcmd	freebsd_wordexp
 getoptscmd	getopts
 hashcmd		hash
 histcmd -h	fc
-jobidcmd	jobid
-jobscmd		jobs
-killcmd		kill
+jobidcmd -n	jobid
+jobscmd -n	jobs
+killcmd -n	kill
 localcmd	local
-printfcmd	printf
-pwdcmd		pwd
+printfcmd -n	printf
+pwdcmd -n	pwd
 readcmd		read
 returncmd	-s return
 setcmd		-s set
 setvarcmd	setvar
 shiftcmd	-s shift
-testcmd		test [
-timescmd	-s times
+testcmd -n	test [
+timescmd -n	-s times
 trapcmd		-s trap
-truecmd		-s : true
-typecmd		type
+truecmd -n	-s : true
+typecmd -n	type
 ulimitcmd	ulimit
 umaskcmd	umask
 unaliascmd	unalias

Modified: projects/clang500-import/bin/sh/error.h
==============================================================================
--- projects/clang500-import/bin/sh/error.h	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/sh/error.h	Sat Jun 10 13:22:49 2017	(r319779)
@@ -73,7 +73,7 @@ extern volatile sig_atomic_t intpending;
 #define INTOFF suppressint++
 #define INTON { if (--suppressint == 0 && intpending) onint(); }
 #define is_int_on() suppressint
-#define SETINTON(s) suppressint = (s)
+#define SETINTON(s) do { suppressint = (s); if (suppressint == 0 && intpending) onint(); } while (0)
 #define FORCEINTON {suppressint = 0; if (intpending) onint();}
 #define SET_PENDING_INT intpending = 1
 #define CLEAR_PENDING_INT intpending = 0

Modified: projects/clang500-import/bin/sh/eval.c
==============================================================================
--- projects/clang500-import/bin/sh/eval.c	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/sh/eval.c	Sat Jun 10 13:22:49 2017	(r319779)
@@ -470,6 +470,7 @@ evalredir(union node *n, int flags)
 		if (e == EXERROR || e == EXEXEC) {
 			if (in_redirect) {
 				exitstatus = 2;
+				FORCEINTON;
 				return;
 			}
 		}
@@ -799,11 +800,8 @@ xtracecommand(struct arglist *varlist, int argc, char 
 static int
 safe_builtin(int idx, int argc, char **argv)
 {
-	if (idx == BLTINCMD || idx == COMMANDCMD || idx == ECHOCMD ||
-	    idx == FALSECMD || idx == JOBIDCMD || idx == JOBSCMD ||
-	    idx == KILLCMD || idx == PRINTFCMD || idx == PWDCMD ||
-	    idx == TESTCMD || idx == TIMESCMD || idx == TRUECMD ||
-	    idx == TYPECMD)
+	/* Generated from builtins.def. */
+	if (safe_builtin_always(idx))
 		return (1);
 	if (idx == EXPORTCMD || idx == TRAPCMD || idx == ULIMITCMD ||
 	    idx == UMASKCMD)

Modified: projects/clang500-import/bin/sh/histedit.c
==============================================================================
--- projects/clang500-import/bin/sh/histedit.c	Sat Jun 10 11:14:54 2017	(r319778)
+++ projects/clang500-import/bin/sh/histedit.c	Sat Jun 10 13:22:49 2017	(r319779)
@@ -376,10 +376,10 @@ histcmd(int argc, char **argv __unused)
 		char *editcmd;
 
 		fclose(efp);
+		INTON;
 		editcmd = stalloc(strlen(editor) + strlen(editfile) + 2);
 		sprintf(editcmd, "%s %s", editor, editfile);
 		evalstring(editcmd, 0);	/* XXX - should use no JC command */
-		INTON;
 		readcmdfile(editfile);	/* XXX - should read back - quick tst */
 		unlink(editfile);
 	}

Modified: projects/clang500-import/bin/sh/mkbuiltins
==============================================================================
--- projects/clang500-import/bin/sh/mkbuiltins	Sat Jun 10 11:14:54 2017	(r319778)

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