31 files changed, 40 insertions, 18 deletions

diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 24441708b49b0..2a5d13ba4f34f 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-PACKAGE=	lib${LIB}
+PACKAGE=	runtime
+
 LIB=		cam
 SHLIBDIR?=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 1aa4c66d9cc72..f222394b45c31 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -2,11 +2,12 @@
 # $FreeBSD$
 #
 
-PACKAGE=lib${LIB}
 SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
+PACKAGE=	runtime
+
 SHLIB_MAJOR=	5
 LIB=		crypt
 
diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index f4389da9d1783..f3fd14d1e2b4a 100644
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <bsd.own.mk>
@@ -10,6 +9,7 @@ SRCDIR=	${ELFTCDIR}/libelf
 
 .PATH:	${SRCDIR}
 
+PACKAGE=	runtime
 LIB=	elf
 
 SRCS=	elf.c							\
diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile
index b7877cc56ece6..bdd91b47bf677 100644
--- a/lib/libgeom/Makefile
+++ b/lib/libgeom/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
+
 LIB=	geom
 SHLIBDIR?= /lib
 SRCS+=	geom_getxml.c
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index c626830e2e9bc..6c710567498d9 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -27,12 +27,12 @@
 #
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
 LIB=	ipsec
+PACKAGE=	runtime
 SHLIB_MAJOR= 4
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile
index 74eb8e1091b2b..a2ee0c9ac1f73 100644
--- a/lib/libjail/Makefile
+++ b/lib/libjail/Makefile
@@ -1,14 +1,12 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=	jail
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 1
 SRCS=	jail.c jail_getid.c
 INCS=	jail.h
 
-PACKAGE=jail
-
 MAN=	jail.3
 
 MLINKS+=jail.3 jail_getid.3
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index 44ec6c0c9d60f..95b8c11c6057d 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -4,7 +4,7 @@ SHLIBDIR?=	/lib
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=		kiconv
 SRCS=		kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
 SRCS+=		quirks.c
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index d934690d43553..affd02e06da1d 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -1,9 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 LIB=	kvm
 
