16 files changed, 23 insertions, 18 deletions

diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 24441708b49b..2a5d13ba4f34 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 1aa4c66d9cc7..f222394b45c3 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 f4389da9d178..f3fd14d1e2b4 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 b7877cc56ece..bdd91b47bf67 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 c626830e2e9b..6c710567498d 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 74eb8e1091b2..a2ee0c9ac1f7 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 44ec6c0c9d60..95b8c11c6057 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 d934690d4355..affd02e06da1 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 edeb308c82d6..9559761aa002 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 bf92041d4c87..8fa818fb0e1e 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 c9d257be9010..e925b311636b 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 ac8be92c8dbd..5d983d6e017e 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 a3f4cb3991ed..a767546f457f 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 972fc65c53e5..5ea2addd5d34 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 7844332862ad..d33c39dd6c2a 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 9d415a8b976c..30f80981012c 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