svn commit: r298107 - in head: . bin/cat bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin/ed bin/expr bin/e...

Sat Apr 16 07:45:39 UTC 2016

Author: gjb
Date: Sat Apr 16 07:45:30 2016
New Revision: 298107
URL: https://svnweb.freebsd.org/changeset/base/298107

Log:
  Merge the projects/release-pkg branch to head.
  
  This allows packaging the base system with pkg(8), including
  but not limited to providing the ability to provide upstream
  binary update possibilities for non-tier-1 architectures.
  
  This merge is a requirement of the 11.0-RELEASE, and as such,
  thank you to everyone that has tested the project branch.
  
  Documentation in build(7) etc. is still somewhat sparse, but
  updates to those parts will follow.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  head/lib/libcapsicum/
     - copied from r298104, projects/release-pkg/lib/libcapsicum/
  head/libexec/casper/
     - copied from r298104, projects/release-pkg/libexec/casper/
  head/release/packages/
     - copied from r298104, projects/release-pkg/release/packages/
  head/release/scripts/make-pkg-package.sh
     - copied unchanged from r298104, projects/release-pkg/release/scripts/make-pkg-package.sh
  head/release/scripts/mtree-to-plist.awk
     - copied unchanged from r298104, projects/release-pkg/release/scripts/mtree-to-plist.awk
  head/share/syscons/Makefile.inc
     - copied unchanged from r298104, projects/release-pkg/share/syscons/Makefile.inc
  head/usr.sbin/bsdinstall/Makefile.inc
     - copied unchanged from r298104, projects/release-pkg/usr.sbin/bsdinstall/Makefile.inc
Replaced:
  head/sys/boot/forth/Makefile
     - copied unchanged from r298104, projects/release-pkg/sys/boot/forth/Makefile
