33 files changed, 33 insertions, 64 deletions

diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile
index fe81d5cc70aea..3cd9c5d71ae8a 100644
--- a/tools/diag/dumpvfscache/Makefile
+++ b/tools/diag/dumpvfscache/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	dumpvfscache
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 
 MAN=
 
diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile
index 187c973b34a96..9c5cdd5c215bf 100644
--- a/tools/regression/gaithrstress/Makefile
+++ b/tools/regression/gaithrstress/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	gaithrstress
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 MAN=
 .include <bsd.prog.mk>
diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile
index f550db3198f4c..c34cf650479df 100644
--- a/tools/regression/geom/ConfCmp/Makefile
+++ b/tools/regression/geom/ConfCmp/Makefile
@@ -12,8 +12,7 @@ CFLAGS+=	 -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -
 # Uncomment for ElectricFence
 #LDADD += -lefence -L/usr/local/lib
 
-DPADD += ${LIBBSDXML}
-LDADD += -lbsdxml
+LIBADD= bsdxml
 
 MAN=
 CLEANFILES	+= _*
diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile
index eab3f89b239ef..4804f97593894 100644
--- a/tools/regression/geom/MdLoad/Makefile
+++ b/tools/regression/geom/MdLoad/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	MdLoad
-DPADD=	${LIBSBUF} ${LIBBSDXML}
-LDADD=	-lsbuf -lbsdxml
+LIBADD=	sbuf bsdxml
 
 MAN=
 
diff --git a/tools/regression/kgssapi/Makefile b/tools/regression/kgssapi/Makefile
index 751604f58f94e..203b688462a5a 100644
--- a/tools/regression/kgssapi/Makefile
+++ b/tools/regression/kgssapi/Makefile
@@ -3,8 +3,7 @@
 PROG=	gsstest
 MAN=
 WARNS?=	2
-DPADD=	${LIBGSSAPI} ${LIBGSSAPI_KRB5}
-LDADD=	-lgssapi -lgssapi_krb5
+LIBADD=	gssapi gssapi_krb5
 DEBUG_FLAGS= -g -O0
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/lib/libc/resolv/Makefile b/tools/regression/lib/libc/resolv/Makefile
index fa91ac3993147..18a71bcdedb3a 100644
--- a/tools/regression/lib/libc/resolv/Makefile
+++ b/tools/regression/lib/libc/resolv/Makefile
@@ -6,8 +6,7 @@ MAN=
 
 # Note: this test relies on being dynamically linked.  You will get a
 # spurious PASS for a statically linked test.
-DPADD+=		${LIBPTHREAD}
-LDADD+=		-lpthread
+LIBADD+=	pthread
 
 regress: ${PROG}
 	./${PROG} -r ${.CURDIR}/mach
diff --git a/tools/regression/mac/mac_bsdextended/Makefile b/tools/regression/mac/mac_bsdextended/Makefile
index 36464bae1d516..aaa060aefa79e 100644
--- a/tools/regression/mac/mac_bsdextended/Makefile
+++ b/tools/regression/mac/mac_bsdextended/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	test_ugidfw
-DPADD=	${LIBUGIDFW}
-LDADD=	-lugidfw
+LIBADD=	ugidfw
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/posixsem/Makefile b/tools/regression/posixsem/Makefile
index 312031323f6a3..5f73a72376d45 100644
--- a/tools/regression/posixsem/Makefile
+++ b/tools/regression/posixsem/Makefile
@@ -2,8 +2,7 @@
 
 PROG=	posixsem
 SRCS=	posixsem.c test.c
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 MAN=
 
 WARNS?=	3
diff --git a/tools/regression/priv/Makefile b/tools/regression/priv/Makefile
index a1fbcc668f57b..32a4a74fdd53b 100644
--- a/tools/regression/priv/Makefile
+++ b/tools/regression/priv/Makefile
@@ -48,8 +48,7 @@ SRCS=	main.c				\
 MAN=
 WARNS?=	3
 
-DPADD+= ${LIBIPSEC}
-LDADD+= -lipsec
+LIBADD+=	ipsec
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
diff --git a/tools/regression/pthread/cv_cancel1/Makefile b/tools/regression/pthread/cv_cancel1/Makefile
index bedca5627185a..be2ffaaa3f5b6 100644
--- a/tools/regression/pthread/cv_cancel1/Makefile
+++ b/tools/regression/pthread/cv_cancel1/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	cv_cancel1
 MAN=
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/pthread/mutex_isowned_np/Makefile b/tools/regression/pthread/mutex_isowned_np/Makefile
index f7a8984f7e3cd..88270530e6aec 100644
--- a/tools/regression/pthread/mutex_isowned_np/Makefile
+++ b/tools/regression/pthread/mutex_isowned_np/Makefile
@@ -2,7 +2,6 @@
 
 PROG=	mutex_isowned_np
 MAN=
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile
index 5db4b79152371..bea9d9c10e218 100644
--- a/tools/regression/rpcsec_gss/Makefile
+++ b/tools/regression/rpcsec_gss/Makefile
@@ -3,8 +3,7 @@
 PROG=	rpctest
 MAN=
 WARNS?=	6
