Convert usr.sbin to LIBADD

Reduce overlinking

usr.sbin/acpi/acpidb/Makefile

@@ -74,7 +74,6 @@ MAN=	acpidb.8
 WARNS?=	3
 
 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 .include <bsd.prog.mk>

usr.sbin/amd/Makefile.inc

@@ -29,13 +29,6 @@ CFLAGS+= -DYES_HESIOD
 
 CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\"
 
-.if exists(${.OBJDIR}/../libamu)
-LIBAMUDIR=	${.OBJDIR}/../libamu
-.else
-LIBAMUDIR=	${.CURDIR}/../libamu
-.endif
-LIBAMU=		${LIBAMUDIR}/libamu.a
-
 RPCCOM=		RPCGEN_CPP=${CPP:Q} rpcgen
 MOUNT_X=	${DESTDIR}/usr/include/rpcsvc/mount.x
 NFS_PROT_X=	${DESTDIR}/usr/include/rpcsvc/nfs_prot.x

usr.sbin/amd/amd/Makefile

@@ -27,8 +27,7 @@ SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
 	 -I${DESTDIR}/usr/include/rpcsvc
 
-DPADD=	${LIBAMU} ${LIBWRAP}
-LDADD=	${LIBAMU} -lwrap
+LIBADD=	amu wrap
 
 CLEANFILES+=	conf_parse.c conf_parse.h conf_tok.c
 

usr.sbin/amd/amq/Makefile

@@ -14,7 +14,6 @@ SRCS=	amq.c amq_clnt.c amq_xdr.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>

usr.sbin/amd/fixmount/Makefile

@@ -10,12 +10,11 @@
 
 PROG=	fixmount
 MAN=	fixmount.8
-SRCS=	fixmount.c 
+SRCS=	fixmount.c
 
 #	These would be links created by the GNU-style configure
 SRCS+=	checkmount_bsd44.c
 
-DPADD=	${LIBAMU} ${LIBRPCSVC}
-LDADD=	${LIBAMU} -lrpcsvc
+LIBADD+=	amu rpcsvc
 
 .include <bsd.prog.mk>

usr.sbin/amd/fsinfo/Makefile

@@ -15,8 +15,7 @@ SRCS+=	wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 CLEANFILES+=	fsi_gram.c fsi_gram.h fsi_lex.c
 

usr.sbin/amd/hlfsd/Makefile

@@ -13,7 +13,6 @@ SRCS=	hlfsd.c homedir.c nfs_prot_svc.c stubs.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>

usr.sbin/amd/mk-amd-map/Makefile

@@ -10,7 +10,6 @@
 PROG=	mk-amd-map
 MAN=	mk-amd-map.8
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>

usr.sbin/amd/pawd/Makefile

@@ -14,7 +14,6 @@ SRCS=	pawd.c amq_clnt.c amq_xdr.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>

usr.sbin/amd/wire-test/Makefile

@@ -10,7 +10,6 @@
 PROG=	wire-test
 MAN=	wire-test.8
 
-DPADD=	${LIBAMU}
-LDADD=	${LIBAMU}
+LIBADD=	amu
 
 .include <bsd.prog.mk>

usr.sbin/ancontrol/Makefile

@@ -6,7 +6,6 @@ MAN=	ancontrol.8
 WARNS?=	3
 CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys
 
-DPADD=	${LIBMD}
-LDADD=	-lmd
+LIBADD=	md
 
 .include <bsd.prog.mk>

usr.sbin/apmd/Makefile

@@ -7,8 +7,7 @@ SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
 
 WARNS?=	3
 
-DPADD=	${LIBL}
-LDADD=	-ll
+LIBADD=	l
 
 CFLAGS+= -I${.CURDIR}
 

usr.sbin/asf/Makefile

@@ -4,7 +4,6 @@ PROG=	asf
 SRCS=	asf.c asf_kld.c asf_kvm.c asf_prog.c
 MAN=	asf.8
 
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 
 .include <bsd.prog.mk>

usr.sbin/audit/Makefile

@@ -10,8 +10,7 @@ CFLAGS+=	-I${OPENBSMDIR}
 PROG=	audit
 MAN=	audit.8
 
-DPADD=	${LIBBSM}
-LDADD=	-lbsm
+LIBADD=	bsm
 
 WARNS?=	5
 

usr.sbin/auditd/Makefile

@@ -11,8 +11,7 @@ PROG=	auditd
 SRCS=	auditd.c audit_warn.c auditd_fbsd.c
 MAN=	auditd.8
 