Modified:
  head/Makefile
  head/Makefile.inc1
  head/bin/cat/Makefile
  head/bin/cat/tests/Makefile
  head/bin/chflags/Makefile
  head/bin/chio/Makefile
  head/bin/chmod/Makefile
  head/bin/cp/Makefile
  head/bin/csh/Makefile
  head/bin/date/Makefile
  head/bin/date/tests/Makefile
  head/bin/dd/Makefile
  head/bin/dd/tests/Makefile
  head/bin/df/Makefile
  head/bin/domainname/Makefile
  head/bin/echo/Makefile
  head/bin/ed/Makefile
  head/bin/expr/Makefile
  head/bin/expr/tests/Makefile
  head/bin/freebsd-version/Makefile
  head/bin/getfacl/Makefile
  head/bin/hostname/Makefile
  head/bin/kenv/Makefile
  head/bin/kill/Makefile
  head/bin/ln/Makefile
  head/bin/ls/Makefile
  head/bin/ls/tests/Makefile
  head/bin/mkdir/Makefile
  head/bin/mv/Makefile
  head/bin/mv/tests/Makefile
  head/bin/pax/Makefile
  head/bin/pax/tests/Makefile
  head/bin/pkill/Makefile
  head/bin/pkill/tests/Makefile
  head/bin/ps/Makefile
  head/bin/pwait/Makefile
  head/bin/pwd/Makefile
  head/bin/rcp/Makefile
  head/bin/realpath/Makefile
  head/bin/rm/Makefile
  head/bin/rmail/Makefile
  head/bin/rmdir/Makefile
  head/bin/setfacl/Makefile
  head/bin/sh/Makefile
  head/bin/sh/tests/Makefile
  head/bin/sh/tests/builtins/Makefile
  head/bin/sh/tests/errors/Makefile
  head/bin/sh/tests/execution/Makefile
  head/bin/sh/tests/expansion/Makefile
  head/bin/sh/tests/parameters/Makefile
  head/bin/sh/tests/parser/Makefile
  head/bin/sh/tests/set-e/Makefile
  head/bin/sleep/Makefile
  head/bin/sleep/tests/Makefile
  head/bin/stty/Makefile
  head/bin/sync/Makefile
  head/bin/test/Makefile
  head/bin/test/tests/Makefile
  head/bin/tests/Makefile
  head/bin/uuidgen/Makefile
  head/cddl/lib/tests/Makefile
  head/cddl/sbin/tests/Makefile
  head/cddl/tests/Makefile
  head/cddl/usr.bin/tests/Makefile
  head/cddl/usr.sbin/tests/Makefile
  head/contrib/ntp/ntpd/ntp_control.c
  head/etc/Makefile
  head/etc/devd/Makefile
  head/etc/mtree/BSD.var.dist
  head/etc/pam.d/Makefile
  head/etc/periodic/daily/Makefile
  head/etc/periodic/monthly/Makefile
  head/etc/rc.d/Makefile
  head/gnu/lib/libgcc/Makefile
  head/gnu/lib/tests/Makefile
  head/gnu/tests/Makefile
  head/gnu/usr.bin/binutils/Makefile.inc
  head/gnu/usr.bin/diff/tests/Makefile
  head/gnu/usr.bin/gdb/Makefile.inc
  head/gnu/usr.bin/groff/Makefile.inc
  head/gnu/usr.bin/tests/Makefile
  head/include/Makefile
  head/lib/Makefile
  head/lib/atf/libatf-c++/tests/Makefile
  head/lib/atf/libatf-c++/tests/detail/Makefile
  head/lib/atf/libatf-c/tests/Makefile
  head/lib/atf/libatf-c/tests/detail/Makefile
  head/lib/atf/tests/Makefile
  head/lib/atf/tests/test-programs/Makefile
  head/lib/lib80211/Makefile
  head/lib/libalias/libalias/Makefile
  head/lib/libarchive/Makefile
  head/lib/libarchive/tests/Makefile
  head/lib/libauditd/Makefile
  head/lib/libbegemot/Makefile
  head/lib/libblocksruntime/Makefile
  head/lib/libbluetooth/Makefile
  head/lib/libbsdstat/Makefile
  head/lib/libbsm/Makefile
  head/lib/libbsnmp/Makefile.inc
  head/lib/libbz2/Makefile
  head/lib/libc++/Makefile
  head/lib/libc/Makefile
  head/lib/libc/tests/Makefile
  head/lib/libc/tests/c063/Makefile
  head/lib/libc/tests/db/Makefile
  head/lib/libc/tests/gen/Makefile
  head/lib/libc/tests/gen/execve/Makefile
  head/lib/libc/tests/gen/posix_spawn/Makefile
  head/lib/libc/tests/hash/Makefile
  head/lib/libc/tests/inet/Makefile
  head/lib/libc/tests/locale/Makefile
  head/lib/libc/tests/net/Makefile
  head/lib/libc/tests/nss/Makefile
  head/lib/libc/tests/regex/Makefile
  head/lib/libc/tests/resolv/Makefile
  head/lib/libc/tests/rpc/Makefile
  head/lib/libc/tests/setjmp/Makefile
  head/lib/libc/tests/ssp/Makefile
  head/lib/libc/tests/stdio/Makefile
  head/lib/libc/tests/stdlib/Makefile
  head/lib/libc/tests/string/Makefile
  head/lib/libc/tests/sys/Makefile
  head/lib/libc/tests/termios/Makefile
  head/lib/libc/tests/time/Makefile
  head/lib/libc/tests/tls/Makefile
  head/lib/libc/tests/tls/dso/Makefile
  head/lib/libc/tests/tls_dso/Makefile
  head/lib/libc/tests/ttyio/Makefile
  head/lib/libcalendar/Makefile
  head/lib/libcam/Makefile
  head/lib/libcasper/libcasper/Makefile
  head/lib/libcasper/services/cap_dns/Makefile
  head/lib/libcasper/services/cap_grp/Makefile
  head/lib/libcasper/services/cap_pwd/Makefile
  head/lib/libcasper/services/cap_random/Makefile
  head/lib/libcasper/services/cap_sysctl/Makefile
  head/lib/libcom_err/Makefile
  head/lib/libcompat/Makefile
  head/lib/libcompiler_rt/Makefile
  head/lib/libcrypt/Makefile
  head/lib/libcrypt/tests/Makefile
  head/lib/libcuse/Makefile
  head/lib/libcxxrt/Makefile
  head/lib/libdevctl/Makefile
  head/lib/libdevinfo/Makefile
  head/lib/libdevstat/Makefile
  head/lib/libdpv/Makefile
  head/lib/libdwarf/Makefile
  head/lib/libedit/Makefile
  head/lib/libefi/Makefile
  head/lib/libelf/Makefile
  head/lib/libelftc/Makefile
  head/lib/libevent/Makefile
  head/lib/libexecinfo/Makefile
  head/lib/libexpat/Makefile
  head/lib/libfetch/Makefile
  head/lib/libfigpar/Makefile
  head/lib/libgeom/Makefile
  head/lib/libgpio/Makefile
  head/lib/libgssapi/Makefile
  head/lib/libipsec/Makefile
  head/lib/libjail/Makefile
  head/lib/libkiconv/Makefile
  head/lib/libkvm/Makefile
  head/lib/libldns/Makefile
  head/lib/liblzma/Makefile
  head/lib/libmagic/Makefile
  head/lib/libmd/Makefile
  head/lib/libmemstat/Makefile
  head/lib/libmilter/Makefile
  head/lib/libmp/Makefile
  head/lib/libmp/tests/Makefile
  head/lib/libmt/Makefile
  head/lib/libnandfs/Makefile
  head/lib/libnetbsd/Makefile
  head/lib/libnetgraph/Makefile
  head/lib/libngatm/Makefile
  head/lib/libnv/Makefile
  head/lib/libnv/tests/Makefile
  head/lib/libopenbsd/Makefile
  head/lib/libopie/Makefile
  head/lib/libpam/libpam/Makefile
  head/lib/libpam/libpam/tests/Makefile
  head/lib/libpam/modules/pam_ssh/Makefile
  head/lib/libpcap/Makefile
  head/lib/libpjdlog/Makefile
  head/lib/libpmc/Makefile
  head/lib/libproc/Makefile
  head/lib/libproc/tests/Makefile
  head/lib/libprocstat/Makefile
  head/lib/libradius/Makefile
  head/lib/librpcsec_gss/Makefile
  head/lib/librpcsvc/Makefile
  head/lib/librt/Makefile
  head/lib/librt/tests/Makefile
  head/lib/librtld_db/Makefile
  head/lib/libsbuf/Makefile
  head/lib/libsdp/Makefile
  head/lib/libsm/Makefile
  head/lib/libsmb/Makefile
  head/lib/libsmdb/Makefile
  head/lib/libsmutil/Makefile
  head/lib/libsqlite3/Makefile
  head/lib/libstand/Makefile
  head/lib/libstdbuf/Makefile
  head/lib/libstdthreads/Makefile
  head/lib/libsysdecode/Makefile
  head/lib/libtacplus/Makefile
  head/lib/libtelnet/Makefile
  head/lib/libthr/Makefile
  head/lib/libthr/tests/Makefile
  head/lib/libthr/tests/dlopen/Makefile
  head/lib/libthr/tests/dlopen/dso/Makefile
  head/lib/libthread_db/Makefile
  head/lib/libucl/Makefile
  head/lib/libufs/Makefile
  head/lib/libugidfw/Makefile
  head/lib/libulog/Makefile
  head/lib/libunbound/Makefile
  head/lib/libusb/Makefile
  head/lib/libusbhid/Makefile
  head/lib/libutil/Makefile
  head/lib/libutil/tests/Makefile
  head/lib/libvgl/Makefile
  head/lib/libvmmapi/Makefile
  head/lib/libwrap/Makefile
  head/lib/libxo/Makefile
  head/lib/libxo/tests/Makefile
  head/lib/libxo/tests/encoder/Makefile
  head/lib/liby/Makefile
  head/lib/libypclnt/Makefile
  head/lib/libz/Makefile
  head/lib/msun/Makefile
  head/lib/msun/tests/Makefile
  head/lib/ncurses/ncurses/Makefile
  head/lib/tests/Makefile
  head/libexec/atf/atf-check/tests/Makefile
  head/libexec/atf/atf-sh/tests/Makefile
  head/libexec/atf/tests/Makefile
  head/libexec/atrun/Makefile
  head/libexec/dma/Makefile.inc
  head/libexec/mail.local/Makefile
  head/libexec/rlogind/Makefile
  head/libexec/rshd/Makefile
  head/libexec/rtld-elf/Makefile
  head/libexec/rtld-elf/tests/Makefile
  head/libexec/rtld-elf/tests/libpythagoras/Makefile
  head/libexec/rtld-elf/tests/target/Makefile
  head/libexec/smrsh/Makefile
  head/libexec/tests/Makefile
  head/rescue/librescue/Makefile
  head/rescue/rescue/Makefile
  head/sbin/adjkerntz/Makefile
  head/sbin/atm/atmconfig/Makefile
  head/sbin/badsect/Makefile
  head/sbin/bsdlabel/Makefile
  head/sbin/camcontrol/Makefile
  head/sbin/ccdconfig/Makefile
  head/sbin/clri/Makefile
  head/sbin/comcontrol/Makefile
  head/sbin/conscontrol/Makefile
  head/sbin/ddb/Makefile
  head/sbin/devd/Makefile
  head/sbin/devd/tests/Makefile
  head/sbin/devfs/Makefile
  head/sbin/dhclient/Makefile
  head/sbin/dhclient/tests/Makefile
  head/sbin/dmesg/Makefile
  head/sbin/dump/Makefile
  head/sbin/dumpfs/Makefile
  head/sbin/dumpon/Makefile
  head/sbin/etherswitchcfg/Makefile
  head/sbin/fdisk/Makefile
  head/sbin/fdisk_pc98/Makefile
  head/sbin/ffsinfo/Makefile
  head/sbin/fsck/Makefile
  head/sbin/fsck_ffs/Makefile
  head/sbin/fsck_msdosfs/Makefile
  head/sbin/fsdb/Makefile
  head/sbin/fsirand/Makefile
  head/sbin/gbde/Makefile
  head/sbin/geom/Makefile
  head/sbin/geom/class/cache/Makefile
  head/sbin/geom/class/concat/Makefile
  head/sbin/geom/class/eli/Makefile
  head/sbin/geom/class/journal/Makefile
  head/sbin/geom/class/label/Makefile
  head/sbin/geom/class/mirror/Makefile
  head/sbin/geom/class/mountver/Makefile
  head/sbin/geom/class/multipath/Makefile
  head/sbin/geom/class/nop/Makefile
  head/sbin/geom/class/part/Makefile
  head/sbin/geom/class/raid/Makefile
  head/sbin/geom/class/raid3/Makefile
  head/sbin/geom/class/sched/Makefile
  head/sbin/geom/class/shsec/Makefile
  head/sbin/geom/class/stripe/Makefile
  head/sbin/geom/class/virstor/Makefile
  head/sbin/geom/core/Makefile
  head/sbin/growfs/Makefile
  head/sbin/growfs/tests/Makefile
  head/sbin/gvinum/Makefile
  head/sbin/hastctl/Makefile
  head/sbin/hastd/Makefile
  head/sbin/ifconfig/Makefile
  head/sbin/ifconfig/tests/Makefile
  head/sbin/init/Makefile
  head/sbin/ipf/ipf/Makefile
  head/sbin/ipf/ipfs/Makefile
  head/sbin/ipf/ipfstat/Makefile
  head/sbin/ipf/ipftest/Makefile
  head/sbin/ipf/ipmon/Makefile
  head/sbin/ipf/ipnat/Makefile
  head/sbin/ipf/ippool/Makefile
  head/sbin/ipf/ipresend/Makefile
  head/sbin/ipf/libipf/Makefile
  head/sbin/ipfw/Makefile
  head/sbin/iscontrol/Makefile
  head/sbin/kldconfig/Makefile
  head/sbin/kldload/Makefile
  head/sbin/kldstat/Makefile
  head/sbin/kldunload/Makefile
  head/sbin/ldconfig/Makefile
  head/sbin/md5/Makefile
  head/sbin/mdconfig/Makefile
  head/sbin/mdconfig/tests/Makefile
  head/sbin/mdmfs/Makefile
  head/sbin/mknod/Makefile
  head/sbin/mksnap_ffs/Makefile
  head/sbin/mount/Makefile
  head/sbin/mount_cd9660/Makefile
  head/sbin/mount_fusefs/Makefile
  head/sbin/mount_msdosfs/Makefile
  head/sbin/mount_nfs/Makefile
  head/sbin/mount_nullfs/Makefile
  head/sbin/mount_udf/Makefile
  head/sbin/mount_unionfs/Makefile
  head/sbin/nandfs/Makefile
  head/sbin/natd/Makefile
  head/sbin/newfs_msdos/Makefile
  head/sbin/newfs_nandfs/Makefile
  head/sbin/nfsiod/Makefile
  head/sbin/nos-tun/Makefile
  head/sbin/nvmecontrol/Makefile
  head/sbin/pfctl/Makefile
  head/sbin/pflogd/Makefile
  head/sbin/ping/Makefile
  head/sbin/ping6/Makefile
  head/sbin/quotacheck/Makefile
  head/sbin/rcorder/Makefile
  head/sbin/reboot/Makefile
  head/sbin/recoverdisk/Makefile
  head/sbin/resolvconf/Makefile
  head/sbin/restore/Makefile
  head/sbin/route/Makefile
  head/sbin/routed/Makefile
  head/sbin/routed/rtquery/Makefile
  head/sbin/rtsol/Makefile
  head/sbin/savecore/Makefile
  head/sbin/sconfig/Makefile
  head/sbin/setkey/Makefile
  head/sbin/shutdown/Makefile
  head/sbin/swapon/Makefile
  head/sbin/sysctl/Makefile
  head/sbin/tests/Makefile
  head/sbin/tunefs/Makefile
  head/sbin/umount/Makefile
  head/secure/lib/libssh/Makefile
  head/secure/lib/tests/Makefile
  head/secure/libexec/Makefile.inc
  head/secure/libexec/tests/Makefile
  head/secure/tests/Makefile
  head/secure/usr.bin/scp/Makefile
  head/secure/usr.bin/sftp/Makefile
  head/secure/usr.bin/ssh-add/Makefile
  head/secure/usr.bin/ssh-agent/Makefile
  head/secure/usr.bin/ssh-keygen/Makefile
  head/secure/usr.bin/ssh-keyscan/Makefile
  head/secure/usr.bin/ssh/Makefile
  head/secure/usr.bin/tests/Makefile
  head/secure/usr.sbin/sshd/Makefile
  head/secure/usr.sbin/tests/Makefile
  head/share/examples/Makefile
  head/share/examples/tests/Makefile
  head/share/examples/tests/tests/Makefile
  head/share/examples/tests/tests/atf/Makefile
  head/share/examples/tests/tests/plain/Makefile
  head/share/man/man1/Makefile
  head/share/man/man3/Makefile
  head/share/man/man4/Makefile
  head/share/man/man4/man4.arm/Makefile
  head/share/man/man4/man4.i386/Makefile
  head/share/man/man4/man4.powerpc/Makefile
  head/share/man/man4/man4.sparc64/Makefile
  head/share/man/man5/Makefile
  head/share/man/man6/Makefile
  head/share/man/man7/Makefile
  head/share/man/man8/Makefile
  head/share/man/man9/Makefile
  head/share/mk/bsd.doc.mk
  head/share/mk/bsd.files.mk
  head/share/mk/bsd.incs.mk
  head/share/mk/bsd.lib.mk
  head/share/mk/bsd.links.mk
  head/share/mk/bsd.man.mk
  head/share/mk/bsd.prog.mk
  head/share/mk/bsd.test.mk
  head/share/sendmail/Makefile
  head/share/tests/Makefile
  head/sys/conf/kmod.mk
  head/sys/modules/tests/callout_test/Makefile
  head/sys/modules/tests/framework/Makefile
  head/tests/Makefile
  head/tests/etc/Makefile
  head/tests/etc/rc.d/Makefile
  head/tests/sys/Makefile
  head/tests/sys/acl/Makefile
  head/tests/sys/aio/Makefile
  head/tests/sys/fifo/Makefile
  head/tests/sys/file/Makefile
  head/tests/sys/geom/Makefile
  head/tests/sys/geom/class/Makefile
  head/tests/sys/geom/class/concat/Makefile
  head/tests/sys/geom/class/eli/Makefile
  head/tests/sys/geom/class/gate/Makefile
  head/tests/sys/geom/class/mirror/Makefile
  head/tests/sys/geom/class/nop/Makefile
  head/tests/sys/geom/class/raid3/Makefile
  head/tests/sys/geom/class/shsec/Makefile
  head/tests/sys/geom/class/stripe/Makefile
  head/tests/sys/geom/class/uzip/Makefile
  head/tests/sys/kern/Makefile
  head/tests/sys/kern/acct/Makefile
  head/tests/sys/kern/execve/Makefile
  head/tests/sys/kern/pipe/Makefile
  head/tests/sys/kqueue/Makefile
  head/tests/sys/mac/Makefile
  head/tests/sys/mac/bsdextended/Makefile
  head/tests/sys/mac/portacl/Makefile
  head/tests/sys/mqueue/Makefile
  head/tests/sys/netinet/Makefile
  head/tests/sys/opencrypto/Makefile
  head/tests/sys/pjdfstest/Makefile
  head/tests/sys/pjdfstest/pjdfstest/Makefile
  head/tests/sys/pjdfstest/tests/Makefile
  head/tests/sys/pjdfstest/tests/chflags/Makefile
  head/tests/sys/pjdfstest/tests/chmod/Makefile
  head/tests/sys/pjdfstest/tests/chown/Makefile
  head/tests/sys/pjdfstest/tests/ftruncate/Makefile
  head/tests/sys/pjdfstest/tests/granular/Makefile
  head/tests/sys/pjdfstest/tests/link/Makefile
  head/tests/sys/pjdfstest/tests/mkdir/Makefile
  head/tests/sys/pjdfstest/tests/mkfifo/Makefile
  head/tests/sys/pjdfstest/tests/mknod/Makefile
  head/tests/sys/pjdfstest/tests/open/Makefile
  head/tests/sys/pjdfstest/tests/rename/Makefile
  head/tests/sys/pjdfstest/tests/rmdir/Makefile
  head/tests/sys/pjdfstest/tests/symlink/Makefile
  head/tests/sys/pjdfstest/tests/truncate/Makefile
  head/tests/sys/pjdfstest/tests/unlink/Makefile
  head/tests/sys/posixshm/Makefile
  head/tests/sys/vfs/Makefile
  head/tests/sys/vm/Makefile
  head/usr.bin/apply/tests/Makefile
  head/usr.bin/at/Makefile.inc
  head/usr.bin/basename/tests/Makefile
  head/usr.bin/bmake/tests/Makefile
  head/usr.bin/bmake/tests/archives/Makefile
  head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile
  head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile
  head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile
  head/usr.bin/bmake/tests/basic/Makefile
  head/usr.bin/bmake/tests/basic/t0/Makefile
  head/usr.bin/bmake/tests/basic/t1/Makefile
  head/usr.bin/bmake/tests/basic/t2/Makefile
  head/usr.bin/bmake/tests/basic/t3/Makefile
  head/usr.bin/bmake/tests/execution/Makefile
  head/usr.bin/bmake/tests/execution/ellipsis/Makefile
  head/usr.bin/bmake/tests/execution/empty/Makefile
  head/usr.bin/bmake/tests/execution/joberr/Makefile
  head/usr.bin/bmake/tests/execution/plus/Makefile
  head/usr.bin/bmake/tests/shell/Makefile
  head/usr.bin/bmake/tests/shell/builtin/Makefile
  head/usr.bin/bmake/tests/shell/meta/Makefile
  head/usr.bin/bmake/tests/shell/path/Makefile
  head/usr.bin/bmake/tests/shell/path_select/Makefile
  head/usr.bin/bmake/tests/shell/replace/Makefile
  head/usr.bin/bmake/tests/shell/select/Makefile
  head/usr.bin/bmake/tests/suffixes/Makefile
  head/usr.bin/bmake/tests/suffixes/basic/Makefile
  head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile
  head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile
  head/usr.bin/bmake/tests/syntax/Makefile
  head/usr.bin/bmake/tests/syntax/directive-t0/Makefile
  head/usr.bin/bmake/tests/syntax/enl/Makefile
  head/usr.bin/bmake/tests/syntax/funny-targets/Makefile
  head/usr.bin/bmake/tests/syntax/semi/Makefile
  head/usr.bin/bmake/tests/sysmk/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/2/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/Makefile
  head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/2/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/Makefile
  head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/2/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/Makefile
  head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile
  head/usr.bin/bmake/tests/variables/Makefile
  head/usr.bin/bmake/tests/variables/modifier_M/Makefile
  head/usr.bin/bmake/tests/variables/modifier_t/Makefile
  head/usr.bin/bmake/tests/variables/opt_V/Makefile
  head/usr.bin/bmake/tests/variables/t0/Makefile
  head/usr.bin/calendar/tests/Makefile
  head/usr.bin/chpass/Makefile
  head/usr.bin/clang/clang.prog.mk
  head/usr.bin/cmp/tests/Makefile
  head/usr.bin/col/tests/Makefile
  head/usr.bin/comm/tests/Makefile
  head/usr.bin/cpio/tests/Makefile
  head/usr.bin/cut/tests/Makefile
  head/usr.bin/dirname/tests/Makefile
  head/usr.bin/ee/Makefile
  head/usr.bin/file2c/tests/Makefile
  head/usr.bin/grep/tests/Makefile
  head/usr.bin/gzip/tests/Makefile
  head/usr.bin/ident/tests/Makefile
  head/usr.bin/iscsictl/Makefile
  head/usr.bin/join/tests/Makefile
  head/usr.bin/jot/tests/Makefile
  head/usr.bin/lastcomm/Makefile
  head/usr.bin/lastcomm/tests/Makefile
  head/usr.bin/limits/tests/Makefile
  head/usr.bin/m4/tests/Makefile
  head/usr.bin/mkimg/tests/Makefile
  head/usr.bin/ncal/tests/Makefile
  head/usr.bin/passwd/Makefile
  head/usr.bin/printf/tests/Makefile
  head/usr.bin/rlogin/Makefile
  head/usr.bin/rsh/Makefile
  head/usr.bin/ruptime/Makefile
  head/usr.bin/rwho/Makefile
  head/usr.bin/sed/tests/Makefile
  head/usr.bin/sed/tests/regress.multitest.out/Makefile
  head/usr.bin/soelim/tests/Makefile
  head/usr.bin/ssh-copy-id/Makefile
  head/usr.bin/svn/Makefile.inc
  head/usr.bin/tar/tests/Makefile
  head/usr.bin/tests/Makefile
  head/usr.bin/timeout/tests/Makefile
  head/usr.bin/tr/tests/Makefile
  head/usr.bin/truncate/tests/Makefile
  head/usr.bin/units/tests/Makefile
  head/usr.bin/uudecode/tests/Makefile
  head/usr.bin/uuencode/tests/Makefile
  head/usr.bin/vi/Makefile
  head/usr.bin/vi/catalog/Makefile
  head/usr.bin/xargs/tests/Makefile
  head/usr.bin/xo/tests/Makefile
  head/usr.bin/yacc/tests/Makefile
  head/usr.sbin/accton/Makefile
  head/usr.sbin/acpi/Makefile.inc
  head/usr.sbin/amd/Makefile.inc
  head/usr.sbin/apm/Makefile
  head/usr.sbin/apmd/Makefile
  head/usr.sbin/autofs/Makefile
  head/usr.sbin/bhyve/Makefile
  head/usr.sbin/bhyvectl/Makefile
  head/usr.sbin/bhyveload/Makefile
  head/usr.sbin/bsdinstall/Makefile
  head/usr.sbin/bsnmpd/Makefile.inc
  head/usr.sbin/bsnmpd/modules/Makefile.inc
  head/usr.sbin/bsnmpd/tools/Makefile.inc
  head/usr.sbin/chown/tests/Makefile
  head/usr.sbin/etcupdate/tests/Makefile
  head/usr.sbin/fstyp/tests/Makefile
  head/usr.sbin/iscsid/Makefile
  head/usr.sbin/jail/Makefile
  head/usr.sbin/jexec/Makefile
  head/usr.sbin/jls/Makefile
  head/usr.sbin/makefs/tests/Makefile
  head/usr.sbin/newsyslog/tests/Makefile
  head/usr.sbin/nmtree/tests/Makefile
  head/usr.sbin/pw/tests/Makefile
  head/usr.sbin/rpcbind/tests/Makefile
  head/usr.sbin/rwhod/Makefile
  head/usr.sbin/sa/Makefile
  head/usr.sbin/sa/tests/Makefile
  head/usr.sbin/sendmail/Makefile
  head/usr.sbin/tests/Makefile
  head/usr.sbin/unbound/Makefile.inc
