svn commit: r296869 - in projects/release-pkg: . bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/bmake contrib/bmake/mk contrib/bmake/unit-tests contrib/elftoolchain/libdwarf contrib/e...

Glen Barber gjb at FreeBSD.org
Mon Mar 14 18:54:33 UTC 2016 

Author: gjb
Date: Mon Mar 14 18:54:29 2016
New Revision: 296869
URL: https://svnweb.freebsd.org/changeset/base/296869

Log:
  MFH
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-pkg/Makefile.libcompat
     - copied unchanged from r296868, head/Makefile.libcompat
  projects/release-pkg/crypto/openssh/platform-pledge.c
     - copied unchanged from r296868, head/crypto/openssh/platform-pledge.c
  projects/release-pkg/crypto/openssh/regress/cert-file.sh
     - copied unchanged from r296868, head/crypto/openssh/regress/cert-file.sh
  projects/release-pkg/crypto/openssh/regress/check-perm.c
     - copied unchanged from r296868, head/crypto/openssh/regress/check-perm.c
  projects/release-pkg/crypto/openssh/sandbox-pledge.c
     - copied unchanged from r296868, head/crypto/openssh/sandbox-pledge.c
  projects/release-pkg/crypto/openssh/sandbox-solaris.c
     - copied unchanged from r296868, head/crypto/openssh/sandbox-solaris.c
  projects/release-pkg/etc/defaults/Makefile.depend
     - copied unchanged from r296868, head/etc/defaults/Makefile.depend
  projects/release-pkg/share/examples/Makefile.depend
     - copied unchanged from r296868, head/share/examples/Makefile.depend
  projects/release-pkg/sys/dev/usb/controller/xhci_mv.c
     - copied unchanged from r296868, head/sys/dev/usb/controller/xhci_mv.c
  projects/release-pkg/tools/build/options/WITHOUT_FAST_DEPEND
     - copied unchanged from r296868, head/tools/build/options/WITHOUT_FAST_DEPEND
Deleted:
  projects/release-pkg/crypto/openssh/roaming_client.c
  projects/release-pkg/crypto/openssh/roaming_common.c
  projects/release-pkg/crypto/openssh/roaming_dummy.c
  projects/release-pkg/crypto/openssh/roaming_serv.c
