svn commit: r292179 - in user/ngie/detangle-rc: . bin/freebsd-version bin/ls bin/ls/tests bin/sh/tests/parameters cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa cddl/contrib/opensolaris...

Garrett Cooper ngie at FreeBSD.org
Mon Dec 14 00:22:08 UTC 2015 

Author: ngie
Date: Mon Dec 14 00:22:03 2015
New Revision: 292179
URL: https://svnweb.freebsd.org/changeset/base/292179

Log:
  MFhead @ r292178

Added:
  user/ngie/detangle-rc/bin/sh/tests/parameters/positional9.0
     - copied unchanged from r292178, head/bin/sh/tests/parameters/positional9.0
  user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
     - copied unchanged from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
  user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
     - copied unchanged from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
  user/ngie/detangle-rc/etc/etc.riscv/
     - copied from r292178, head/etc/etc.riscv/
  user/ngie/detangle-rc/lib/csu/riscv/
     - copied from r292178, head/lib/csu/riscv/
  user/ngie/detangle-rc/lib/libc/aarch64/sys/__vdso_gettc.c
     - copied unchanged from r292178, head/lib/libc/aarch64/sys/__vdso_gettc.c
  user/ngie/detangle-rc/lib/libc/arm/sys/__vdso_gettc.c
     - copied unchanged from r292178, head/lib/libc/arm/sys/__vdso_gettc.c
  user/ngie/detangle-rc/lib/libc/riscv/
     - copied from r292178, head/lib/libc/riscv/
  user/ngie/detangle-rc/lib/libthr/arch/riscv/
     - copied from r292178, head/lib/libthr/arch/riscv/
  user/ngie/detangle-rc/lib/msun/riscv/
     - copied from r292178, head/lib/msun/riscv/
  user/ngie/detangle-rc/share/man/man9/proc_rwmem.9
     - copied unchanged from r292178, head/share/man/man9/proc_rwmem.9
  user/ngie/detangle-rc/sys/dev/mlx5/eswitch_vacl.h
     - copied unchanged from r292178, head/sys/dev/mlx5/eswitch_vacl.h
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
     - copied unchanged from r292178, head/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
  user/ngie/detangle-rc/sys/netinet/in_fib.c
     - copied unchanged from r292178, head/sys/netinet/in_fib.c
  user/ngie/detangle-rc/sys/netinet/in_fib.h
     - copied unchanged from r292178, head/sys/netinet/in_fib.h
  user/ngie/detangle-rc/sys/netinet6/in6_fib.c
     - copied unchanged from r292178, head/sys/netinet6/in6_fib.c
  user/ngie/detangle-rc/sys/netinet6/in6_fib.h
     - copied unchanged from r292178, head/sys/netinet6/in6_fib.h
  user/ngie/detangle-rc/sys/x86/include/x86_smp.h
     - copied unchanged from r292178, head/sys/x86/include/x86_smp.h
  user/ngie/detangle-rc/sys/x86/include/x86_var.h
     - copied unchanged from r292178, head/sys/x86/include/x86_var.h
