Convert to LIBADD

Reduce overlinking

gnu/lib/libdialog/Makefile

@@ -13,8 +13,7 @@ SRCS=		argv.c arrows.c buildlist.c buttons.c calendar.c checklist.c \
 INCS=		dialog.h dlg_colors.h dlg_config.h dlg_keys.h
 MAN=		dialog.3
 
-DPADD=		${LIBNCURSESW} ${LIBM}
+LIBADD=		ncursesw m
-LDADD=		-lncursesw -lm
 
 CFLAGS+= 	-I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused
 .PATH:		${DIALOG}

gnu/lib/libgcc/Makefile

@@ -28,8 +28,7 @@ CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
 		-I${.CURDIR}/../../usr.bin/cc/cc_tools
 
 LDFLAGS+=	-nodefaultlibs
-DPADD+=		${LIBC}
+LIBADD+=	c
-LDADD+=		-lc
 
 OBJS=		# added to below in various ways depending on TARGET_CPUARCH
 
@@ -119,8 +118,7 @@ LIB1ASMSRC =	lib1funcs.asm
 LIB1ASMFUNCS =  _dvmd_tls _bb_init_func
 LIB2ADDEH =	unwind-arm.c libunwind.S pr-support.c unwind-c.c
 # Some compilers generate __aeabi_ functions libgcc_s is missing
-DPADD+=		${LIBCOMPILER_RT}
+LIBADD+=	compiler_rt
-LDADD+=		-lcompiler_rt
 .endif
 
 .if ${TARGET_CPUARCH} == mips

gnu/lib/libreadline/readline/Makefile

@@ -23,7 +23,6 @@ ${.OBJDIR}/${_h}:	${SRCDIR}/${_h}
 	${INSTALL} ${.ALLSRC} ${.TARGET}
 .endfor
 
-DPADD=	${LIBTERMCAPW}
+LIBADD=	ncursesw
-LDADD=	-ltermcapw
 
 .include <bsd.lib.mk>

gnu/lib/libstdc++/Makefile

@@ -23,8 +23,8 @@ CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
 		-Wno-deprecated
 PO_CXXFLAGS=	${CXXFLAGS:N-ffunction-sections}
 
-DPADD=		${LIBM}
+LIBADD+=	m
-LDADD=		-lm  -Wl,-f,libsupc++.so.1
+LDADD=		-Wl,-f,libsupc++.so.1
 
 # libstdc++ sources
 SRCS+=	bitmap_allocator.cc pool_allocator.cc \

gnu/usr.bin/dialog/Makefile

@@ -3,8 +3,7 @@
 DIALOG=	${.CURDIR}/../../../contrib/dialog
 PROG=   dialog
 
-DPADD=	${LIBDIALOG} ${LIBNCURSESW} ${LIBM}
+LIBADD=	dialog ncursesw m
-LDADD=	-ldialog -lncursesw -lm
 CFLAGS+= -I${.CURDIR} -I${DIALOG}
 .PATH:	${DIALOG}
 

gnu/usr.bin/diff/Makefile

@@ -26,8 +26,7 @@ CFLAGS+=-I${DESTDIR}/usr/include/gnu
 
 SUBDIR+=doc
 
-DPADD=	${LIBGNUREGEX}
+LIBADD+=	gnuregex
-LDADD=	-lgnuregex
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests

gnu/usr.bin/gdb/gdb/Makefile

@@ -11,8 +11,9 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
+DPADD=	${GDBLIBS} ${BULIBS}
-LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
+LDADD=	${GDBLIBS} ${BULIBS}
+LIBADD+=	m readline ncursesw gnuregex
 
 .include <bsd.prog.mk>
 CFLAGS+=	-DDEBUGDIR=\"${DEBUGDIR}\"

gnu/usr.bin/gdb/gdbtui/Makefile

@@ -12,7 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
+DPADD=	${GDBLIBS} ${BULIBS}
-LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
+LDADD=	${GDBLIBS} ${BULIBS}
+LIBADD+=	m readline ncursesw gnuregex
 
 .include <bsd.prog.mk>

gnu/usr.bin/gdb/kgdb/Makefile

@@ -8,10 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 	${OBJ_BU}/libiberty/libiberty.a
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM}
-	${LIBGNUREGEX}
+LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX}
-LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \
+LIBADD+=	m readline ncursesw gnuregex
-	-lgnuregex
 
 .if defined(GDB_CROSS_DEBUGGER)
 CFLAGS+= -Wl,-export-dynamic

gnu/usr.bin/grep/Makefile

@@ -22,8 +22,7 @@ LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
 MLINKS=	grep.1 egrep.1 grep.1 fgrep.1
 .endif
 