-DPADD=	${LIBAUDITD} ${LIBBSM}
-LDADD=	-lauditd -lbsm
+LIBADD=	auditd bsm
 
 WARNS?=	3
 

usr.sbin/auditdistd/Makefile

@@ -21,10 +21,7 @@ SRCS+=	sandbox.c sender.c subr.c
 SRCS+=	token.l trail.c
 MAN=	auditdistd.8 auditdistd.conf.5
 
-DPADD=	${LIBL} ${LIBPTHREAD} ${LIBUTIL}
-LDADD=	-ll -lpthread -lutil
-DPADD+=	${LIBCRYPTO} ${LIBSSL}
-LDADD+=	-lcrypto -lssl
+LIBADD+=	l pthread util crypto ssl
 
 YFLAGS+=-v
 

usr.sbin/auditreduce/Makefile

@@ -10,8 +10,7 @@ CFLAGS+=	-I${OPENBSMDIR}
 PROG=	auditreduce
 MAN=	auditreduce.1
 
-DPADD=	${LIBBSM}
-LDADD=	-lbsm
+LIBADD=	bsm
 
 WARNS?=	3
 

usr.sbin/authpf/Makefile

@@ -13,8 +13,7 @@ SRCS=   authpf.c
 # XXX ALTQ:
 CFLAGS+= -DENABLE_ALTQ
 
-LDADD+= -lm -lmd -lutil
-DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL}
+LIBADD=	m md util
 
 WARNS?=	3
 

usr.sbin/autofs/Makefile

@@ -16,8 +16,7 @@ CFLAGS+=-I${.CURDIR}/../../sys/fs/autofs
 
 MAN=	automount.8 automountd.8 autounmountd.8 auto_master.5
 
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+LIBADD=	util
 
 # Needed for getmntopts.c
 MOUNT=  ${.CURDIR}/../../sbin/mount

usr.sbin/bhyve/Makefile

@@ -4,7 +4,7 @@
 
 PROG=	bhyve
 
-DEBUG_FLAGS= -g -O0 
+DEBUG_FLAGS= -g -O0
 
 MAN=	bhyve.8
 
@@ -43,8 +43,7 @@ SRCS=	\
 .PATH:	${.CURDIR}/../../sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
-DPADD=	${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD}
-LDADD=	-lvmmapi -lmd -lutil -lpthread
+LIBADD=	vmmapi md util pthread
 
 WARNS?=	2
 

usr.sbin/bhyvectl/Makefile

@@ -7,8 +7,7 @@ SRCS=	bhyvectl.c
 
 MAN=
 
-DPADD=	${LIBVMMAPI} ${LIBUTIL}
-LDADD=	-lvmmapi -lutil
+LIBADD=	vmmapi util
 
 WARNS?=	3
 

usr.sbin/bhyveload/Makefile

@@ -4,8 +4,7 @@ PROG=	bhyveload
 SRCS=	bhyveload.c
 MAN=	bhyveload.8
 
-DPADD+=	${LIBVMMAPI} ${LIBUTIL}
-LDADD+=	-lvmmapi -lutil
+LIBADD=	vmmapi util
 
 WARNS?=	3
 

usr.sbin/bluetooth/ath3kfw/Makefile

@@ -2,7 +2,6 @@
 
 PROG=		ath3kfw
 MAN=		ath3kfw.8
-DPADD+=		${LIBUSB}
-LDADD+=		-lusb
+LIBADD+=	usb
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/bt3cfw/Makefile

@@ -5,7 +5,6 @@ PROG=		bt3cfw
 MAN=		bt3cfw.8
 WARNS?=		2
 
-DPADD=		${LIBNETGRAPH}
-LDADD=		-lnetgraph
+LIBADD+=	netgraph
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/bthidcontrol/Makefile

@@ -9,7 +9,6 @@ SRCS=		bthidcontrol.c hid.c lexer.l  parser.y sdp.c
 WARNS?=		1
 CFLAGS+=	-DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd
 
-DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBUSBHID}
-LDADD=		-lbluetooth -lsdp -lusbhid
+LIBADD+=	bluetooth sdp usbhid
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/bthidd/Makefile

@@ -10,8 +10,7 @@ SRCS=		bthidd.c client.c hid.c kbd.c lexer.l parser.y server.c \
 CFLAGS+=	-I${.CURDIR}
 DEBUG_FLAGS=	-g
 
-DPADD=          ${LIBBLUETOOTH} ${LIBUSBHID}
-LDADD=		-lbluetooth -lusbhid
+LIBADD+=	bluetooth usbhid
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 