Modified:
  user/ngie/detangle-rc/MAINTAINERS   (contents, props changed)
  user/ngie/detangle-rc/Makefile
  user/ngie/detangle-rc/Makefile.inc1
  user/ngie/detangle-rc/UPDATING
  user/ngie/detangle-rc/bin/freebsd-version/Makefile
  user/ngie/detangle-rc/bin/ls/print.c
  user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh
  user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile
  user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
  user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
  user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
  user/ngie/detangle-rc/contrib/bmake/ChangeLog
  user/ngie/detangle-rc/contrib/bmake/Makefile
  user/ngie/detangle-rc/contrib/bmake/boot-strap
  user/ngie/detangle-rc/contrib/bmake/cond.c
  user/ngie/detangle-rc/contrib/bmake/config.h.in
  user/ngie/detangle-rc/contrib/bmake/configure
  user/ngie/detangle-rc/contrib/bmake/configure.in
  user/ngie/detangle-rc/contrib/bmake/main.c
  user/ngie/detangle-rc/contrib/bmake/meta.c
  user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog
  user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk
  user/ngie/detangle-rc/contrib/bmake/mk/init.mk
  user/ngie/detangle-rc/contrib/bmake/mk/install-mk
  user/ngie/detangle-rc/contrib/bmake/mk/lib.mk
  user/ngie/detangle-rc/contrib/bmake/mk/meta.autodep.mk
  user/ngie/detangle-rc/contrib/bmake/mk/meta.stage.mk
  user/ngie/detangle-rc/contrib/bmake/mk/meta.subdir.mk
  user/ngie/detangle-rc/contrib/bmake/mk/meta.sys.mk
  user/ngie/detangle-rc/contrib/bmake/mk/own.mk
  user/ngie/detangle-rc/contrib/bmake/mk/sys.mk
  user/ngie/detangle-rc/contrib/bmake/os.sh
  user/ngie/detangle-rc/contrib/bmake/parse.c
  user/ngie/detangle-rc/contrib/bmake/unit-tests/Makefile.in
  user/ngie/detangle-rc/contrib/bmake/unit-tests/cond2.mk
  user/ngie/detangle-rc/contrib/bmake/unit-tests/doterror.exp
  user/ngie/detangle-rc/contrib/bmake/unit-tests/modts.mk
  user/ngie/detangle-rc/contrib/bmake/var.c
  user/ngie/detangle-rc/contrib/elftoolchain/addr2line/addr2line.1
  user/ngie/detangle-rc/contrib/elftoolchain/addr2line/addr2line.c
  user/ngie/detangle-rc/contrib/elftoolchain/common/elfdefinitions.h
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/binary.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/elfcopy.1
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/main.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/sections.c
  user/ngie/detangle-rc/contrib/elftoolchain/elfcopy/segments.c
  user/ngie/detangle-rc/contrib/elftoolchain/libelf/elf_data.c
  user/ngie/detangle-rc/contrib/elftoolchain/readelf/readelf.c
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibaddr/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibnetdiscover/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibping/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibportstate/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibroute/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibsendtrap/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibstat/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibsysstat/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/ibtracert/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/opensm/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/osmtest/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/perfquery/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/saquery/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/sminfo/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/smpdump/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/smpquery/Makefile
  user/ngie/detangle-rc/contrib/ofed/usr.bin/vendstat/Makefile
  user/ngie/detangle-rc/contrib/top/loadavg.h
  user/ngie/detangle-rc/contrib/unbound/freebsd-configure.sh
  user/ngie/detangle-rc/include/resolv.h
  user/ngie/detangle-rc/kerberos5/lib/libgssapi_krb5/Makefile.depend
  user/ngie/detangle-rc/kerberos5/lib/libgssapi_ntlm/Makefile.depend
  user/ngie/detangle-rc/kerberos5/lib/libhdb/Makefile.depend
  user/ngie/detangle-rc/kerberos5/lib/libheimntlm/Makefile.depend
  user/ngie/detangle-rc/kerberos5/lib/libkadm5clnt/Makefile.depend
  user/ngie/detangle-rc/kerberos5/lib/libkadm5srv/Makefile.depend
  user/ngie/detangle-rc/kerberos5/lib/libkafs5/Makefile.depend
  user/ngie/detangle-rc/kerberos5/lib/libkdc/Makefile.depend
  user/ngie/detangle-rc/lib/csu/aarch64/crt1.c
  user/ngie/detangle-rc/lib/csu/amd64/crt1.c
  user/ngie/detangle-rc/lib/csu/arm/crt1.c
  user/ngie/detangle-rc/lib/csu/i386/crt1_c.c
  user/ngie/detangle-rc/lib/csu/mips/crt1.c
  user/ngie/detangle-rc/lib/csu/powerpc/crt1.c
  user/ngie/detangle-rc/lib/csu/powerpc64/crt1.c
  user/ngie/detangle-rc/lib/csu/sparc64/crt1.c
  user/ngie/detangle-rc/lib/lib80211/Makefile.depend
  user/ngie/detangle-rc/lib/libc/aarch64/sys/Makefile.inc
  user/ngie/detangle-rc/lib/libc/arm/sys/Makefile.inc
  user/ngie/detangle-rc/lib/libc/gen/exec.3
  user/ngie/detangle-rc/lib/libc/gen/getnetgrent.c
  user/ngie/detangle-rc/lib/libc/net/getaddrinfo.c
  user/ngie/detangle-rc/lib/libc/regex/grot/Makefile
  user/ngie/detangle-rc/lib/libc/rpc/svc_vc.c
  user/ngie/detangle-rc/lib/libc/stdio/open_memstream.c
  user/ngie/detangle-rc/lib/libc/stdio/open_wmemstream.c
  user/ngie/detangle-rc/lib/libc/tests/stdio/getdelim_test.c
  user/ngie/detangle-rc/lib/libc/tests/stdio/printbasic_test.c
  user/ngie/detangle-rc/lib/libc/tests/stdio/printfloat_test.c
  user/ngie/detangle-rc/lib/libopenbsd/Makefile
  user/ngie/detangle-rc/lib/libopenbsd/imsg.c
  user/ngie/detangle-rc/lib/libpam/modules/pam_krb5/Makefile.depend
  user/ngie/detangle-rc/lib/libpam/modules/pam_ksu/Makefile.depend
  user/ngie/detangle-rc/lib/libpam/modules/pam_ssh/Makefile
  user/ngie/detangle-rc/sbin/devd/devd.cc
  user/ngie/detangle-rc/sbin/geom/class/multipath/geom_multipath.c
  user/ngie/detangle-rc/sbin/geom/class/part/gpart.8
  user/ngie/detangle-rc/sbin/newfs_msdos/mkfs_msdos.c
  user/ngie/detangle-rc/sbin/swapon/swapon.c
  user/ngie/detangle-rc/sbin/sysctl/sysctl.8
  user/ngie/detangle-rc/sbin/sysctl/sysctl.c
  user/ngie/detangle-rc/secure/lib/libssh/Makefile
  user/ngie/detangle-rc/secure/libexec/sftp-server/Makefile
  user/ngie/detangle-rc/secure/libexec/ssh-keysign/Makefile
  user/ngie/detangle-rc/secure/libexec/ssh-pkcs11-helper/Makefile
  user/ngie/detangle-rc/secure/usr.bin/scp/Makefile
  user/ngie/detangle-rc/secure/usr.bin/sftp/Makefile
  user/ngie/detangle-rc/secure/usr.bin/ssh-add/Makefile
  user/ngie/detangle-rc/secure/usr.bin/ssh-agent/Makefile
  user/ngie/detangle-rc/secure/usr.bin/ssh-keygen/Makefile
  user/ngie/detangle-rc/secure/usr.bin/ssh-keyscan/Makefile
  user/ngie/detangle-rc/secure/usr.bin/ssh/Makefile
  user/ngie/detangle-rc/secure/usr.sbin/sshd/Makefile
  user/ngie/detangle-rc/share/examples/etc/make.conf
  user/ngie/detangle-rc/share/man/man4/ioat.4
  user/ngie/detangle-rc/share/man/man4/isp.4
  user/ngie/detangle-rc/share/man/man4/mps.4
  user/ngie/detangle-rc/share/man/man5/src.conf.5
  user/ngie/detangle-rc/share/man/man7/release.7
  user/ngie/detangle-rc/share/man/man9/BUS_DESCRIBE_INTR.9
  user/ngie/detangle-rc/share/man/man9/Makefile
  user/ngie/detangle-rc/share/man/man9/g_bio.9
  user/ngie/detangle-rc/share/misc/bsd-family-tree
  user/ngie/detangle-rc/share/mk/bsd.compiler.mk
  user/ngie/detangle-rc/share/mk/bsd.cpu.mk
  user/ngie/detangle-rc/share/mk/bsd.dep.mk
  user/ngie/detangle-rc/share/mk/bsd.endian.mk
  user/ngie/detangle-rc/share/mk/bsd.lib.mk
  user/ngie/detangle-rc/share/mk/bsd.libnames.mk
  user/ngie/detangle-rc/share/mk/bsd.opts.mk
  user/ngie/detangle-rc/share/mk/bsd.sys.mk
  user/ngie/detangle-rc/share/mk/local.dirdeps.mk
  user/ngie/detangle-rc/share/mk/local.meta.sys.mk
  user/ngie/detangle-rc/share/mk/src.libnames.mk
  user/ngie/detangle-rc/share/mk/src.opts.mk
  user/ngie/detangle-rc/share/mk/sys.mk
  user/ngie/detangle-rc/sys/amd64/amd64/machdep.c
  user/ngie/detangle-rc/sys/amd64/amd64/pmap.c
  user/ngie/detangle-rc/sys/amd64/include/md_var.h
  user/ngie/detangle-rc/sys/amd64/include/smp.h
  user/ngie/detangle-rc/sys/arm/arm/elf_machdep.c
  user/ngie/detangle-rc/sys/arm/arm/generic_timer.c
  user/ngie/detangle-rc/sys/arm/arm/machdep.c
  user/ngie/detangle-rc/sys/arm/include/md_var.h
  user/ngie/detangle-rc/sys/arm/include/vdso.h
  user/ngie/detangle-rc/sys/arm/include/vmparam.h
  user/ngie/detangle-rc/sys/arm64/arm64/elf_machdep.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic.h
  user/ngie/detangle-rc/sys/arm64/arm64/gic_fdt.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_its.c
  user/ngie/detangle-rc/sys/arm64/arm64/gic_v3_var.h
  user/ngie/detangle-rc/sys/arm64/arm64/intr_machdep.c
  user/ngie/detangle-rc/sys/arm64/arm64/machdep.c
  user/ngie/detangle-rc/sys/arm64/arm64/pic_if.m
  user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie.c
  user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie_common.c
  user/ngie/detangle-rc/sys/arm64/cavium/thunder_pcie_pem.c
  user/ngie/detangle-rc/sys/arm64/conf/GENERIC
  user/ngie/detangle-rc/sys/arm64/include/intr.h
  user/ngie/detangle-rc/sys/arm64/include/md_var.h
  user/ngie/detangle-rc/sys/arm64/include/vdso.h
  user/ngie/detangle-rc/sys/arm64/include/vmparam.h
  user/ngie/detangle-rc/sys/boot/common/part.c
  user/ngie/detangle-rc/sys/boot/userboot/test/Makefile.depend
  user/ngie/detangle-rc/sys/cam/cam_ccb.h
  user/ngie/detangle-rc/sys/cam/cam_xpt.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
  user/ngie/detangle-rc/sys/cddl/dev/dtrace/dtrace_ioctl.c
  user/ngie/detangle-rc/sys/conf/files
  user/ngie/detangle-rc/sys/conf/files.arm
  user/ngie/detangle-rc/sys/conf/files.arm64
  user/ngie/detangle-rc/sys/dev/aic/aic_pccard.c
  user/ngie/detangle-rc/sys/dev/an/if_an_pccard.c
  user/ngie/detangle-rc/sys/dev/ata/ata-card.c
  user/ngie/detangle-rc/sys/dev/bwn/if_bwn.c
  user/ngie/detangle-rc/sys/dev/cmx/cmx_pccard.c
  user/ngie/detangle-rc/sys/dev/cs/if_cs_pccard.c
  user/ngie/detangle-rc/sys/dev/ed/if_ed_isa.c
  user/ngie/detangle-rc/sys/dev/ed/if_ed_pccard.c
  user/ngie/detangle-rc/sys/dev/ed/if_ed_pci.c
  user/ngie/detangle-rc/sys/dev/ep/if_ep_pccard.c
  user/ngie/detangle-rc/sys/dev/ex/if_ex_pccard.c
  user/ngie/detangle-rc/sys/dev/fdc/fdc_pccard.c
  user/ngie/detangle-rc/sys/dev/fdt/simplebus.c
  user/ngie/detangle-rc/sys/dev/fe/if_fe_pccard.c
  user/ngie/detangle-rc/sys/dev/hwpmc/hwpmc_core.c
  user/ngie/detangle-rc/sys/dev/hwpmc/hwpmc_logging.c
  user/ngie/detangle-rc/sys/dev/ioat/ioat.c
  user/ngie/detangle-rc/sys/dev/ioat/ioat.h
  user/ngie/detangle-rc/sys/dev/ioat/ioat_internal.h
  user/ngie/detangle-rc/sys/dev/ioat/ioat_test.c
  user/ngie/detangle-rc/sys/dev/ioat/ioat_test.h
  user/ngie/detangle-rc/sys/dev/iscsi/iscsi.c
  user/ngie/detangle-rc/sys/dev/isp/isp.c
  user/ngie/detangle-rc/sys/dev/isp/isp_pci.c
  user/ngie/detangle-rc/sys/dev/md/md.c
  user/ngie/detangle-rc/sys/dev/mlx5/device.h
  user/ngie/detangle-rc/sys/dev/mlx5/driver.h
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_core/mlx5_eq.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_core/mlx5_vport.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/en.h
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  user/ngie/detangle-rc/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  user/ngie/detangle-rc/sys/dev/mlx5/vport.h
  user/ngie/detangle-rc/sys/dev/ncv/ncr53c500_pccard.c
  user/ngie/detangle-rc/sys/dev/nsp/nsp_pccard.c
  user/ngie/detangle-rc/sys/dev/nvd/nvd.c
  user/ngie/detangle-rc/sys/dev/nvme/nvme.h
  user/ngie/detangle-rc/sys/dev/nvme/nvme_ns.c
  user/ngie/detangle-rc/sys/dev/nvme/nvme_sysctl.c
  user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.c
  user/ngie/detangle-rc/sys/dev/ofw/ofw_bus_subr.h
  user/ngie/detangle-rc/sys/dev/ofw/ofw_iicbus.c
  user/ngie/detangle-rc/sys/dev/otus/if_otus.c
  user/ngie/detangle-rc/sys/dev/pccard/pccardvar.h
  user/ngie/detangle-rc/sys/dev/ral/rt2560.c
  user/ngie/detangle-rc/sys/dev/ral/rt2661.c
  user/ngie/detangle-rc/sys/dev/ral/rt2860.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efsys.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_check.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_crc32.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_impl.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_mcdi.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_mcdi.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_nvram.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_tx.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/efx_types.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_ev.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_impl.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_mcdi.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_nic.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_nvram.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/hunt_tx.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/siena_impl.h
  user/ngie/detangle-rc/sys/dev/sfxge/common/siena_mcdi.c
  user/ngie/detangle-rc/sys/dev/sfxge/common/siena_nic.c
  user/ngie/detangle-rc/sys/dev/sfxge/sfxge.c
  user/ngie/detangle-rc/sys/dev/sfxge/sfxge_tx.c
  user/ngie/detangle-rc/sys/dev/sn/if_sn_pccard.c
  user/ngie/detangle-rc/sys/dev/snc/if_snc_pccard.c
  user/ngie/detangle-rc/sys/dev/sound/usb/uaudio.c
  user/ngie/detangle-rc/sys/dev/stg/tmc18c30_pccard.c
  user/ngie/detangle-rc/sys/dev/uart/uart_bus_pccard.c
  user/ngie/detangle-rc/sys/dev/usb/input/atp.c
  user/ngie/detangle-rc/sys/dev/usb/input/uep.c
  user/ngie/detangle-rc/sys/dev/usb/input/uhid.c
  user/ngie/detangle-rc/sys/dev/usb/input/ukbd.c
  user/ngie/detangle-rc/sys/dev/usb/input/ums.c
  user/ngie/detangle-rc/sys/dev/usb/input/wsp.c
  user/ngie/detangle-rc/sys/dev/usb/misc/udbp.c
  user/ngie/detangle-rc/sys/dev/usb/misc/ufm.c
  user/ngie/detangle-rc/sys/dev/usb/misc/ugold.c
  user/ngie/detangle-rc/sys/dev/usb/misc/uled.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_aue.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_axe.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_axge.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_cdce.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_cue.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_ipheth.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_kue.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_mos.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_rue.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_smsc.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_udav.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_urndis.c
  user/ngie/detangle-rc/sys/dev/usb/net/if_usie.c
  user/ngie/detangle-rc/sys/dev/usb/net/uhso.c
  user/ngie/detangle-rc/sys/dev/usb/serial/u3g.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uark.c
  user/ngie/detangle-rc/sys/dev/usb/serial/ubsa.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uchcom.c
  user/ngie/detangle-rc/sys/dev/usb/serial/ucycom.c
  user/ngie/detangle-rc/sys/dev/usb/serial/ufoma.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uftdi.c
  user/ngie/detangle-rc/sys/dev/usb/serial/ugensa.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uipaq.c
  user/ngie/detangle-rc/sys/dev/usb/serial/ulpt.c
  user/ngie/detangle-rc/sys/dev/usb/serial/umcs.c
  user/ngie/detangle-rc/sys/dev/usb/serial/umct.c
  user/ngie/detangle-rc/sys/dev/usb/serial/umodem.c
  user/ngie/detangle-rc/sys/dev/usb/serial/umoscom.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uplcom.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uslcom.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uvisor.c
  user/ngie/detangle-rc/sys/dev/usb/serial/uvscom.c
  user/ngie/detangle-rc/sys/dev/usb/storage/umass.c
  user/ngie/detangle-rc/sys/dev/usb/storage/urio.c
  user/ngie/detangle-rc/sys/dev/usb/usb_hub.c
  user/ngie/detangle-rc/sys/dev/usb/usbdi.h
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_rsu.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_rum.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_run.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_uath.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_upgt.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_ural.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtw.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwn.c
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwnreg.h
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_urtwnvar.h
  user/ngie/detangle-rc/sys/dev/usb/wlan/if_zyd.c
  user/ngie/detangle-rc/sys/dev/wi/if_wi_pccard.c
  user/ngie/detangle-rc/sys/dev/wpi/if_wpi.c
  user/ngie/detangle-rc/sys/dev/wpi/if_wpi_debug.h
  user/ngie/detangle-rc/sys/dev/wtap/if_wtap_module.c
  user/ngie/detangle-rc/sys/dev/wtap/if_wtapvar.h
  user/ngie/detangle-rc/sys/dev/wtap/plugins/visibility.c
  user/ngie/detangle-rc/sys/dev/xe/if_xe_pccard.c
  user/ngie/detangle-rc/sys/geom/part/g_part_gpt.c
  user/ngie/detangle-rc/sys/i386/i386/mp_machdep.c
  user/ngie/detangle-rc/sys/i386/i386/pmap.c
  user/ngie/detangle-rc/sys/i386/i386/sys_machdep.c
  user/ngie/detangle-rc/sys/i386/include/md_var.h
  user/ngie/detangle-rc/sys/i386/include/smp.h
  user/ngie/detangle-rc/sys/kern/imgact_elf.c
  user/ngie/detangle-rc/sys/kern/kern_linker.c
  user/ngie/detangle-rc/sys/kern/kern_malloc.c
  user/ngie/detangle-rc/sys/kern/kern_proc.c
  user/ngie/detangle-rc/sys/kern/kern_racct.c
  user/ngie/detangle-rc/sys/kern/kern_rctl.c
  user/ngie/detangle-rc/sys/kern/sys_process.c
  user/ngie/detangle-rc/sys/kern/vfs_bio.c
  user/ngie/detangle-rc/sys/mips/include/cpuregs.h
  user/ngie/detangle-rc/sys/mips/mips/pm_machdep.c
  user/ngie/detangle-rc/sys/modules/ahci/Makefile
  user/ngie/detangle-rc/sys/modules/cam/Makefile
  user/ngie/detangle-rc/sys/modules/mlx5/Makefile
  user/ngie/detangle-rc/sys/modules/mlx5en/Makefile
  user/ngie/detangle-rc/sys/net/if_llatbl.c
  user/ngie/detangle-rc/sys/net/if_llatbl.h
  user/ngie/detangle-rc/sys/net/route.c
  user/ngie/detangle-rc/sys/net/route.h
  user/ngie/detangle-rc/sys/net80211/ieee80211_phy.h
  user/ngie/detangle-rc/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
  user/ngie/detangle-rc/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  user/ngie/detangle-rc/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  user/ngie/detangle-rc/sys/netinet/cc/cc_cubic.c
  user/ngie/detangle-rc/sys/netinet/cc/cc_newreno.c
  user/ngie/detangle-rc/sys/netinet/if_ether.c
  user/ngie/detangle-rc/sys/netinet/in_gif.c
  user/ngie/detangle-rc/sys/netinet/in_mcast.c
  user/ngie/detangle-rc/sys/netinet/ip_icmp.c
  user/ngie/detangle-rc/sys/netinet/ip_input.c
  user/ngie/detangle-rc/sys/netinet/ip_options.c
  user/ngie/detangle-rc/sys/netinet/ip_var.h
  user/ngie/detangle-rc/sys/netinet/sctp_input.c
  user/ngie/detangle-rc/sys/netinet/sctp_output.c
  user/ngie/detangle-rc/sys/netinet/sctp_pcb.c
  user/ngie/detangle-rc/sys/netinet/sctp_pcb.h
  user/ngie/detangle-rc/sys/netinet/sctp_usrreq.c
  user/ngie/detangle-rc/sys/netinet/sctputil.c
  user/ngie/detangle-rc/sys/netinet/sctputil.h
  user/ngie/detangle-rc/sys/netinet/tcp_hostcache.c
  user/ngie/detangle-rc/sys/netinet/tcp_hostcache.h
  user/ngie/detangle-rc/sys/netinet/tcp_input.c
  user/ngie/detangle-rc/sys/netinet/tcp_sack.c
  user/ngie/detangle-rc/sys/netinet/tcp_var.h
  user/ngie/detangle-rc/sys/netinet6/icmp6.c
  user/ngie/detangle-rc/sys/netinet6/in6.c
  user/ngie/detangle-rc/sys/netinet6/in6_gif.c
  user/ngie/detangle-rc/sys/netinet6/in6_mcast.c
  user/ngie/detangle-rc/sys/netinet6/in6_src.c
  user/ngie/detangle-rc/sys/netinet6/nd6.c
  user/ngie/detangle-rc/sys/netinet6/nd6_nbr.c
  user/ngie/detangle-rc/sys/netinet6/scope6.c
  user/ngie/detangle-rc/sys/netinet6/scope6_var.h
  user/ngie/detangle-rc/sys/netinet6/sctp6_usrreq.c
  user/ngie/detangle-rc/sys/netpfil/ipfw/ip_fw2.c
  user/ngie/detangle-rc/sys/powerpc/booke/booke_machdep.c
  user/ngie/detangle-rc/sys/powerpc/booke/trap_subr.S
  user/ngie/detangle-rc/sys/powerpc/include/trap.h
  user/ngie/detangle-rc/sys/powerpc/powerpc/trap.c
  user/ngie/detangle-rc/sys/sys/elf_common.h
  user/ngie/detangle-rc/sys/sys/module.h
  user/ngie/detangle-rc/sys/sys/ptrace.h
  user/ngie/detangle-rc/sys/ufs/ufs/ufs_vnops.c
  user/ngie/detangle-rc/sys/vm/uma_core.c
  user/ngie/detangle-rc/sys/vm/vm_fault.c
  user/ngie/detangle-rc/sys/vm/vm_page.c
  user/ngie/detangle-rc/targets/pseudo/gcc/Makefile.depend
  user/ngie/detangle-rc/targets/pseudo/universe/Makefile
  user/ngie/detangle-rc/tools/bsdbox/Makefile.base
  user/ngie/detangle-rc/tools/regression/mac/mac_portacl/misc.sh
  user/ngie/detangle-rc/tools/regression/tls/ttls2/ttls2.c
  user/ngie/detangle-rc/tools/regression/tls/ttls4/ttls4.c
  user/ngie/detangle-rc/tools/tools/ioat/ioatcontrol.8
  user/ngie/detangle-rc/tools/tools/ioat/ioatcontrol.c
  user/ngie/detangle-rc/tools/tools/nanobsd/defaults.sh
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/README
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/beaglebone.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/common
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-amd64.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-i386.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-mips.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-mips64.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/rpi.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/rpi2.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/sam9260ek.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/embedded/sam9g20ek.cfg
  user/ngie/detangle-rc/tools/tools/nanobsd/mtree-dedup.awk
  user/ngie/detangle-rc/tools/tools/nanobsd/nanobsd.sh
  user/ngie/detangle-rc/usr.bin/bmake/Makefile
  user/ngie/detangle-rc/usr.bin/bmake/config.h
  user/ngie/detangle-rc/usr.bin/bmake/unit-tests/Makefile
  user/ngie/detangle-rc/usr.bin/clang/lldb/Makefile
  user/ngie/detangle-rc/usr.bin/clang/lldb/Makefile.depend
  user/ngie/detangle-rc/usr.bin/mkimg/mbr.c
  user/ngie/detangle-rc/usr.bin/mkimg/scheme.c
  user/ngie/detangle-rc/usr.bin/mkimg/scheme.h
  user/ngie/detangle-rc/usr.bin/unzip/unzip.1
  user/ngie/detangle-rc/usr.bin/unzip/unzip.c
  user/ngie/detangle-rc/usr.bin/xo/tests/Makefile
  user/ngie/detangle-rc/usr.sbin/crunch/crunchide/exec_elf32.c
  user/ngie/detangle-rc/usr.sbin/iostat/iostat.c
  user/ngie/detangle-rc/usr.sbin/kldxref/kldxref.c
  user/ngie/detangle-rc/usr.sbin/ofwdump/Makefile.depend
  user/ngie/detangle-rc/usr.sbin/pmcstudy/pmcstudy.8
  user/ngie/detangle-rc/usr.sbin/pmcstudy/pmcstudy.c
  user/ngie/detangle-rc/usr.sbin/sesutil/Makefile
  user/ngie/detangle-rc/usr.sbin/sesutil/eltsub.c
  user/ngie/detangle-rc/usr.sbin/sesutil/eltsub.h
  user/ngie/detangle-rc/usr.sbin/sesutil/sesutil.c