-DPADD=	${LIBGNUREGEX} ${LIBBZ2}
+LIBADD=	gnuregex bz2
-LDADD=	-lgnuregex -lbz2
 
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/bzgrep \
@@ -33,8 +32,7 @@ MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 grep.1 bzfgrep.1
 .endif
 
 .if defined(GREP_LIBZ) && !empty(GREP_LIBZ)
-LDADD+=	-lz
+LIBADD+=	z
-DPADD+=	${LIBZ}
 CFLAGS+=-DHAVE_LIBZ=1
 .if ${MK_BSD_GREP} != "yes"
 LINKS+=	${BINDIR}/grep ${BINDIR}/zgrep \

libexec/atf/atf-check/Makefile

@@ -38,9 +38,7 @@ MAN=		atf-check.1
 CFLAGS+=	-I${ATF}
 CFLAGS+=	-DATF_SHELL='"/bin/sh"'
 
-DPADD+=		${LIBATF_CXX} ${LIBATF_C}
+LIBADD=		atf_cxx
-LDADD+=		${LDATF_CXX} ${LDATF_C}
-USEPRIVATELIB=	atf-c++ atf-c
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests

libexec/atf/atf-sh/Makefile

@@ -42,9 +42,7 @@ CFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
 CFLAGS+=	-DATF_SHELL='"/bin/sh"'
 CFLAGS+=	-I${ATF}
 
-DPADD+=		${LIBATF_C} ${LIBATF_CXX}
+LIBADD=		atf_cxx
-LDADD+=		${LDATF_C} ${LDATF_CXX}
-USEPRIVATELIB=	atf-c++ atf-c
 
 FILESGROUPS=	SUBR
 

libexec/atrun/Makefile

@@ -17,8 +17,7 @@ CFLAGS+=-DLOGIN_CAP -DPAM
 WARNS?=	2
 WFORMAT=0
 
-DPADD=	${LIBPAM} ${LIBUTIL}
+LIBADD=	pam util
-LDADD=	${MINUSLPAM} -lutil
 
 atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \

libexec/casper/dns/Makefile

@@ -6,8 +6,7 @@ PROG=	dns
 
 SRCS=	dns.c
 
-DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LIBADD=	casper nv
-LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
 
 BINDIR=	/libexec/casper
 

libexec/casper/grp/Makefile

@@ -6,8 +6,7 @@ PROG=	grp
 
 SRCS=	grp.c
 
-DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LIBADD=	casper nv pjdlog
-LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
 
 BINDIR=	/libexec/casper
 

libexec/casper/pwd/Makefile

@@ -6,8 +6,7 @@ PROG=	pwd
 
 SRCS=	pwd.c
 
-DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LIBADD=	casper nv pjdlog
-LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
 
 BINDIR=	/libexec/casper
 

libexec/casper/random/Makefile

@@ -6,8 +6,7 @@ PROG=	random
 
 SRCS=	random.c
 
-DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LIBADD=	casper nv
-LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
 
 BINDIR=	/libexec/casper
 

libexec/casper/sysctl/Makefile

@@ -6,8 +6,7 @@ PROG=	sysctl
 
 SRCS=	sysctl.c
 
-DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LIBADD=	casper nv pjdlog
-LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
 
 BINDIR=	/libexec/casper
 

libexec/dma/Makefile

@@ -8,8 +8,7 @@ CFLAGS=	-I${.CURDIR}/../../contrib/dma \
 	-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \
 	-DDMA_ROOT_USER='"mailnull"' \
 	-DDMA_GROUP='"mail"'
-DPADD=	${LIBSSL} ${LIBCRYPTO}
+LIBADD=	ssl crypto
-LDADD=	-lssl -lcrypto
 
 PROG=	dma
 SRCS=	aliases_parse.y \

libexec/fingerd/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PROG=	fingerd
-DPADD=	${LIBUTIL}
+LIBADD=	util
-LDADD=	-lutil
 MAN=	fingerd.8
 
 WARNS?=	2

libexec/ftpd/Makefile

@@ -13,19 +13,16 @@ YFLAGS=
 WARNS?=	2
 WFORMAT=0
 
-DPADD=	${LIBUTIL} ${LIBCRYPT}
+LIBADD=	util crypt
-LDADD=	-lutil -lcrypt
 
 # XXX Kluge! Conversation mechanism needs to be fixed.
-DPADD+=	${LIBOPIE} ${LIBMD}
+LIBADD+=	opie md
-LDADD+=	-lopie -lmd
 
 LSDIR=	../../bin/ls
 .PATH:	${.CURDIR}/${LSDIR}
 SRCS+=	ls.c cmp.c print.c util.c
 CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR}
