aboutsummaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/adjkerntz/Makefile1
-rw-r--r--sbin/atm/atmconfig/Makefile1
-rw-r--r--sbin/badsect/Makefile1
-rw-r--r--sbin/bsdlabel/Makefile1
-rw-r--r--sbin/camcontrol/Makefile1
-rw-r--r--sbin/casperd/Makefile18
-rw-r--r--sbin/ccdconfig/Makefile1
-rw-r--r--sbin/clri/Makefile1
-rw-r--r--sbin/comcontrol/Makefile1
-rw-r--r--sbin/conscontrol/Makefile1
-rw-r--r--sbin/ddb/Makefile1
-rw-r--r--sbin/devd/Makefile1
-rw-r--r--sbin/devd/tests/Makefile4
-rw-r--r--sbin/devfs/Makefile1
-rw-r--r--sbin/dhclient/Makefile1
-rw-r--r--sbin/dhclient/tests/Makefile4
-rw-r--r--sbin/dmesg/Makefile1
-rw-r--r--sbin/dump/Makefile1
-rw-r--r--sbin/dumpfs/Makefile1
-rw-r--r--sbin/dumpon/Makefile1
-rw-r--r--sbin/etherswitchcfg/Makefile1
-rw-r--r--sbin/fdisk/Makefile1
-rw-r--r--sbin/fdisk_pc98/Makefile1
-rw-r--r--sbin/ffsinfo/Makefile1
-rw-r--r--sbin/fsck/Makefile1
-rw-r--r--sbin/fsck_ffs/Makefile1
-rw-r--r--sbin/fsck_msdosfs/Makefile1
-rw-r--r--sbin/fsdb/Makefile1
-rw-r--r--sbin/fsirand/Makefile1
-rw-r--r--sbin/gbde/Makefile1
-rw-r--r--sbin/geom/Makefile1
-rw-r--r--sbin/geom/class/cache/Makefile1
-rw-r--r--sbin/geom/class/concat/Makefile1
-rw-r--r--sbin/geom/class/eli/Makefile1
-rw-r--r--sbin/geom/class/journal/Makefile1
-rw-r--r--sbin/geom/class/label/Makefile1
-rw-r--r--sbin/geom/class/mirror/Makefile1
-rw-r--r--sbin/geom/class/mountver/Makefile1
-rw-r--r--sbin/geom/class/multipath/Makefile1
-rw-r--r--sbin/geom/class/nop/Makefile1
-rw-r--r--sbin/geom/class/part/Makefile1
-rw-r--r--sbin/geom/class/raid/Makefile1
-rw-r--r--sbin/geom/class/raid3/Makefile1
-rw-r--r--sbin/geom/class/sched/Makefile1
-rw-r--r--sbin/geom/class/shsec/Makefile1
-rw-r--r--sbin/geom/class/stripe/Makefile1
-rw-r--r--sbin/geom/class/virstor/Makefile1
-rw-r--r--sbin/geom/core/Makefile1
-rw-r--r--sbin/growfs/Makefile1
-rw-r--r--sbin/growfs/tests/Makefile4
-rw-r--r--sbin/gvinum/Makefile1
-rw-r--r--sbin/hastctl/Makefile1
-rw-r--r--sbin/hastd/Makefile1
-rw-r--r--sbin/ifconfig/Makefile1
-rw-r--r--sbin/ifconfig/tests/Makefile4
-rw-r--r--sbin/init/Makefile1
-rw-r--r--sbin/ipf/ipf/Makefile1
-rw-r--r--sbin/ipf/ipfs/Makefile1
-rw-r--r--sbin/ipf/ipfstat/Makefile1
-rw-r--r--sbin/ipf/ipftest/Makefile1
-rw-r--r--sbin/ipf/ipmon/Makefile1
-rw-r--r--sbin/ipf/ipnat/Makefile1
-rw-r--r--sbin/ipf/ippool/Makefile1
-rw-r--r--sbin/ipf/ipresend/Makefile1
-rw-r--r--sbin/ipf/libipf/Makefile1
-rw-r--r--sbin/ipfw/Makefile1
-rw-r--r--sbin/iscontrol/Makefile1
-rw-r--r--sbin/kldconfig/Makefile1
-rw-r--r--sbin/kldload/Makefile1
-rw-r--r--sbin/kldstat/Makefile1
-rw-r--r--sbin/kldunload/Makefile1
-rw-r--r--sbin/ldconfig/Makefile1
-rw-r--r--sbin/md5/Makefile1
-rw-r--r--sbin/mdconfig/Makefile1
-rw-r--r--sbin/mdconfig/tests/Makefile4
-rw-r--r--sbin/mdmfs/Makefile1
-rw-r--r--sbin/mknod/Makefile1
-rw-r--r--sbin/mksnap_ffs/Makefile1
-rw-r--r--sbin/mount/Makefile1
-rw-r--r--sbin/mount_cd9660/Makefile1
-rw-r--r--sbin/mount_fusefs/Makefile1
-rw-r--r--sbin/mount_msdosfs/Makefile1
-rw-r--r--sbin/mount_nfs/Makefile1
-rw-r--r--sbin/mount_nullfs/Makefile1
-rw-r--r--sbin/mount_udf/Makefile1
-rw-r--r--sbin/mount_unionfs/Makefile1
-rw-r--r--sbin/nandfs/Makefile1
-rw-r--r--sbin/natd/Makefile1
-rw-r--r--sbin/newfs_msdos/Makefile1
-rw-r--r--sbin/newfs_nandfs/Makefile1
-rw-r--r--sbin/nfsiod/Makefile1
-rw-r--r--sbin/nos-tun/Makefile1
-rw-r--r--sbin/nvmecontrol/Makefile1
-rw-r--r--sbin/pfctl/Makefile1
-rw-r--r--sbin/pflogd/Makefile1
-rw-r--r--sbin/ping/Makefile1
-rw-r--r--sbin/ping6/Makefile1
-rw-r--r--sbin/quotacheck/Makefile1
-rw-r--r--sbin/rcorder/Makefile1
-rw-r--r--sbin/reboot/Makefile1
-rw-r--r--sbin/recoverdisk/Makefile1
-rw-r--r--sbin/resolvconf/Makefile1
-rw-r--r--sbin/restore/Makefile1
-rw-r--r--sbin/route/Makefile1
-rw-r--r--sbin/routed/Makefile1
-rw-r--r--sbin/routed/rtquery/Makefile1
-rw-r--r--sbin/rtsol/Makefile1
-rw-r--r--sbin/savecore/Makefile1
-rw-r--r--sbin/sconfig/Makefile1
-rw-r--r--sbin/setkey/Makefile1
-rw-r--r--sbin/shutdown/Makefile1
-rw-r--r--sbin/swapon/Makefile1
-rw-r--r--sbin/sysctl/Makefile1
-rw-r--r--sbin/tests/Makefile5
-rw-r--r--sbin/tunefs/Makefile1
-rw-r--r--sbin/umount/Makefile1
116 files changed, 152 insertions, 0 deletions
diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile
index 27c128916f9b..e30841e3ae2d 100644
--- a/sbin/adjkerntz/Makefile
+++ b/sbin/adjkerntz/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= adjkerntz
MAN= adjkerntz.8
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index a77eb25549e8..75a2ede8d7ff 100644
--- a/sbin/atm/atmconfig/Makefile
+++ b/sbin/atm/atmconfig/Makefile
@@ -7,6 +7,7 @@
.include <src.opts.mk>
+PACKAGE=atm
PROG= atmconfig
SRCS= main.c diag.c natm.c
MAN= atmconfig.8
diff --git a/sbin/badsect/Makefile b/sbin/badsect/Makefile
index 68e29645a512..c344e6c63552 100644
--- a/sbin/badsect/Makefile
+++ b/sbin/badsect/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= badsect
LIBADD= ufs
MAN= badsect.8
diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile
index 42f0f1c3861a..d2e34d36e3ea 100644
--- a/sbin/bsdlabel/Makefile
+++ b/sbin/bsdlabel/Makefile
@@ -3,6 +3,7 @@
.PATH: ${.CURDIR}/../../sys/geom
+PACKAGE=runtime
PROG= bsdlabel
SRCS= bsdlabel.c geom_bsd_enc.c
MAN+= bsdlabel.8
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index cbc545236b81..f1101d3d9ea2 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= camcontrol
SRCS= camcontrol.c util.c
.if !defined(RELEASE_CRUNCH)
diff --git a/sbin/casperd/Makefile b/sbin/casperd/Makefile
new file mode 100644
index 000000000000..698263c1836e
--- /dev/null
+++ b/sbin/casperd/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PACKAGE=casper
+PROG= casperd
+
+SRCS= casperd.c zygote.c
+
+LIBADD= casper nv pjdlog util
+
+MAN= casperd.8
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../../lib/libcapsicum
+CFLAGS+=-I${.CURDIR}/../../lib/libcasper
+CFLAGS+=-I${.CURDIR}/../../lib/libnv
+CFLAGS+=-I${.CURDIR}/../../lib/libpjdlog
+
+.include <bsd.prog.mk>
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index 3b64dafb5c83..c01b0c55b178 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=ccdconfig
PROG= ccdconfig
MAN= ccdconfig.8
diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile
index 1ae0cf45e731..114f56382a18 100644
--- a/sbin/clri/Makefile
+++ b/sbin/clri/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= clri
MAN= clri.8
WARNS?= 2
diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile
index d8757565b1a0..9bfc4684dd6a 100644
--- a/sbin/comcontrol/Makefile
+++ b/sbin/comcontrol/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 5.4 (Berkeley) 6/5/91
# $FreeBSD$
+PACKAGE=runtime
PROG= comcontrol
MAN= comcontrol.8
diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile
index 9014d80ad556..0bd82e695c31 100644
--- a/sbin/conscontrol/Makefile
+++ b/sbin/conscontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= conscontrol
MAN= conscontrol.8
WARNS?= 2
diff --git a/sbin/ddb/Makefile b/sbin/ddb/Makefile
index 72abbed337ae..914942e34f67 100644
--- a/sbin/ddb/Makefile
+++ b/sbin/ddb/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= ddb
SRCS= ddb.c ddb_capture.c ddb_script.c
MAN= ddb.8
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index fc0021656beb..4e5fa4710e03 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+PACKAGE=runtime
PROG_CXX=devd
SRCS= devd.cc token.l parse.y y.tab.h
MAN= devd.8 devd.conf.5
diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile
index e06928c5571c..bdec4c454a57 100644
--- a/sbin/devd/tests/Makefile
+++ b/sbin/devd/tests/Makefile
@@ -1,5 +1,9 @@
# $FreeBSD$
+PACKAGE= tests
+FILESGROUPS= TESTS
+TESTSPACKAGE= ${PACKAGE}
+
ATF_TESTS_C= client_test
TEST_METADATA.client_test= required_programs="devd"
TEST_METADATA.client_test+= required_user="root"
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index 29b0f54fbc5f..eee24e02e71e 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= devfs
SRCS= devfs.c rule.c
MAN= devfs.8
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 868df6d6ba65..2e9881f191cd 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -33,6 +33,7 @@
.include <src.opts.mk>
+PACKAGE=runtime
SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
parse.c privsep.c
diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
index fd3df4e17e68..88516d920725 100644
--- a/sbin/dhclient/tests/Makefile
+++ b/sbin/dhclient/tests/Makefile
@@ -1,5 +1,9 @@
# $FreeBSD$
+PACKAGE= tests
+FILESGROUPS= TESTS
+TESTSPACKAGE= ${PACKAGE}
+
.PATH: ${.CURDIR}/..
PLAIN_TESTS_C= option-domain-search_test
diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 64a0155917be..a443225242d8 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= dmesg
MAN= dmesg.8
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index e3d9aef61518..7c89570292db 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -13,6 +13,7 @@
# DEBUG use local directory to find ddate and dumpdates
# TDEBUG trace out the process forking
+PACKAGE=runtime
PROG= dump
LINKS= ${BINDIR}/dump ${BINDIR}/rdump
CFLAGS+=-DRDUMP
diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile
index 87eb89b1782e..03e1aae03b87 100644
--- a/sbin/dumpfs/Makefile
+++ b/sbin/dumpfs/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= dumpfs
WARNS?= 2
LIBADD= ufs
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index d11ccc761127..782117c16ff0 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= dumpon
MAN= dumpon.8
diff --git a/sbin/etherswitchcfg/Makefile b/sbin/etherswitchcfg/Makefile
index b5cf39ab8da1..547a27296bd9 100644
--- a/sbin/etherswitchcfg/Makefile
+++ b/sbin/etherswitchcfg/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 5.4 (Berkeley) 6/5/91
# $FreeBSD$
+PACKAGE=runtime
PROG= etherswitchcfg
MAN= etherswitchcfg.8
SRCS= etherswitchcfg.c ifmedia.c
diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile
index a49c69954d0f..fc4bcbabc329 100644
--- a/sbin/fdisk/Makefile
+++ b/sbin/fdisk/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= fdisk
SRCS= fdisk.c geom_mbr_enc.c
WARNS?= 4
diff --git a/sbin/fdisk_pc98/Makefile b/sbin/fdisk_pc98/Makefile
index 9915267e6d7c..7bfa0632612d 100644
--- a/sbin/fdisk_pc98/Makefile
+++ b/sbin/fdisk_pc98/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= fdisk
SRCS= fdisk.c geom_pc98_enc.c
WARNS?= 4
diff --git a/sbin/ffsinfo/Makefile b/sbin/ffsinfo/Makefile
index 7fd033d3475a..cdc9e7b3a765 100644
--- a/sbin/ffsinfo/Makefile
+++ b/sbin/ffsinfo/Makefile
@@ -7,6 +7,7 @@
GROWFS= ${.CURDIR}/../growfs
.PATH: ${GROWFS}
+PACKAGE=runtime
PROG= ffsinfo
SRCS= ffsinfo.c debug.c
MAN= ffsinfo.8
diff --git a/sbin/fsck/Makefile b/sbin/fsck/Makefile
index 22de03c4da78..8d3dd214857e 100644
--- a/sbin/fsck/Makefile
+++ b/sbin/fsck/Makefile
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.14 1996/09/27 22:38:37 christos Exp $
# $FreeBSD$
+PACKAGE=runtime
PROG= fsck
SRCS= fsck.c fsutil.c preen.c
MAN= fsck.8
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index 02754697dfa5..b00aee5d162c 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
# @(#)Makefile 8.2 (Berkeley) 4/27/95
+PACKAGE=runtime
PROG= fsck_ffs
LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
diff --git a/sbin/fsck_msdosfs/Makefile b/sbin/fsck_msdosfs/Makefile
index f9dd9fae401b..0de68f18a01d 100644
--- a/sbin/fsck_msdosfs/Makefile
+++ b/sbin/fsck_msdosfs/Makefile
@@ -4,6 +4,7 @@
FSCK= ${.CURDIR}/../fsck
.PATH: ${FSCK}
+PACKAGE=runtime
PROG= fsck_msdosfs
MAN= fsck_msdosfs.8
SRCS= main.c check.c boot.c fat.c dir.c fsutil.c
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index e0a9cc3cb382..729f9cde2d35 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -2,6 +2,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= fsdb
MAN= fsdb.8
SRCS= fsdb.c fsdbutil.c \
diff --git a/sbin/fsirand/Makefile b/sbin/fsirand/Makefile
index 2ae820a84783..c415b11983f1 100644
--- a/sbin/fsirand/Makefile
+++ b/sbin/fsirand/Makefile
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.1 1997/01/26 02:23:20 millert Exp $
# $FreeBSD$
+PACKAGE=runtime
PROG= fsirand
MAN= fsirand.8
WARNS?= 3
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile
index f80f8cd8f70e..2e5dc81bf010 100644
--- a/sbin/gbde/Makefile
+++ b/sbin/gbde/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= gbde
SRCS= gbde.c template.c
SRCS+= rijndael-alg-fst.c
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 19a56360ccce..5ef8fb847dd8 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.if defined(RESCUE) || defined(RELEASE_CRUNCH)
.PATH: ${.CURDIR}/class/part \
diff --git a/sbin/geom/class/cache/Makefile b/sbin/geom/class/cache/Makefile
index 35f81d81b76f..63b740b5e98d 100644
--- a/sbin/geom/class/cache/Makefile
+++ b/sbin/geom/class/cache/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= cache
diff --git a/sbin/geom/class/concat/Makefile b/sbin/geom/class/concat/Makefile
index 34e2c28fdecc..133805605cdb 100644
--- a/sbin/geom/class/concat/Makefile
+++ b/sbin/geom/class/concat/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= concat
diff --git a/sbin/geom/class/eli/Makefile b/sbin/geom/class/eli/Makefile
index 5eff32c50689..74749d2df763 100644
--- a/sbin/geom/class/eli/Makefile
+++ b/sbin/geom/class/eli/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2
GEOM_CLASS= eli
diff --git a/sbin/geom/class/journal/Makefile b/sbin/geom/class/journal/Makefile
index 0e1a38ea6dc4..14fff151b62a 100644
--- a/sbin/geom/class/journal/Makefile
+++ b/sbin/geom/class/journal/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= journal
diff --git a/sbin/geom/class/label/Makefile b/sbin/geom/class/label/Makefile
index 0b609a1dd3a0..2a51c5bf288d 100644
--- a/sbin/geom/class/label/Makefile
+++ b/sbin/geom/class/label/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= label
diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile
index ce7ee6466326..195c9d580842 100644
--- a/sbin/geom/class/mirror/Makefile
+++ b/sbin/geom/class/mirror/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= mirror
diff --git a/sbin/geom/class/mountver/Makefile b/sbin/geom/class/mountver/Makefile
index 750d1a557e5e..3dba58909d32 100644
--- a/sbin/geom/class/mountver/Makefile
+++ b/sbin/geom/class/mountver/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= mountver
diff --git a/sbin/geom/class/multipath/Makefile b/sbin/geom/class/multipath/Makefile
index ff40fe9faa32..2a6b7cc84ba2 100644
--- a/sbin/geom/class/multipath/Makefile
+++ b/sbin/geom/class/multipath/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= multipath
diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile
index d9a6ca6f845e..903cfcf04984 100644
--- a/sbin/geom/class/nop/Makefile
+++ b/sbin/geom/class/nop/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= nop
diff --git a/sbin/geom/class/part/Makefile b/sbin/geom/class/part/Makefile
index 4b67de4ef415..b67d11f3cb01 100644
--- a/sbin/geom/class/part/Makefile
+++ b/sbin/geom/class/part/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= part
diff --git a/sbin/geom/class/raid/Makefile b/sbin/geom/class/raid/Makefile
index 07d71403d48f..79c05a21b9f8 100644
--- a/sbin/geom/class/raid/Makefile
+++ b/sbin/geom/class/raid/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= raid
diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile
index 74e12455a432..b8bc5ea9195a 100644
--- a/sbin/geom/class/raid3/Makefile
+++ b/sbin/geom/class/raid3/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= raid3
diff --git a/sbin/geom/class/sched/Makefile b/sbin/geom/class/sched/Makefile
index 6f54d3f36f9f..17e4523a7224 100644
--- a/sbin/geom/class/sched/Makefile
+++ b/sbin/geom/class/sched/Makefile
@@ -1,6 +1,7 @@
# GEOM_LIBRARY_PATH
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= sched
diff --git a/sbin/geom/class/shsec/Makefile b/sbin/geom/class/shsec/Makefile
index 6b5c835551b2..51cee346969a 100644
--- a/sbin/geom/class/shsec/Makefile
+++ b/sbin/geom/class/shsec/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= shsec
diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile
index 8ee5f6e2f871..c0fdef1ca8b6 100644
--- a/sbin/geom/class/stripe/Makefile
+++ b/sbin/geom/class/stripe/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc
GEOM_CLASS= stripe
diff --git a/sbin/geom/class/virstor/Makefile b/sbin/geom/class/virstor/Makefile
index 0924f0d2fd21..0fe24e67a548 100644
--- a/sbin/geom/class/virstor/Makefile
+++ b/sbin/geom/class/virstor/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
GEOM_CLASS= virstor
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index 0636d037a358..8b69b72e9ee1 100644
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@@ -2,6 +2,7 @@
.PATH: ${.CURDIR}/../misc
+PACKAGE=runtime
PROG= geom
MAN= geom.8
SRCS= geom.c subr.c
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index e7017a71f938..a75c644a4f98 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -8,6 +8,7 @@
.PATH: ${.CURDIR}/../mount
+PACKAGE=runtime
PROG= growfs
SRCS= growfs.c getmntopts.c
MAN= growfs.8
diff --git a/sbin/growfs/tests/Makefile b/sbin/growfs/tests/Makefile
index 6a3208d9c441..5fdceb755cef 100644
--- a/sbin/growfs/tests/Makefile
+++ b/sbin/growfs/tests/Makefile
@@ -1,5 +1,9 @@
# $FreeBSD$
+PACKAGE= tests
+FILESGROUPS= TESTS
+TESTSPACKAGE= ${PACKAGE}
+
TAP_TESTS_PERL= legacy_test
.include <bsd.test.mk>
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index 0e56920d9cee..5bb40eacf72e 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= gvinum
SRCS= gvinum.c gvinum.h geom_vinum_share.c
MAN= gvinum.8
diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile
index 41d443d32783..a24b55e87f52 100644
--- a/sbin/hastctl/Makefile
+++ b/sbin/hastctl/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+PACKAGE=hast
.PATH: ${.CURDIR}/../hastd
PROG= hastctl
diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile
index e3fed8d0b522..7ffebf9a4fa6 100644
--- a/sbin/hastd/Makefile
+++ b/sbin/hastd/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+PACKAGE=hast
PROG= hastd
SRCS= activemap.c
SRCS+= control.c crc32.c
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index b5616a4626a5..a3623d507b77 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -3,6 +3,7 @@
.include <src.opts.mk>
+PACKAGE=runtime
PROG= ifconfig
SRCS= ifconfig.c # base support
diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile
index 93967c705175..8a551917d709 100644
--- a/sbin/ifconfig/tests/Makefile
+++ b/sbin/ifconfig/tests/Makefile
@@ -1,5 +1,9 @@
# $FreeBSD$
+PACKAGE= tests
+FILESGROUPS= TESTS
+TESTSPACKAGE= ${PACKAGE}
+
NETBSD_ATF_TESTS_SH= nonexistent_test
.include <netbsd-tests.test.mk>
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 29ad63ddc65f..cf6de6c12abe 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
+PACKAGE=runtime
PROG= init
SRCS= init.c getmntopts.c
MAN= init.8
diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile
index 2ff340f68c0a..1f825783b37f 100644
--- a/sbin/ipf/ipf/Makefile
+++ b/sbin/ipf/ipf/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= ipf
PROG= ipf
SRCS= ${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c
MAN= ipfilter.4 ipfilter.5 ipf.8 ipf.4 ipf.5 ipl.4
diff --git a/sbin/ipf/ipfs/Makefile b/sbin/ipf/ipfs/Makefile
index a64f805b2ab3..6f76f9db5d76 100644
--- a/sbin/ipf/ipfs/Makefile
+++ b/sbin/ipf/ipfs/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=ipf
PROG= ipfs
MAN= ipfs.8
diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile
index 14823cf5110c..4714f2c0394e 100644
--- a/sbin/ipf/ipfstat/Makefile
+++ b/sbin/ipf/ipfstat/Makefile
@@ -2,6 +2,7 @@
NOGCCERROR= # defined
+PACKAGE= ipf
PROG= ipfstat
SRCS= ipfstat.c
MAN= ipfstat.8
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index a74599f3cd15..63cafabd109a 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= ipf
PROG= ipftest
SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
ip_nat6.c \
diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile
index 031f929067b4..5d76a05ae44a 100644
--- a/sbin/ipf/ipmon/Makefile
+++ b/sbin/ipf/ipmon/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= ipf
PROG= ipmon
SRCS= ${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c
MAN= ipmon.8
diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile
index 74be486ec557..ba9c50ee70e3 100644
--- a/sbin/ipf/ipnat/Makefile
+++ b/sbin/ipf/ipnat/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= ipf
PROG= ipnat
SRCS= ${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c
MAN= ipnat.8 ipnat.4 ipnat.5
diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile
index eedebef90ba3..ab350f223f53 100644
--- a/sbin/ipf/ippool/Makefile
+++ b/sbin/ipf/ippool/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= ipf
PROG= ippool
SRCS= ${GENHDRS} ippool_y.c ippool_l.c kmem.c ippool.c
MAN= ippool.5 ippool.8
diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile
index 5e0ac15cbb1f..da1879b83175 100644
--- a/sbin/ipf/ipresend/Makefile
+++ b/sbin/ipf/ipresend/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= ipf
PROG= ipresend
SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c
MAN= ipresend.1
diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile
index 7a7a011d043c..a8f43e24fb74 100644
--- a/sbin/ipf/libipf/Makefile
+++ b/sbin/ipf/libipf/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= ipf
LIB= ipf
INTERNALLIB=
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index efd99fcdf316..668f22a67a8e 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+PACKAGE=ipfw
PROG= ipfw
SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c tables.c
WARNS?= 2
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile
index 9c4d9f4fff58..6b0fe3a4bfd6 100644
--- a/sbin/iscontrol/Makefile
+++ b/sbin/iscontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=iscsi_legacy
SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c
PROG= iscontrol
LIBADD= cam md
diff --git a/sbin/kldconfig/Makefile b/sbin/kldconfig/Makefile
index a478c4b619d0..3efb34f8a252 100644
--- a/sbin/kldconfig/Makefile
+++ b/sbin/kldconfig/Makefile
@@ -26,6 +26,7 @@
# $FreeBSD$
#
+PACKAGE=runtime
PROG= kldconfig
MAN= kldconfig.8
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index 05ad5bab82c0..13c0f0ec5abf 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -26,6 +26,7 @@
# $FreeBSD$
#
+PACKAGE=runtime
PROG= kldload
MAN= kldload.8
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index 4bf022eb94d4..2d0c4437dc05 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -26,6 +26,7 @@
# $FreeBSD$
#
+PACKAGE=runtime
PROG= kldstat
MAN= kldstat.8
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index 1a25a02351be..5688f790941e 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -26,6 +26,7 @@
# $FreeBSD$
#
+PACKAGE=runtime
PROG= kldunload
MAN= kldunload.8
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 15c3808520ba..6589dbc9c6ec 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= ldconfig
SRCS= elfhints.c ldconfig.c shlib.c support.c
LDDIR?= ${.CURDIR}/../../libexec/rtld-aout
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 5f927c43a9fe..6b651725f7c9 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/9/93
# $FreeBSD$
+PACKAGE=runtime
PROG= md5
LINKS= ${BINDIR}/md5 ${BINDIR}/rmd160 \
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 6be9129144e7..21db48a5ef1e 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+PACKAGE=runtime
PROG= mdconfig
MAN= mdconfig.8
diff --git a/sbin/mdconfig/tests/Makefile b/sbin/mdconfig/tests/Makefile
index 6c179fcf59ad..58507d39799b 100644
--- a/sbin/mdconfig/tests/Makefile
+++ b/sbin/mdconfig/tests/Makefile
@@ -1,5 +1,9 @@
# $FreeBSD$
+PACKAGE= tests
+FILESGROUPS= TESTS
+TESTSPACKAGE= ${PACKAGE}
+
ATF_TESTS_SH= mdconfig_test
TEST_METADATA.mdconfig_test+= required_user="root"
diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile
index 999793f0e103..e8d2d7b46f3f 100644
--- a/sbin/mdmfs/Makefile
+++ b/sbin/mdmfs/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= mdmfs
LINKS= ${BINDIR}/${PROG} ${BINDIR}/mount_mfs
MAN= mdmfs.8
diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile
index 63235b2ce6e4..610d2a4f399a 100644
--- a/sbin/mknod/Makefile
+++ b/sbin/mknod/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= mknod
MAN= mknod.8
diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile
index de96fa03e0f5..33040ecaf3db 100644
--- a/sbin/mksnap_ffs/Makefile
+++ b/sbin/mksnap_ffs/Makefile
@@ -2,6 +2,7 @@
.PATH: ${.CURDIR}/../mount
+PACKAGE=runtime
PROG= mksnap_ffs
SRCS= mksnap_ffs.c getmntopts.c
MAN= mksnap_ffs.8
diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile
index f95085a6cae7..80d40234e792 100644
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.6 (Berkeley) 5/8/95
# $FreeBSD$
+PACKAGE=runtime
PROG= mount
SRCS= mount.c mount_fs.c getmntopts.c vfslist.c
MAN= mount.8 mount.conf.8
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index c70892c3309e..83d58a2ab5f1 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.3 (Berkeley) 3/27/94
# $FreeBSD$
+PACKAGE=runtime
PROG= mount_cd9660
SRCS= mount_cd9660.c getmntopts.c
MAN= mount_cd9660.8
diff --git a/sbin/mount_fusefs/Makefile b/sbin/mount_fusefs/Makefile
index 9c84fa685192..21975800481f 100644
--- a/sbin/mount_fusefs/Makefile
+++ b/sbin/mount_fusefs/Makefile
@@ -20,6 +20,7 @@ DEBUG_FLAGS+= -D_DEBUG_MSG
DEBUG_FLAGS+= -DFUSE4BSD_VERSION="\"${F4BVERS}\""
.endif
+PACKAGE=runtime
PROG= mount_fusefs
SRCS= mount_fusefs.c getmntopts.c
MAN8= mount_fusefs.8
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index ede86b4d8674..abbad5e186f0 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
#
+PACKAGE=runtime
PROG= mount_msdosfs
SRCS= mount_msdosfs.c getmntopts.c
MAN= mount_msdosfs.8
diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 75f781798ab7..76c2bfb55ce5 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile
@@ -2,6 +2,7 @@
#
# $FreeBSD$
+PACKAGE=runtime
PROG= mount_nfs
SRCS= mount_nfs.c getmntopts.c mounttab.c
MAN= mount_nfs.8
diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile
index 0b2ecc5834c0..c9b52796a1a8 100644
--- a/sbin/mount_nullfs/Makefile
+++ b/sbin/mount_nullfs/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.3 (Berkeley) 3/27/94
# $FreeBSD$
+PACKAGE=runtime
PROG= mount_nullfs
SRCS= mount_nullfs.c getmntopts.c
MAN= mount_nullfs.8
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index 12d5d5822424..f0f50ab4b1b7 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= mount_udf
SRCS= mount_udf.c getmntopts.c
MAN= mount_udf.8
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile
index 276fc7467d13..cca1ea06222f 100644
--- a/sbin/mount_unionfs/Makefile
+++ b/sbin/mount_unionfs/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.3 (Berkeley) 3/27/94
# $FreeBSD$
+PACKAGE=runtime
PROG= mount_unionfs
SRCS= mount_unionfs.c getmntopts.c
MAN= mount_unionfs.8
diff --git a/sbin/nandfs/Makefile b/sbin/nandfs/Makefile
index 5757f8c16886..40af5775c510 100644
--- a/sbin/nandfs/Makefile
+++ b/sbin/nandfs/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=nandfs
PROG= nandfs
SRCS= nandfs.c lssnap.c mksnap.c rmsnap.c
MAN= nandfs.8
diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile
index 44e5b6f3b0f6..aef193b3f1d0 100644
--- a/sbin/natd/Makefile
+++ b/sbin/natd/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE= natd
PROG = natd
SRCS = natd.c icmp.c
WARNS?= 3
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index ec5e84878aec..3a2c49fed0db 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= newfs_msdos
MAN= newfs_msdos.8
SRCS= newfs_msdos.c mkfs_msdos.c
diff --git a/sbin/newfs_nandfs/Makefile b/sbin/newfs_nandfs/Makefile
index 7a39fbb088e6..9b1b3009c400 100644
--- a/sbin/newfs_nandfs/Makefile
+++ b/sbin/newfs_nandfs/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=nandfs
PROG= newfs_nandfs
MAN= newfs_nandfs.8
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index 47cd290ec78e..ea66a6dfb1e5 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= nfsiod
MAN= nfsiod.8
diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile
index 9f1024f41e8e..480141ec6b6f 100644
--- a/sbin/nos-tun/Makefile
+++ b/sbin/nos-tun/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= nos-tun
MAN= nos-tun.8
WARNS?= 3
diff --git a/sbin/nvmecontrol/Makefile b/sbin/nvmecontrol/Makefile
index e8a23719a2a7..42dd5916fc59 100644
--- a/sbin/nvmecontrol/Makefile
+++ b/sbin/nvmecontrol/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= nvmecontrol
SRCS= nvmecontrol.c devlist.c firmware.c identify.c logpage.c \
perftest.c reset.c nvme_util.c power.c
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index de3b7ec5012c..91ebf5567d61 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -5,6 +5,7 @@
# pf_ruleset.c is shared between kernel and pfctl
.PATH: ${.CURDIR}/../../sys/netpfil/pf
+PACKAGE=pf
PROG= pfctl
MAN= pfctl.8
diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
index 49a311e11bb7..bb74500dcf53 100644
--- a/sbin/pflogd/Makefile
+++ b/sbin/pflogd/Makefile
@@ -2,6 +2,7 @@
.PATH: ${.CURDIR}/../../contrib/pf/pflogd
+PACKAGE=pf
PROG= pflogd
SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c
MAN= pflogd.8
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 31e6153871bd..21a4dccc01d9 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -3,6 +3,7 @@
.include <src.opts.mk>
+PACKAGE=runtime
PROG= ping
MAN= ping.8
BINOWN= root
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 707bff4cc657..78874f5d2391 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= ping6
MAN= ping6.8
diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile
index 7be3e3510503..601c19e98a7d 100644
--- a/sbin/quotacheck/Makefile
+++ b/sbin/quotacheck/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
# @(#)Makefile 8.1 (Berkeley) 6/5/93
+PACKAGE=quotacheck
PROG= quotacheck
SRCS= quotacheck.c preen.c fsutil.c utilities.c
WARNS?= 2
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 2f1bbac1fa8f..71bc82c60b33 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.1 1999/11/23 05:28:20 mrg Exp $
# $FreeBSD$
+PACKAGE=runtime
PROG= rcorder
SRCS= ealloc.c hash.c rcorder.c
MAN= rcorder.8
diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile
index aa41e30438a6..87c47307d59c 100644
--- a/sbin/reboot/Makefile
+++ b/sbin/reboot/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= reboot
MAN= reboot.8 nextboot.8
MLINKS= reboot.8 halt.8 reboot.8 fastboot.8 reboot.8 fasthalt.8
diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile
index 136e570eb5a3..41ef1f3e4912 100644
--- a/sbin/recoverdisk/Makefile
+++ b/sbin/recoverdisk/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= recoverdisk
.include <bsd.prog.mk>
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile
index 2d4701eade42..783d8b67fb3e 100644
--- a/sbin/resolvconf/Makefile
+++ b/sbin/resolvconf/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
DIST= ${.CURDIR}/../../contrib/openresolv
.PATH: ${DIST}
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index c462f51a8dd3..58fed3e89c4f 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -3,6 +3,7 @@
.PATH: ${.CURDIR}/../dump
+PACKAGE=runtime
PROG= restore
LINKS= ${BINDIR}/restore ${BINDIR}/rrestore
MAN= restore.8
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index 25134e473b66..a1db0b6528dd 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -3,6 +3,7 @@
.include <src.opts.mk>
+PACKAGE=runtime
PROG= route
MAN= route.8
SRCS= route.c keywords.h
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 2308722c7191..c01ab4178443 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,6 +1,7 @@
# Make `routed` for FreeBSD
# $FreeBSD$
+PACKAGE=runtime
PROG= routed
MAN= routed.8
SRCS= if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 4df7dc29ace3..a9893a988537 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -2,6 +2,7 @@
# $Revision: 1.6 $
# $FreeBSD$
+PACKAGE=runtime
PROG= rtquery
MAN= rtquery.8
LIBADD= md
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index 8356ea465c5e..f12107a1e45f 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -16,6 +16,7 @@
.PATH: ${.CURDIR}/../../usr.sbin/rtsold
+PACKAGE=runtime
PROG= rtsol
SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
MAN=
diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile
index 5134e4c546a7..f5eeb77ee5e7 100644
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PACKAGE=runtime
PROG= savecore
LIBADD= z xo
MAN= savecore.8
diff --git a/sbin/sconfig/Makefile b/sbin/sconfig/Makefile
index 9698c04ddbad..bce914f40868 100644
--- a/sbin/sconfig/Makefile
+++ b/sbin/sconfig/Makefile
@@ -1,6 +1,7 @@
# Cronyx Id: sbin.sconfig.Makefile,v 1.1.4.1 2003/02/17 12:51:24 rik Exp $
# $FreeBSD$
+PACKAGE=runtime
PROG= sconfig
MAN= sconfig.8
MANSUBDIR= /i386
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index e974af5f0b15..0777fff9fa67 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -29,6 +29,7 @@
.include <src.opts.mk>
+PACKAGE=runtime
PROG= setkey
MAN= setkey.8
SRCS= setkey.c parse.y token.l
diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index 905d1bc9a04e..fc7e38be03cd 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= shutdown
MAN= shutdown.8
LINKS= ${BINDIR}/shutdown ${BINDIR}/poweroff
diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile
index e9074be9c433..c832be3dc96a 100644
--- a/sbin/swapon/Makefile
+++ b/sbin/swapon/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= swapon
MAN= swapon.8
LINKS= ${BINDIR}/swapon ${BINDIR}/swapoff
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index 06ff9b482d69..30099aedb34c 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+PACKAGE=runtime
PROG= sysctl
WARNS?= 3
MAN= sysctl.8
diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile
index a0e63e5da42a..609357e57d33 100644
--- a/sbin/tests/Makefile
+++ b/sbin/tests/Makefile
@@ -2,6 +2,11 @@
.include <bsd.own.mk>
+PACKAGE= tests
+FILESGROUPS= TESTS
+TESTSPACKAGE= ${PACKAGE}
+TESTS+= Kyuafile
+
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index 07fe3b1ccaa1..a62d2f428e79 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -1,6 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+PACKAGE=runtime
PROG= tunefs
LIBADD= ufs
MAN= tunefs.8
diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile
index e472b41de493..cdc66b9ed808 100644
--- a/sbin/umount/Makefile
+++ b/sbin/umount/Makefile
@@ -2,6 +2,7 @@
#
# $FreeBSD$
+PACKAGE=runtime
PROG= umount
SRCS= umount.c vfslist.c mounttab.c
MAN= umount.8