Modified:
  projects/release-pkg/MAINTAINERS   (contents, props changed)
  projects/release-pkg/Makefile
  projects/release-pkg/Makefile.inc1
  projects/release-pkg/ObsoleteFiles.inc
  projects/release-pkg/UPDATING
  projects/release-pkg/bin/sh/exec.c
  projects/release-pkg/bin/sh/miscbltin.c
  projects/release-pkg/bin/sh/sh.1
  projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
  projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c
  projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c
  projects/release-pkg/contrib/bmake/ChangeLog
  projects/release-pkg/contrib/bmake/Makefile
  projects/release-pkg/contrib/bmake/arch.c
  projects/release-pkg/contrib/bmake/bmake.1
  projects/release-pkg/contrib/bmake/bmake.cat1
  projects/release-pkg/contrib/bmake/compat.c
  projects/release-pkg/contrib/bmake/cond.c
  projects/release-pkg/contrib/bmake/dirname.c
  projects/release-pkg/contrib/bmake/for.c
  projects/release-pkg/contrib/bmake/getopt.c
  projects/release-pkg/contrib/bmake/job.c
  projects/release-pkg/contrib/bmake/main.c
  projects/release-pkg/contrib/bmake/make.1
  projects/release-pkg/contrib/bmake/make.c
  projects/release-pkg/contrib/bmake/make.h
  projects/release-pkg/contrib/bmake/meta.c
  projects/release-pkg/contrib/bmake/meta.h
  projects/release-pkg/contrib/bmake/mk/ChangeLog
  projects/release-pkg/contrib/bmake/mk/auto.dep.mk
  projects/release-pkg/contrib/bmake/mk/dirdeps.mk
  projects/release-pkg/contrib/bmake/mk/gendirdeps.mk
  projects/release-pkg/contrib/bmake/mk/install-mk
  projects/release-pkg/contrib/bmake/mk/meta.autodep.mk
  projects/release-pkg/contrib/bmake/mk/meta.stage.mk
  projects/release-pkg/contrib/bmake/mk/meta.sys.mk
  projects/release-pkg/contrib/bmake/mk/meta2deps.sh
  projects/release-pkg/contrib/bmake/mk/sys.clean-env.mk
  projects/release-pkg/contrib/bmake/mk/sys.dependfile.mk
  projects/release-pkg/contrib/bmake/mk/warnings.mk
  projects/release-pkg/contrib/bmake/nonints.h
  projects/release-pkg/contrib/bmake/parse.c
  projects/release-pkg/contrib/bmake/suff.c
  projects/release-pkg/contrib/bmake/targ.c
  projects/release-pkg/contrib/bmake/unit-tests/export-env.exp
  projects/release-pkg/contrib/bmake/unit-tests/export-env.mk
  projects/release-pkg/contrib/bmake/unit-tests/modts.exp
  projects/release-pkg/contrib/bmake/unit-tests/modts.mk
  projects/release-pkg/contrib/bmake/var.c
  projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
  projects/release-pkg/contrib/elftoolchain/libelf/libelf_convert.m4
  projects/release-pkg/contrib/libc++/include/__config
  projects/release-pkg/contrib/libc++/include/atomic
  projects/release-pkg/contrib/libc++/include/string
  projects/release-pkg/contrib/libc++/include/system_error
  projects/release-pkg/contrib/pjdfstest/tests/ftruncate/11.t
  projects/release-pkg/contrib/pjdfstest/tests/misc.sh
  projects/release-pkg/contrib/pjdfstest/tests/open/20.t
  projects/release-pkg/contrib/pjdfstest/tests/truncate/11.t
  projects/release-pkg/contrib/unbound/iterator/iter_hints.c
  projects/release-pkg/crypto/openssh/ChangeLog
  projects/release-pkg/crypto/openssh/FREEBSD-upgrade
  projects/release-pkg/crypto/openssh/Makefile.in
  projects/release-pkg/crypto/openssh/README
  projects/release-pkg/crypto/openssh/README.platform
  projects/release-pkg/crypto/openssh/auth-bsdauth.c
  projects/release-pkg/crypto/openssh/auth-krb5.c
  projects/release-pkg/crypto/openssh/auth-options.c
  projects/release-pkg/crypto/openssh/auth-pam.c
  projects/release-pkg/crypto/openssh/auth.h
  projects/release-pkg/crypto/openssh/auth2-pubkey.c
  projects/release-pkg/crypto/openssh/authfd.c
  projects/release-pkg/crypto/openssh/authfd.h
  projects/release-pkg/crypto/openssh/authfile.c
  projects/release-pkg/crypto/openssh/channels.c
  projects/release-pkg/crypto/openssh/cipher.c
  projects/release-pkg/crypto/openssh/clientloop.c
  projects/release-pkg/crypto/openssh/clientloop.h
  projects/release-pkg/crypto/openssh/config.h
  projects/release-pkg/crypto/openssh/configure.ac
  projects/release-pkg/crypto/openssh/contrib/redhat/openssh.spec
  projects/release-pkg/crypto/openssh/contrib/ssh-copy-id
  projects/release-pkg/crypto/openssh/contrib/ssh-copy-id.1
  projects/release-pkg/crypto/openssh/contrib/suse/openssh.spec
  projects/release-pkg/crypto/openssh/defines.h
  projects/release-pkg/crypto/openssh/dh.h
  projects/release-pkg/crypto/openssh/includes.h
  projects/release-pkg/crypto/openssh/kex.c
  projects/release-pkg/crypto/openssh/kex.h
  projects/release-pkg/crypto/openssh/kexc25519s.c
  projects/release-pkg/crypto/openssh/kexdhs.c
  projects/release-pkg/crypto/openssh/kexecdhs.c
  projects/release-pkg/crypto/openssh/kexgexs.c
  projects/release-pkg/crypto/openssh/key.c
  projects/release-pkg/crypto/openssh/key.h
  projects/release-pkg/crypto/openssh/krl.c
  projects/release-pkg/crypto/openssh/krl.h
  projects/release-pkg/crypto/openssh/loginrec.c
  projects/release-pkg/crypto/openssh/misc.c
  projects/release-pkg/crypto/openssh/monitor.c
  projects/release-pkg/crypto/openssh/monitor_wrap.c
  projects/release-pkg/crypto/openssh/monitor_wrap.h
  projects/release-pkg/crypto/openssh/mux.c
  projects/release-pkg/crypto/openssh/myproposal.h
  projects/release-pkg/crypto/openssh/opacket.c
  projects/release-pkg/crypto/openssh/opacket.h
  projects/release-pkg/crypto/openssh/openbsd-compat/bsd-misc.c
  projects/release-pkg/crypto/openssh/openbsd-compat/bsd-misc.h
  projects/release-pkg/crypto/openssh/openbsd-compat/bsd-poll.h
  projects/release-pkg/crypto/openssh/openbsd-compat/glob.c
  projects/release-pkg/crypto/openssh/openbsd-compat/glob.h
  projects/release-pkg/crypto/openssh/openbsd-compat/openbsd-compat.h
  projects/release-pkg/crypto/openssh/openbsd-compat/port-solaris.c
  projects/release-pkg/crypto/openssh/openbsd-compat/port-solaris.h
  projects/release-pkg/crypto/openssh/openbsd-compat/realpath.c
  projects/release-pkg/crypto/openssh/packet.c
  projects/release-pkg/crypto/openssh/packet.h
  projects/release-pkg/crypto/openssh/platform.h
  projects/release-pkg/crypto/openssh/readconf.c
  projects/release-pkg/crypto/openssh/readconf.h
  projects/release-pkg/crypto/openssh/readpass.c
  projects/release-pkg/crypto/openssh/regress/Makefile
  projects/release-pkg/crypto/openssh/regress/agent-ptrace.sh
  projects/release-pkg/crypto/openssh/regress/dhgex.sh
  projects/release-pkg/crypto/openssh/regress/hostkey-rotate.sh
  projects/release-pkg/crypto/openssh/regress/keys-command.sh
  projects/release-pkg/crypto/openssh/regress/keyscan.sh
  projects/release-pkg/crypto/openssh/regress/limit-keytype.sh
  projects/release-pkg/crypto/openssh/regress/principals-command.sh
  projects/release-pkg/crypto/openssh/regress/proxy-connect.sh
  projects/release-pkg/crypto/openssh/regress/rekey.sh
  projects/release-pkg/crypto/openssh/regress/setuid-allowed.c
  projects/release-pkg/crypto/openssh/regress/sftp-chroot.sh
  projects/release-pkg/crypto/openssh/regress/unittests/sshkey/test_file.c
  projects/release-pkg/crypto/openssh/regress/unittests/sshkey/test_fuzz.c
  projects/release-pkg/crypto/openssh/regress/unittests/sshkey/test_sshkey.c
  projects/release-pkg/crypto/openssh/roaming.h
  projects/release-pkg/crypto/openssh/sandbox-seccomp-filter.c
  projects/release-pkg/crypto/openssh/sandbox-systrace.c
  projects/release-pkg/crypto/openssh/scp.1
  projects/release-pkg/crypto/openssh/scp.c
  projects/release-pkg/crypto/openssh/servconf.c
  projects/release-pkg/crypto/openssh/serverloop.c
  projects/release-pkg/crypto/openssh/session.c
  projects/release-pkg/crypto/openssh/sftp-client.c
  projects/release-pkg/crypto/openssh/sftp-client.h
  projects/release-pkg/crypto/openssh/sftp-server-main.c
  projects/release-pkg/crypto/openssh/sftp-server.c
  projects/release-pkg/crypto/openssh/sftp.1
  projects/release-pkg/crypto/openssh/sftp.c
  projects/release-pkg/crypto/openssh/ssh-add.c
  projects/release-pkg/crypto/openssh/ssh-agent.1
  projects/release-pkg/crypto/openssh/ssh-agent.c
  projects/release-pkg/crypto/openssh/ssh-dss.c
  projects/release-pkg/crypto/openssh/ssh-ecdsa.c
  projects/release-pkg/crypto/openssh/ssh-keygen.1
  projects/release-pkg/crypto/openssh/ssh-keygen.c
  projects/release-pkg/crypto/openssh/ssh-keyscan.1
  projects/release-pkg/crypto/openssh/ssh-keyscan.c
  projects/release-pkg/crypto/openssh/ssh-keysign.8
  projects/release-pkg/crypto/openssh/ssh-keysign.c
  projects/release-pkg/crypto/openssh/ssh-pkcs11-client.c
  projects/release-pkg/crypto/openssh/ssh-pkcs11-helper.c
  projects/release-pkg/crypto/openssh/ssh-pkcs11.c
  projects/release-pkg/crypto/openssh/ssh-rsa.c
  projects/release-pkg/crypto/openssh/ssh.1
  projects/release-pkg/crypto/openssh/ssh.c
  projects/release-pkg/crypto/openssh/ssh.h
  projects/release-pkg/crypto/openssh/ssh2.h
  projects/release-pkg/crypto/openssh/ssh_api.c
  projects/release-pkg/crypto/openssh/ssh_config
  projects/release-pkg/crypto/openssh/ssh_config.5
  projects/release-pkg/crypto/openssh/ssh_namespace.h
  projects/release-pkg/crypto/openssh/sshbuf-getput-basic.c
  projects/release-pkg/crypto/openssh/sshbuf.c
  projects/release-pkg/crypto/openssh/sshbuf.h
  projects/release-pkg/crypto/openssh/sshconnect.c
  projects/release-pkg/crypto/openssh/sshconnect.h
  projects/release-pkg/crypto/openssh/sshconnect1.c
  projects/release-pkg/crypto/openssh/sshconnect2.c
  projects/release-pkg/crypto/openssh/sshd.8
  projects/release-pkg/crypto/openssh/sshd.c
  projects/release-pkg/crypto/openssh/sshd_config
  projects/release-pkg/crypto/openssh/sshd_config.5
  projects/release-pkg/crypto/openssh/ssherr.c
  projects/release-pkg/crypto/openssh/sshkey.c
  projects/release-pkg/crypto/openssh/sshkey.h
  projects/release-pkg/crypto/openssh/sshlogin.c
  projects/release-pkg/crypto/openssh/uidswap.c
  projects/release-pkg/crypto/openssh/version.h
  projects/release-pkg/crypto/openssh/xmalloc.c
  projects/release-pkg/crypto/openssh/xmalloc.h
  projects/release-pkg/etc/Makefile
  projects/release-pkg/etc/autofs/special_media
  projects/release-pkg/etc/defaults/Makefile
  projects/release-pkg/etc/login.conf
  projects/release-pkg/etc/rc.d/netwait
  projects/release-pkg/include/Makefile
  projects/release-pkg/lib/Makefile
  projects/release-pkg/lib/atf/Makefile
  projects/release-pkg/lib/clang/clang.build.mk
  projects/release-pkg/lib/libc++/Makefile
  projects/release-pkg/lib/libc/sys/Symbol.map
  projects/release-pkg/lib/libpam/modules/pam_ssh/Makefile
  projects/release-pkg/lib/libpam/modules/pam_ssh/Makefile.depend
  projects/release-pkg/lib/libpam/modules/pam_ssh/pam_ssh.c
  projects/release-pkg/lib/libunbound/Makefile
  projects/release-pkg/lib/libutil/login.conf.5
  projects/release-pkg/lib/libutil/login_class.3
  projects/release-pkg/lib/libutil/login_class.c
  projects/release-pkg/sbin/geom/core/geom.c
  projects/release-pkg/sbin/ifconfig/ifieee80211.c
  projects/release-pkg/sbin/mdmfs/mdmfs.8
  projects/release-pkg/sbin/mdmfs/mdmfs.c
  projects/release-pkg/sbin/nvmecontrol/power.c
  projects/release-pkg/sbin/ping/ping.8
  projects/release-pkg/sbin/ping/ping.c
  projects/release-pkg/secure/lib/libssh/Makefile
  projects/release-pkg/secure/libexec/sftp-server/Makefile
  projects/release-pkg/secure/libexec/ssh-keysign/Makefile
  projects/release-pkg/secure/libexec/ssh-pkcs11-helper/Makefile
  projects/release-pkg/secure/usr.bin/scp/Makefile
  projects/release-pkg/secure/usr.bin/sftp/Makefile
  projects/release-pkg/secure/usr.bin/ssh-add/Makefile
  projects/release-pkg/secure/usr.bin/ssh-agent/Makefile
  projects/release-pkg/secure/usr.bin/ssh-keygen/Makefile
  projects/release-pkg/secure/usr.bin/ssh-keyscan/Makefile
  projects/release-pkg/secure/usr.bin/ssh/Makefile
  projects/release-pkg/secure/usr.sbin/sshd/Makefile
  projects/release-pkg/share/examples/Makefile
  projects/release-pkg/share/i18n/esdb/BIG5/Makefile
  projects/release-pkg/share/i18n/esdb/Makefile.part
  projects/release-pkg/share/i18n/esdb/UTF/Makefile
  projects/release-pkg/share/man/man5/src.conf.5
  projects/release-pkg/share/man/man9/sx.9
  projects/release-pkg/share/mk/bsd.dep.mk
  projects/release-pkg/share/mk/bsd.files.mk
  projects/release-pkg/share/mk/bsd.opts.mk
  projects/release-pkg/share/mk/bsd.subdir.mk
  projects/release-pkg/share/mk/bsd.sys.mk
  projects/release-pkg/share/mk/dirdeps.mk
  projects/release-pkg/share/mk/gendirdeps.mk
  projects/release-pkg/share/mk/local.meta.sys.mk
  projects/release-pkg/share/mk/local.sys.mk
  projects/release-pkg/share/mk/meta.autodep.mk
  projects/release-pkg/share/mk/meta.stage.mk
  projects/release-pkg/share/mk/meta.sys.mk
  projects/release-pkg/share/mk/sys.dependfile.mk
  projects/release-pkg/share/sendmail/Makefile
  projects/release-pkg/share/sendmail/Makefile.depend
  projects/release-pkg/share/zoneinfo/Makefile
  projects/release-pkg/share/zoneinfo/Makefile.depend
  projects/release-pkg/sys/arm/allwinner/a10_hdmi.c
  projects/release-pkg/sys/arm/arm/gic.c
  projects/release-pkg/sys/arm/arm/vm_machdep.c
  projects/release-pkg/sys/arm/conf/ARMADA38X
  projects/release-pkg/sys/arm/mv/armada38x/files.armada38x
  projects/release-pkg/sys/arm/mv/files.mv
  projects/release-pkg/sys/arm/mv/mpic.c
  projects/release-pkg/sys/arm/mv/mv_common.c
  projects/release-pkg/sys/arm/mv/mvreg.h
  projects/release-pkg/sys/arm/mv/mvwin.h
  projects/release-pkg/sys/arm64/arm64/pmap.c
  projects/release-pkg/sys/boot/efi/boot1/Makefile
  projects/release-pkg/sys/boot/efi/boot1/boot1.c
  projects/release-pkg/sys/boot/efi/fdt/Makefile
  projects/release-pkg/sys/boot/efi/loader/Makefile
  projects/release-pkg/sys/boot/fdt/dts/arm/bananapi.dts
  projects/release-pkg/sys/boot/fdt/dts/arm/db78460.dts
  projects/release-pkg/sys/boot/ficl/Makefile
  projects/release-pkg/sys/boot/i386/gptboot/Makefile
  projects/release-pkg/sys/boot/i386/gptzfsboot/Makefile
  projects/release-pkg/sys/boot/i386/libfirewire/Makefile
  projects/release-pkg/sys/boot/i386/libi386/Makefile
  projects/release-pkg/sys/boot/i386/loader/Makefile
  projects/release-pkg/sys/boot/i386/zfsboot/Makefile
  projects/release-pkg/sys/boot/libstand32/Makefile
  projects/release-pkg/sys/boot/ofw/libofw/Makefile
  projects/release-pkg/sys/boot/uboot/fdt/Makefile
  projects/release-pkg/sys/boot/uboot/lib/Makefile
  projects/release-pkg/sys/boot/userboot/ficl/Makefile
  projects/release-pkg/sys/boot/zfs/Makefile
  projects/release-pkg/sys/compat/freebsd32/freebsd32_syscall.h
  projects/release-pkg/sys/conf/config.mk
  projects/release-pkg/sys/conf/kern.mk
  projects/release-pkg/sys/conf/kern.opts.mk
  projects/release-pkg/sys/conf/kern.post.mk
  projects/release-pkg/sys/conf/kmod.mk
  projects/release-pkg/sys/dev/agp/agp_i810.c
  projects/release-pkg/sys/dev/agp/agpreg.h
  projects/release-pkg/sys/dev/cxgbe/adapter.h
  projects/release-pkg/sys/dev/cxgbe/common/common.h
  projects/release-pkg/sys/dev/cxgbe/t4_main.c
  projects/release-pkg/sys/dev/drm2/drm_drv.c
  projects/release-pkg/sys/dev/drm2/i915/i915_dma.c
  projects/release-pkg/sys/dev/drm2/i915/i915_gem.c
  projects/release-pkg/sys/dev/drm2/i915/i915_gem_context.c
  projects/release-pkg/sys/dev/drm2/i915/i915_gem_gtt.c
  projects/release-pkg/sys/dev/pci/pci_iov.c
  projects/release-pkg/sys/dev/pci/pci_iov_private.h
  projects/release-pkg/sys/dev/pci/pci_iov_schema.c
  projects/release-pkg/sys/dev/pci/schema_private.h
  projects/release-pkg/sys/fs/autofs/autofs.h
  projects/release-pkg/sys/fs/autofs/autofs_vfsops.c
  projects/release-pkg/sys/fs/autofs/autofs_vnops.c
  projects/release-pkg/sys/fs/pseudofs/pseudofs_vnops.c
  projects/release-pkg/sys/fs/unionfs/union_subr.c
  projects/release-pkg/sys/kern/kern_alq.c
  projects/release-pkg/sys/kern/kern_event.c
  projects/release-pkg/sys/kern/makesyscalls.sh
  projects/release-pkg/sys/kern/vfs_lookup.c
  projects/release-pkg/sys/modules/Makefile
  projects/release-pkg/sys/net80211/ieee80211.h
  projects/release-pkg/sys/net80211/ieee80211_input.c
  projects/release-pkg/sys/netinet/siftr.c
  projects/release-pkg/sys/netinet/tcp_stacks/fastpath.c
  projects/release-pkg/sys/netinet/tcp_var.h
  projects/release-pkg/sys/netipsec/key.c
  projects/release-pkg/sys/ofed/drivers/infiniband/core/device.c
  projects/release-pkg/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/release-pkg/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c
  projects/release-pkg/sys/sys/errno.h
  projects/release-pkg/sys/sys/iov.h
  projects/release-pkg/sys/sys/iov_schema.h
  projects/release-pkg/sys/sys/namei.h
  projects/release-pkg/sys/sys/param.h
  projects/release-pkg/sys/sys/syscall.h
  projects/release-pkg/sys/sys/syscall.mk
  projects/release-pkg/sys/sys/sysctl.h
  projects/release-pkg/targets/pseudo/bootstrap-tools/Makefile
  projects/release-pkg/targets/pseudo/kernel/Makefile
  projects/release-pkg/targets/pseudo/stage/Makefile
  projects/release-pkg/targets/pseudo/userland/share/Makefile.depend
  projects/release-pkg/usr.bin/bmake/Makefile
  projects/release-pkg/usr.bin/grep/regex/glue.h
  projects/release-pkg/usr.bin/limits/limits.1
  projects/release-pkg/usr.bin/limits/limits.c
  projects/release-pkg/usr.bin/mkuzip/mkuz_blockcache.c
  projects/release-pkg/usr.bin/mkuzip/mkuzip.8
  projects/release-pkg/usr.bin/mkuzip/mkuzip.c
  projects/release-pkg/usr.sbin/bhyve/pci_virtio_net.c
  projects/release-pkg/usr.sbin/ctld/uclparse.c
  projects/release-pkg/usr.sbin/gpioctl/gpioctl.8
  projects/release-pkg/usr.sbin/gpioctl/gpioctl.c
  projects/release-pkg/usr.sbin/iovctl/iovctl.c
  projects/release-pkg/usr.sbin/iovctl/iovctl.h
  projects/release-pkg/usr.sbin/iovctl/parse.c
  projects/release-pkg/usr.sbin/iovctl/validate.c
  projects/release-pkg/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
  projects/release-pkg/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  projects/release-pkg/usr.sbin/unbound/anchor/Makefile
  projects/release-pkg/usr.sbin/unbound/checkconf/Makefile
  projects/release-pkg/usr.sbin/unbound/control/Makefile
  projects/release-pkg/usr.sbin/unbound/daemon/Makefile