-DPADD+=	${LIBM}
+LIBADD+=	m
-LDADD+=	-lm
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
@@ -33,8 +30,7 @@ CFLAGS+=-DINET6
 
 .if ${MK_PAM_SUPPORT} != "no"
 CFLAGS+=-DUSE_PAM
-DPADD+= ${LIBPAM}
+LIBADD+=	pam
-LDADD+= ${MINUSLPAM}
 .endif
 
 .include <bsd.prog.mk>

libexec/getty/Makefile

@@ -3,8 +3,7 @@
 
 PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
-DPADD=	${LIBUTIL}
+LIBADD=	util
-LDADD=	-lutil
 MAN=	gettytab.5 ttys.5 getty.8
 
 WARNS?=	1

libexec/mail.local/Makefile

@@ -12,11 +12,7 @@ CFLAGS+=-I${SENDMAIL_DIR}/include -I.
 WARNS?=	2
 WFORMAT=0
 
-LIBSMDIR=	${.OBJDIR}/../../lib/libsm
+LIBADD=	sm
-LIBSM=		${LIBSMDIR}/libsm.a
-
-DPADD=	${LIBSM}
-LDADD=	${LIBSM}
 
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h

libexec/pppoed/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	pppoed
-DPADD=	${LIBNETGRAPH}
+LIBADD=	netgraph
-LDADD=	-lnetgraph
 MAN=	pppoed.8
 
 WARNS?=	1

libexec/rlogind/Makefile

@@ -5,8 +5,7 @@
 
 PROG=	rlogind
 MAN=	rlogind.8
-DPADD=	${LIBUTIL}
+LIBADD=	util
-LDADD=	-lutil
 WARNS?=	2
 
 .if ${MK_INET6_SUPPORT} != "no"

libexec/rpc.rquotad/Makefile

@@ -4,7 +4,6 @@ PROG =	rpc.rquotad
 SRCS =	rquotad.c
 MAN  =	rpc.rquotad.8
 
-DPADD=	${LIBRPCSVC} ${LIBUTIL}
+LIBADD=	rpcsvc util
-LDADD=	-lrpcsvc -lutil
 
 .include <bsd.prog.mk>

libexec/rpc.rstatd/Makefile

@@ -4,8 +4,7 @@ PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c
 MAN =	rpc.rstatd.8
 
-DPADD=	${LIBRPCSVC} ${LIBUTIL} ${LIBDEVSTAT} ${LIBKVM}
+LIBADD=	rpcsvc devstat
-LDADD=	-lrpcsvc -lutil -ldevstat -lkvm
 
 WARNS?=	1
 

libexec/rpc.rusersd/Makefile

@@ -4,8 +4,7 @@ PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c extern.h
 MAN =	rpc.rusersd.8
 
-DPADD=	${LIBRPCSVC} ${LIBUTIL}
+LIBADD=	rpcsvc
-LDADD=	-lrpcsvc -lutil
 
 #.if exists(/usr/X11R6/include/X11/extensions/xidle.h)
 #CFLAGS+= -DXIDLE

libexec/rpc.rwalld/Makefile

@@ -4,8 +4,7 @@ PROG =	rpc.rwalld
 SRCS =	rwalld.c
 MAN =	rpc.rwalld.8
 
-DPADD=	${LIBUTIL}
+LIBADD=	util
-LDADD=	-lutil
 
 WARNS?=	2
 

libexec/rpc.sprayd/Makefile

@@ -4,8 +4,7 @@ PROG =	rpc.sprayd
 SRCS =	sprayd.c
 MAN =	rpc.sprayd.8
 
-DPADD=	${LIBRPCSVC}
+LIBADD=	rpcsvc
-LDADD=	-lrpcsvc
 
 WARNS?=	2
 

libexec/rshd/Makefile

@@ -7,7 +7,6 @@ MAN=	rshd.8
 WARNS?=	3
 WFORMAT=0
 
-DPADD=	${LIBUTIL} ${LIBPAM}
+LIBADD=	util pam
-LDADD=	-lutil ${MINUSLPAM}
 
 .include <bsd.prog.mk>

libexec/rtld-elf/Makefile

@@ -43,16 +43,14 @@ CFLAGS+=	-fpic
 .endif
 CFLAGS+=	-DPIC $(DEBUG)
 LDFLAGS+=	-shared -Wl,-Bsymbolic