Directory Properties:
  user/ngie/detangle-rc/   (props changed)
  user/ngie/detangle-rc/cddl/   (props changed)
  user/ngie/detangle-rc/cddl/contrib/opensolaris/   (props changed)
  user/ngie/detangle-rc/contrib/bmake/   (props changed)
  user/ngie/detangle-rc/contrib/elftoolchain/   (props changed)
  user/ngie/detangle-rc/contrib/top/   (props changed)
  user/ngie/detangle-rc/contrib/unbound/   (props changed)
  user/ngie/detangle-rc/include/   (props changed)
  user/ngie/detangle-rc/lib/libc/   (props changed)
  user/ngie/detangle-rc/sbin/   (props changed)
  user/ngie/detangle-rc/share/   (props changed)
  user/ngie/detangle-rc/share/man/man4/   (props changed)
  user/ngie/detangle-rc/sys/   (props changed)
  user/ngie/detangle-rc/sys/boot/   (props changed)
  user/ngie/detangle-rc/sys/cddl/contrib/opensolaris/   (props changed)
  user/ngie/detangle-rc/sys/conf/   (props changed)
  user/ngie/detangle-rc/targets/   (props changed)
  user/ngie/detangle-rc/usr.bin/mkimg/   (props changed)

Modified: user/ngie/detangle-rc/MAINTAINERS
==============================================================================
--- user/ngie/detangle-rc/MAINTAINERS	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/MAINTAINERS	Mon Dec 14 00:22:03 2015	(r292179)
@@ -26,54 +26,62 @@ sub-system.
 
 subsystem	login	notes
 -----------------------------