usr.sbin/bluetooth/btpand/Makefile

@@ -7,7 +7,6 @@ SRCS=	btpand.c bnep.c channel.c client.c event.c packet.c server.c sdp.c tap.c
 
 WARNS?=	3
 
-DPADD+=	${LIBBLUETOOTH} ${LIBSDP} ${LIBUTIL}
-LDADD+=	-lbluetooth -lsdp -lutil
+LIBADD=	bluetooth sdp util
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/hccontrol/Makefile

@@ -8,7 +8,6 @@ SRCS=		send_recv.c link_policy.c link_control.c \
 		util.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/hcsecd/Makefile

@@ -7,7 +7,6 @@ SRCS=		hcsecd.c lexer.l parser.y
 WARNS?=		2
 CFLAGS+=	-I${.CURDIR}
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/hcseriald/Makefile

@@ -5,7 +5,6 @@ PROG=		hcseriald
 MAN=		hcseriald.8
 WARNS?=		2
 
-DPADD=		${LIBNETGRAPH}
-LDADD=		-lnetgraph
+LIBADD=		netgraph
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/l2control/Makefile

@@ -6,7 +6,6 @@ MAN=		l2control.8
 SRCS=		l2cap.c l2control.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/l2ping/Makefile

@@ -5,7 +5,6 @@ PROG=		l2ping
 MAN=		l2ping.8
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/rfcomm_pppd/Makefile

@@ -8,7 +8,6 @@ MAN=		rfcomm_pppd.8
 SRCS=		rfcomm_pppd.c rfcomm_sdp.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH} ${LIBSDP}
-LDADD=		-lbluetooth -lsdp
+LIBADD=		bluetooth sdp
 
 .include <bsd.prog.mk>

usr.sbin/bluetooth/sdpcontrol/Makefile

@@ -6,7 +6,6 @@ MAN=		sdpcontrol.8
 SRCS=		sdpcontrol.c search.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH} ${LIBSDP}
-LDADD=		-lbluetooth -lsdp
+LIBADD=		bluetooth sdp
 
 .include <bsd.prog.mk>

usr.sbin/boot0cfg/Makefile

@@ -3,8 +3,7 @@
 PROG=	boot0cfg
 MAN=	boot0cfg.8
 
-DPADD=	${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
-LDADD=	-lgeom -lbsdxml -lsbuf
+LIBADD=	geom
 
 NO_WCAST_ALIGN=
 

usr.sbin/boot98cfg/Makefile

@@ -5,7 +5,6 @@ MAN=	boot98cfg.8
 
 WARNS?=	2
 
-DPADD=	${LIBGEOM}
-LDADD=	-lgeom
+LIBADD=	geom
 
 .include <bsd.prog.mk>

usr.sbin/bsdinstall/distextract/Makefile

@@ -2,8 +2,7 @@
 
 BINDIR= /usr/libexec/bsdinstall
 PROG=	distextract
-DPADD=	${LIBARCHIVE} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM}
-LDADD=	-larchive -lncursesw -ldialog -lm
+LIBADD=	archive ncursesw dialog m
 
 WARNS?=	6
 MAN=

usr.sbin/bsdinstall/distfetch/Makefile

@@ -2,8 +2,7 @@
 
 BINDIR= /usr/libexec/bsdinstall
 PROG=	distfetch
-DPADD=	${LIBFETCH} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM}
-LDADD=	-lfetch -lncursesw -ldialog -lm
+LIBADD=	fetch ncursesw dialog m
 
 WARNS?=	6
 MAN=

usr.sbin/bsdinstall/partedit/Makefile

@@ -5,8 +5,7 @@ PROG=	partedit
 LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
        ${BINDIR}/partedit ${BINDIR}/scriptedpart
 SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade
-DPADD=	${LIBGEOM} ${LIBNCURSESW} ${LIBUTIL} ${LIBDIALOG} ${LIBM}
-LDADD=	-lgeom -lncursesw -lutil -ldialog -lm
+LIBADD+=	geom ncursesw util dialog m
 
 PARTEDIT_ARCH= ${MACHINE}
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"

usr.sbin/bsnmpd/bsnmpd/Makefile

@@ -29,8 +29,7 @@ CFLAGS+= -DSNMPTREE_TYPES
 CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
 CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
 CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
-DPADD=	${LIBBEGEMOT} ${LIBBSNMP} ${LIBWRAP}
-LDADD=	-lbegemot -lbsnmp -lwrap
+LIBADD=	begemot bsnmp wrap
 
 LDFLAGS= -Wl,-export-dynamic