47 files changed, 11 insertions, 48 deletions

diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile
index 8cd15982405d..0b27d20e9805 100644
--- a/bin/uuidgen/Makefile
+++ b/bin/uuidgen/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=runtime
 PROG=	uuidgen
 
 .include <bsd.prog.mk>
diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile
index bfbd523aa0b7..1078e6d46b78 100644
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@@ -3,7 +3,6 @@
 .PATH: ${SRCTOP}/sys/netinet/libalias
 
 CONFS=	libalias.conf
-PACKAGE=lib${LIB}
 LIB=	alias
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 7
diff --git a/lib/libauditd/Makefile b/lib/libauditd/Makefile
index c29c32ceb12b..bd3b5a5ee112 100644
--- a/lib/libauditd/Makefile
+++ b/lib/libauditd/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 #
 
-PACKAGE=lib${LIB}
 OPENBSMDIR=		${SRCTOP}/contrib/openbsm
 _LIBAUDITDDIR=		${OPENBSMDIR}/libauditd
 _LIBBSMDIR=		${OPENBSMDIR}/libbsm
diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile
index 9d2dc04918dd..3a02f22e69a7 100644
--- a/lib/libbe/Makefile
+++ b/lib/libbe/Makefile
@@ -4,7 +4,6 @@ SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
-PACKAGE=	lib${LIB}
 LIB=		be
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile
index d217a10a7f5c..b0ae002fd5e9 100644
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	lib${LIB}
 LIB=	calendar
 
 SRCS=	calendar.c easter.c
diff --git a/lib/libcapsicum/Makefile b/lib/libcapsicum/Makefile
index 3aa4eac4413a..b30bb5990878 100644
--- a/lib/libcapsicum/Makefile
+++ b/lib/libcapsicum/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
-
 INCS=	capsicum_helpers.h
 
 MAN+=	capsicum_helpers.3
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index ca65c091387d..89fed48e1dd1 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	com_err
 SRCS=	com_err.c error.c
 INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
diff --git a/lib/libdevctl/Makefile b/lib/libdevctl/Makefile
index ed56b25dc374..74687ecc2bd2 100644
--- a/lib/libdevctl/Makefile
+++ b/lib/libdevctl/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	devctl
 SRCS=	devctl.c
 INCS=	devctl.h
diff --git a/lib/libdevinfo/Makefile b/lib/libdevinfo/Makefile
index 4849c7acd5dc..8b67ab4c372a 100644
--- a/lib/libdevinfo/Makefile
+++ b/lib/libdevinfo/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	devinfo
 SRCS=	devinfo.c
 INCS=	devinfo.h
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index df5d44ec30db..dcda3c2bdac8 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	devstat
 SHLIBDIR?= /lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 6990e7b1bb83..e3c4533aed1f 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -2,7 +2,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=		fetch
 CFLAGS+=	-I.
 SRCS=		fetch.c common.c ftp.c http.c file.c \
diff --git a/lib/libgpio/Makefile b/lib/libgpio/Makefile
index fc163e90efd0..94118d6eb00d 100644
--- a/lib/libgpio/Makefile
+++ b/lib/libgpio/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	gpio
 SHLIB_MAJOR= 0
 
diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile
index 052bf73a12f3..3094631e8536 100644
--- a/lib/libgssapi/Makefile
+++ b/lib/libgssapi/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=		gssapi
 SHLIB_MAJOR=	10
 VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile
index 8554eb0482e8..597dc6db1606 100644
--- a/lib/libmemstat/Makefile
+++ b/lib/libmemstat/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 WARNS?=		3
 LIB=		memstat
 SHLIB_MAJOR=	3
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index 9f001f521519..6f63cb56aa04 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -2,7 +2,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=		mp
 SHLIB_MAJOR=	7
 LIBADD=		crypto
diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile
index c67130ecc57e..6fe59201a87f 100644
--- a/lib/libmt/Makefile
+++ b/lib/libmt/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=		mt
 SHLIBDIR?=	/lib
 SRCS=		mtlib.c
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index 3f80ee84f47d..fa760479f712 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 # $Whistle: Makefile,v 1.4 1999/01/17 03:41:02 julian Exp $
 
