Index: head/share/mk/bsd.libnames.mk
===================================================================
--- head/share/mk/bsd.libnames.mk	(revision 204310)
+++ head/share/mk/bsd.libnames.mk	(revision 204311)
@@ -1,164 +1,166 @@
 # $FreeBSD$
 
 # The include file <bsd.libnames.mk> define library names.
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
 # file where necessary.
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.libnames.mk cannot be included directly.
 .endif
 
 LIBCRT0?=	${DESTDIR}${LIBDIR}/crt0.o
 
 LIBALIAS?=	${DESTDIR}${LIBDIR}/libalias.a
 LIBARCHIVE?=	${DESTDIR}${LIBDIR}/libarchive.a
 LIBASN1?=	${DESTDIR}${LIBDIR}/libasn1.a
 LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
 LIBAUDITD?=	${DESTDIR}${LIBDIR}/libauditd.a
 LIBAVL?=	${DESTDIR}${LIBDIR}/libavl.a
 LIBBEGEMOT?=	${DESTDIR}${LIBDIR}/libbegemot.a
 .if ${MK_BIND_LIBS} != "no"
 LIBBIND?=	${DESTDIR}${LIBDIR}/libbind.a
 LIBBIND9?=	${DESTDIR}${LIBDIR}/libbind9.a
 .endif
 LIBBLUETOOTH?=	${DESTDIR}${LIBDIR}/libbluetooth.a
 LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxml.a
 LIBBSM?=	${DESTDIR}${LIBDIR}/libbsm.a
 LIBBSNMP?=	${DESTDIR}${LIBDIR}/libbsnmp.a
 LIBBZ2?=	${DESTDIR}${LIBDIR}/libbz2.a
 LIBC?=		${DESTDIR}${LIBDIR}/libc.a
 LIBC_PIC?=	${DESTDIR}${LIBDIR}/libc_pic.a
 LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a
 LIBCAM?=	${DESTDIR}${LIBDIR}/libcam.a
 LIBCOM_ERR?=	${DESTDIR}${LIBDIR}/libcom_err.a
 LIBCOMPAT?=	${DESTDIR}${LIBDIR}/libcompat.a
 LIBCRYPT?=	${DESTDIR}${LIBDIR}/libcrypt.a
 LIBCRYPTO?=	${DESTDIR}${LIBDIR}/libcrypto.a
 LIBCTF?=	${DESTDIR}${LIBDIR}/libctf.a
 LIBCURSES?=	${DESTDIR}${LIBDIR}/libcurses.a
 LIBDEVINFO?=	${DESTDIR}${LIBDIR}/libdevinfo.a
 LIBDEVSTAT?=	${DESTDIR}${LIBDIR}/libdevstat.a
 LIBDIALOG?=	${DESTDIR}${LIBDIR}/libdialog.a
 LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
 LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
 LIBDTRACE?=	${DESTDIR}${LIBDIR}/libdtrace.a
 LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
 LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
 LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
 LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
 LIBFL?=		"don't use LIBFL, use LIBL"
 LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
 LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
 LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
 LIBGCC?=	${DESTDIR}${LIBDIR}/libgcc.a
 LIBGCC_PIC?=	${DESTDIR}${LIBDIR}/libgcc_pic.a
 LIBGEOM?=	${DESTDIR}${LIBDIR}/libgeom.a
 LIBGNUREGEX?=	${DESTDIR}${LIBDIR}/libgnuregex.a
 LIBGSSAPI?=	${DESTDIR}${LIBDIR}/libgssapi.a
 LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a
 LIBHDB?=	${DESTDIR}${LIBDIR}/libhdb.a
 LIBHISTORY?=	${DESTDIR}${LIBDIR}/libhistory.a
 LIBHEIMNTLM?=	${DESTDIR}${LIBDIR}/libheimntlm.a
 LIBHX509?=	${DESTDIR}${LIBDIR}/libhx509.a
 LIBIPSEC?=	${DESTDIR}${LIBDIR}/libipsec.a
 .if ${MK_IPX} != "no"
 LIBIPX?=	${DESTDIR}${LIBDIR}/libipx.a
 .endif
 .if ${MK_BIND_LIBS} != "no"
 LIBISC?=	${DESTDIR}${LIBDIR}/libisc.a
 LIBISCCC?=	${DESTDIR}${LIBDIR}/libisccc.a
 LIBISCCFG?=	${DESTDIR}${LIBDIR}/libisccfg.a
 .endif
 LIBJAIL?=	${DESTDIR}${LIBDIR}/libjail.a
 LIBKADM5CLNT?=	${DESTDIR}${LIBDIR}/libkadm5clnt.a
 LIBKADM5SRV?=	${DESTDIR}${LIBDIR}/libkadm5srv.a
 LIBKAFS5?=	${DESTDIR}${LIBDIR}/libkafs5.a
 LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
 LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
 LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
 LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=		${DESTDIR}${LIBDIR}/libl.a
 LIBLN?=		"don't use LIBLN, use LIBL"
 .if ${MK_BIND} != "no"
 LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
 .endif
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
 LIBMAGIC?=	${DESTDIR}${LIBDIR}/libmagic.a
 LIBMD?=		${DESTDIR}${LIBDIR}/libmd.a
 LIBMEMSTAT?=	${DESTDIR}${LIBDIR}/libmemstat.a
 LIBMENU?=	${DESTDIR}${LIBDIR}/libmenu.a
 .if ${MK_SENDMAIL} != "no"
 LIBMILTER?=	${DESTDIR}${LIBDIR}/libmilter.a
 .endif
 LIBMP?=		${DESTDIR}${LIBDIR}/libmp.a
 .if ${MK_NCP} != "no"
 LIBNCP?=	${DESTDIR}${LIBDIR}/libncp.a
 .endif
 LIBNCURSES?=	${DESTDIR}${LIBDIR}/libncurses.a
 LIBNCURSESW?=	${DESTDIR}${LIBDIR}/libncursesw.a
 LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnetgraph.a
 LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a
 LIBNVPAIR?=	${DESTDIR}${LIBDIR}/libnvpair.a
 LIBOBJC?=	${DESTDIR}${LIBDIR}/libobjc.a
 LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
 
 # The static PAM library doesn't know its secondary dependencies,
 # so we have to specify them explicitly.
 LIBPAM?=	${DESTDIR}${LIBDIR}/libpam.a
 MINUSLPAM=	-lpam
 .if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
 .if ${MK_KERBEROS} != "no"
 LIBPAM+=	${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
 		${LIBROKEN} ${LIBCOM_ERR}
 MINUSLPAM+=	-lkrb5 -lhx509 -lasn1 -lcrypto -lcrypt -lroken -lcom_err
 .endif
 LIBPAM+=	${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \
 		${LIBUTIL} ${LIBOPIE} ${LIBMD}
 MINUSLPAM+=	-lradius -ltacplus -lcrypt \
 		-lutil -lopie -lmd
 .if ${MK_OPENSSH} != "no"
 LIBPAM+=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
 MINUSLPAM+=	-lssh -lcrypto -lcrypt
 .endif
 .if ${MK_NIS} != "no"
 LIBPAM+=	${LIBYPCLNT}
 MINUSLPAM+=	-lypclnt
 .endif
 .endif
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
 LIBREADLINE?=	${DESTDIR}${LIBDIR}/libreadline.a
 LIBROKEN?=	${DESTDIR}${LIBDIR}/libroken.a
 LIBRPCSVC?=	${DESTDIR}${LIBDIR}/librpcsvc.a
+LIBRPCSEC_GSS?=	${DESTDIR}${LIBDIR}/librpcsec_gss.a
+LIBRT?=		${DESTDIR}${LIBDIR}/librt.a
 LIBSBUF?=	${DESTDIR}${LIBDIR}/libsbuf.a
 LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
 LIBSSH?=	${DESTDIR}${LIBDIR}/libssh.a
 LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a
 LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
 LIBTACPLUS?=	${DESTDIR}${LIBDIR}/libtacplus.a
 LIBTERMCAP?=	${DESTDIR}${LIBDIR}/libtermcap.a
 LIBTERMLIB?=	"don't use LIBTERMLIB, use LIBTERMCAP"
 LIBTINFO?=	"don't use LIBTINFO, use LIBNCURSES"
 LIBUFS?=	${DESTDIR}${LIBDIR}/libufs.a
 LIBUGIDFW?=	${DESTDIR}${LIBDIR}/libugidfw.a
 LIBUMEM?=	${DESTDIR}${LIBDIR}/libumem.a
 LIBUSBHID?=	${DESTDIR}${LIBDIR}/libusbhid.a
 LIBUSB?=	${DESTDIR}${LIBDIR}/libusb.a
 LIBULOG?=	${DESTDIR}${LIBDIR}/libulog.a
 LIBUTIL?=	${DESTDIR}${LIBDIR}/libutil.a
 LIBUUTIL?=	${DESTDIR}${LIBDIR}/libuutil.a
 LIBVGL?=	${DESTDIR}${LIBDIR}/libvgl.a
 LIBWRAP?=	${DESTDIR}${LIBDIR}/libwrap.a
 LIBXPG4?=	${DESTDIR}${LIBDIR}/libxpg4.a
 LIBY?=		${DESTDIR}${LIBDIR}/liby.a
 LIBYPCLNT?=	${DESTDIR}${LIBDIR}/libypclnt.a
 LIBZ?=		${DESTDIR}${LIBDIR}/libz.a
 LIBZFS?=	${DESTDIR}${LIBDIR}/libzfs.a
 LIBZPOOL?=	${DESTDIR}${LIBDIR}/libzpool.a
Index: head/tools/regression/file/closefrom/Makefile
===================================================================
--- head/tools/regression/file/closefrom/Makefile	(revision 204310)
+++ head/tools/regression/file/closefrom/Makefile	(revision 204311)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PROG=	closefrom
 MAN=
 WARNS?=	6
-
+DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
 .include <bsd.prog.mk>
Index: head/tools/regression/file/flock/Makefile
===================================================================
--- head/tools/regression/file/flock/Makefile	(revision 204310)
+++ head/tools/regression/file/flock/Makefile	(revision 204311)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PROG=	flock
 NO_MAN=
 WARNS?=	6
-
-LDADD+=	-lpthread
+DPADD=	${LIBPTHREAD}
+LDADD=	-lpthread
 
 .include <bsd.prog.mk>
Index: head/tools/regression/gaithrstress/Makefile
===================================================================
--- head/tools/regression/gaithrstress/Makefile	(revision 204310)
+++ head/tools/regression/gaithrstress/Makefile	(revision 204311)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PROG=	gaithrstress
-LDADD+=	-pthread
+DPADD=	${LIBPTHREAD}
+LDADD=	-lpthread
 
 NO_MAN=
 .include <bsd.prog.mk>
Index: head/tools/regression/kgssapi/Makefile
===================================================================
--- head/tools/regression/kgssapi/Makefile	(revision 204310)
+++ head/tools/regression/kgssapi/Makefile	(revision 204311)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PROG=	gsstest
 NO_MAN=
 WARNS?=	2
+DPADD=	${LIBGSSAPI} ${LIBGSSAPI_KRB5}
 LDADD=	-lgssapi -lgssapi_krb5
 DEBUG_FLAGS= -g -O0
 
 .include <bsd.prog.mk>
Index: head/tools/regression/mqueue/mqtest1/Makefile
===================================================================
--- head/tools/regression/mqueue/mqtest1/Makefile	(revision 204310)
+++ head/tools/regression/mqueue/mqtest1/Makefile	(revision 204311)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=mqtest1
-LDADD+=-lrt
+DPADD=	${LIBRT}
+LDADD=	-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/mqueue/mqtest2/Makefile
===================================================================
--- head/tools/regression/mqueue/mqtest2/Makefile	(revision 204310)
+++ head/tools/regression/mqueue/mqtest2/Makefile	(revision 204311)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=mqtest2
-LDADD+=-lrt
+DPADD=	${LIBRT}
+LDADD=	-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/mqueue/mqtest3/Makefile
===================================================================
--- head/tools/regression/mqueue/mqtest3/Makefile	(revision 204310)
+++ head/tools/regression/mqueue/mqtest3/Makefile	(revision 204311)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=mqtest3
-LDADD+=-lrt
+DPADD=	${LIBRT}
+LDADD=	-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/mqueue/mqtest4/Makefile
===================================================================
--- head/tools/regression/mqueue/mqtest4/Makefile	(revision 204310)
+++ head/tools/regression/mqueue/mqtest4/Makefile	(revision 204311)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=mqtest4
-LDADD+=-lrt
+DPADD=	${LIBRT}
+LDADD=	-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/mqueue/mqtest5/Makefile
===================================================================
--- head/tools/regression/mqueue/mqtest5/Makefile	(revision 204310)
+++ head/tools/regression/mqueue/mqtest5/Makefile	(revision 204311)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=mqtest5
-LDADD+=-lrt
+DPADD=	${LIBRT}
+LDADD=	-lrt
 NO_MAN=
 DEBUG_FLAGS=-g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/netipx/ipxdgramloopback/Makefile
===================================================================
--- head/tools/regression/netipx/ipxdgramloopback/Makefile	(revision 204310)
+++ head/tools/regression/netipx/ipxdgramloopback/Makefile	(revision 204311)
@@ -1,12 +1,12 @@
 #
 # $FreeBSD$
 #
 
 PROG=	ipxdgramloopback
 NO_MAN=
 
-DPADD=	${LIBIPX};
+DPADD=	${LIBIPX}
 LDADD=	-lipx
 WARNS?=	3
 
 .include <bsd.prog.mk>
Index: head/tools/regression/netipx/spxabort/Makefile
===================================================================
--- head/tools/regression/netipx/spxabort/Makefile	(revision 204310)
+++ head/tools/regression/netipx/spxabort/Makefile	(revision 204311)
@@ -1,12 +1,12 @@
 #
 # $FreeBSD$
 #
 
 PROG=	spxabort
 NO_MAN=
 
-DPADD=	${LIBIPX};
+DPADD=	${LIBIPX}
 LDADD=	-lipx
 WARNS?=	3
 
 .include <bsd.prog.mk>
Index: head/tools/regression/netipx/spxloopback/Makefile
===================================================================
--- head/tools/regression/netipx/spxloopback/Makefile	(revision 204310)
+++ head/tools/regression/netipx/spxloopback/Makefile	(revision 204311)
@@ -1,12 +1,12 @@
 #
 # $FreeBSD$
 #
 
 PROG=	spxloopback
 NO_MAN=
 
-DPADD=	${LIBIPX};
+DPADD=	${LIBIPX}
 LDADD=	-lipx
 WARNS?=	3
 
 .include <bsd.prog.mk>
Index: head/tools/regression/pthread/cv_cancel1/Makefile
===================================================================
--- head/tools/regression/pthread/cv_cancel1/Makefile	(revision 204310)
+++ head/tools/regression/pthread/cv_cancel1/Makefile	(revision 204311)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PROG=	cv_cancel1
 NO_MAN=
-
+DPADD=	${LIBPTHREAD}
 LDADD=	-lpthread
 
 .include <bsd.prog.mk>
Index: head/tools/regression/pthread/mutex_isowned_np/Makefile
===================================================================
--- head/tools/regression/pthread/mutex_isowned_np/Makefile	(revision 204310)
+++ head/tools/regression/pthread/mutex_isowned_np/Makefile	(revision 204311)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PROG=	mutex_isowned_np
 NO_MAN=
-
+DPADD=	${LIBPTHREAD}
 LDADD=	-lpthread
 
 .include <bsd.prog.mk>
Index: head/tools/regression/rpcsec_gss/Makefile
===================================================================
--- head/tools/regression/rpcsec_gss/Makefile	(revision 204310)
+++ head/tools/regression/rpcsec_gss/Makefile	(revision 204311)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
 PROG=	rpctest
 NO_MAN=
 WARNS?=	6
+DPADD=	${LIBRPCSEC_GSS}
 LDADD=	-lrpcsec_gss
 DEBUG_FLAGS= -g -O0
 
 .include <bsd.prog.mk>
Index: head/tools/regression/sigqueue/sigqtest1/Makefile
===================================================================
--- head/tools/regression/sigqueue/sigqtest1/Makefile	(revision 204310)
+++ head/tools/regression/sigqueue/sigqtest1/Makefile	(revision 204311)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=sigqtest1
-LDADD+=
 NO_MAN=
 DEBUG_FLAGS=-g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/sigqueue/sigqtest2/Makefile
===================================================================
--- head/tools/regression/sigqueue/sigqtest2/Makefile	(revision 204310)
+++ head/tools/regression/sigqueue/sigqtest2/Makefile	(revision 204311)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=sigqtest2
-LDADD+=
 NO_MAN=
 DEBUG_FLAGS=-g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/sockets/sendfile/Makefile
===================================================================
--- head/tools/regression/sockets/sendfile/Makefile	(revision 204310)
+++ head/tools/regression/sockets/sendfile/Makefile	(revision 204311)
@@ -1,10 +1,11 @@
 #
 # $FreeBSD$
 #
 
 PROG=	sendfile
 NO_MAN=
 WARNS?=	6
-LDADD = -lmd
+DPADD=	${LIBMD}
+LDADD=	-lmd
 
 .include <bsd.prog.mk>
Index: head/tools/regression/tls/libxx/Makefile
===================================================================
--- head/tools/regression/tls/libxx/Makefile	(revision 204310)
+++ head/tools/regression/tls/libxx/Makefile	(revision 204311)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
-LIB=		xx
-SHLIB_MAJOR=	1
+SHLIB_NAME=	libxx.so
 
 SRCS=	xx.c
 #CFLAGS+=-mtls-dialect=sun
 
 .include <bsd.lib.mk>
Index: head/tools/regression/tls/libyy/Makefile
===================================================================
--- head/tools/regression/tls/libyy/Makefile	(revision 204310)
+++ head/tools/regression/tls/libyy/Makefile	(revision 204311)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
-LIB=		yy
-SHLIB_MAJOR=	1
+SHLIB_NAME=	libyy.so
 
 SRCS=	yy.c
 CFLAGS+=-fpic
 
 .include <bsd.lib.mk>
Index: head/tools/regression/tls/ttls1/Makefile
===================================================================
--- head/tools/regression/tls/ttls1/Makefile	(revision 204310)
+++ head/tools/regression/tls/ttls1/Makefile	(revision 204311)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PROG=	ttls1
-LDADD+=	-L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx
-LDADD+=	-L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy
+LDFLAGS+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx
+LDFLAGS+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy
 NO_MAN=
 DEBUG_FLAGS= -g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/tls/ttls2/Makefile
===================================================================
--- head/tools/regression/tls/ttls2/Makefile	(revision 204310)
+++ head/tools/regression/tls/ttls2/Makefile	(revision 204311)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=	ttls2
-LDADD+= -lpthread
+DPADD=	${LIBPTHREAD}
+LDADD=	-lpthread
 NO_MAN=
 DEBUG_FLAGS= -g
 
 .include <bsd.prog.mk>
Index: head/tools/regression/tls/ttls4/Makefile
===================================================================
--- head/tools/regression/tls/ttls4/Makefile	(revision 204310)
+++ head/tools/regression/tls/ttls4/Makefile	(revision 204311)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=	ttls4
-LDADD+=	-lpthread
+DPADD=	${LIBPTHREAD}
+LDADD=	-lpthread
 NO_MAN=
 DEBUG_FLAGS= -g
 
 .include <bsd.prog.mk>
Index: head/tools/tools/ether_reflect/Makefile
===================================================================
--- head/tools/tools/ether_reflect/Makefile	(revision 204310)
+++ head/tools/tools/ether_reflect/Makefile	(revision 204311)
@@ -1,10 +1,10 @@
 #
 # $FreeBSD$
 #
 # A Makefile that builds both the ether_reflect program and its manual page.
 
 PROG=   ether_reflect
-
-LDADD+= -lpcap
+DPADD=	${LIBPCAP}
+LDADD=	-lpcap
 
 .include <bsd.prog.mk>
Index: head/tools/tools/net80211/stumbler/Makefile
===================================================================
--- head/tools/tools/net80211/stumbler/Makefile	(revision 204310)
+++ head/tools/tools/net80211/stumbler/Makefile	(revision 204311)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PROG=	stumbler
 BINDIR=	/usr/local/bin
-DPADD=	${LIBPCAP}
+DPADD=	${LIBPCAP} ${LIBNCURSES}
 LDADD=	-lpcap -lncurses
 CFLAGS=-g
 NO_MAN=
 
 .include <bsd.prog.mk>
Index: head/tools/tools/net80211/w00t/Makefile.inc
===================================================================
--- head/tools/tools/net80211/w00t/Makefile.inc	(revision 204310)
+++ head/tools/tools/net80211/w00t/Makefile.inc	(revision 204311)
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
 W00T=	../libw00t
 # NB: we get crc32 from -lz
 DPADD=	${W00T}/libw00t.a ${LIBCRYPTO} ${LIBZ}
-LDADD=	-L${W00T} -lw00t  -lcrypto -lz
+LDFLAGS= -L${W00T}
+LDADD=	-lw00t  -lcrypto -lz
 
 BINDIR=	/usr/local/bin
 CFLAGS=	-g -I${W00T}
 
 NO_MAN=