Directory Properties:
  projects/release-pkg/   (props changed)
  projects/release-pkg/cddl/   (props changed)
  projects/release-pkg/cddl/contrib/opensolaris/   (props changed)
  projects/release-pkg/contrib/bmake/   (props changed)
  projects/release-pkg/contrib/elftoolchain/   (props changed)
  projects/release-pkg/contrib/libc++/   (props changed)
  projects/release-pkg/contrib/unbound/   (props changed)
  projects/release-pkg/crypto/openssh/   (props changed)
  projects/release-pkg/include/   (props changed)
  projects/release-pkg/lib/libc/   (props changed)
  projects/release-pkg/lib/libutil/   (props changed)
  projects/release-pkg/sbin/   (props changed)
  projects/release-pkg/share/   (props changed)
  projects/release-pkg/share/zoneinfo/   (props changed)
  projects/release-pkg/sys/   (props changed)
  projects/release-pkg/sys/boot/   (props changed)
  projects/release-pkg/sys/conf/   (props changed)
  projects/release-pkg/targets/   (props changed)
  projects/release-pkg/usr.sbin/bhyve/   (props changed)

Modified: projects/release-pkg/MAINTAINERS
==============================================================================
--- projects/release-pkg/MAINTAINERS	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/MAINTAINERS	Mon Mar 14 18:54:29 2016	(r296869)
@@ -102,3 +102,6 @@ usr.sbin/dpv	dteske	Pre-commit review re
 usr.sbin/pkg	pkg@	Please coordinate behavior or flag changes with pkg team.
 usr.sbin/sysrc	dteske	Pre-commit phabricator review requested. Keep in sync with bsdconfig(8) sysrc.subr.
 vmm(4)		neel,grehan	Pre-commit review requested.