-DPADD=	${LIBRPCSEC_GSS}
-LDADD=	-lrpcsec_gss
+LIBADD=	rpcsec_gss
 DEBUG_FLAGS= -g -O0
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sendfile/Makefile b/tools/regression/sockets/sendfile/Makefile
index 9d6f1854eb8a3..6e9c1ab701641 100644
--- a/tools/regression/sockets/sendfile/Makefile
+++ b/tools/regression/sockets/sendfile/Makefile
@@ -5,7 +5,6 @@
 PROG=	sendfile
 MAN=
 WARNS?=	6
-DPADD=	${LIBMD}
-LDADD=	-lmd
+LIBADD=	md
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile
index 643040f10c17d..cbebbe769e2f4 100644
--- a/tools/regression/tls/ttls2/Makefile
+++ b/tools/regression/tls/ttls2/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	ttls2
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD= pthread
 MAN=
 DEBUG_FLAGS= -g
 
diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile
index 2d1e501c073cc..ab6ca6fe753c0 100644
--- a/tools/regression/tls/ttls4/Makefile
+++ b/tools/regression/tls/ttls4/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	ttls4
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 MAN=
 DEBUG_FLAGS= -g
 
diff --git a/tools/tools/ath/athratestats/Makefile b/tools/tools/ath/athratestats/Makefile
index 87cd0f819c0f2..938f0cb4ba517 100644
--- a/tools/tools/ath/athratestats/Makefile
+++ b/tools/tools/ath/athratestats/Makefile
@@ -7,7 +7,7 @@ PROG=	athratestats
 
 SRCS=	main.c opt_ah.h ah_osdep.h
 
-LDADD+=	-lcurses
+LIBADD+=	curses
 
 CLEANFILES+=	opt_ah.h ah_osdep.h
 
diff --git a/tools/tools/atsectl/Makefile b/tools/tools/atsectl/Makefile
index 3f3a8c479ec54..afe79a91af22f 100644
--- a/tools/tools/atsectl/Makefile
+++ b/tools/tools/atsectl/Makefile
@@ -2,8 +2,7 @@
 
 PROG=	atsectl
 
-DPADD=	${LIBMD}
-LDADD=	-lmd
+LIBADD=	md
 
 BINDIR?=	/usr/sbin
 
diff --git a/tools/tools/ether_reflect/Makefile b/tools/tools/ether_reflect/Makefile
index 0d20f39baff38..040a5bd5fba66 100644
--- a/tools/tools/ether_reflect/Makefile
+++ b/tools/tools/ether_reflect/Makefile
@@ -4,8 +4,7 @@
 # A Makefile that builds both the ether_reflect program and its manual page.
 
 PROG=   ether_reflect
-DPADD=	${LIBPCAP}
-LDADD=	-lpcap
+LIBADD=	pcap
 CFLAGS+=-DHAVE_SNPRINTF
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/ifpifa/Makefile b/tools/tools/ifpifa/Makefile
index 0c09ecc61487a..d381792547396 100644
--- a/tools/tools/ifpifa/Makefile
+++ b/tools/tools/ifpifa/Makefile
@@ -4,7 +4,6 @@ PROG=	ifpifa
 MAN=
 WARNS?=6
 BINDIR?=/usr/local/bin
-DPADD=${LIBKVM}
-LDADD=-lkvm
+LIBADD=kvm
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/mctest/Makefile b/tools/tools/mctest/Makefile
index 6edaf89820f38..dc583e55a222f 100644
--- a/tools/tools/mctest/Makefile
+++ b/tools/tools/mctest/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG_CXX=   mctest 
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD= pthread
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/ncpus/Makefile b/tools/tools/ncpus/Makefile
index 011f49e231c3d..b2683e1152724 100644
--- a/tools/tools/ncpus/Makefile
+++ b/tools/tools/ncpus/Makefile
@@ -9,7 +9,6 @@ SRCS+=	biosmptable.c
 BINDIR=	/usr/local/bin
 WARNS?=	6
 
-DPADD=	${LIBDEVINFO}
-LDADD=	-ldevinfo
+LIBADD=	devinfo
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile
index e7ea87c25bcee..e840be7446cea 100644
--- a/tools/tools/net80211/stumbler/Makefile
+++ b/tools/tools/net80211/stumbler/Makefile
@@ -2,8 +2,7 @@
 
 PROG=	stumbler
 BINDIR=	/usr/local/bin
-DPADD=	${LIBPCAP} ${LIBNCURSESW}
-LDADD=	-lpcap -lncursesw
+LIBADD=	pcap ncursesw
 CFLAGS=-g
 MAN=
 
diff --git a/tools/tools/net80211/wesside/dics/Makefile b/tools/tools/net80211/wesside/dics/Makefile
index 4f368e33ed840..96583cfac8da2 100644
--- a/tools/tools/net80211/wesside/dics/Makefile
+++ b/tools/tools/net80211/wesside/dics/Makefile
@@ -2,8 +2,7 @@
 
 PROG=	dics
 BINDIR=	/usr/local/bin