-DPADD=		${LIBC_PIC}
+LIBADD=		c_pic
-LDADD=		-lc_pic
 
 .if ${MACHINE_CPUARCH} == "arm"
 # Some of the required math functions (div & mod) are implemented in
 # libcompiler_rt on ARM. The library also needs to be placed first to be
 # correctly linked. As some of the functions are used before we have
 # shared libraries.
-DPADD+=		${LIBCOMPILER_RT}
+LIBADD+=	compiler_rt
-LDADD+=		-lcompiler_rt
 .endif
 
 

libexec/smrsh/Makefile

@@ -9,11 +9,7 @@ SRCS=	smrsh.c
 MAN=	smrsh.8
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 
-LIBSMDIR=	${.OBJDIR}/../../lib/libsm
+LIBADD=	sm
-LIBSM=		${LIBSMDIR}/libsm.a
-
-DPADD=	${LIBSM}
-LDADD=	${LIBSM}
 
 WARNS?=	2
 

libexec/tcpd/Makefile

@@ -15,8 +15,7 @@ CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
 CFLAGS+=-DINET6
 .endif
 
-DPADD=	${LIBWRAP}
+LIBADD=	wrap
-LDADD=	-lwrap
 
 WARNS?=	1
 

libexec/telnetd/Makefile

@@ -29,20 +29,17 @@ CFLAGS+=	-I${TELNETDIR}/telnet
 
 LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
 
-DPADD=		${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET}
+LIBADD=		telnet util ncursesw
-LDADD=		-lutil -ltermcapw ${LIBTELNET}
 
 .if ${MK_OPENSSL} != "no"
 SRCS+=		authenc.c
 CFLAGS+=	-DAUTHENTICATION -DENCRYPTION
-DPADD+=		${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
+LIBADD+=	mp crypto pam
-LDADD+=		-lmp -lcrypto -lcrypt ${MINUSLPAM}
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+=	-DKRB5 -DFORWARD -Dnet_write=telnet_net_write
-DPADD+=		${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR}
+LIBADD+=	krb5 roken
-LDADD+=		-lkrb5 -lhx509 -lasn1 -lroken -lcom_err
 .endif
 
 .include <bsd.prog.mk>

libexec/tftpd/Makefile

@@ -7,7 +7,6 @@ SRCS=	tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c tftp-utils.c
 SRCS+=	tftpd.c
 WFORMAT=0
 
-DPADD=	${LIBWRAP}
+LIBADD=	wrap
-LDADD=	-lwrap
 
 .include <bsd.prog.mk>

libexec/ulog-helper/Makefile

@@ -5,7 +5,6 @@ BINOWN=	root
 BINMODE=4555
 MAN=
 
-DPADD=	${LIBULOG}
+LIBADD=	ulog
-LDADD=	-lulog
 
 .include <bsd.prog.mk>

libexec/ypxfr/Makefile

@@ -16,8 +16,7 @@ CFLAGS+= -I.
 WARNS?=	2
 WFORMAT=0
 
-DPADD=	${LIBRPCSVC}
+LIBADD=	rpcsvc
-LDADD=	-lrpcsvc
 
 CLEANFILES= ${GENSRCS}
 

secure/lib/libssh/Makefile

@@ -34,17 +34,14 @@ SRCS+=	getrrsetbyname.c
 LDNSDIR=	${.CURDIR}/../../../contrib/ldns
 CFLAGS+=	-DHAVE_LDNS=1 -I${LDNSDIR}
 SRCS+=	getrrsetbyname-ldns.c
-DPADD+=	${LIBLDNS}
+LIBADD+=	ldns
-LDADD+=	${LDLDNS}
-USEPRIVATELIB+= ldns
 .endif
 
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
-DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
+LIBADD+=	gssapi krb5 hx509 asn1 com_err md roken
-LDADD+=	-lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
 .endif
 
 .if ${MK_OPENSSH_NONE_CIPHER} != "no"
@@ -53,8 +50,7 @@ CFLAGS+= -DNONE_CIPHER_ENABLED
 
 NO_LINT=
 
-DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBZ}
+LIBADD+=	crypto crypt z
-LDADD+=	-lcrypto -lcrypt -lz
 
 .include <bsd.lib.mk>
 

secure/lib/libssl/Makefile

@@ -21,8 +21,7 @@ SRCS=	bio_ssl.c d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_meth.c d1_pkt.c \
 INCS=	dtls1.h kssl.h srtp.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
 INCSDIR=${INCLUDEDIR}/openssl
 
-DPADD=	${LIBCRYPTO}
+LIBADD=	crypto
-LDADD=	-lcrypto
 
 .include <bsd.lib.mk>
 

secure/libexec/sftp-server/Makefile