+PACKAGE=	runtime
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	7
 CFLAGS+=-DNO__SCCSID -I${.CURDIR}
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index edeb308c82d61..9559761aa0026 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -4,7 +4,7 @@ SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=	md
 SHLIB_MAJOR= 6
 SRCS=	md4c.c md5c.c md4hl.c md5hl.c \
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index bf92041d4c870..8fa818fb0e1e0 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
+PACKAGE=	runtime
 LIB=	nv
 SHLIB_MAJOR= 0
 
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index c9d257be90109..e925b311636b4 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -35,7 +35,6 @@
 #
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 OPENPAM=	${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
 
@@ -44,6 +43,8 @@ OPENPAM=	${SRCTOP}/contrib/openpam
 SHLIB=	pam
 .endif
 
+PACKAGE=	runtime
+
 MK_PROFILE=no
 
 SRCS=	openpam_asprintf.c \
diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile
index ac8be92c8dbd8..5d983d6e017e9 100644
--- a/lib/libsbuf/Makefile
+++ b/lib/libsbuf/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
+
 LIB=		sbuf
 SHLIBDIR?= 	/lib
 SRCS=		subr_prf.c subr_sbuf.c
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index a3f4cb3991ed3..a767546f457fb 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=	ufs
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	7
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 972fc65c53e54..5ea2addd5d345 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,11 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 #	$FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
+PACKAGE=	runtime
+
 .PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c
 
 LIB=	util
diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile
index 7844332862ade..d33c39dd6c2a1 100644
--- a/lib/libxo/Makefile
+++ b/lib/libxo/Makefile
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
-PACKAGE=lib${LIB}
 SHLIBDIR?=      /lib
 
 .include <src.opts.mk>
 
+PACKAGE=	runtime
+
 LIBXOSRC=	${SRCTOP}/contrib/libxo
 
 .PATH:	${LIBXOSRC}/libxo
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 9d415a8b976c7..30f80981012c9 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-PACKAGE=lib${LIB}
+PACKAGE=	runtime
 LIB=		z
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	6
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 34e2accbb93da..8fa13ee7e7da6 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -5,6 +5,7 @@ SUBDIR=		engines
 
 .include <bsd.own.mk>
 
+PACKAGE=	runtime
 LIB=		crypto
 SHLIB_MAJOR=	111
 VERSION_MAP=	${.CURDIR}/Version.map
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index e1faaead62770..9b1e09c2c1784 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -7,6 +7,7 @@
 #
 MAN=	termcap.5
 
+PACKAGE=	runtime
 FILES=		termcap termcap.db
 FILESDIR=	${BINDIR}/misc
 CLEANFILES+=	termcap.db
diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile
index b9256f3cec30a..2f16201d171d1 100644
--- a/usr.bin/du/Makefile
+++ b/usr.bin/du/Makefile
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	runtime
 PROG=	du
 LIBADD=	util
 
diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile
index c9bc5249ee6f4..e6c1c535dfb0b 100644
--- a/usr.bin/fsync/Makefile
+++ b/usr.bin/fsync/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	runtime
 PROG=	fsync
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 1ec051fb3b36c..c8eacf577443d 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE	 = runtime
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index 2a90fb10153ff..4cf4550801c6c 100644
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@@ -3,6 +3,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	runtime
 PROG=	sed
 SRCS=	compile.c main.c misc.c process.c
 
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index bf34cffcdac5c..b333b2828c437 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -3,6 +3,7 @@
 
 _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 
+PACKAGE=	runtime
 PROG=	bsdtar
 BSDTAR_VERSION_STRING=	3.4.0
 
diff --git a/usr.bin/uname/Makefile b/usr.bin/uname/Makefile
index ae634ca09a5bd..1e01694a44f60 100644
--- a/usr.bin/uname/Makefile
+++ b/usr.bin/uname/Makefile
@@ -1,5 +1,7 @@
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
+PACKAGE=	runtime
 PROG=	uname
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile
index 8114290f968dd..6016483546360 100644
--- a/usr.bin/what/Makefile
+++ b/usr.bin/what/Makefile
@@ -1,6 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+PACKAGE=	runtime
 PROG=	what
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile
index cd2510eb0e19a..f484461b3ccbf 100644
--- a/usr.sbin/ip6addrctl/Makefile
+++ b/usr.sbin/ip6addrctl/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	runtime
 PROG=	ip6addrctl
 MAN=	ip6addrctl.8
 
diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile
index 77436f3e8178d..c22960c54e3a6 100644
--- a/usr.sbin/kldxref/Makefile
+++ b/usr.sbin/kldxref/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	runtime
 PROG=	kldxref
 MAN=	kldxref.8
 SRCS=	kldxref.c ef.c ef_obj.c
diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile
index f937cddf97b5a..14255fa6ac7f6 100644
--- a/usr.sbin/pwd_mkdb/Makefile
+++ b/usr.sbin/pwd_mkdb/Makefile
@@ -3,6 +3,7 @@
 
 .PATH: ${SRCTOP}/lib/libc/gen		# for pw_scan.c
 
+PACKAGE=	runtime
 PROG=	pwd_mkdb
 MAN=	pwd_mkdb.8
 SRCS=	pw_scan.c pwd_mkdb.c
diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile
index a25ab3cd88370..db9c83472d569 100644
--- a/usr.sbin/services_mkdb/Makefile
+++ b/usr.sbin/services_mkdb/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+PACKAGE=	runtime
+
 CONFS=	services
 PROG=	services_mkdb
 MAN=	services_mkdb.8
diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile
index ada19698a9a18..e90019fedb5d1 100644
--- a/usr.sbin/traceroute/Makefile
+++ b/usr.sbin/traceroute/Makefile
@@ -5,6 +5,7 @@
 TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
 
+PACKAGE=	runtime
 PROG=	traceroute
 MAN=	traceroute.8
 SRCS=	as.c version.c traceroute.c ifaddrlist.c findsaddr-udp.c
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index f0b5c02e5037f..a7eaaf5bdaa32 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -16,6 +16,7 @@
 TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
 .PATH: ${TRACEROUTE_DISTDIR}
 
+PACKAGE=	runtime
 PROG=	traceroute6
 MAN=	traceroute6.8
 SRCS=	as.c traceroute6.c