Directory Properties:
  head/   (props changed)
  head/MAINTAINERS   (props changed)

Modified: head/Makefile
==============================================================================

--- head/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -127,7 +127,9 @@ TGTS=	all all-man buildenv buildenvvars 
 	_build-tools _cross-tools _includes _libraries \
 	build32 distribute32 install32 buildsoft distributesoft installsoft \
 	builddtb xdev xdev-build xdev-install \
-	xdev-links native-xtools installconfig \
+	xdev-links native-xtools stageworld stagekernel stage-packages \
+	create-world-packages create-kernel-packages create-packages \
+	packages installconfig real-packages sign-packages package-pkg
 
 TGTS+=	${SUBDIR_TARGETS}
 

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/Makefile.inc1	Sat Apr 16 07:45:30 2016	(r298107)
@@ -194,6 +194,21 @@ VERSION=	FreeBSD ${REVISION}-${BRANCH:C/
 .export VERSION
 .endif
 
+.if !defined(PKG_VERSION)
+REVISION!=	${MAKE} -C ${SRCDIR}/release -V REVISION
+BRANCH!=	${MAKE} -C ${SRCDIR}/release -V BRANCH
+SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+		${SRCDIR}/sys/sys/param.h
+.if ${BRANCH:MSTABLE*} || ${BRANCH:MCURRENT*}
+TIMENOW=	%Y%m%d%H%M%S
+EXTRA_REVISION=	.s${TIMENOW:gmtime}
+.endif
+.if ${BRANCH:M*-p*}
+EXTRA_REVISION=	_${BRANCH:C/.*-p([0-9]+$)/\1/}
+.endif
+PKG_VERSION=	${REVISION}${EXTRA_REVISION}
+.endif
+
 KNOWN_ARCHES?=	aarch64/arm64 \
 		amd64 \
 		arm \
@@ -262,10 +277,15 @@ TMPPATH=	${STRICTTMPPATH}:${PATH}
 # It may not be functional, e.g., due to new ABI
 # when in the middle of installing over this system.
 #
-.if make(distributeworld) || make(installworld)
+.if make(distributeworld) || make(installworld) || make(stageworld)
 INSTALLTMP!=	/usr/bin/mktemp -d -u -t install
 .endif
 
+.if make(stagekernel) || make(distributekernel)
+TAGS+=		kernel
+PACKAGE=	kernel
+.endif
+
 #
 # Building a world goes through the following stages
 #
@@ -495,6 +515,9 @@ IMAKE+=		-DNO_ROOT METALOG=${METALOG}
 INSTALLFLAGS+=	-U -M ${METALOG} -D ${INSTALL_DDIR}
 MTREEFLAGS+=	-W
 .endif
+.if defined(BUILD_PKGS)
+INSTALLFLAGS+=	-h sha256
+.endif
 .if defined(DB_FROM_SRC) || defined(NO_ROOT)
 IMAKE_INSTALL=	INSTALL="install ${INSTALLFLAGS}"
 IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLAGS}"