-PACKAGE=lib${LIB}
 LIB=		netgraph
 WARNS?=		3
 MAN=		netgraph.3
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
index afda4fb3e59b..47dc716b800e 100644
--- a/lib/libngatm/Makefile
+++ b/lib/libngatm/Makefile
@@ -2,7 +2,6 @@
 #
 # Author: Harti Brandt <harti@freebsd.org>
 #
-PACKAGE=lib${LIB}
 LIB=	ngatm
 SHLIB_MAJOR= 4
 MAN=	libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 86896340c555..89e31c6ac48f 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -5,7 +5,6 @@ SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=	pcap
 
 SRCS=	bpf_dump.c \
diff --git a/lib/libpjdlog/Makefile b/lib/libpjdlog/Makefile
index 4fcfe028d9f7..ead5619afb67 100644
--- a/lib/libpjdlog/Makefile
+++ b/lib/libpjdlog/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 #
 
-PACKAGE=lib${LIB}
 SHLIBDIR?=	/lib
 
 .include <bsd.own.mk>
diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index d515f25d4c99..35af606a7225 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	pmc
 
 SRCS=	libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index cd78eb335ecc..a20dd69ef346 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -2,7 +2,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=	proc
 
 SRCS=	crc32.c			\
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index 9d80d17e16a8..d55a02b46b7d 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -2,7 +2,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=	procstat
 
 SRCS=	cd9660.c	\
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index 3ce1435aa2d9..42f5def20ef1 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -26,7 +26,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=		radius
 SRCS=		radlib.c
 INCS=		radlib.h radlib_vs.h
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 80c253d0c54f..35669a5e3570 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -5,7 +5,6 @@
 
 .PATH: ${SRCTOP}/include/rpcsvc
 
-PACKAGE=lib${LIB}
 LIB=    rpcsvc
 
 RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
index 3c0973db1d70..389e0280a6bc 100644
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@@ -2,7 +2,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=rt
 SHLIB_MAJOR= 1
 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
index 704140397f58..f3d97753fe93 100644
--- a/lib/librtld_db/Makefile
+++ b/lib/librtld_db/Makefile
@@ -2,7 +2,6 @@
 
 .include <bsd.own.mk>
 
-PACKAGE=lib${LIB}
 LIB=		rtld_db
 SHLIB_MAJOR= 	2
 MAN=		librtld_db.3
diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile
index c96a39e0ffac..d58858086bc9 100644
--- a/lib/libsysdecode/Makefile
+++ b/lib/libsysdecode/Makefile
@@ -2,7 +2,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
 LIB=	sysdecode
 
 SRCS=	errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 73d8e766da0d..01345e175a6b 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -24,7 +24,6 @@
 #
 #	$FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=		tacplus
 SRCS=		taclib.c
 INCS=		taclib.h
diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile
index 2fe638463805..9da8907cb5d0 100644
--- a/lib/libugidfw/Makefile
+++ b/lib/libugidfw/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=		ugidfw
 SHLIB_MAJOR=	5
 SRCS=		ugidfw.c
diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile
index 7c793e9a0e7d..65700b658223 100644
--- a/lib/libulog/Makefile
+++ b/lib/libulog/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?=/lib
 
 .include <src.opts.mk>
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index 397c1816226c..2a97f5f1adb5 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -4,7 +4,6 @@
 # Makefile for the FreeBSD specific LibUSB 2.0
 #
 
-PACKAGE=lib${LIB}
 LIB=		usb
 SHLIB_MAJOR=	3
 SHLIB_MINOR=	0
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index 6efe9ccbe613..7dba7ffc9113 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -1,7 +1,6 @@
 #	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
 #	$FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	usbhid
 MAN=	usbhid.3
 
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 1326b43bad23..f45e8f9dda6b 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -5,7 +5,6 @@
 .include <src.opts.mk>
 
 CONFS=	hosts.allow
-PACKAGE=lib${LIB}
 LIB=	wrap
 SHLIB_MAJOR= 6
 INCS=	tcpd.h
diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile
index c043d6381fd3..636c9b6c81b9 100644
--- a/lib/libypclnt/Makefile
+++ b/lib/libypclnt/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	ypclnt
 SHLIB_MAJOR= 4
 SRCS=	ypclnt_connect.c \
diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
index 03c7815231aa..ee48bdb47534 100644
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -84,6 +84,8 @@ tests_COMMENT= 		Test Suite
 tests_DESC= 		Test Suite
 unbound_COMMENT= 	Unbound DNS Resolver
 unbound_DESC= 		Unbound DNS Resolver