-DPADD=	${LIBZ}
-LDADD=	-lz
+LIBADD=	z
 CFLAGS=-g
 MAN=
 
diff --git a/tools/tools/net80211/wesside/udps/Makefile b/tools/tools/net80211/wesside/udps/Makefile
index caa2fc0c4d3a2..b4dd203dd2533 100644
--- a/tools/tools/net80211/wesside/udps/Makefile
+++ b/tools/tools/net80211/wesside/udps/Makefile
@@ -2,8 +2,7 @@
 
 PROG=	udps
 BINDIR=	/usr/local/bin
-DPADD=	${LIBZ}
-LDADD=	-lz
+LIBADD=	z
 CFLAGS=-g
 MAN=
 
diff --git a/tools/tools/net80211/wesside/wesside/Makefile b/tools/tools/net80211/wesside/wesside/Makefile
index 5c394075272d0..65942e5352fd3 100644
--- a/tools/tools/net80211/wesside/wesside/Makefile
+++ b/tools/tools/net80211/wesside/wesside/Makefile
@@ -2,8 +2,7 @@
 
 PROG=	wesside
 BINDIR=	/usr/local/bin
-DPADD=	${LIBZ}
-LDADD=	-lz
+LIBADD=	z
 CFLAGS=-g
 MAN=
 SRCS=wesside.c aircrack-ptw-lib.c
diff --git a/tools/tools/netrate/http/Makefile b/tools/tools/netrate/http/Makefile
index d501e612dfe97..bd144b5459124 100644
--- a/tools/tools/netrate/http/Makefile
+++ b/tools/tools/netrate/http/Makefile
@@ -3,7 +3,6 @@
 PROG=	http
 MAN=
 WARNS?=	3
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/netrate/httpd/Makefile b/tools/tools/netrate/httpd/Makefile
index 2318dae042d0e..6acbe64ecb591 100644
--- a/tools/tools/netrate/httpd/Makefile
+++ b/tools/tools/netrate/httpd/Makefile
@@ -3,7 +3,6 @@
 PROG=	httpd
 MAN=
 WARNS?=	3
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/netrate/juggle/Makefile b/tools/tools/netrate/juggle/Makefile
index 751bbb57adae3..f7b7afdf36d02 100644
--- a/tools/tools/netrate/juggle/Makefile
+++ b/tools/tools/netrate/juggle/Makefile
@@ -3,7 +3,6 @@
 PROG=	juggle
 MAN=
 WARNS?=	3
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LIBADD=	pthread
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/tscdrift/Makefile b/tools/tools/tscdrift/Makefile
index 0b5c8acd8da41..fad714d6b058c 100644
--- a/tools/tools/tscdrift/Makefile
+++ b/tools/tools/tscdrift/Makefile
@@ -4,7 +4,6 @@ PROG=	tscdrift
 MAN=
 WARNS?=	6
 
-LDADD=	-lpthread -lm
-DPADD=	${LIBPTHREAD} ${LIBM}
+LIBADD=	pthread m
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/umastat/Makefile b/tools/tools/umastat/Makefile
index 816093686d929..92cd50e8ae3b7 100644
--- a/tools/tools/umastat/Makefile
+++ b/tools/tools/umastat/Makefile
@@ -4,7 +4,6 @@ PROG=	umastat
 MAN=
 WARNS?=	3
 
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/usbtest/Makefile b/tools/tools/usbtest/Makefile
index f9b16bc2fc9ee..b535f5227f10f 100644
--- a/tools/tools/usbtest/Makefile
+++ b/tools/tools/usbtest/Makefile
@@ -33,8 +33,7 @@ SRCS+=	usb_modem_test.c
 SRCS+=	usb_control_ep_test.c
 SYSDIR?= ${.CURDIR}/../../../sys
 
-DPADD+=	${LIBUSB}
-LDADD+=	-lusb
+LIBADD+=	usb
 
 WARNS=	3
 
diff --git a/tools/tools/vimage/Makefile b/tools/tools/vimage/Makefile
index 76c76179f7653..262e3c68209b9 100644
--- a/tools/tools/vimage/Makefile
+++ b/tools/tools/vimage/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	vimage
-LDADD=	-ljail
-DPADD=	${LIBJAIL}
+LIBADD=	jail
 
 WARNS?=	2
 CFLAGS+= -I../../../sys
diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile
index 73620735d0a0a..4b08a2db8d869 100644
--- a/tools/tools/zfsboottest/Makefile
+++ b/tools/tools/zfsboottest/Makefile
@@ -17,7 +17,7 @@ CFLAGS=	-O1 \
 	-fdiagnostics-show-option \
 	-W -Wextra -Wno-sign-compare -Wno-unused-parameter
 CFLAGS+=-m32
-LDADD+=	-lmd
+LIBADD+=	md
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend zfsboottest.o: machine