Index: lib/libcam/Makefile =================================================================== --- lib/libcam/Makefile +++ 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 \ Index: lib/libcrypt/Makefile =================================================================== --- lib/libcrypt/Makefile +++ lib/libcrypt/Makefile @@ -2,11 +2,12 @@ # $FreeBSD$ # -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include +PACKAGE= runtime + SHLIB_MAJOR= 5 LIB= crypt Index: lib/libelf/Makefile =================================================================== --- lib/libelf/Makefile +++ lib/libelf/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include @@ -10,6 +9,7 @@ .PATH: ${SRCDIR} +PACKAGE= runtime LIB= elf SRCS= elf.c \ Index: lib/libgeom/Makefile =================================================================== --- lib/libgeom/Makefile +++ lib/libgeom/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -PACKAGE=lib${LIB} +PACKAGE= runtime + LIB= geom SHLIBDIR?= /lib SRCS+= geom_getxml.c Index: lib/libipsec/Makefile =================================================================== --- lib/libipsec/Makefile +++ lib/libipsec/Makefile @@ -27,12 +27,12 @@ # # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include LIB= ipsec +PACKAGE= runtime SHLIB_MAJOR= 4 CFLAGS+=-I. -I${.CURDIR} CFLAGS+=-DIPSEC_DEBUG -DIPSEC Index: lib/libjail/Makefile =================================================================== --- lib/libjail/Makefile +++ 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 Index: lib/libkiconv/Makefile =================================================================== --- lib/libkiconv/Makefile +++ lib/libkiconv/Makefile @@ -4,7 +4,7 @@ .include -PACKAGE=lib${LIB} +PACKAGE= runtime LIB= kiconv SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c SRCS+= quirks.c Index: lib/libkvm/Makefile =================================================================== --- lib/libkvm/Makefile +++ 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} Index: lib/libmd/Makefile =================================================================== --- lib/libmd/Makefile +++ lib/libmd/Makefile @@ -4,7 +4,7 @@ .include -PACKAGE=lib${LIB} +PACKAGE= runtime LIB= md SHLIB_MAJOR= 6 SRCS= md4c.c md5c.c md4hl.c md5hl.c \ Index: lib/libnv/Makefile =================================================================== --- lib/libnv/Makefile +++ lib/libnv/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include +PACKAGE= runtime LIB= nv SHLIB_MAJOR= 0 Index: lib/libpam/libpam/Makefile =================================================================== --- lib/libpam/libpam/Makefile +++ 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 @@ SHLIB= pam .endif +PACKAGE= runtime + MK_PROFILE=no SRCS= openpam_asprintf.c \ Index: lib/libsbuf/Makefile =================================================================== --- lib/libsbuf/Makefile +++ lib/libsbuf/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -PACKAGE=lib${LIB} +PACKAGE= runtime + LIB= sbuf SHLIBDIR?= /lib SRCS= subr_prf.c subr_sbuf.c Index: lib/libufs/Makefile =================================================================== --- lib/libufs/Makefile +++ lib/libufs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE=lib${LIB} +PACKAGE= runtime LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 7 Index: lib/libutil/Makefile =================================================================== --- lib/libutil/Makefile +++ lib/libutil/Makefile @@ -1,11 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include +PACKAGE= runtime + .PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c LIB= util Index: lib/libxo/Makefile =================================================================== --- lib/libxo/Makefile +++ lib/libxo/Makefile @@ -1,10 +1,11 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include +PACKAGE= runtime + LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/libxo Index: lib/libz/Makefile =================================================================== --- lib/libz/Makefile +++ lib/libz/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -PACKAGE=lib${LIB} +PACKAGE= runtime LIB= z SHLIBDIR?= /lib SHLIB_MAJOR= 6 Index: secure/lib/libcrypto/Makefile =================================================================== --- secure/lib/libcrypto/Makefile +++ secure/lib/libcrypto/Makefile @@ -5,6 +5,7 @@ .include +PACKAGE= runtime LIB= crypto SHLIB_MAJOR= 111 VERSION_MAP= ${.CURDIR}/Version.map Index: share/termcap/Makefile =================================================================== --- share/termcap/Makefile +++ share/termcap/Makefile @@ -7,6 +7,7 @@ # MAN= termcap.5 +PACKAGE= runtime FILES= termcap termcap.db FILESDIR= ${BINDIR}/misc CLEANFILES+= termcap.db Index: usr.bin/du/Makefile =================================================================== --- usr.bin/du/Makefile +++ usr.bin/du/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE= runtime PROG= du LIBADD= util Index: usr.bin/fsync/Makefile =================================================================== --- usr.bin/fsync/Makefile +++ usr.bin/fsync/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE= runtime PROG= fsync .include Index: usr.bin/passwd/Makefile =================================================================== --- usr.bin/passwd/Makefile +++ usr.bin/passwd/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE = runtime PROG = passwd BINOWN = root BINMODE = 4555 Index: usr.bin/sed/Makefile =================================================================== --- usr.bin/sed/Makefile +++ usr.bin/sed/Makefile @@ -3,6 +3,7 @@ .include +PACKAGE= runtime PROG= sed SRCS= compile.c main.c misc.c process.c Index: usr.bin/tar/Makefile =================================================================== --- usr.bin/tar/Makefile +++ usr.bin/tar/Makefile @@ -3,6 +3,7 @@ _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +PACKAGE= runtime PROG= bsdtar BSDTAR_VERSION_STRING= 3.4.0 Index: usr.bin/uname/Makefile =================================================================== --- usr.bin/uname/Makefile +++ usr.bin/uname/Makefile @@ -1,5 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +PACKAGE= runtime PROG= uname .include Index: usr.bin/what/Makefile =================================================================== --- usr.bin/what/Makefile +++ usr.bin/what/Makefile @@ -1,6 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +PACKAGE= runtime PROG= what .include Index: usr.sbin/ip6addrctl/Makefile =================================================================== --- usr.sbin/ip6addrctl/Makefile +++ usr.sbin/ip6addrctl/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE= runtime PROG= ip6addrctl MAN= ip6addrctl.8 Index: usr.sbin/kldxref/Makefile =================================================================== --- usr.sbin/kldxref/Makefile +++ usr.sbin/kldxref/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ +PACKAGE= runtime PROG= kldxref MAN= kldxref.8 SRCS= kldxref.c ef.c ef_obj.c Index: usr.sbin/pwd_mkdb/Makefile =================================================================== --- usr.sbin/pwd_mkdb/Makefile +++ 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 Index: usr.sbin/services_mkdb/Makefile =================================================================== --- usr.sbin/services_mkdb/Makefile +++ usr.sbin/services_mkdb/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +PACKAGE= runtime + CONFS= services PROG= services_mkdb MAN= services_mkdb.8 Index: usr.sbin/traceroute/Makefile =================================================================== --- usr.sbin/traceroute/Makefile +++ 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 Index: usr.sbin/traceroute6/Makefile =================================================================== --- usr.sbin/traceroute6/Makefile +++ 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