-opencrypto	jmg	Pre-commit review requested.  Documentation Required.
-kqueue		jmg	Pre-commit review requested.  Documentation Required.
-share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
+atf			freebsd-testing,jmmv,ngie	Pre-commit review requested.
 ath(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
-net80211	adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
-iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
-iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
-otus(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
-dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
-openssl		benl,jkim	Pre-commit review requested.
-release/release.sh	gjb,re	Pre-commit review and regression tests
-				requested.
-sh(1)		jilles		Pre-commit review requested. This also applies
-				to kill(1), printf(1) and test(1) which are
-				compiled in as builtins.
-isci(4)		jimharris	Pre-commit review requested.
-nvme(4)		jimharris	Pre-commit review requested.
-nvd(4)		jimharris	Pre-commit review requested.
-nvmecontrol(8)	jimharris	Pre-commit review requested.
-libfetch	des	Pre-commit review requested.
-fetch		des	Pre-commit review requested.
-libpam		des	Pre-commit review requested.
-openssh		des	Pre-commit review requested.
-pseudofs	des	Pre-commit review requested.
-procfs		des	Pre-commit review requested.
-linprocfs	des	Pre-commit review requested.
+callout_*(9)	rrs		Pre-commit review requested -- becareful its tricksy code :o.
 contrib/compiler-rt	dim	Pre-commit review preferred.
 contrib/libc++		dim	Pre-commit review preferred.
 contrib/libcxxrt	dim	Pre-commit review preferred.
 contrib/llvm		dim	Pre-commit review preferred.
 contrib/llvm/tools/lldb	emaste	Pre-commit review preferred.
-atf			freebsd-testing,jmmv,ngie	Pre-commit review requested.
 contrib/netbsd-tests	freebsd-testing,ngie	Pre-commit review requested.
 contrib/pjdfstest	freebsd-testing,ngie,pjd	Pre-commit review requested.
+dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
+etc/mail	gshapiro	Pre-commit review requested.  Keep in sync with -STABLE.
+etc/sendmail	gshapiro	Pre-commit review requested.  Keep in sync with -STABLE.
+fetch		des	Pre-commit review requested.
+isci(4)		jimharris	Pre-commit review requested.
+iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
+iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
+kqueue		jmg	Pre-commit review requested.  Documentation Required.
+libfetch	des	Pre-commit review requested.
+libpam		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
+lpr		gad	Pre-commit review requested, particularly for
+			lpd/recvjob.c and lpd/printjob.c.
+nanobsd		imp	Pre-commit phabricator review requested.
+net80211	adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
+nis(8), yp(8)	araujo	Pre-commit review requested.
+nvd(4)		jimharris	Pre-commit review requested.
+nvme(4)		jimharris	Pre-commit review requested.
+nvmecontrol(8)	jimharris	Pre-commit review requested.
+opencrypto	jmg	Pre-commit review requested.  Documentation Required.
+openssh		des	Pre-commit review requested.
+openssl		benl,jkim	Pre-commit review requested.
+otus(4)		adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
+pmcstudy(8)	rrs		Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+pseudofs	des	Pre-commit review requested.
+release/release.sh	gjb,re	Pre-commit review and regression tests
+				requested.
+sctp		rrs,tuexen	Pre-commit review requested (changes need to be backported to github).
+sendmail	gshapiro	Pre-commit review requested.
+sh(1)		jilles		Pre-commit review requested. This also applies
+				to kill(1), printf(1) and test(1) which are
+				compiled in as builtins.
+share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
 share/mk/*.test.mk	freebsd-testing,ngie (same list as share/mk too)	Pre-commit review requested.
-tests			freebsd-testing,ngie	Pre-commit review requested.
-sys/dev/usb	hselasky	If in doubt, ask.
-sys/dev/sound/usb	hselasky	If in doubt, ask.
 sys/compat/linuxkpi	hselasky	If in doubt, ask.
 sys/dev/e1000	erj	Pre-commit phabricator review requested.
 sys/dev/ixgbe	erj	Pre-commit phabricator review requested.
 sys/dev/ixl	erj	Pre-commit phabricator review requested.
+sys/dev/sound/usb	hselasky	If in doubt, ask.
+sys/dev/usb	hselasky	If in doubt, ask.
 sys/netinet/ip_carp.c	glebius	Pre-commit review recommended.
 sys/netpfil/pf	kp,glebius	Pre-commit review recommended.
+tests			freebsd-testing,ngie	Pre-commit review requested.
 usr.sbin/pkg	pkg@	Please coordinate behavior or flag changes with pkg team.
-lpr		gad	Pre-commit review requested, particularly for
-			lpd/recvjob.c and lpd/printjob.c.
-nis(8), yp(8)	araujo	Pre-commit review requested.
+vmm(4)		neel,grehan	Pre-commit review requested.
 ---- OLD ----
 libc/posix1e	rwatson	Pre-commit review requested.
 POSIX.1e ACLs	rwatson	Pre-commit review requested.
@@ -99,11 +107,6 @@ cd(4)		ken	Pre-commit review requested.
 pass(4)		ken	Pre-commit review requested.
 ch(4)		ken	Pre-commit review requested.
 em(4)		jfv	Pre-commit review requested.
-sendmail	gshapiro	Pre-commit review requested.
-etc/mail	gshapiro	Pre-commit review requested.
-				Keep in sync with -STABLE.
-etc/sendmail	gshapiro	Pre-commit review requested.
-				Keep in sync with -STABLE.
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
 groff		ru	Recommends pre-commit review.
@@ -152,5 +155,4 @@ sbin/routed	bms	Pre-commit review; notif
 cmx		daniel at roe.ch	Pre-commit review preferred.
 filemon		obrien		Pre-commit review preferred.
 sysdoc		trhodes		Pre-commit review preferred.
-nanobsd		imp	Pre-commit review requested for coordination.
-vmm(4)		neel,grehan	Pre-commit review requested.
+

Modified: user/ngie/detangle-rc/Makefile
==============================================================================
--- user/ngie/detangle-rc/Makefile	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/Makefile	Mon Dec 14 00:22:03 2015	(r292179)
@@ -180,7 +180,7 @@ _MAKE=	PATH=${PATH} ${SUB_MAKE} -f Makef
 _TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} != ${MACHINE_ARCH}
-_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/}
+_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/}
 .endif
 .if defined(TARGET) && !defined(_TARGET)
 _TARGET=${TARGET}

Modified: user/ngie/detangle-rc/Makefile.inc1
==============================================================================
--- user/ngie/detangle-rc/Makefile.inc1	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/Makefile.inc1	Mon Dec 14 00:22:03 2015	(r292179)
@@ -163,7 +163,7 @@ OSRELDATE=	0
 .endif
 
 # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
-.if !defined(VERSION)
+.if !defined(VERSION) && !make(showconfig)
 REVISION!=	${MAKE} -C ${SRCDIR}/release -V REVISION
 BRANCH!=	${MAKE} -C ${SRCDIR}/release -V BRANCH
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
@@ -172,7 +172,11 @@ VERSION=	FreeBSD ${REVISION}-${BRANCH:C/
 .export VERSION
 .endif
 
-KNOWN_ARCHES?=	aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+KNOWN_ARCHES?=	aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm   \
+		i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips \
+		mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc     \
+		riscv64/riscv sparc64
+
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
@@ -195,11 +199,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
 _TARGET_CPUTYPE=dummy
 .endif
+# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk.
+.if !make(showconfig)
 _CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
 		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
+.endif
 .if make(buildworld)
 BUILD_ARCH!=	uname -p
 .if ${MACHINE_ARCH} != ${BUILD_ARCH}
@@ -666,7 +673,7 @@ everything:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
-	${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all
+	${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
 .if defined(LIB32TMP)
 build32: .PHONY
 	@echo
@@ -2008,14 +2015,14 @@ _prebuild_libs: ${_prebuild_libs:S/$/__L
 _generic_libs: ${_generic_libs:S/$/__L/}
 
 # Enable SUBDIR_PARALLEL when not calling 'make all', unless called from
-# 'everything' with _PARALLEL_SUBUDIR_OK set.  This is because it is unlikely
+# 'everything' with _PARALLEL_SUBDIR_OK set.  This is because it is unlikely
 # that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE
 # or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in
 # parallel.  This is safe for the world stage of buildworld though since it has
 # already built libraries in a proper order and installed includes into
 # WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to
 # avoid trashing a system if it crashes mid-install.
-.if !make(all) || defined(_PARALLEL_SUBUDIR_OK)
+.if !make(all) || defined(_PARALLEL_SUBDIR_OK)
 SUBDIR_PARALLEL=
 .endif
 

Modified: user/ngie/detangle-rc/UPDATING
==============================================================================
--- user/ngie/detangle-rc/UPDATING	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/UPDATING	Mon Dec 14 00:22:03 2015	(r292179)
@@ -31,6 +31,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20151211:
+	The code to start recording plug and play data into the modules has
+	been committed. While the old tools will properly build a new kernel,
+	a number of warnings about "unknown metadata record 4" will be produced
+	for an older kldxref. To avoid such warnings, make sure to rebuild
+	the kernel toolchain (or world). Make sure that you have r292078 or
+	later when trying to build 292077 or later before rebuilding.
+
+20151207:
+	Debug data files are now built by default with 'make buildworld' and
+	installed with 'make installworld'. This facilitates debugging but
+	requires more disk space both during the build and for the installed
+	world. Debug files may be disabled by setting WITHOUT_DEBUG_FILES=yes
+	in src.conf(5).
+
 20151130:
 	r291527 changed the internal interface between the nfsd.ko and
 	nfscommon.ko modules. As such, they must both be upgraded to-gether.

Modified: user/ngie/detangle-rc/bin/freebsd-version/Makefile
==============================================================================
--- user/ngie/detangle-rc/bin/freebsd-version/Makefile	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/bin/freebsd-version/Makefile	Mon Dec 14 00:22:03 2015	(r292179)
@@ -2,7 +2,7 @@
 
 SCRIPTS = freebsd-version
 MAN = freebsd-version.1
-CLEANFILES = freebsd-version.sh
+CLEANFILES = freebsd-version freebsd-version.sh
 NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh
 
 freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS}

Modified: user/ngie/detangle-rc/bin/ls/print.c
==============================================================================
--- user/ngie/detangle-rc/bin/ls/print.c	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/bin/ls/print.c	Mon Dec 14 00:22:03 2015	(r292179)
@@ -47,12 +47,14 @@ __FBSDID("$FreeBSD$");
 #include <fts.h>
 #include <langinfo.h>
 #include <libutil.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <wchar.h>
 #ifdef COLORLS
 #include <ctype.h>
 #include <termcap.h>
@@ -105,6 +107,9 @@ static struct {
 } colors[C_NUMCOLORS];
 #endif
 
+static size_t padding_for_month[12];
+static size_t month_max_size = 0;
+
 void
 printscol(const DISPLAY *dp)
 {
@@ -138,6 +143,70 @@ printname(const char *field, const char 
 	return rc;
 }
 
+static const char *
+get_abmon(int mon)
+{
+
+	switch (mon) {
+	case 0: return (nl_langinfo(ABMON_1));
+	case 1: return (nl_langinfo(ABMON_2));
+	case 2: return (nl_langinfo(ABMON_3));
+	case 3: return (nl_langinfo(ABMON_4));
+	case 4: return (nl_langinfo(ABMON_5));
+	case 5: return (nl_langinfo(ABMON_6));
+	case 6: return (nl_langinfo(ABMON_7));
+	case 7: return (nl_langinfo(ABMON_8));
+	case 8: return (nl_langinfo(ABMON_9));
+	case 9: return (nl_langinfo(ABMON_10));
+	case 10: return (nl_langinfo(ABMON_11));
+	case 11: return (nl_langinfo(ABMON_12));
+	}
+
+	/* should never happen */
+	abort();
+}
+
+static size_t
+mbswidth(const char *month)
+{
+	wchar_t wc;
+	size_t width, donelen, clen, w;
+
+	width = donelen = 0;
+	while ((clen = mbrtowc(&wc, month + donelen, MB_LEN_MAX, NULL)) != 0) {
+		if (clen == (size_t)-1 || clen == (size_t)-2)
+			return (-1);
+		donelen += clen;
+		if ((w = wcwidth(wc)) == (size_t)-1)
+			return (-1);
+		width += w;
+	}
+
+	return (width);
+}
+
+static void
+compute_abbreviated_month_size(void)
+{
+	int i;
+	size_t width;
+	size_t months_width[12];
+
+	for (i = 0; i < 12; i++) {
+		width = mbswidth(get_abmon(i));
+		if (width == (size_t)-1) {
+			month_max_size = -1;
+			return;
+		}
+		months_width[i] = width;
+		if (width > month_max_size)
+			month_max_size = width;
+	}
+
+	for (i = 0; i < 12; i++)
+		padding_for_month[i] = month_max_size - months_width[i];
+}
+
 /*
  * print name in current style
  */
@@ -425,6 +494,31 @@ printdev(size_t width, dev_t dev)
 	xo_emit("{:device/%#*jx} ", (u_int)width, (uintmax_t)dev);
 }
 