@@ -12,9 +12,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=  ${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -23,8 +21,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+=	${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypto crypto z
-LDADD+=	-lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/libexec/ssh-keysign/Makefile

@@ -8,9 +8,7 @@ MAN=	ssh-keysign.8
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 BINMODE=4555
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=	${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -19,8 +17,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/libexec/ssh-pkcs11-helper/Makefile

@@ -12,9 +12,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=	${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -23,8 +21,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/bdes/Makefile

@@ -5,7 +5,6 @@ PROG=	bdes
 
 WARNS?=	2
 
-DPADD=	${LIBCRYPTO}
+LIBADD=	crypto
-LDADD=	-lcrypto
 
 .include <bsd.prog.mk>

secure/usr.bin/openssl/Makefile

@@ -2,8 +2,7 @@
 
 PROG=	openssl
 
-DPADD=	${LIBSSL} ${LIBCRYPTO}
+LIBADD=	ssl crypto
-LDADD=	-lssl -lcrypto
 
 .if exists(Makefile.man)
 .include "Makefile.man"

secure/usr.bin/scp/Makefile

@@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=	${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -22,8 +20,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/sftp/Makefile

@@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH} ${LIBEDIT} ${LIBNCURSESW}
+LIBADD=	ssh edit
-LDADD=	${LDSSH} -ledit -lncursesw
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -22,8 +20,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIABDD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-add/Makefile

@@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=	${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -22,8 +20,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-agent/Makefile

@@ -11,9 +11,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=	${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -22,8 +20,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-keygen/Makefile

@@ -11,19 +11,14 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=	${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
-DPADD+=	${LIBLDNS}
+LIBADD+=	ldns
-LDADD+=	${LDLDNS}
-USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh-keyscan/Makefile

@@ -6,9 +6,7 @@ PROG=	ssh-keyscan
 SRCS=	ssh-keyscan.c roaming_dummy.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 
-DPADD=	${LIBSSH}
+LIBADD=	ssh
-LDADD=	${LDSSH}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -17,8 +15,7 @@ CFLAGS+=	-DHAVE_LDNS=1
 #USEPRIVATELIB+= ldns
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 

secure/usr.bin/ssh/Makefile

@@ -15,29 +15,23 @@ SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 SRCS+=	gss-genr.c
 
-DPADD=	${LIBSSH} ${LIBUTIL}
+LIBADD=	ssh util
-LDADD=	${LDSSH} -lutil
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
-DPADD+=	${LIBLDNS}
+LIBADD+=	ldns
-LDADD+=	${LDLDNS}
-USEPRIVATELIB+= ldns
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
-DPADD+=	 ${LIBGSSAPI}
+LIBADD+=	gssapi
-LDADD+=	 -lgssapi
 .endif
 
 .if ${MK_OPENSSH_NONE_CIPHER} != "no"
 CFLAGS+= -DNONE_CIPHER_ENABLED
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+=	crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 .if defined(LOCALBASE)
 CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\"

secure/usr.sbin/sshd/Makefile

@@ -25,9 +25,7 @@ SRCS+=	gss-genr.c
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 
-DPADD=	${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM}
+LIBADD=	ssh util wrap pam
-LDADD=	${LDSSH} -lutil -lwrap ${MINUSLPAM}
-USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
@@ -38,33 +36,29 @@ CFLAGS+=	-DHAVE_LDNS=1
 
 .if ${MK_AUDIT} != "no"
 CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR
-DPADD+=  ${LIBBSM}
+LIBADD+=	bsm
-LDADD+=  -lbsm
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} != "no"
 CFLAGS+= -include krb5_config.h
-DPADD+=	 ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \
+LIBADD+=	gssapi_krb5 gssapi krb5 hx509 asn1 com_err roken wind heimbase \
-	${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
+		heimipcc
-LDADD+=	 -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \
-	-lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC}
 .endif
 
 .if ${MK_OPENSSH_NONE_CIPHER} != "no"
 CFLAGS+= -DNONE_CIPHER_ENABLED
 .endif
 
-DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LIBADD+= crypt crypto z
-LDADD+= -lcrypt -lcrypto -lz
 
 # Fix the order of NEEDED entries for libthr and libc. The libthr
 # needs to interpose libc symbols, leaving the libthr loading as
 # dependency of krb causes reversed order and broken interposing. Put
 # the threading library last on the linker command line, just before
 # the -lc added by a compiler driver.
+# XXX In theory the framework now takes care of that, it needs to be checked
 .if ${MK_KERBEROS_SUPPORT} != "no"
-DPADD+= ${LIBPTHREAD}
+LIBADD+=	pthread
-LDADD+= -lpthread
 .endif
 
 .if defined(LOCALBASE)