+utilities_COMMENT=	Non-vital programs and librairies
+utilities_DESC=		Non-vital programs and librairies
 vi_COMMENT= 		Vi Editor
 vi_DESC= 		Vi Editor
 wpa_COMMENT=		802.11 Supplicant
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 0d6c54f24f23..ed61b5ee8015 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -3,7 +3,7 @@
 .include <src.opts.mk>
 
 WARNS?= 3
-PACKAGE=runtime
+PACKAGE=utilities
 CONFGROUPS=	CONFS DEVD
 CONFS=	devd.conf
 DEVD=	devmatch.conf
diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile
index ea66a6dfb1e5..47cd290ec78e 100644
--- a/sbin/nfsiod/Makefile
+++ b/sbin/nfsiod/Makefile
@@ -1,7 +1,6 @@
 #	@(#)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 480141ec6b6f..9f1024f41e8e 100644
--- a/sbin/nos-tun/Makefile
+++ b/sbin/nos-tun/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=runtime
 PROG=	nos-tun
 MAN=	nos-tun.8
 WARNS?=	3
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index a4d5b1201b7a..12f258158dbb 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -29,7 +29,6 @@
 
 .include <src.opts.mk>
 
-PACKAGE=runtime
 PROG=	setkey
 MAN=	setkey.8
 SRCS=	setkey.c parse.y token.l
diff --git a/share/mk/bsd.confs.mk b/share/mk/bsd.confs.mk
index 0820ac5d7b4d..eb87ba49caa9 100644
--- a/share/mk/bsd.confs.mk
+++ b/share/mk/bsd.confs.mk
@@ -44,9 +44,9 @@ STAGE_SETS+=	${group:C,[/*],_,g}
 .      if defined(NO_ROOT)
 .        if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
 .          if defined(${group}PACKAGE)
-${group}TAGS+=		package=${${group}PACKAGE:Uruntime}
+${group}TAGS+=		package=${${group}PACKAGE:Uutilities}
 .          else
-${group}TAGS+=		package=${PACKAGE:Uruntime}
+${group}TAGS+=		package=${PACKAGE:Uutilities}
 .          endif
 .        endif
 ${group}TAGS+=		config
diff --git a/share/mk/bsd.dirs.mk b/share/mk/bsd.dirs.mk
index cdd8b09b1bc3..fc51bf5fb711 100644
--- a/share/mk/bsd.dirs.mk
+++ b/share/mk/bsd.dirs.mk
@@ -21,7 +21,7 @@ ${dir}_FLAG=	-f ${${dir}_FLAGS}
 
 .      if defined(NO_ROOT)
 .        if !defined(${dir}TAGS) || ! ${${dir}TAGS:Mpackage=*}
-${dir}TAGS+=		package=${${dir}PACKAGE:Uruntime}
+${dir}TAGS+=		package=${${dir}PACKAGE:Uutilities}
 .        endif
 ${dir}TAG_ARGS=	-T ${${dir}TAGS:[*]:S/ /,/g}
 .      endif
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index 5b88ae5d9f0b..725b8033444c 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -83,7 +83,7 @@ TRFLAGS+=	-t
 
 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index ec84adfdac88..0bbbdfe29c3d 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -40,7 +40,7 @@ STAGE_SETS+=	${group:C,[/*],_,g}
 
 .if defined(NO_ROOT)
 .if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
-${group}TAGS+=		package=${${group}PACKAGE:Uruntime}
+${group}TAGS+=		package=${${group}PACKAGE:Uutilities}
 .endif
 ${group}TAG_ARGS=	-T ${${group}TAGS:[*]:S/ /,/g}
 .endif
diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
index 10bfe7721fe0..cb5c800b62b2 100644
--- a/share/mk/bsd.incs.mk
+++ b/share/mk/bsd.incs.mk
@@ -10,7 +10,7 @@ INCSGROUPS?=	INCS
 
 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 22655768cc66..010783731135 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -66,7 +66,7 @@ TAGS+=	lib32
 
 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 46eb6bda4caf..d2631452bedc 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -73,7 +73,7 @@ STRIP?=	-s
 
 .if defined(NO_ROOT)
 .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
-TAGS+=		package=${PACKAGE:Uruntime}
+TAGS+=		package=${PACKAGE:Uutilities}
 .endif
 TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .endif