+static size_t
+ls_strftime(char *str, size_t len, const char *fmt, const struct tm *tm)
+{
+	char *posb, nfmt[BUFSIZ];
+	const char *format = fmt;
+	size_t ret;
+
+	if ((posb = strstr(fmt, "%b")) != NULL) {
+		if (month_max_size == 0) {
+			compute_abbreviated_month_size();
+		}
+		if (month_max_size > 0) {
+			snprintf(nfmt, sizeof(nfmt),  "%.*s%s%*s%s",
+			    (int)(posb - fmt), fmt,
+			    get_abmon(tm->tm_mon),
+			    (int)padding_for_month[tm->tm_mon],
+			    "",
+			    posb + 2);
+			format = nfmt;
+		}
+	}
+	ret = strftime(str, len, format, tm);
+	return (ret);
+}
+
 static void
 printtime(const char *field, time_t ftime)
 {
@@ -451,7 +545,7 @@ printtime(const char *field, time_t ftim
 	else
 		/* mmm dd  yyyy || dd mmm  yyyy */
 		format = d_first ? "%e %b  %Y" : "%b %e  %Y";
-	strftime(longstring, sizeof(longstring), format, localtime(&ftime));
+	ls_strftime(longstring, sizeof(longstring), format, localtime(&ftime));
 
 	snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field);
 	xo_attr("value", "%ld", (long) ftime);

Modified: user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh
==============================================================================
--- user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/bin/ls/tests/ls_tests.sh	Mon Dec 14 00:22:03 2015	(r292179)
@@ -170,8 +170,6 @@ B_flag_head()
 
 B_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
 	atf_check -e empty -o match:'y\\013z' -s exit:0 ls -B
 }