@@ -805,7 +828,7 @@ DEBUG_DISTRIBUTIONS+=	base ${EXTRA_DISTR
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: _installcheck_world
+distributeworld installworld stageworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
@@ -958,6 +981,21 @@ reinstall: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install${libcompat}
 .endif
 
+restage: .MAKE .PHONY
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Making hierarchy"
+	@echo "--------------------------------------------------------------"
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
+	    LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Installing everything"
+	@echo "--------------------------------------------------------------"
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
+.if defined(LIB32TMP) && ${MK_LIB32} != "no"
+	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
+.endif
+
 redistribute: .MAKE .PHONY
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Distributing everything"
@@ -1123,7 +1161,7 @@ distributekernel distributekernel.debug:
 .endif
 	mkdir -p ${DESTDIR}/${DISTDIR}
 .if defined(NO_ROOT)
-	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
+	@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
 .endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
@@ -1131,14 +1169,14 @@ distributekernel distributekernel.debug:
 	    DESTDIR=${INSTALL_DDIR}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
-	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
+	@sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
 .endif
 .if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 .if defined(NO_ROOT)
-	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
+	@echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
@@ -1147,7 +1185,7 @@ distributekernel distributekernel.debug:
 	    DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
-	sed -e 's|^./kernel|.|' \
+	@sed -e "s|^./kernel.${_kernel}|.|" \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endif
@@ -1199,6 +1237,146 @@ packagekernel:
 .endif
 .endif
 
+stagekernel:
+	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
+
+PORTSDIR?=	/usr/ports
+WSTAGEDIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
+KSTAGEDIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
+REPODIR?=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo
+PKGSIGNKEY?=	# empty
+
+.ORDER:		stage-packages create-packages
+.ORDER:		create-packages create-world-packages
+.ORDER:		create-packages create-kernel-packages
+.ORDER:		create-packages sign-packages
+
+_pkgbootstrap:
+.if !exists(${LOCALBASE}/sbin/pkg)
+	@env ASSUME_ALWAYS_YES=YES pkg bootstrap
+.endif
+
+packages:
+	${MAKE} -C ${.CURDIR} PKG_VERSION=${PKG_VERSION} real-packages
+
+package-pkg:
+	rm -rf /tmp/ports.${TARGET} || :
+	env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${REVISION} \
+		PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} WSTAGEDIR=${WSTAGEDIR} \
+		sh ${.CURDIR}/release/scripts/make-pkg-package.sh
+
+real-packages:	stage-packages create-packages sign-packages
+
+stage-packages:
+	@mkdir -p ${REPODIR} ${WSTAGEDIR} ${KSTAGEDIR}
+	${_+_}@cd ${.CURDIR}; \
+		${MAKE} DESTDIR=${WSTAGEDIR} -DNO_ROOT -B stageworld ; \
+		${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT -B stagekernel
+
+create-packages:	_pkgbootstrap
+	@mkdir -p ${REPODIR}
+	${_+_}@cd ${.CURDIR}; \
+		${MAKE} DESTDIR=${WSTAGEDIR} \
+			PKG_VERSION=${PKG_VERSION} create-world-packages ; \
+		${MAKE} DESTDIR=${KSTAGEDIR} \
+			PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
+			create-kernel-packages
+
+create-world-packages:	_pkgbootstrap
+	@rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || :
+	@cd ${WSTAGEDIR} ; \
+		awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
+		${WSTAGEDIR}/METALOG
+	@for plist in ${WSTAGEDIR}/*.plist; do \
+		plist=$${plist##*/} ; \
+		pkgname=$${plist%.plist} ; \
+		sh ${SRCDIR}/release/packages/generate-ucl.sh -o $${pkgname} \
+			-s ${SRCDIR} -u ${WSTAGEDIR}/$${pkgname}.ucl ; \
+	done
+	@for plist in ${WSTAGEDIR}/*.plist; do \
+		plist=$${plist##*/} ; \
+		pkgname=$${plist%.plist} ; \
+		awk -F\" ' \
+			/^name/ { printf("===> Creating %s-", $$2); next } \
+			/^version/ { print $$2; next } \
+			' ${WSTAGEDIR}/$${pkgname}.ucl ; \
+		pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+			create -M ${WSTAGEDIR}/$${pkgname}.ucl \
+			-p ${WSTAGEDIR}/$${pkgname}.plist \
+			-r ${WSTAGEDIR} \
+			-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \
+	done
+
+create-kernel-packages:	_pkgbootstrap
+.if exists(${KSTAGEDIR}/kernel.meta)
+.for flavor in "" -debug
+	@cd ${KSTAGEDIR}/${DISTDIR} ; \
+	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
+		-v kernel=yes -v _kernconf=${INSTALLKERNEL} \
+		${KSTAGEDIR}/kernel.meta ; \
+	cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
+	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
+	sed -e "s/%VERSION%/${PKG_VERSION}/" \
+		-e "s/%PKGNAME%/kernel-${INSTALLKERNEL:tl}${flavor}/" \
+		-e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
+		-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
+		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
+		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
+		${SRCDIR}/release/packages/kernel.ucl \
+		> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
+	awk -F\" ' \
+		/name/ { printf("===> Creating %s-", $$2); next } \
+		/version/ {print $$2; next } ' \
+		${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
+	pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+		create -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \
+		-p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
+		-r ${KSTAGEDIR}/${DISTDIR} \
+		-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
+.endfor
+.endif
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.for _kernel in ${BUILDKERNELS:[2..-1]}
+.if exists(${KSTAGEDIR}/kernel.${_kernel}.meta)
+.for flavor in "" -debug
+	@cd ${KSTAGEDIR}/kernel.${_kernel} ; \
+	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
+		-v kernel=yes -v _kernconf=${_kernel} \
+		${KSTAGEDIR}/kernel.${_kernel}.meta ; \
+	cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \
+	pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \
+	sed -e "s/%VERSION%/${PKG_VERSION}/" \
+		-e "s/%PKGNAME%/kernel-${_kernel:tl}${flavor}/" \
+		-e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \
+		-e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
+		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
+		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
+		${SRCDIR}/release/packages/kernel.ucl \
+		> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
+	awk -F\" ' \
+		/name/ { printf("===> Creating %s-", $$2); next } \
+		/version/ {print $$2; next } ' \
+		${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
+	pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
+		create -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \
+		-p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
+		-r ${KSTAGEDIR}/kernel.${_kernel} \
+		-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
+.endfor
+.endif
+.endfor
+.endif
+
+sign-packages:	_pkgbootstrap
+	@[ -L "${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \
+		unlink ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \
+	pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \
+		-o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
+		${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
+		${PKGSIGNKEY} ; \
+	ln -s ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \
+		${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest
+
 #
 #
 # checkworld

Modified: head/bin/cat/Makefile
==============================================================================
--- head/bin/cat/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/cat/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	cat
 
 .if ${MK_TESTS} != "no"

Modified: head/bin/cat/tests/Makefile
==============================================================================
--- head/bin/cat/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/cat/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=		cat_test
 
 FILESDIR=	${TESTSDIR}

Modified: head/bin/chflags/Makefile
==============================================================================
--- head/bin/chflags/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/chflags/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	chflags
 
 .include <bsd.prog.mk>

Modified: head/bin/chio/Makefile
==============================================================================
--- head/bin/chio/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/chio/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
+PACKAGE=runtime
 PROG=	chio
 
 .include <bsd.prog.mk>

Modified: head/bin/chmod/Makefile
==============================================================================
--- head/bin/chmod/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/chmod/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	chmod
 
 .include <bsd.prog.mk>

Modified: head/bin/cp/Makefile
==============================================================================
--- head/bin/cp/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/cp/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	cp
 SRCS=	cp.c utils.c
 CFLAGS+= -DVM_AND_BUFFER_CACHE_SYNCHRONIZED -D_ACL_PRIVATE

Modified: head/bin/csh/Makefile
==============================================================================
--- head/bin/csh/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/csh/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -8,6 +8,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 TCSHDIR= ${.CURDIR}/../../contrib/tcsh
 .PATH: ${TCSHDIR}
 

Modified: head/bin/date/Makefile
==============================================================================
--- head/bin/date/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/date/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	date
 SRCS=	date.c netdate.c vary.c
 

Modified: head/bin/date/tests/Makefile
==============================================================================
--- head/bin/date/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/date/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_SH=	format_string_test
 
 .include <bsd.test.mk>

Modified: head/bin/dd/Makefile
==============================================================================
--- head/bin/dd/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/dd/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
 

Modified: head/bin/dd/tests/Makefile
==============================================================================
--- head/bin/dd/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/dd/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=	dd_test
 
 .include <netbsd-tests.test.mk>

Modified: head/bin/df/Makefile
==============================================================================
--- head/bin/df/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/df/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
 # $FreeBSD$
 
+PACKAGE=runtime
 MOUNT=	${.CURDIR}/../../sbin/mount
 .PATH: ${MOUNT}
 

Modified: head/bin/domainname/Makefile
==============================================================================
--- head/bin/domainname/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/domainname/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	domainname
 
 .include <bsd.prog.mk>

Modified: head/bin/echo/Makefile
==============================================================================
--- head/bin/echo/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/echo/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	echo
 
 .include <bsd.prog.mk>

Modified: head/bin/ed/Makefile
==============================================================================
--- head/bin/ed/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/ed/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=	${BINDIR}/ed ${BINDIR}/red

Modified: head/bin/expr/Makefile
==============================================================================
--- head/bin/expr/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/expr/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	expr
 SRCS=	expr.y
 YFLAGS=

Modified: head/bin/expr/tests/Makefile
==============================================================================
--- head/bin/expr/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/expr/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=	expr_test
 
 ATF_TESTS_SH_SED_expr_test+=	-e 's/eval expr/eval expr --/g'

Modified: head/bin/freebsd-version/Makefile
==============================================================================
--- head/bin/freebsd-version/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/freebsd-version/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 SCRIPTS = freebsd-version
 MAN = freebsd-version.1
 CLEANFILES = freebsd-version freebsd-version.sh

Modified: head/bin/getfacl/Makefile
==============================================================================
--- head/bin/getfacl/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/getfacl/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	getfacl
 
 .include <bsd.prog.mk>

Modified: head/bin/hostname/Makefile
==============================================================================
--- head/bin/hostname/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/hostname/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	hostname
 
 .include <bsd.prog.mk>

Modified: head/bin/kenv/Makefile
==============================================================================
--- head/bin/kenv/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/kenv/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	kenv
 
 .include <bsd.prog.mk>

Modified: head/bin/kill/Makefile
==============================================================================
--- head/bin/kill/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/kill/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	kill
 
 .include <bsd.prog.mk>

Modified: head/bin/ln/Makefile
==============================================================================
--- head/bin/ln/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/ln/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	ln
 MAN=	ln.1 symlink.7
 

Modified: head/bin/ls/Makefile
==============================================================================
--- head/bin/ls/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/ls/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
 LIBADD=	xo util

Modified: head/bin/ls/tests/Makefile
==============================================================================
--- head/bin/ls/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/ls/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 ATF_TESTS_SH+=	ls_tests
 # This seems like overkill, but the idea in mind is that all of the testcases
 # should be runnable as !root

Modified: head/bin/mkdir/Makefile
==============================================================================
--- head/bin/mkdir/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/mkdir/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	mkdir
 
 .include <bsd.prog.mk>

Modified: head/bin/mv/Makefile
==============================================================================
--- head/bin/mv/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/mv/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	mv
 
 .if ${MK_TESTS} != "no"

Modified: head/bin/mv/tests/Makefile
==============================================================================
--- head/bin/mv/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/mv/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	legacy_test
 
 .include <bsd.test.mk>

Modified: head/bin/pax/Makefile
==============================================================================
--- head/bin/pax/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/pax/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -27,6 +27,7 @@
 # 		regex routines and must define NET2_REGEX.
 # 		Pax may not compile if this not (un)defined properly.
 
+PACKAGE=runtime
 PROG=   pax
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \

Modified: head/bin/pax/tests/Makefile
==============================================================================
--- head/bin/pax/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/pax/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_PERL=	legacy_test
 
 .include <bsd.test.mk>

Modified: head/bin/pkill/Makefile
==============================================================================
--- head/bin/pkill/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/pkill/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	pkill
 
 LIBADD=	kvm jail

Modified: head/bin/pkill/tests/Makefile
==============================================================================
--- head/bin/pkill/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/pkill/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=			pgrep-F_test
 TAP_TESTS_SH+=			pgrep-LF_test
 TAP_TESTS_SH+=			pgrep-P_test

Modified: head/bin/ps/Makefile
==============================================================================
--- head/bin/ps/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/ps/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
+PACKAGE=runtime
 PROG=	ps
 SRCS=	fmt.c keyword.c nlist.c print.c ps.c
 

Modified: head/bin/pwait/Makefile
==============================================================================
--- head/bin/pwait/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/pwait/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	pwait
 
 .include <bsd.prog.mk>

Modified: head/bin/pwd/Makefile
==============================================================================
--- head/bin/pwd/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/pwd/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	pwd
 
 .include <bsd.prog.mk>

Modified: head/bin/rcp/Makefile
==============================================================================
--- head/bin/rcp/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/rcp/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,10 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
 # $FreeBSD$
 
+PACKAGE=rcmds
 PROG=	rcp
 SRCS=	rcp.c util.c
 CFLAGS+=-DBINDIR=${BINDIR}
 
+PACKAGE=rcmds
+
 BINOWN=	root
 BINMODE=4555
 

Modified: head/bin/realpath/Makefile
==============================================================================
--- head/bin/realpath/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/realpath/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	realpath
 
 .include <bsd.prog.mk>

Modified: head/bin/rm/Makefile
==============================================================================
--- head/bin/rm/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/rm/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	rm
 
 LINKS=	${BINDIR}/rm ${BINDIR}/unlink

Modified: head/bin/rmail/Makefile
==============================================================================
--- head/bin/rmail/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/rmail/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=sendmail
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
 

Modified: head/bin/rmdir/Makefile
==============================================================================
--- head/bin/rmdir/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/rmdir/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	rmdir
 
 .include <bsd.prog.mk>

Modified: head/bin/setfacl/Makefile
==============================================================================
--- head/bin/setfacl/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/setfacl/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	setfacl
 SRCS=	file.c mask.c merge.c remove.c setfacl.c util.c
 

Modified: head/bin/sh/Makefile
==============================================================================
--- head/bin/sh/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	sh
 INSTALLFLAGS= -S
 SHSRCS=	alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \

Modified: head/bin/sh/tests/Makefile
==============================================================================
--- head/bin/sh/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TESTS_SUBDIRS+=	builtins
 TESTS_SUBDIRS+=	errors
 TESTS_SUBDIRS+=	execution

Modified: head/bin/sh/tests/builtins/Makefile
==============================================================================
--- head/bin/sh/tests/builtins/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/builtins/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,9 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: head/bin/sh/tests/errors/Makefile
==============================================================================
--- head/bin/sh/tests/errors/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/errors/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: head/bin/sh/tests/execution/Makefile
==============================================================================
--- head/bin/sh/tests/execution/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/execution/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: head/bin/sh/tests/expansion/Makefile
==============================================================================
--- head/bin/sh/tests/expansion/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/expansion/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: head/bin/sh/tests/parameters/Makefile
==============================================================================
--- head/bin/sh/tests/parameters/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/parameters/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: head/bin/sh/tests/parser/Makefile
==============================================================================
--- head/bin/sh/tests/parser/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/parser/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: head/bin/sh/tests/set-e/Makefile
==============================================================================
--- head/bin/sh/tests/set-e/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sh/tests/set-e/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
 TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
 .PATH: ${.CURDIR:H}

Modified: head/bin/sleep/Makefile
==============================================================================
--- head/bin/sleep/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sleep/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	sleep
 
 .if ${MK_TESTS} != "no"

Modified: head/bin/sleep/tests/Makefile
==============================================================================
--- head/bin/sleep/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sleep/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 NETBSD_ATF_TESTS_SH=	sleep_test
 
 .include <bsd.test.mk>

Modified: head/bin/stty/Makefile
==============================================================================
--- head/bin/stty/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/stty/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c
 

Modified: head/bin/sync/Makefile
==============================================================================
--- head/bin/sync/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/sync/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	sync
 MAN=	sync.8
 

Modified: head/bin/test/Makefile
==============================================================================
--- head/bin/test/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/test/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=runtime
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
 MLINKS=	test.1 [.1

Modified: head/bin/test/tests/Makefile
==============================================================================
--- head/bin/test/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/test/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,10 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+
 TAP_TESTS_SH=	legacy_test
 # Some tests in here are silently not run when the tests are executed as
 # root.  Explicitly tell Kyua to drop privileges.

Modified: head/bin/tests/Makefile
==============================================================================
--- head/bin/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: head/bin/uuidgen/Makefile
==============================================================================
--- head/bin/uuidgen/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/bin/uuidgen/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=runtime
 PROG=	uuidgen
 
 .include <bsd.prog.mk>

Modified: head/cddl/lib/tests/Makefile
==============================================================================
--- head/cddl/lib/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/cddl/lib/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: head/cddl/sbin/tests/Makefile
==============================================================================
--- head/cddl/sbin/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/cddl/sbin/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: head/cddl/tests/Makefile
==============================================================================
--- head/cddl/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/cddl/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: head/cddl/usr.bin/tests/Makefile
==============================================================================
--- head/cddl/usr.bin/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/cddl/usr.bin/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: head/cddl/usr.sbin/tests/Makefile
==============================================================================
--- head/cddl/usr.sbin/tests/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/cddl/usr.sbin/tests/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -2,6 +2,11 @@
 
 .include <bsd.own.mk>
 
+PACKAGE=	tests
+FILESGROUPS=	TESTS
+TESTSPACKAGE=	${PACKAGE}
+TESTS+=		Kyuafile
+
 .PATH:		${SRCTOP}/tests
 KYUAFILE=	yes
 

Modified: head/contrib/ntp/ntpd/ntp_control.c
==============================================================================
--- head/contrib/ntp/ntpd/ntp_control.c	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/contrib/ntp/ntpd/ntp_control.c	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,6 +3,10 @@
  *		   traps.  Provides service to ntpq and others.
  */
 
+/*
+ * $FreeBSD: projects/release-pkg/contrib/ntp/ntpd/ntp_control.c 277386 2015-01-19 16:15:12Z gjb $
+ */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sat Apr 16 07:41:56 2016	(r298106)
+++ head/etc/Makefile	Sat Apr 16 07:45:30 2016	(r298107)
@@ -3,9 +3,10 @@
 
 .include <src.opts.mk>
 
+FILESGROUPS=	FILES
+
 # No need as it is empty and just causes rebuilds since this file does so much.
 UPDATE_DEPENDFILE=	no
-
 SUBDIR=	\
 	newsyslog.conf.d
 
@@ -82,8 +83,13 @@ BIN1+= apmd.conf
 .endif
 
 .if ${MK_AUTOFS} != "no"
-BIN1+= auto_master
+FILESGROUPS+=	AUTOFS
+AUTOFS+=	auto_master

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