+autofs(5)	trasz	Pre-commit review recommended.
+iscsi(4)	trasz	Pre-commit review recommended.
+rctl(8)		trasz	Pre-commit review recommended.

Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/Makefile	Mon Mar 14 18:54:29 2016	(r296869)
@@ -125,7 +125,8 @@ TGTS=	all all-man buildenv buildenvvars 
 	obj objlink rerelease showconfig tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
-	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+	build32 distribute32 install32 build32 distribute32 install32 \
+	builddtb xdev xdev-build xdev-install \
 	xdev-links native-xtools stageworld stagekernel stage-packages \
 	create-world-packages create-kernel-packages create-packages \
 	packages installconfig real-packages sign-packages package-pkg
@@ -161,6 +162,8 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH
 # We cannot blindly use a make which may not be the one we want
 # so be exlicit - until all choice is removed.
 WANT_MAKE=	bmake
+# 20160220 - support .dinclude for FAST_DEPEND.
+WANT_MAKE_VERSION= 20160220
 MYMAKE=		${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
 .if defined(.PARSEDIR)
 HAVE_MAKE=	bmake
@@ -303,7 +306,7 @@ kernel: buildkernel installkernel
 upgrade_checks:
 .if ${HAVE_MAKE} != ${WANT_MAKE} || \
     (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
-	@(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
+	@${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
 .endif
 
 #
@@ -315,9 +318,9 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 		DESTDIR= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 MMAKE=		${MMAKEENV} ${MAKE} \
-		-DNO_MAN -DNO_SHARED \
+		MAN= -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR \
-		MK_TESTS=no \
+		-DNO_SUBDIR \
 		DESTDIR= PROGNAME=${MYMAKE:T}
 
 bmake: .PHONY

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/Makefile.inc1	Mon Mar 14 18:54:29 2016	(r296869)
@@ -474,70 +474,16 @@ XCXXFLAGS+=	${BFLAGS}
 .endif
 .endif # ${XCC:M/*}
 
-WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
-
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
-# 32 bit world
-LIB32_OBJTREE=	${OBJTREE}${.CURDIR}/world32
-LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
-
-.if ${TARGET_ARCH} == "amd64"
-.if empty(TARGET_CPUTYPE)
-LIB32CPUFLAGS=	-march=i686 -mmmx -msse -msse2
-.else
-LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
-.endif
-LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
-		MACHINE_CPU="i686 mmx sse sse2"
-LIB32WMAKEFLAGS=	\
-		AS="${XAS} --32" \
-		LD="${XLD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
-		OBJCOPY="${XOBJCOPY}"
-
-.elif ${TARGET_ARCH} == "powerpc64"
-.if empty(TARGET_CPUTYPE)
-LIB32CPUFLAGS=	-mcpu=powerpc
-.else
-LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
-.endif
-LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
-LIB32WMAKEFLAGS=	\
-		LD="${XLD} -m elf32ppc_fbsd" \
-		OBJCOPY="${XOBJCOPY}"
+.if ${MK_LIB32} != "no" && (${TARGET_ARCH} == "amd64" || \
+    ${TARGET_ARCH} == "powerpc64")
+LIBCOMPAT= 32
+.include "Makefile.libcompat"
+.elif ${MK_LIBSOFT} != "no" && ${TARGET_ARCH} == "armv6"
+LIBCOMPAT= SOFT
+.include "Makefile.libcompat"
 .endif
 
-
-LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \
-		-isystem ${LIB32TMP}/usr/include/ \
-		-L${LIB32TMP}/usr/lib32 \
-		-B${LIB32TMP}/usr/lib32
-.if ${XCC:N${CCACHE_BIN}:M/*}
-LIB32FLAGS+=		--sysroot=${WORLDTMP}
-.endif
-
-# Yes, the flags are redundant.
-LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \
-		_LDSCRIPTROOT=${LIB32TMP} \
-		INSTALL="sh ${.CURDIR}/tools/install.sh" \
-		PATH=${TMPPATH} \
-		LIBDIR=/usr/lib32 \
-		SHLIBDIR=/usr/lib32 \
-		DTRACE="${DTRACE} -32"
-LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
-		CXX="${XCXX} ${LIB32FLAGS}" \
-		DESTDIR=${LIB32TMP} \
-		-DCOMPAT_32BIT \
-		-DLIBRARIES_ONLY \
-		-DNO_CPU_CFLAGS \
-		MK_CTF=no \
-		-DNO_LINT \
-		MK_TESTS=no
-
-LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
-		MK_MAN=no MK_HTML=no
-LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
-		MK_TOOLCHAIN=no ${IMAKE_INSTALL}
-.endif
+WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
@@ -595,8 +541,8 @@ _worldtmp: .PHONY
 	@echo "--------------------------------------------------------------"
 .if !defined(NO_CLEAN)
 	rm -rf ${WORLDTMP}
-.if defined(LIB32TMP)
-	rm -rf ${LIB32TMP}
+.if defined(LIBCOMPAT)
+	rm -rf ${LIBCOMPATTMP}
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
@@ -626,13 +572,13 @@ _worldtmp: .PHONY
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
-.if ${MK_LIB32} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+.if defined(LIBCOMPAT)
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/usr >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null
 .endif
 .endif
@@ -668,8 +614,8 @@ _cleanobj:
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR}
-.if defined(LIB32TMP)
-	${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR}
+.if defined(LIBCOMPAT)
+	${_+_}cd ${.CURDIR}; ${LIBCOMPATWMAKE} -f Makefile.inc1 ${CLEANDIR}
 .endif
 .endif
 _obj:
@@ -723,78 +669,6 @@ everything:
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
-.if defined(LIB32TMP)
-build32: .PHONY
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 5.1: building 32 bit shim libraries"
-	@echo "--------------------------------------------------------------"
-	mkdir -p ${LIB32TMP}/usr/include
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
-	    -p ${LIB32TMP}/usr >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-	    -p ${LIB32TMP}/usr/include >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
-	    -p ${LIB32TMP}/usr >/dev/null
-.if ${MK_DEBUG_FILES} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-	    -p ${LIB32TMP}/usr/lib >/dev/null
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
-	    -p ${LIB32TMP}/usr/lib/debug/usr >/dev/null
-.endif
-	mkdir -p ${WORLDTMP}
-	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.for _t in obj includes
-	${_+_}cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
-	${_+_}cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
-.if ${MK_CDDL} != "no"
-	${_+_}cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t}
-.endif
-	${_+_}cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=gnu/lib/ ${_t}
-.if ${MK_CRYPT} != "no"
-	${_+_}cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=secure/lib/ ${_t}
-.endif
-.if ${MK_KERBEROS} != "no"
-	${_+_}cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=kerberos5/lib ${_t}
-.endif
-.endfor
-.for _dir in usr.bin/lex/lib
-	${_+_}cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=${_dir}/ obj
-.endfor
-.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
-	${_+_}cd ${.CURDIR}/${_dir}; \
-	    WORLDTMP=${WORLDTMP} \
-	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
-	    MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
-	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
-	    build-tools
-.endfor
-	${_+_}cd ${.CURDIR}; \
-	    ${LIB32WMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
-.for _t in obj depend all
-	${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \
-	    -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
-	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \
-	    DIRPRFX=usr.bin/ldd ${_t}
-.endfor
-
-distribute32 install32: .MAKE .PHONY
-	${_+_}cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.if ${MK_CDDL} != "no"
-	${_+_}cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.endif
-	${_+_}cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.if ${MK_CRYPT} != "no"
-	${_+_}cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.endif
-.if ${MK_KERBEROS} != "no"
-	${_+_}cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
-.endif
-	${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
-	    PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
-	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} \
-	    ${.TARGET:S/32$//}
-.endif
 
 WMAKE_TGTS=
 WMAKE_TGTS+=	_worldtmp _legacy
@@ -807,8 +681,8 @@ WMAKE_TGTS+=	_includes _libraries
 WMAKE_TGTS+=	_depend
 .endif
 WMAKE_TGTS+=	everything
-.if defined(LIB32TMP) && ${MK_LIB32} != "no" && empty(SUBDIR_OVERRIDE)
-WMAKE_TGTS+=	build32
+.if defined(LIBCOMPAT) && empty(SUBDIR_OVERRIDE)
+WMAKE_TGTS+=	build${libcompat}
 .endif
 
 buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
@@ -848,7 +722,7 @@ buildenv: .PHONY
 	@cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \
 	    || true
 
-TOOLCHAIN_TGTS=	${WMAKE_TGTS:N_depend:Neverything:Nbuild32}
+TOOLCHAIN_TGTS=	${WMAKE_TGTS:N_depend:Neverything:Nbuild${libcompat}}
 toolchain: ${TOOLCHAIN_TGTS}
 kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
 
@@ -942,8 +816,8 @@ ITOOLS+=makewhatis
 
 # Non-base distributions produced by the base system
 EXTRA_DISTRIBUTIONS=	doc
-.if defined(LIB32TMP) && ${MK_LIB32} != "no"
-EXTRA_DISTRIBUTIONS+=	lib32
+.if defined(LIBCOMPAT)
+EXTRA_DISTRIBUTIONS+=	lib${libcompat}
 .endif
 .if ${MK_TESTS} != "no"
 EXTRA_DISTRIBUTIONS+=	tests
@@ -995,11 +869,11 @@ distributeworld installworld stageworld:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
 .endif
-.if ${MK_LIB32} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+.if defined(LIBCOMPAT)
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
 .endif
 .endif
@@ -1019,8 +893,8 @@ distributeworld installworld stageworld:
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
 	    sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
-.if ${MK_LIB32} != "no"
-	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib32.dist | \
+.if defined(LIBCOMPAT)
+	${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist | \
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 .endif
 .endif
@@ -1105,8 +979,8 @@ reinstall: .MAKE .PHONY
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if defined(LIB32TMP) && ${MK_LIB32} != "no"
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
+.if defined(LIBCOMPAT)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
 .endif
 
 restage: .MAKE .PHONY
@@ -1129,9 +1003,9 @@ redistribute: .MAKE .PHONY
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
-.if defined(LIB32TMP) && ${MK_LIB32} != "no"
-	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \
-	    DISTRIBUTION=lib32
+.if defined(LIBCOMPAT)
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute${libcompat} \
+	    DISTRIBUTION=lib${libcompat}
 .endif
 
 distrib-dirs distribution: .MAKE .PHONY
@@ -1194,7 +1068,7 @@ INSTALLKERNEL= ${_kernel}
 .endif
 .endfor
 
-${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
+${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
 
 #
 # buildkernel
@@ -1574,7 +1448,8 @@ update:
 #
 
 # ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
-.if ${BOOTSTRAPPING} < 1100006
+# r296685 fix cross-endian objcopy
+.if ${BOOTSTRAPPING} < 1100102
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
@@ -2578,8 +2453,8 @@ _xi-mtree: .PHONY
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
-.if ${MK_LIB32} != "no"
-	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+.if defined(LIBCOMPAT)
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
 	    -p ${XDDESTDIR}/usr >/dev/null
 .endif
 .if ${MK_TESTS} != "no"

Copied: projects/release-pkg/Makefile.libcompat (from r296868, head/Makefile.libcompat)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/release-pkg/Makefile.libcompat	Mon Mar 14 18:54:29 2016	(r296869, copy of r296868, head/Makefile.libcompat)
@@ -0,0 +1,161 @@
+# $FreeBSD$
+
+.if !targets(__<${_this:T}>__)
+__<${_this:T}>__:
+
+# Makefile for the compatibility libraries.
+# - 32-bit compat libraries on PowerPC and AMD64.
+#   could also be for mips, but that doesn't work today.
+
+# -------------------------------------------------------------------
+# 32 bit world
+.if ${TARGET_ARCH} == "amd64"
+.if empty(TARGET_CPUTYPE)
+LIB32CPUFLAGS=	-march=i686 -mmmx -msse -msse2
+.else
+LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
+.endif
+LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
+		MACHINE_CPU="i686 mmx sse sse2"
+LIB32WMAKEFLAGS=	\
+		AS="${XAS} --32" \
+		LD="${XLD} -m elf_i386_fbsd -Y P,${LIBCOMPATTMP}/usr/lib32" \
+		OBJCOPY="${XOBJCOPY}"
+
+.elif ${TARGET_ARCH} == "powerpc64"
+.if empty(TARGET_CPUTYPE)
+LIB32CPUFLAGS=	-mcpu=powerpc
+.else
+LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
+.endif
+LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
+LIB32WMAKEFLAGS=	\
+		LD="${XLD} -m elf32ppc_fbsd" \
+		OBJCOPY="${XOBJCOPY}"
+.endif
+
+
+LIB32CFLAGS=	-m32 -DCOMPAT_32BIT
+LIB32DTRACE=	${DTRACE} -32
+LIB32WMAKEFLAGS+=	-DCOMPAT_32BIT
+
+# -------------------------------------------------------------------
+# soft-fp world
+.if ${TARGET_ARCH} == "armv6"
+LIBSOFTCFLAGS=        -DCOMPAT_SOFTFP
+LIBSOFTCPUFLAGS= -mfloat-abi=softfp
+LIBSOFTWMAKEENV= CPUTYPE=soft MACHINE=arm MACHINE_ARCH=armv6
+LIBSOFTWMAKEFLAGS=        -DCOMPAT_SOFTFP
+.endif
+
+# -------------------------------------------------------------------
+# Generic code for each type.
+# Set defaults based on type.
+libcompat=	${LIBCOMPAT:tl}
+_LIBCOMPAT_MAKEVARS=	_OBJTREE TMP CPUFLAGS CFLAGS WMAKEENV WMAKEFLAGS WMAKE
+.for _var in ${_LIBCOMPAT_MAKEVARS}
+.if !empty(LIB${LIBCOMPAT}${_var})
+LIBCOMPAT${_var}?=	${LIB${LIBCOMPAT}${_var}}
+.endif
+.endfor
+
+# Shared flags
+LIBCOMPAT_OBJTREE?=	${OBJTREE}${.CURDIR}/world${libcompat}
+LIBCOMPATTMP?=		${OBJTREE}${.CURDIR}/lib${libcompat}
+
+LIBCOMPATCFLAGS+=	${LIBCOMPATCPUFLAGS} \
+			-isystem ${LIBCOMPATTMP}/usr/include/ \
+			-L${LIBCOMPATTMP}/usr/lib${libcompat} \
+			-B${LIBCOMPATTMP}/usr/lib${libcompat}
+
+# Yes, the flags are redundant.
+LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
+		_LDSCRIPTROOT=${LIBCOMPATTMP} \
+		INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${TMPPATH} \
+		LIBDIR=/usr/lib${libcompat} \
+		SHLIBDIR=/usr/lib${libcompat} \
+		DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
+LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
+		CXX="${XCXX} ${LIBCOMPATCFLAGS}" \
+		DESTDIR=${LIBCOMPATTMP} \
+		-DLIBRARIES_ONLY \
+		-DNO_CPU_CFLAGS \
+		MK_CTF=no \
+		-DNO_LINT \
+		MK_TESTS=no
+LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
+			MK_MAN=no MK_HTML=no
+LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
+			MK_TOOLCHAIN=no ${IMAKE_INSTALL}
+
+.if ${XCC:N${CCACHE_BIN}:M/*}
+LIBCOMPATCFLAGS+=	--sysroot=${WORLDTMP}
+.endif
+
+_LC_LIBDIRS.yes=		lib gnu/lib
+_LC_LIBDIRS.${MK_CDDL:tl}+=	cddl/lib
+_LC_LIBDIRS.${MK_CRYPT:tl}+=	secure/lib
+_LC_LIBDIRS.${MK_KERBEROS:tl}+=	kerberos5/lib
+
+# Shared logic
+build${libcompat}: .PHONY
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> stage 5.1: building lib${libcompat} shim libraries"
+	@echo "--------------------------------------------------------------"
+	mkdir -p ${LIBCOMPATTMP}/usr/include
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${LIBCOMPATTMP}/usr >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
+	    -p ${LIBCOMPATTMP}/usr/include >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
+	    -p ${LIBCOMPATTMP}/usr >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
+	    -p ${LIBCOMPATTMP}/usr/lib >/dev/null
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib${libcompat}.dist \
+	    -p ${LIBCOMPATTMP}/usr/lib/debug/usr >/dev/null
+.endif
+	mkdir -p ${WORLDTMP}
+	ln -sf ${.CURDIR}/sys ${WORLDTMP}
+.for _t in obj includes
+	${_+_}cd ${.CURDIR}/include; ${LIBCOMPATWMAKE} DIRPRFX=include/ ${_t}
+.for _dir in ${_LC_LIBDIRS.yes}
+	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} DIRPRFX=${_dir}/ ${_t}
+.endfor
+.endfor
+.for _dir in usr.bin/lex/lib
+	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATWMAKE} DIRPRFX=${_dir}/ obj
+.endfor
+.for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
+	${_+_}cd ${.CURDIR}/${_dir}; \
+	    WORLDTMP=${WORLDTMP} \
+	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
+	    MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \
+	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
+	    build-tools
+.endfor
+	${_+_}cd ${.CURDIR}; \
+	    ${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
+.if ${libcompat} == "32"
+.for _t in obj depend all
+	${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \
+	    -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
+	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATWMAKE} \
+	    DIRPRFX=usr.bin/ldd ${_t}
+.endfor
+.endif
+
+distribute${libcompat} install${libcompat}: .PHONY
+.for _dir in ${_LC_LIBDIRS.yes}
+	${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//}
+.endfor
+.if ${libcompat} == "32"
+	${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
+	    PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//}
+	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \
+	    ${.TARGET:S/32$//}
+.endif
+
+.endif

Modified: projects/release-pkg/ObsoleteFiles.inc
==============================================================================
--- projects/release-pkg/ObsoleteFiles.inc	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/ObsoleteFiles.inc	Mon Mar 14 18:54:29 2016	(r296869)
@@ -144,6 +144,12 @@ OLD_FILES+=libexec/casper/grp
 OLD_FILES+=libexec/casper/pwd
 OLD_FILES+=libexec/casper/random
 OLD_FILES+=libexec/casper/sysctl
+OLD_FILES+=libexec/casper/.debug/random.debug
+OLD_FILES+=libexec/casper/.debug/dns.debug
+OLD_FILES+=libexec/casper/.debug/sysctl.debug
+OLD_FILES+=libexec/casper/.debug/pwd.debug
+OLD_FILES+=libexec/casper/.debug/grp.debug
+OLD_DIRS+=libexec/casper/.debug
 OLD_DIRS+=libexec/casper
 OLD_FILES+=usr/lib/libcapsicum.a
 OLD_FILES+=usr/lib/libcapsicum.so

Modified: projects/release-pkg/UPDATING
==============================================================================
--- projects/release-pkg/UPDATING	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/UPDATING	Mon Mar 14 18:54:29 2016	(r296869)
@@ -31,6 +31,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20160311:
+	WITH_FAST_DEPEND is now enabled by default for in-tree and out-of-tree
+	builds.  It no longer runs mkdep(1) during 'make depend', and the
+	'make depend' stage can safely be skipped now as it is auto ran
+	when building 'make all' and will generate all SRCS and DPSRCS before
+	building anything else.  Dependencies are gathered at compile time with
+	-MF flags kept in separate .depend files per object file.  Users should
+	run 'make cleandepend' once if using -DNO_CLEAN to clean out older
+	stale .depend files.
+
 20160306:
 	On amd64, clang 3.8.0 can now insert sections of type AMD64_UNWIND into
 	kernel modules.  Therefore, if you load any kernel modules at boot time,

Modified: projects/release-pkg/bin/sh/exec.c
==============================================================================
--- projects/release-pkg/bin/sh/exec.c	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/bin/sh/exec.c	Mon Mar 14 18:54:29 2016	(r296869)
@@ -332,6 +332,7 @@ find_command(const char *name, struct cm
 	if (strchr(name, '/') != NULL) {
 		entry->cmdtype = CMDNORMAL;
 		entry->u.index = 0;
+		entry->special = 0;
 		return;
 	}
 
@@ -408,6 +409,7 @@ find_command(const char *name, struct cm
 			cmdp = &loc_cmd;
 		cmdp->cmdtype = CMDNORMAL;
 		cmdp->param.index = idx;
+		cmdp->special = 0;
 		INTON;
 		goto success;
 	}
@@ -420,6 +422,7 @@ find_command(const char *name, struct cm
 	}
 	entry->cmdtype = CMDUNKNOWN;
 	entry->u.index = 0;
+	entry->special = 0;
 	return;
 
 success:
@@ -588,6 +591,7 @@ addcmdentry(const char *name, struct cmd
 	}
 	cmdp->cmdtype = entry->cmdtype;
 	cmdp->param = entry->u;
+	cmdp->special = entry->special;
 	INTON;
 }
 
@@ -604,6 +608,7 @@ defun(const char *name, union node *func
 	INTOFF;
 	entry.cmdtype = CMDFUNCTION;
 	entry.u.func = copyfunc(func);
+	entry.special = 0;
 	addcmdentry(name, &entry);
 	INTON;
 }

Modified: projects/release-pkg/bin/sh/miscbltin.c
==============================================================================
--- projects/release-pkg/bin/sh/miscbltin.c	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/bin/sh/miscbltin.c	Mon Mar 14 18:54:29 2016	(r296869)
@@ -452,7 +452,7 @@ ulimitcmd(int argc __unused, char **argv
 	struct rlimit	limit;
 
 	what = 'f';
-	while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0')
+	while ((optc = nextopt("HSatfdsmcnuvlbpwko")) != '\0')
 		switch (optc) {
 		case 'H':
 			how = HARD;

Modified: projects/release-pkg/bin/sh/sh.1
==============================================================================
--- projects/release-pkg/bin/sh/sh.1	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/bin/sh/sh.1	Mon Mar 14 18:54:29 2016	(r296869)
@@ -2615,7 +2615,7 @@ and not found.
 For aliases the alias expansion is printed;
 for commands and tracked aliases
 the complete pathname of the command is printed.
-.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit
+.It Ic ulimit Oo Fl HSabcdfklmnopstuvw Oc Op Ar limit
 Set or display resource limits (see
 .Xr getrlimit 2 ) .
 If
@@ -2674,6 +2674,11 @@ kilobytes.
 The maximal resident set size of a process, in kilobytes.
 .It Fl n Ar nofiles
 The maximal number of descriptors that could be opened by a process.
+.It Fl o Ar umtxp
+The maximal number of process-shared locks
+(see
+.Xr pthread 3 )
+for this user ID.
 .It Fl p Ar pseudoterminals
 The maximal number of pseudo-terminals for this user ID.
 .It Fl s Ar stacksize

Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c	Mon Mar 14 18:54:29 2016	(r296869)
@@ -24,6 +24,7 @@
  */
 /*
  * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ * Copyright (c) 2016, Pedro Giffuni.  All rights reserved.
  */
 
 #include <sys/types.h>
@@ -721,22 +722,20 @@ dt_module_load_proc(dtrace_hdl_t *dtp, d
 		return (dt_set_errno(dtp, EDT_CANTLOAD));
 	}
 
-	dmp->dm_libctfp = malloc(sizeof (ctf_file_t *) * arg.dpa_count);
+	dmp->dm_libctfp = calloc(arg.dpa_count, sizeof (ctf_file_t *));
 	if (dmp->dm_libctfp == NULL) {
 		dt_proc_unlock(dtp, p);
 		dt_proc_release(dtp, p);
 		return (dt_set_errno(dtp, EDT_NOMEM));
 	}
-	bzero(dmp->dm_libctfp, sizeof (ctf_file_t *) * arg.dpa_count);
 
-	dmp->dm_libctfn = malloc(sizeof (char *) * arg.dpa_count);
+	dmp->dm_libctfn = calloc(arg.dpa_count, sizeof (char *));
 	if (dmp->dm_libctfn == NULL) {
 		free(dmp->dm_libctfp);
 		dt_proc_unlock(dtp, p);
 		dt_proc_release(dtp, p);
 		return (dt_set_errno(dtp, EDT_NOMEM));
 	}
-	bzero(dmp->dm_libctfn, sizeof (char *) * arg.dpa_count);
 
 	dmp->dm_nctflibs = arg.dpa_count;
 
@@ -817,17 +816,14 @@ dt_module_load(dtrace_hdl_t *dtp, dt_mod
 	dmp->dm_nsymbuckets = _dtrace_strbuckets;
 	dmp->dm_symfree = 1;		/* first free element is index 1 */
 
-	dmp->dm_symbuckets = malloc(sizeof (uint_t) * dmp->dm_nsymbuckets);
-	dmp->dm_symchains = malloc(sizeof (dt_sym_t) * dmp->dm_nsymelems + 1);
+	dmp->dm_symbuckets = calloc(dmp->dm_nsymbuckets, sizeof (uint_t));
+	dmp->dm_symchains = calloc(dmp->dm_nsymelems + 1, sizeof (dt_sym_t));
 
 	if (dmp->dm_symbuckets == NULL || dmp->dm_symchains == NULL) {
 		dt_module_unload(dtp, dmp);
 		return (dt_set_errno(dtp, EDT_NOMEM));
 	}
 
-	bzero(dmp->dm_symbuckets, sizeof (uint_t) * dmp->dm_nsymbuckets);
-	bzero(dmp->dm_symchains, sizeof (dt_sym_t) * dmp->dm_nsymelems + 1);
-
 	/*
 	 * Iterate over the symbol table data buffer and insert each symbol
 	 * name into the name hash if the name and type are valid.  Then

Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c	Mon Mar 14 18:54:29 2016	(r296869)
@@ -27,6 +27,7 @@
 
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2016 Pedro Giffuni.  All rights reserved.
  */
 
 #include <sys/types.h>
@@ -47,15 +48,15 @@ dt_regset_create(ulong_t nregs)
 	if (drp == NULL)
 		return (NULL);
 
-	drp->dr_bitmap = malloc(sizeof (ulong_t) * n);
-	drp->dr_size = nregs;
+	drp->dr_bitmap = calloc(n, sizeof (ulong_t));
 
 	if (drp->dr_bitmap == NULL) {
 		dt_regset_destroy(drp);
 		return (NULL);
 	}
 
-	bzero(drp->dr_bitmap, sizeof (ulong_t) * n);
+	drp->dr_size = nregs;
+
 	return (drp);
 }
 

Modified: projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c	Mon Mar 14 18:54:29 2016	(r296869)
@@ -24,6 +24,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Portions Copyright 2016 Pedro Giffuni.  All rights reserved.
+ */
+ 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <sys/types.h>
@@ -70,12 +74,11 @@ dt_strtab_create(size_t bufsz)
 		return (NULL);
 
 	bzero(sp, sizeof (dt_strtab_t));
-	sp->str_hash = malloc(nbuckets * sizeof (dt_strhash_t *));
+	sp->str_hash = calloc(nbuckets, sizeof (dt_strhash_t *));
 
 	if (sp->str_hash == NULL)
 		goto err;
 
-	bzero(sp->str_hash, nbuckets * sizeof (dt_strhash_t *));
 	sp->str_hashsz = nbuckets;
 	sp->str_bufs = NULL;
 	sp->str_ptr = NULL;

Modified: projects/release-pkg/contrib/bmake/ChangeLog
==============================================================================
--- projects/release-pkg/contrib/bmake/ChangeLog	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/contrib/bmake/ChangeLog	Mon Mar 14 18:54:29 2016	(r296869)
@@ -1,3 +1,41 @@
+2016-03-07  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20160307
+	  Merge with NetBSD make, pick up
+	  o var.c: fix :ts\nnn to be octal by default.
+	  o meta.c: meta_finish() to cleanup memory.
+
+2016-02-26  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20160226
+	  Merge with NetBSD make, pick up
+	  o meta.c: allow meta file for makeDepend if makefiles want it.
+
+2016-02-19  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* var.c: default .MAKE.SAVE_DOLLARS to FALSE
+	  for backwards compatability.
+
+	* Makefile (MAKE_VERSION): 20160220
+	  Merge with NetBSD make, pick up
+	  o var.c: add knob to control handling of '$$' in :=
+
+2016-02-18  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20160218
+	  Merge with NetBSD make, pick up
+	  o var.c: add .export-literal allows us to fix sys.clean-env.mk
+	    post the changes to Var_Subst.
+	    Var_Subst now takes flags, and does not consume '$$' in :=
+
+2016-02-17  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20160217
+	  Merge with NetBSD make, pick up
+	  o var.c: preserve '$$' in :=
+	  o parse.c: add .dinclude for handling included 
+	    makefile like .depend
+
 2015-12-20  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* Makefile (MAKE_VERSION): 20151220

Modified: projects/release-pkg/contrib/bmake/Makefile
==============================================================================
--- projects/release-pkg/contrib/bmake/Makefile	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/contrib/bmake/Makefile	Mon Mar 14 18:54:29 2016	(r296869)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.49 2015/12/20 22:54:40 sjg Exp $
+#	$Id: Makefile,v 1.55 2016/03/07 22:02:47 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20151220
+MAKE_VERSION= 20160307
 
 PROG=	bmake
 

Modified: projects/release-pkg/contrib/bmake/arch.c
==============================================================================
--- projects/release-pkg/contrib/bmake/arch.c	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/contrib/bmake/arch.c	Mon Mar 14 18:54:29 2016	(r296869)
@@ -1,4 +1,4 @@
-/*	$NetBSD: arch.c,v 1.64 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.64 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: arch.c,v 1.64 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: arch.c,v 1.68 2016/02/18 18:29:14 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -136,7 +136,6 @@ __RCSID("$NetBSD: arch.c,v 1.64 2015/10/
 #include    <sys/stat.h>
 #include    <sys/time.h>
 #include    <sys/param.h>
-#include    <ctype.h>
 #ifdef HAVE_AR_H
 #include    <ar.h>
 #else
@@ -156,7 +155,6 @@ struct ar_hdr {
 #if defined(HAVE_RANLIB_H) && !(defined(__ELF__) || defined(NO_RANLIB))
 #include    <ranlib.h>
 #endif
-#include    <fcntl.h>
 #include    <stdio.h>
 #include    <stdlib.h>
 #ifdef HAVE_UTIME_H
@@ -254,8 +252,7 @@ ArchFree(void *ap)
 	free(Hash_GetValue(entry));
 
     free(a->name);
-    if (a->fnametab)
-	free(a->fnametab);
+    free(a->fnametab);
     Hash_DeleteTable(&a->members);
     free(a);
 }
@@ -310,9 +307,10 @@ Arch_ParseArchive(char **linePtr, Lst no
 	    void	*freeIt;
 	    char	*result;
 
-	    result = Var_Parse(cp, ctxt, TRUE, TRUE, &length, &freeIt);
-	    if (freeIt)
-		free(freeIt);
+	    result = Var_Parse(cp, ctxt, VARF_UNDEFERR|VARF_WANTRES,
+			       &length, &freeIt);
+	    free(freeIt);
+
 	    if (result == var_Error) {
 		return(FAILURE);
 	    } else {
@@ -325,7 +323,7 @@ Arch_ParseArchive(char **linePtr, Lst no
 
     *cp++ = '\0';
     if (subLibName) {
-	libName = Var_Subst(NULL, libName, ctxt, TRUE, TRUE);
+	libName = Var_Subst(NULL, libName, ctxt, VARF_UNDEFERR|VARF_WANTRES);
     }
 
 
@@ -351,9 +349,10 @@ Arch_ParseArchive(char **linePtr, Lst no
 		void	*freeIt;
 		char	*result;
 
-		result = Var_Parse(cp, ctxt, TRUE, TRUE, &length, &freeIt);
-		if (freeIt)
-		    free(freeIt);
+		result = Var_Parse(cp, ctxt, VARF_UNDEFERR|VARF_WANTRES,
+				   &length, &freeIt);
+		free(freeIt);
+
 		if (result == var_Error) {
 		    return(FAILURE);
 		} else {
@@ -404,7 +403,8 @@ Arch_ParseArchive(char **linePtr, Lst no
 	    char    *oldMemName = memName;
 	    size_t   sz;
 
-	    memName = Var_Subst(NULL, memName, ctxt, TRUE, TRUE);
+	    memName = Var_Subst(NULL, memName, ctxt,
+				VARF_UNDEFERR|VARF_WANTRES);
 
 	    /*
 	     * Now form an archive spec and recurse to deal with nested
@@ -759,8 +759,7 @@ ArchStatMember(char *archive, char *memb
 badarch:
     fclose(arch);
     Hash_DeleteTable(&ar->members);
-    if (ar->fnametab)
-	free(ar->fnametab);
+    free(ar->fnametab);
     free(ar);
     return NULL;
 }
@@ -1045,10 +1044,10 @@ Arch_Touch(GNode *gn)
     arch = ArchFindMember(Var_Value(ARCHIVE, gn, &p1),
 			  Var_Value(MEMBER, gn, &p2),
 			  &arh, "r+");
-    if (p1)
-	free(p1);
-    if (p2)
-	free(p2);
+
+    free(p1);
+    free(p2);
+
     snprintf(arh.AR_DATE, sizeof(arh.AR_DATE), "%-12ld", (long) now);
 
     if (arch != NULL) {
@@ -1127,10 +1126,9 @@ Arch_MTime(GNode *gn)
     arhPtr = ArchStatMember(Var_Value(ARCHIVE, gn, &p1),
 			     Var_Value(MEMBER, gn, &p2),
 			     TRUE);
-    if (p1)
-	free(p1);
-    if (p2)
-	free(p2);
+
+    free(p1);
+    free(p2);
 
     if (arhPtr != NULL) {
 	modTime = (time_t)strtol(arhPtr->AR_DATE, NULL, 10);

Modified: projects/release-pkg/contrib/bmake/bmake.1
==============================================================================
--- projects/release-pkg/contrib/bmake/bmake.1	Mon Mar 14 18:07:59 2016	(r296868)
+++ projects/release-pkg/contrib/bmake/bmake.1	Mon Mar 14 18:54:29 2016	(r296869)
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.249 2015/06/05 07:33:40 wiz Exp $
+.\"	$NetBSD: make.1,v 1.254 2016/02/20 01:43:28 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd June 4, 2015
+.Dd February 19, 2016
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -293,7 +293,7 @@ then
 will search for the specified file or directory named in the remaining part
 of the argument string.
 The search starts with the current directory of
-the Makefile and then works upward towards the root of the filesystem.
+the Makefile and then works upward towards the root of the file system.
 If the search is successful, then the resulting directory replaces the
 .Qq \&.../
 specification in the
@@ -868,7 +868,7 @@ This can be overridden by setting
 .Va bf
 to a value which represents True.
 .It Pa env
-For debugging, it can be useful to inlcude the environment
+For debugging, it can be useful to include the environment
 in the .meta file.
 .It Pa verbose
 If in "meta" mode, print a clue about the target being built.
@@ -918,7 +918,7 @@ The default value is:
 This variable is used to record the names of variables assigned to
 on the command line, so that they may be exported as part of
 .Ql Ev MAKEFLAGS .
-This behaviour can be disabled by assigning an empty value to
+This behavior can be disabled by assigning an empty value to
 .Ql Va .MAKEOVERRIDES
 within a makefile.
 Extra variables can be exported from a makefile
@@ -941,6 +941,19 @@ The process-id of
 .It Va .MAKE.PPID
 The parent process-id of
 .Nm .
+.It Va .MAKE.SAVE_DOLLARS
+value should be a boolean that controls whether
+.Ql $$
+are preserved when doing
+.Ql :=
+assignments.
+The default is false, for backwards compatibility.
+Set to true for compatability with other makes.
+If set to false,
+.Ql $$
+becomes
+.Ql $

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

More information about the svn-src-projects mailing list