@@ -467,8 +465,6 @@ b_flag_head()
 
 b_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
 	atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b
 }
@@ -747,8 +743,6 @@ q_flag_and_w_flag_head()
 
 q_flag_and_w_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	create_test_dir
 
 	test_file="$(printf "y\01z")"

Modified: user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile
==============================================================================
--- user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/bin/sh/tests/parameters/Makefile	Mon Dec 14 00:22:03 2015	(r292179)
@@ -21,6 +21,7 @@ FILES+=		positional5.0
 FILES+=		positional6.0
 FILES+=		positional7.0
 FILES+=		positional8.0
+FILES+=		positional9.0
 FILES+=		pwd1.0
 FILES+=		pwd2.0
 

Copied: user/ngie/detangle-rc/bin/sh/tests/parameters/positional9.0 (from r292178, head/bin/sh/tests/parameters/positional9.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/detangle-rc/bin/sh/tests/parameters/positional9.0	Mon Dec 14 00:22:03 2015	(r292179, copy of r292178, head/bin/sh/tests/parameters/positional9.0)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Although POSIX leaves the result of expanding ${#@} and ${#*} unspecified,
+# make sure it is at least numeric.
+
+set -- bb cc ddd
+set -f
+lengths=${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+IFS=
+lengths=$lengths${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+case $lengths in
+*[!0-9]*)
+	printf 'bad: %s\n' "$lengths"
+	exit 3 ;;
+????????????????*) ;;
+*)
+	printf 'too short: %s\n' "$lengths"
+	exit 3 ;;
+esac

Modified: user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
==============================================================================
--- user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,2 +1,3 @@
 Sun, 25 Jan 2004 13:00:00 PST
 2004 Jan 25 13:00:00
+

Copied: user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh (from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh	Mon Dec 14 00:22:03 2015	(r292179, copy of r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
@@ -0,0 +1,99 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2015, Joyent, Inc. All rights reserved.
+#
+
+#
+# This test assures that we can have the same provider name across multiple
+# probe definitions, and that the result will be the union of those
+# definitions.  In particular, libusdt depends on this when (for example)
+# node modules that create a provider are loaded multiple times due to
+# being included by different modules.
+#
+
+if [ $# != 1 ]; then
+	echo expected one argument: '<'dtrace-path'>'
+	exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+cat > test.c <<EOF
+#include <unistd.h>
+
+void
+main()
+{
+EOF
+
+objs=
+
+for oogle in bagnoogle stalloogle cockoogle; do
+	cat > $oogle.c <<EOF
+#include <sys/sdt.h>
+
+void
+$oogle()
+{
+	DTRACE_PROBE(doogle, $oogle);
+}
+EOF
+
+	cat > $oogle.d <<EOF
+provider doogle {
+	probe $oogle();
+};
+EOF
+
+	cc -c $oogle.c
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to compile $oogle.c"
+		exit 1
+	fi
+
+	$dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to process $oogle.d"
+		exit 1
+	fi
+
+	objs="$objs $oogle.o $oogle.d.o"
+	echo $oogle'();' >> test.c
+done
+
+echo "}" >> test.c
+
+cc -o test test.c $objs
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to compile test.c"
+	exit 1
+fi
+
+$dtrace -n 'doogle$target:::{@[probename] = count()}' \
+    -n 'END{printa("%-10s %@d\n", @)}' -x quiet -x aggsortkey -Zc ./test
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to execute test"
+	exit 1
+fi
+
+cd /
+rm -rf $DIR
+exit 0

Copied: user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out (from r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/detangle-rc/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out	Mon Dec 14 00:22:03 2015	(r292179, copy of r292178, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
@@ -0,0 +1,4 @@
+bagnoogle  1
+cockoogle  1
+stalloogle 1
+

Modified: user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Mon Dec 14 00:22:03 2015	(r292179)
@@ -571,12 +571,6 @@ dt_pid_usdt_mapping(void *data, const pr
 	prsyminfo_t sip;
 	dof_helper_t dh;
 	GElf_Half e_type;
-#ifdef __FreeBSD__
-	dof_hdr_t hdr;
-	size_t sz;
-	uint64_t dofmax;
-	void *dof;
-#endif
 	const char *mname;
 	const char *syms[] = { "___SUNW_dof", "__SUNW_dof" };
 	int i, fd = -1;
@@ -606,61 +600,25 @@ dt_pid_usdt_mapping(void *data, const pr
 			continue;
 		}
 
-#ifdef __FreeBSD__
+		dh.dofhp_dof = sym.st_value;
 		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
-		if (Pread(P, &hdr, sizeof (hdr), sym.st_value) !=
-		    sizeof (hdr)) {
-			dt_dprintf("read of DOF header failed\n");
-			continue;
-		}
-
-		sz = sizeof(dofmax);
-		if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz,
-		    NULL, 0) != 0) {
-			dt_dprintf("failed to read dof_maxsize: %s\n",
-			    strerror(errno));
-			continue;
-		}
-		if (dofmax < hdr.dofh_loadsz) {
-			dt_dprintf("DOF load size exceeds maximum\n");
-			continue;
-		}
-
-		if ((dof = malloc(hdr.dofh_loadsz)) == NULL)
-			return (-1);
-
-		if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) !=
-		    hdr.dofh_loadsz) {
-			free(dof);
-			dt_dprintf("read of DOF section failed\n");
-			continue;
-		}
-
-		dh.dofhp_dof = (uintptr_t)dof;
-		dh.dofhp_pid = proc_getpid(P);
 
 		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
 		    sip.prs_lmid, mname);
 
+#ifdef __FreeBSD__
+		dh.dofhp_pid = proc_getpid(P);
+
 		if (fd == -1 &&
 		    (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) {
 			dt_dprintf("open of helper device failed: %s\n",
 			    strerror(errno));
-			free(dof);
 			return (-1); /* errno is set for us */
 		}
 
 		if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0)
 			dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod);
-
-		free(dof);
 #else
-		dh.dofhp_dof = sym.st_value;
-		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
-
-		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
-		    sip.prs_lmid, mname);
-
 		if (fd == -1 &&
 		    (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) {
 			dt_dprintf("pr_open of helper device failed: %s\n",

Modified: user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
==============================================================================
--- user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Mon Dec 14 00:22:03 2015	(r292179)
@@ -24,6 +24,6 @@ CFILES= \
      tst.sigwait.c  \
 
 
-LIBADD.tst.sigwait.exe=rt
+LIBADD.tst.sigwait.exe+= rt
 
 .include "../../dtrace.test.mk"

Modified: user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
==============================================================================
--- user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Mon Dec 14 00:22:03 2015	(r292179)
@@ -46,6 +46,8 @@ TESTFILES= \
      tst.onlyenabled.ksh  \
      tst.reap.ksh  \
      tst.reeval.ksh  \
+     tst.sameprovmulti.ksh  \
+     tst.sameprovmulti.ksh.out  \
      tst.static.ksh  \
      tst.static.ksh.out  \
      tst.static2.ksh  \

Modified: user/ngie/detangle-rc/contrib/bmake/ChangeLog
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/ChangeLog	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/ChangeLog	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,3 +1,35 @@
+2015-12-01  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151201
+	  Merge with NetBSD make, pick up
+	  o cond.c: CondCvtArg: avoid access beyond end of empty buffer.
+	  o meta.c: meta_oodate: use lstat(2) for checking link target
+	    in case it is a symlink.
+	  o var.c: avoid calling brk_string and Var_Export1 with empty
+	    strings.
+	
+2015-11-26  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151126
+	  Merge with NetBSD make, pick up
+	  o parse.c: ParseTrackInput don't access beyond 
+	    end of old value.
+	
+2015-10-22  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151022
+
+	* Add support for BSD/OS which lacks inttypes.h
+	  and really needs sys/param.h for sys/sysctl.h
+	  also 'type' is not a shell builtin.
+
+	* var.c: eliminate uint32_t and need for inttypes.h
+	
+	* main.c: PrintOnError flush stdout before run .ERROR
+
+	* parse.c: cope with _SC_PAGESIZE not being defined.
+
+	
 2015-10-20  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile (MAKE_VERSION): 20151020

Modified: user/ngie/detangle-rc/contrib/bmake/Makefile
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/Makefile	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/Makefile	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.44 2015/10/20 21:41:40 sjg Exp $
+#	$Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20151020
+MAKE_VERSION= 20151201
 
 PROG=	bmake
 

Modified: user/ngie/detangle-rc/contrib/bmake/boot-strap
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/boot-strap	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/boot-strap	Mon Dec 14 00:22:03 2015	(r292179)
@@ -111,7 +111,7 @@
 #	Simon J. Gerraty <sjg at crufty.net>
 
 # RCSid:
-#	$Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $
+#	$Id: boot-strap,v 1.48 2015/10/25 05:20:48 sjg Exp $
 #
 #	@(#) Copyright (c) 2001 Simon J. Gerraty
 #
@@ -395,8 +395,15 @@ Bmake() {
     )
 }
 
+# there is actually a shell where type is not a builtin
+# if type is missing, which(1) had better exists!
+if (type cat) > /dev/null 2>&1; then
+which() {
+        type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q'
+}
+fi
 # make sure test below uses the same diff that configure did
-TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'`
+TOOL_DIFF=`which diff`
 export TOOL_DIFF
 
 op_configure() {

Modified: user/ngie/detangle-rc/contrib/bmake/cond.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/cond.c	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/cond.c	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -490,6 +490,10 @@ CondCvtArg(char *str, double *value)
     double d_val;
 
     errno = 0;
+    if (!*str) {
+	*value = (double)0;
+	return TRUE;
+    }
     l_val = strtoul(str, &eptr, str[1] == 'x' ? 16 : 10);
     ech = *eptr;
     if (ech == 0 && errno != ERANGE) {

Modified: user/ngie/detangle-rc/contrib/bmake/config.h.in
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/config.h.in	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/config.h.in	Mon Dec 14 00:22:03 2015	(r292179)
@@ -59,6 +59,12 @@
 /* Define to 1 if you have the `killpg' function. */
 #undef HAVE_KILLPG
 
+/* Define to 1 if you have the <libgen.h> header file. */
+#undef HAVE_LIBGEN_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -158,6 +164,9 @@
    */
 #undef HAVE_SYS_NDIR_H
 
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
@@ -304,6 +313,11 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT32_T
+
 /* C99 function name */
 #undef __func__
 
@@ -319,5 +333,9 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint32_t
+
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork

Modified: user/ngie/detangle-rc/contrib/bmake/configure
==============================================================================
Binary file (source and/or target). No diff available.

Modified: user/ngie/detangle-rc/contrib/bmake/configure.in
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/configure.in	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/configure.in	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,11 +1,11 @@
 dnl
 dnl RCSid:
-dnl	$Id: configure.in,v 1.54 2015/10/10 04:17:10 sjg Exp $
+dnl	$Id: configure.in,v 1.56 2015/10/25 05:20:48 sjg Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
 AC_PREREQ(2.50)
-AC_INIT([bmake], [20151009], [sjg at NetBSD.org])
+AC_INIT([bmake], [20151022], [sjg at NetBSD.org])
 AC_CONFIG_HEADERS(config.h)
 
 dnl make srcdir absolute
@@ -101,10 +101,19 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
 dnl Keep this list sorted
+AC_CHECK_HEADERS(sys/param.h)
+dnl On BSDi at least we really need sys/param.h for sys/sysctl.h
+AC_CHECK_HEADERS([sys/sysctl.h], [], [],
+[#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+# endif
+])
+
 AC_CHECK_HEADERS( \
 	ar.h \
 	err.h \
 	fcntl.h \
+	libgen.h \
 	limits.h \
 	paths.h \
 	poll.h \
@@ -113,7 +122,6 @@ AC_CHECK_HEADERS( \
 	sys/mman.h \
 	sys/select.h \
 	sys/socket.h \
-	sys/sysctl.h \
 	sys/time.h \
 	sys/uio.h \
 	unistd.h \
@@ -143,6 +151,7 @@ AC_C_CONST
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
+AC_TYPE_UINT32_T
 AC_DECL_SYS_SIGLIST
 AC_HEADER_TIME
 AC_STRUCT_TM

Modified: user/ngie/detangle-rc/contrib/bmake/main.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/main.c	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/main.c	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.234 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.235 2015/10/25 05:24:44 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1902,6 +1902,8 @@ PrintOnError(GNode *gn, const char *s)
 	    printf("%s", cp);
 	free(cp);
     }
+    fflush(stdout);
+
     /*
      * Finally, see if there is a .ERROR target, and run it if so.
      */

Modified: user/ngie/detangle-rc/contrib/bmake/meta.c
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/meta.c	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/meta.c	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.40 2015/10/11 04:51:24 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.41 2015/11/30 23:37:56 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -38,7 +38,11 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#ifdef HAVE_LIBGEN_H
 #include <libgen.h>
+#elif !defined(HAVE_DIRNAME)
+char * dirname(char *);
+#endif
 #include <errno.h>
 #if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H)
 #include <err.h>
@@ -1183,7 +1187,8 @@ meta_oodate(GNode *gn, Boolean oodate)
 		    if ((strstr("tmp", p)))
 			break;
 
-		    if (stat(p, &fs) < 0) {
+		    if ((link_src != NULL && lstat(p, &fs) < 0) ||
+			(link_src == NULL && stat(p, &fs) < 0)) {
 			Lst_AtEnd(missingFiles, bmake_strdup(p));
 		    }
 		    break;

Modified: user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/mk/ChangeLog	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,3 +1,29 @@
+2015-11-14  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20151111
+
+	* meta.sys.mk: include sys.dependfile.mk
+
+	* sys.mk (OPTIONS_DEFAULT_NO): use options.mk
+	  to set MK_AUTO_OBJ and MK_DIRDEPS_BUILD
+	  include local.sys.env.mk early
+	  include local.sys.mk later
+	
+	* own.mk (OPTIONS_DEFAULT_NO): AUTO_OBJ etc moved to sys.mk
+
+2015-11-13  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* meta.sys.mk (META_COOKIE_TOUCH):
+	  add ${META_COOKIE_TOUCH} to the end of scripts to touch cookie
+
+	* meta.stage.mk: stage_libs should ignore SYMLINKS.
+
+2015-10-23  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20151022
+
+	* sys.mk: BSD/OS does not have 'type' as a shell builtin.
+
 2015-10-20  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* install-mk (MK_VERSION): 20151020
@@ -460,7 +486,7 @@
 	  needed.
 	* gendirdeps.mk: only produce unqualified deps if no
 	  .MAKE.DEPENDFILE_PREFERENCE ends in .${MACHINE}
-	* meta.subdir.mk: apply SUBDIREPS_FILTER
+	* meta.subdir.mk: apply SUBDIRDEPS_FILTER
 	
 2012-04-20  Simon J. Gerraty  <sjg at bad.crufty.net>
 

Modified: user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/mk/host-target.mk	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,5 +1,5 @@
 # RCSid:
-#	$Id: host-target.mk,v 1.9 2015/09/10 18:42:57 sjg Exp $
+#	$Id: host-target.mk,v 1.11 2015/10/25 00:07:20 sjg Exp $
 
 # Host platform information; may be overridden
 .if !defined(_HOST_OSNAME)
@@ -21,7 +21,7 @@ _HOST_ARCH := ${_HOST_MACHINE}
 .else
 _HOST_ARCH != uname -p 2> /dev/null || uname -m
 # uname -p may produce garbage on linux
-.if ${_HOST_ARCH:[\#]} > 1
+.if ${_HOST_ARCH:[\#]} > 1 || ${_HOST_ARCH:Nunknown} == ""
 _HOST_ARCH := ${_HOST_MACHINE}
 .endif
 .endif
@@ -33,10 +33,10 @@ HOST_MACHINE := ${_HOST_MACHINE}
 .endif
 
 HOST_OSMAJOR := ${_HOST_OSREL:C/[^0-9].*//}
-HOST_OSTYPE  :=	${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH}
+HOST_OSTYPE  :=	${_HOST_OSNAME:S,/,,g}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH}
 HOST_OS      :=	${_HOST_OSNAME}
 host_os      :=	${_HOST_OSNAME:tl}
-HOST_TARGET  := ${host_os}${HOST_OSMAJOR}-${_HOST_ARCH}
+HOST_TARGET  := ${host_os:S,/,,g}${HOST_OSMAJOR}-${_HOST_ARCH}
 
 # tr is insanely non-portable, accommodate the lowest common denominator
 TR ?= tr

Modified: user/ngie/detangle-rc/contrib/bmake/mk/init.mk
==============================================================================
--- user/ngie/detangle-rc/contrib/bmake/mk/init.mk	Mon Dec 14 00:12:53 2015	(r292178)
+++ user/ngie/detangle-rc/contrib/bmake/mk/init.mk	Mon Dec 14 00:22:03 2015	(r292179)
@@ -1,4 +1,4 @@
-# $Id: init.mk,v 1.9 2013/07/18 05:46:24 sjg Exp $
+# $Id: init.mk,v 1.10 2015/12/07 04:28:31 sjg Exp $
 #
 #	@(#) Copyright (c) 2002, Simon J. Gerraty

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

More information about the svn-src-user mailing list