Index: lib/lib80211/Makefile =================================================================== --- lib/lib80211/Makefile +++ lib/lib80211/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ CONFS= regdomain.xml -PACKAGE=lib${LIB} LIB= 80211 SHLIBDIR?= /lib SHLIB_MAJOR= 1 Index: lib/libalias/libalias/Makefile =================================================================== --- lib/libalias/libalias/Makefile +++ 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 Index: lib/libarchive/Makefile =================================================================== --- lib/libarchive/Makefile +++ lib/libarchive/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ .include -PACKAGE=lib${LIB} _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive LIB= archive Index: lib/libauditd/Makefile =================================================================== --- lib/libauditd/Makefile +++ lib/libauditd/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ # -PACKAGE=lib${LIB} OPENBSMDIR= ${SRCTOP}/contrib/openbsm _LIBAUDITDDIR= ${OPENBSMDIR}/libauditd _LIBBSMDIR= ${OPENBSMDIR}/libbsm Index: lib/libbe/Makefile =================================================================== --- lib/libbe/Makefile +++ lib/libbe/Makefile @@ -4,7 +4,6 @@ .include -PACKAGE= lib${LIB} LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 Index: lib/libbegemot/Makefile =================================================================== --- lib/libbegemot/Makefile +++ lib/libbegemot/Makefile @@ -2,7 +2,6 @@ LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot -PACKAGE=lib${LIB} .PATH: ${LIBBEGEMOT_DIR} LIB= begemot Index: lib/libbsm/Makefile =================================================================== --- lib/libbsm/Makefile +++ lib/libbsm/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ # -PACKAGE= lib${LIB} OPENBSMDIR= ${SRCTOP}/contrib/openbsm _LIBBSMDIR= ${OPENBSMDIR}/libbsm Index: lib/libbz2/Makefile =================================================================== --- lib/libbz2/Makefile +++ lib/libbz2/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE= lib${LIB} BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} Index: lib/libcalendar/Makefile =================================================================== --- lib/libcalendar/Makefile +++ lib/libcalendar/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE= lib${LIB} LIB= calendar SRCS= calendar.c easter.c Index: lib/libcam/Makefile =================================================================== --- lib/libcam/Makefile +++ lib/libcam/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE= lib${LIB} LIB= cam SHLIBDIR?= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ Index: lib/libcapsicum/Makefile =================================================================== --- lib/libcapsicum/Makefile +++ lib/libcapsicum/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} - INCS= capsicum_helpers.h MAN+= capsicum_helpers.3 Index: lib/libcasper/libcasper/Makefile =================================================================== --- lib/libcasper/libcasper/Makefile +++ lib/libcasper/libcasper/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=casper - .if ${MK_CASPER} != "no" SHLIB= casper SHLIB_MAJOR= 1 Index: lib/libcasper/services/cap_dns/Makefile =================================================================== --- lib/libcasper/services/cap_dns/Makefile +++ lib/libcasper/services/cap_dns/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=libcasper - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper Index: lib/libcasper/services/cap_fileargs/Makefile =================================================================== --- lib/libcasper/services/cap_fileargs/Makefile +++ lib/libcasper/services/cap_fileargs/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper Index: lib/libcasper/services/cap_grp/Makefile =================================================================== --- lib/libcasper/services/cap_grp/Makefile +++ lib/libcasper/services/cap_grp/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper Index: lib/libcasper/services/cap_pwd/Makefile =================================================================== --- lib/libcasper/services/cap_pwd/Makefile +++ lib/libcasper/services/cap_pwd/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper Index: lib/libcasper/services/cap_random/Makefile =================================================================== --- lib/libcasper/services/cap_random/Makefile +++ lib/libcasper/services/cap_random/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper Index: lib/libcasper/services/cap_sysctl/Makefile =================================================================== --- lib/libcasper/services/cap_sysctl/Makefile +++ lib/libcasper/services/cap_sysctl/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=libcasper - SHLIB_MAJOR= 2 INCSDIR?= ${INCLUDEDIR}/casper Index: lib/libcasper/services/cap_syslog/Makefile =================================================================== --- lib/libcasper/services/cap_syslog/Makefile +++ lib/libcasper/services/cap_syslog/Makefile @@ -4,8 +4,6 @@ .include -PACKAGE=libcasper - SHLIB_MAJOR= 1 INCSDIR?= ${INCLUDEDIR}/casper Index: lib/libcom_err/Makefile =================================================================== --- lib/libcom_err/Makefile +++ 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 Index: lib/libcrypt/Makefile =================================================================== --- lib/libcrypt/Makefile +++ lib/libcrypt/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ # -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include Index: lib/libdevctl/Makefile =================================================================== --- lib/libdevctl/Makefile +++ lib/libdevctl/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= devctl SRCS= devctl.c INCS= devctl.h Index: lib/libdevinfo/Makefile =================================================================== --- lib/libdevinfo/Makefile +++ lib/libdevinfo/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= devinfo SRCS= devinfo.c INCS= devinfo.h Index: lib/libdevstat/Makefile =================================================================== --- lib/libdevstat/Makefile +++ 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. Index: lib/libdwarf/Makefile =================================================================== --- lib/libdwarf/Makefile +++ lib/libdwarf/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ .include -PACKAGE=lib${LIB} ELFTCDIR=${SRCTOP}/contrib/elftoolchain SRCDIR= ${ELFTCDIR}/libdwarf Index: lib/libefivar/Makefile =================================================================== --- lib/libefivar/Makefile +++ lib/libefivar/Makefile @@ -31,7 +31,6 @@ .PATH: ${EFIBOOT}/libefi -PACKAGE=lib${LIB} LIB= efivar SRCS= efivar.c efichar.c efivar-dp-format.c \ efivar-dp-parse.c \ Index: lib/libelf/Makefile =================================================================== --- lib/libelf/Makefile +++ lib/libelf/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include Index: lib/libevent/Makefile =================================================================== --- lib/libevent/Makefile +++ lib/libevent/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} .PATH: ${SRCTOP}/contrib/pf/libevent .include Index: lib/libexpat/Makefile =================================================================== --- lib/libexpat/Makefile +++ lib/libexpat/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} EXPAT= ${SRCTOP}/contrib/expat LIB= bsdxml Index: lib/libfetch/Makefile =================================================================== --- lib/libfetch/Makefile +++ lib/libfetch/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= fetch CFLAGS+= -I. SRCS= fetch.c common.c ftp.c http.c file.c \ Index: lib/libgeom/Makefile =================================================================== --- lib/libgeom/Makefile +++ lib/libgeom/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= geom SHLIBDIR?= /lib SRCS+= geom_getxml.c Index: lib/libgpio/Makefile =================================================================== --- lib/libgpio/Makefile +++ lib/libgpio/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= gpio SHLIB_MAJOR= 0 Index: lib/libgssapi/Makefile =================================================================== --- lib/libgssapi/Makefile +++ lib/libgssapi/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= gssapi SHLIB_MAJOR= 10 VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def Index: lib/libipsec/Makefile =================================================================== --- lib/libipsec/Makefile +++ lib/libipsec/Makefile @@ -27,7 +27,6 @@ # # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include Index: lib/libkiconv/Makefile =================================================================== --- lib/libkiconv/Makefile +++ lib/libkiconv/Makefile @@ -4,7 +4,6 @@ .include -PACKAGE=lib${LIB} 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,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -PACKAGE=lib${LIB} LIB= kvm SHLIBDIR?= /lib Index: lib/libldns/Makefile =================================================================== --- lib/libldns/Makefile +++ lib/libldns/Makefile @@ -3,7 +3,6 @@ # Vendor sources and generated files LDNSDIR = ${SRCTOP}/contrib/ldns -PACKAGE=lib${LIB} .PATH: ${LDNSDIR} ${LDNSDIR}/compat LIB= ldns Index: lib/liblzma/Makefile =================================================================== --- lib/liblzma/Makefile +++ lib/liblzma/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= lzma LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma Index: lib/libmagic/Makefile =================================================================== --- lib/libmagic/Makefile +++ lib/libmagic/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009 -PACKAGE=lib${LIB} CONTRDIR= ${SRCTOP}/contrib/file .PATH: ${CONTRDIR}/src .PATH: ${CONTRDIR}/doc Index: lib/libmd/Makefile =================================================================== --- lib/libmd/Makefile +++ lib/libmd/Makefile @@ -4,7 +4,6 @@ .include -PACKAGE=lib${LIB} LIB= md SHLIB_MAJOR= 6 SRCS= md4c.c md5c.c md4hl.c md5hl.c \ Index: lib/libmemstat/Makefile =================================================================== --- lib/libmemstat/Makefile +++ lib/libmemstat/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} WARNS?= 3 LIB= memstat SHLIB_MAJOR= 3 Index: lib/libmp/Makefile =================================================================== --- lib/libmp/Makefile +++ lib/libmp/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= mp SHLIB_MAJOR= 7 LIBADD= crypto Index: lib/libmt/Makefile =================================================================== --- lib/libmt/Makefile +++ lib/libmt/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= mt SHLIBDIR?= /lib SRCS= mtlib.c Index: lib/libnetgraph/Makefile =================================================================== --- lib/libnetgraph/Makefile +++ 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 Index: lib/libngatm/Makefile =================================================================== --- lib/libngatm/Makefile +++ lib/libngatm/Makefile @@ -2,7 +2,6 @@ # # Author: Harti Brandt # -PACKAGE=lib${LIB} LIB= ngatm SHLIB_MAJOR= 4 MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3 Index: lib/libnv/Makefile =================================================================== --- lib/libnv/Makefile +++ lib/libnv/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include Index: lib/libopie/Makefile =================================================================== --- lib/libopie/Makefile +++ lib/libopie/Makefile @@ -5,7 +5,6 @@ CONFS= opieaccess CONFSMODE= 600 -PACKAGE=lib${LIB} OPIE_DIST?= ${SRCTOP}/contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} SHLIB_MAJOR= 8 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 Index: lib/libpcap/Makefile =================================================================== --- lib/libpcap/Makefile +++ lib/libpcap/Makefile @@ -5,7 +5,6 @@ .include -PACKAGE=lib${LIB} LIB= pcap SRCS= bpf_dump.c \ Index: lib/libpjdlog/Makefile =================================================================== --- lib/libpjdlog/Makefile +++ lib/libpjdlog/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ # -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include Index: lib/libpmc/Makefile =================================================================== --- lib/libpmc/Makefile +++ 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 Index: lib/libproc/Makefile =================================================================== --- lib/libproc/Makefile +++ lib/libproc/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= proc SRCS= crc32.c \ Index: lib/libprocstat/Makefile =================================================================== --- lib/libprocstat/Makefile +++ lib/libprocstat/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= procstat SRCS= cd9660.c \ Index: lib/libradius/Makefile =================================================================== --- lib/libradius/Makefile +++ lib/libradius/Makefile @@ -26,7 +26,6 @@ .include -PACKAGE=lib${LIB} LIB= radius SRCS= radlib.c INCS= radlib.h radlib_vs.h Index: lib/librpcsvc/Makefile =================================================================== --- lib/librpcsvc/Makefile +++ 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 \ Index: lib/librt/Makefile =================================================================== --- lib/librt/Makefile +++ lib/librt/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB=rt SHLIB_MAJOR= 1 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR} Index: lib/librtld_db/Makefile =================================================================== --- lib/librtld_db/Makefile +++ lib/librtld_db/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= rtld_db SHLIB_MAJOR= 2 MAN= librtld_db.3 Index: lib/libsbuf/Makefile =================================================================== --- lib/libsbuf/Makefile +++ lib/libsbuf/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= sbuf SHLIBDIR?= /lib SRCS= subr_prf.c subr_sbuf.c Index: lib/libsmb/Makefile =================================================================== --- lib/libsmb/Makefile +++ lib/libsmb/Makefile @@ -4,7 +4,6 @@ CONFS= nsmb.conf CONFSMODE= 600 -PACKAGE=lib${LIB} CONTRIBDIR= ${SRCTOP}/contrib/smbfs .PATH: ${CONTRIBDIR}/lib/smb Index: lib/libsqlite3/Makefile =================================================================== --- lib/libsqlite3/Makefile +++ lib/libsqlite3/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} PRIVATELIB= yes LIB= sqlite3 SHLIB_MAJOR?= 0 Index: lib/libsysdecode/Makefile =================================================================== --- lib/libsysdecode/Makefile +++ lib/libsysdecode/Makefile @@ -2,7 +2,6 @@ .include -PACKAGE=lib${LIB} LIB= sysdecode SRCS= errno.c flags.c ioctl.c signal.c syscallnames.c utrace.c Index: lib/libtacplus/Makefile =================================================================== --- lib/libtacplus/Makefile +++ lib/libtacplus/Makefile @@ -24,7 +24,6 @@ # # $FreeBSD$ -PACKAGE=lib${LIB} LIB= tacplus SRCS= taclib.c INCS= taclib.h Index: lib/libucl/Makefile =================================================================== --- lib/libucl/Makefile +++ lib/libucl/Makefile @@ -2,7 +2,6 @@ LIBUCL= ${SRCTOP}/contrib/libucl -PACKAGE=lib${LIB} LIB= ucl PRIVATELIB= true SHLIB_MAJOR= 1 Index: lib/libufs/Makefile =================================================================== --- lib/libufs/Makefile +++ lib/libufs/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 7 Index: lib/libugidfw/Makefile =================================================================== --- lib/libugidfw/Makefile +++ lib/libugidfw/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= ugidfw SHLIB_MAJOR= 5 SRCS= ugidfw.c Index: lib/libulog/Makefile =================================================================== --- lib/libulog/Makefile +++ lib/libulog/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?=/lib .include Index: lib/libusb/Makefile =================================================================== --- lib/libusb/Makefile +++ 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 Index: lib/libusbhid/Makefile =================================================================== --- lib/libusbhid/Makefile +++ 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 Index: lib/libutil/Makefile =================================================================== --- lib/libutil/Makefile +++ lib/libutil/Makefile @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include Index: lib/libwrap/Makefile =================================================================== --- lib/libwrap/Makefile +++ lib/libwrap/Makefile @@ -5,7 +5,6 @@ .include CONFS= hosts.allow -PACKAGE=lib${LIB} LIB= wrap SHLIB_MAJOR= 6 INCS= tcpd.h Index: lib/libxo/Makefile =================================================================== --- lib/libxo/Makefile +++ lib/libxo/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} SHLIBDIR?= /lib .include Index: lib/libypclnt/Makefile =================================================================== --- lib/libypclnt/Makefile +++ lib/libypclnt/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ -PACKAGE=lib${LIB} LIB= ypclnt SHLIB_MAJOR= 4 SRCS= ypclnt_connect.c \ Index: lib/libz/Makefile =================================================================== --- lib/libz/Makefile +++ lib/libz/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ # -PACKAGE=lib${LIB} LIB= z SHLIBDIR?= /lib SHLIB_MAJOR= 6