Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Nov 2014 14:29:11 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r275042 - in head/usr.bin: . apply ar atm/sscop awk bc bluetooth/bthost bluetooth/btsockstat bluetooth/rfcomm_sppd bsdiff/bsdiff bsdiff/bspatch bzip2 calendar chkey chpass colldef compi...
Message-ID:  <201411251429.sAPETBfX090723@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Nov 25 14:29:10 2014
New Revision: 275042
URL: https://svnweb.freebsd.org/changeset/base/275042

Log:
  Convert to usr.bin/ to LIBADD
  Reduce overlinking

Modified:
  head/usr.bin/Makefile
  head/usr.bin/apply/Makefile
  head/usr.bin/ar/Makefile
  head/usr.bin/atm/sscop/Makefile
  head/usr.bin/awk/Makefile
  head/usr.bin/bc/Makefile
  head/usr.bin/bluetooth/bthost/Makefile
  head/usr.bin/bluetooth/btsockstat/Makefile
  head/usr.bin/bluetooth/rfcomm_sppd/Makefile
  head/usr.bin/bsdiff/bsdiff/Makefile
  head/usr.bin/bsdiff/bspatch/Makefile
  head/usr.bin/bzip2/Makefile
  head/usr.bin/calendar/Makefile
  head/usr.bin/chkey/Makefile
  head/usr.bin/chpass/Makefile
  head/usr.bin/colldef/Makefile
  head/usr.bin/compile_et/Makefile
  head/usr.bin/cpio/Makefile
  head/usr.bin/cpio/test/Makefile
  head/usr.bin/dc/Makefile
  head/usr.bin/dpv/Makefile
  head/usr.bin/drill/Makefile
  head/usr.bin/du/Makefile
  head/usr.bin/ee/Makefile
  head/usr.bin/enigma/Makefile
  head/usr.bin/fetch/Makefile
  head/usr.bin/file/Makefile
  head/usr.bin/fstat/Makefile
  head/usr.bin/ftp/Makefile
  head/usr.bin/gcore/Makefile
  head/usr.bin/grep/Makefile
  head/usr.bin/gzip/Makefile
  head/usr.bin/host/Makefile
  head/usr.bin/ipcrm/Makefile
  head/usr.bin/ipcs/Makefile
  head/usr.bin/iscsictl/Makefile
  head/usr.bin/kdump/Makefile
  head/usr.bin/keylogin/Makefile
  head/usr.bin/killall/Makefile
  head/usr.bin/ktrdump/Makefile
  head/usr.bin/less/Makefile
  head/usr.bin/limits/Makefile
  head/usr.bin/lock/Makefile
  head/usr.bin/login/Makefile
  head/usr.bin/lzmainfo/Makefile
  head/usr.bin/m4/Makefile
  head/usr.bin/makewhatis/Makefile
  head/usr.bin/minigzip/Makefile
  head/usr.bin/ministat/Makefile
  head/usr.bin/mkimg/Makefile
  head/usr.bin/mkulzma/Makefile
  head/usr.bin/mkuzip/Makefile
  head/usr.bin/msgs/Makefile
  head/usr.bin/nc/Makefile
  head/usr.bin/ncal/Makefile
  head/usr.bin/netstat/Makefile
  head/usr.bin/newgrp/Makefile
  head/usr.bin/newkey/Makefile
  head/usr.bin/nfsstat/Makefile
  head/usr.bin/opieinfo/Makefile
  head/usr.bin/opiekey/Makefile
  head/usr.bin/opiepasswd/Makefile
  head/usr.bin/pamtest/Makefile
  head/usr.bin/passwd/Makefile
  head/usr.bin/procstat/Makefile
  head/usr.bin/quota/Makefile
  head/usr.bin/rctl/Makefile
  head/usr.bin/rup/Makefile
  head/usr.bin/rusers/Makefile
  head/usr.bin/script/Makefile
  head/usr.bin/seq/Makefile
  head/usr.bin/smbutil/Makefile
  head/usr.bin/sort/Makefile
  head/usr.bin/split/Makefile
  head/usr.bin/su/Makefile
  head/usr.bin/systat/Makefile
  head/usr.bin/tabs/Makefile
  head/usr.bin/talk/Makefile
  head/usr.bin/tar/Makefile
  head/usr.bin/telnet/Makefile
  head/usr.bin/tftp/Makefile
  head/usr.bin/top/Makefile
  head/usr.bin/tput/Makefile
  head/usr.bin/truncate/Makefile
  head/usr.bin/tset/Makefile
  head/usr.bin/ul/Makefile
  head/usr.bin/units/Makefile
  head/usr.bin/unzip/Makefile
  head/usr.bin/usbhidaction/Makefile
  head/usr.bin/usbhidctl/Makefile
  head/usr.bin/vacation/Makefile
  head/usr.bin/vi/Makefile
  head/usr.bin/vmstat/Makefile
  head/usr.bin/w/Makefile
  head/usr.bin/wc/Makefile
  head/usr.bin/xinstall/Makefile
  head/usr.bin/xlint/lint1/Makefile
  head/usr.bin/xo/Makefile
  head/usr.bin/xz/Makefile
  head/usr.bin/xzdec/Makefile

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -134,7 +134,6 @@ SUBDIR=	alias \
 	printenv \
 	printf \
 	procstat \
-	protect \
 	rctl \
 	renice \
 	rev \

Modified: head/usr.bin/apply/Makefile
==============================================================================
--- head/usr.bin/apply/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/apply/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -4,8 +4,8 @@
 .include <src.opts.mk>
 
 PROG=	apply
-DPADD=	${LIBSBUF}
-LDADD=	-lsbuf
+
+LIBADD=	sbuf
 
 .if ${MK_TESTS} != "no"
 SUBDIR+= tests

Modified: head/usr.bin/ar/Makefile
==============================================================================
--- head/usr.bin/ar/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ar/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -5,8 +5,7 @@
 PROG=	ar
 SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
 
-DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBZ}
-LDADD=	-larchive -lelf -lz
+LIBADD=	archive elf
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 

Modified: head/usr.bin/atm/sscop/Makefile
==============================================================================
--- head/usr.bin/atm/sscop/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/atm/sscop/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -8,7 +8,6 @@ PROG=	sscop
 SRCS=	common.c sscop_main.c
 CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT
 
-DPADD=	${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM}
-LDADD=	-lbegemot -lnetgraph -lngatm
+LIBADD=	begemot ngatm
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/awk/Makefile
==============================================================================
--- head/usr.bin/awk/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/awk/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -10,8 +10,7 @@ CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC} -
 
 WARNS?=	1
 
-DPADD=	${LIBM}
-LDADD=	-lm
+LIBADD=	m
 
 LINKS=	${BINDIR}/awk ${BINDIR}/nawk
 MLINKS=	awk.1 nawk.1

Modified: head/usr.bin/bc/Makefile
==============================================================================
--- head/usr.bin/bc/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/bc/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -5,8 +5,7 @@ PROG=		bc
 SRCS=		bc.y scan.l tty.c
 CFLAGS+=	-I. -I${.CURDIR}
 
-DPADD+=		${LIBEDIT} ${LIBNCURSESW}
-LDADD+=		-ledit -lncursesw
+LIBADD=		edit
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 

Modified: head/usr.bin/bluetooth/bthost/Makefile
==============================================================================
--- head/usr.bin/bluetooth/bthost/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/bluetooth/bthost/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -3,7 +3,6 @@
 
 PROG=		bthost
 
-DPADD=		${LIBBLUETOOTH}
-LDADD=		-lbluetooth 
+LIBADD=		bluetooth
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/bluetooth/btsockstat/Makefile
==============================================================================
--- head/usr.bin/bluetooth/btsockstat/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/bluetooth/btsockstat/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -6,7 +6,6 @@ WARNS?=		2
 BINGRP=		kmem
 BINMODE=	2555
 
-DPADD=		${LIBBLUETOOTH} ${LIBKVM}
-LDADD=		-lbluetooth -lkvm
+LIBADD=		bluetooth kvm
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/bluetooth/rfcomm_sppd/Makefile
==============================================================================
--- head/usr.bin/bluetooth/rfcomm_sppd/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/bluetooth/rfcomm_sppd/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -5,7 +5,6 @@ PROG=		rfcomm_sppd
 SRCS=		rfcomm_sppd.c rfcomm_sdp.c
 WARNS?=		2
 
-DPADD=		${LIBBLUETOOTH} ${LIBSDP}
-LDADD=		-lbluetooth -lsdp -lutil
+LIBADD=		bluetooth sdp util
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/bsdiff/bsdiff/Makefile
==============================================================================
--- head/usr.bin/bsdiff/bsdiff/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/bsdiff/bsdiff/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,6 @@
 
 PROG=	bsdiff
 
-DPADD=	${LIBBZ2}
-LDADD=	-lbz2
+LIBADD=	bz2
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/bsdiff/bspatch/Makefile
==============================================================================
--- head/usr.bin/bsdiff/bspatch/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/bsdiff/bspatch/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,6 @@
 
 PROG=	bspatch
 
-DPADD=	${LIBBZ2}
-LDADD=	-lbz2
+LIBADD=	bz2
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/bzip2/Makefile
==============================================================================
--- head/usr.bin/bzip2/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/bzip2/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -8,8 +8,7 @@ CFLAGS+= -D_FILE_OFFSET_BITS=64
 
 WARNS?=	3
 
-DPADD=	${LIBBZ2}
-LDADD=	-lbz2
+LIBADD=	bz2
 
 LINKS=	${BINDIR}/bzip2 ${BINDIR}/bunzip2
 LINKS+=	${BINDIR}/bzip2 ${BINDIR}/bzcat

Modified: head/usr.bin/calendar/Makefile
==============================================================================
--- head/usr.bin/calendar/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/calendar/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -6,8 +6,7 @@
 PROG=	calendar
 SRCS=	calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
 	ostern.c paskha.c pom.c sunpos.c calcpp.c
-DPADD=	${LIBM}
-LDADD=	-lm
+LIBADD=	m
 INTER=          de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
 		hr_HR.ISO8859-2 hu_HU.ISO8859-2 pt_BR.ISO8859-1 \
 		pt_BR.UTF-8 ru_RU.KOI8-R ru_RU.UTF-8 uk_UA.KOI8-U

Modified: head/usr.bin/chkey/Makefile
==============================================================================
--- head/usr.bin/chkey/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/chkey/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -10,7 +10,6 @@ CFLAGS+= -I${.CURDIR}/../newkey
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
-DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
-LDADD=	-lrpcsvc -lmp -lcrypto
+LIBADD+=	rpcsvc mp
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/chpass/Makefile
==============================================================================
--- head/usr.bin/chpass/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/chpass/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -16,11 +16,9 @@ CFLAGS+= -DYP
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
 
-DPADD=	${LIBCRYPT} ${LIBUTIL}
-LDADD=	-lcrypt -lutil
+LIBADD=	crypt util
 .if ${MK_NIS} != "no"
-DPADD+=	${LIBYPCLNT}
-LDADD+=	-lypclnt
+LIBADD+=	ypclnt
 .endif 
 
 LINKS=	${BINDIR}/chpass ${BINDIR}/chfn

Modified: head/usr.bin/colldef/Makefile
==============================================================================
--- head/usr.bin/colldef/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/colldef/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -5,8 +5,7 @@ SRCS=	parse.y scan.l y.tab.h
 LFLAGS=	-8 -i
 CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
 CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT -DYY_NO_INPUT
-LDADD=	-ll
-DPADD=	${LIBL}
+LIBADD=	l
 
 WARNS?=	2
 

Modified: head/usr.bin/compile_et/Makefile
==============================================================================
--- head/usr.bin/compile_et/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/compile_et/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,12 +2,9 @@
 
 .PATH: ${.CURDIR}/../../contrib/com_err
 
-LIBVERS=	${.OBJDIR}/../../kerberos5/lib/libvers/libvers.a
-
 PROG=	compile_et
 SRCS=	compile_et.c parse.y lex.l
-LDADD=	-lroken ${LIBVERS}
-DPADD=	${LIBROKEN} ${LIBVERS}
+LIBADD=	roken vers
 CFLAGS+=-I. -I${.CURDIR}/../../contrib/com_err
 
 WARNS?=	0

Modified: head/usr.bin/cpio/Makefile
==============================================================================
--- head/usr.bin/cpio/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/cpio/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -23,15 +23,7 @@ CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIB
 # statically linked, cannot use -lcrypto, and are size sensitive.
 CFLAGS+= -DSMALLER
 .endif
-DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML}
-LDADD=	-larchive -lz -lbz2 -llzma -lbsdxml
-.if ${MK_OPENSSL} != "no"
-DPADD+=	${LIBCRYPTO}
-LDADD+= -lcrypto
-.else
-DPADD+= ${LIBMD}
-LDADD+= -lmd
-.endif
+LIBADD=	archive
 
 .if ${MK_ICONV} != "no"
 CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const

Modified: head/usr.bin/cpio/test/Makefile
==============================================================================
--- head/usr.bin/cpio/test/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/cpio/test/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -67,10 +67,9 @@ CLEANFILES+= list.h bsdcpio_test
 MAN=
 
 PROG=bsdcpio_test
-DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\"
 CFLAGS+=	-I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR}
-LDADD= -larchive -lz -lbz2 -llzma
+LIBADD=	archive
 #CFLAGS+= -static -g -O2 -Wall
 CFLAGS+= -g -O2 -Wall
 CFLAGS+= -I${.OBJDIR}

Modified: head/usr.bin/dc/Makefile
==============================================================================
--- head/usr.bin/dc/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/dc/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -3,7 +3,6 @@
 
 PROG=	dc
 SRCS=	dc.c bcode.c inout.c mem.c stack.c
-DPADD=	${LIBCRYPTO}
-LDADD=	-lcrypto
+LIBADD=	crypto
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/dpv/Makefile
==============================================================================
--- head/usr.bin/dpv/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/dpv/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -4,8 +4,7 @@ PROG=		dpv
 
 CFLAGS+=	-I${.CURDIR}
 
-DPADD=		${LIBDPV} ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL} ${LIBM}
-LDADD=		-ldpv -ldialog -lfigpar -lncursesw -lutil -lm
+LIBADD=		dpv dialog
 
 WARNS?=		6
 

Modified: head/usr.bin/drill/Makefile
==============================================================================
--- head/usr.bin/drill/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/drill/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -12,8 +12,6 @@ CFLAGS+= -I${LDNSDIR}
 NO_WERROR= true
 MAN=	drill.1
 
-DPADD+=	${LIBLDNS} ${LIBCRYPTO}
-LDADD+=	${LDLDNS} -lcrypto
-USEPRIVATELIB= ldns
+LIBADD=	ldns crypto
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/du/Makefile
==============================================================================
--- head/usr.bin/du/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/du/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	du
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+LIBADD=	util
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/ee/Makefile
==============================================================================
--- head/usr.bin/ee/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ee/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -8,8 +8,7 @@ CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHA
 PROG=	ee
 LINKS=	${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
 MLINKS=	ee.1 ree.1 ee.1 edit.1
-DPADD=	${LIBNCURSESW}
-LDADD=	-lncursesw
+LIBADD=	ncursesw
 
 WARNS?=	2
 

Modified: head/usr.bin/enigma/Makefile
==============================================================================
--- head/usr.bin/enigma/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/enigma/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -5,7 +5,6 @@ PROG=	enigma
 LINKS=	${BINDIR}/enigma ${BINDIR}/crypt
 MLINKS=	enigma.1 crypt.1
 
-DPADD=	${LIBCRYPT}
-LDADD=	-lcrypt
+LIBADD=	crypt
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/fetch/Makefile
==============================================================================
--- head/usr.bin/fetch/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/fetch/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,15 +1,7 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 PROG=		fetch
 CSTD?=		c99
-.if ${MK_OPENSSL} != "no"
-DPADD=		${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
-LDADD=		-lfetch -lssl -lcrypto
-.else
-DPADD=		${LIBFETCH} ${LIBMD}
-LDADD=		-lfetch -lmd
-.endif
+LIBADD=		fetch
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/file/Makefile
==============================================================================
--- head/usr.bin/file/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/file/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -31,8 +31,7 @@ MAGICPATH?=	/usr/share/misc
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR}/../../lib/libmagic
 
-DPADD=	${LIBMAGIC} ${LIBZ}
-LDADD=	-lmagic -lz
+LIBADD=	magic
 
 FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
 			${.CURDIR}/../../lib/libmagic/config.h

Modified: head/usr.bin/fstat/Makefile
==============================================================================
--- head/usr.bin/fstat/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/fstat/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -4,8 +4,7 @@
 PROG=	fstat
 SRCS=	fstat.c fuser.c main.c
 LINKS=	${BINDIR}/fstat ${BINDIR}/fuser
-DPADD=	${LIBKVM} ${LIBUTIL} ${LIBPROCSTAT}
-LDADD=	-lkvm -lutil -lprocstat
+LIBADD=	procstat
 
 MAN1=	fuser.1 fstat.1
 

Modified: head/usr.bin/ftp/Makefile
==============================================================================
--- head/usr.bin/ftp/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ftp/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -20,8 +20,7 @@ CFLAGS+= -DINET6
 .endif
 
 CFLAGS+= -I${.CURDIR} -I${TNFTP}
-LDADD=	-ledit -ltermcapw
-DPADD=	${LIBEDIT} ${LIBTERMCAPW}
+LIBADD=	edit
 
 WARNS?=	2
 

Modified: head/usr.bin/gcore/Makefile
==============================================================================
--- head/usr.bin/gcore/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/gcore/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -3,8 +3,7 @@
 
 PROG=	gcore
 SRCS=	elfcore.c gcore.c
-DPADD=	${LIBSBUF} ${LIBUTIL}
-LDADD=	-lsbuf -lutil
+LIBADD=	sbuf util
 
 .if ${MACHINE_ARCH} == "amd64"
 SRCS+=	elf32core.c

Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/grep/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -40,12 +40,10 @@ MLINKS= grep.1 egrep.1 \
 	grep.1 lzfgrep.1
 .endif
 
-LDADD=	-lz
-DPADD=	${LIBZ}
+LIBADD=	z
 
 .if ${MK_LZMA_SUPPORT} != "no"
-LDADD+=	-llzma
-DPADD+=	${LIBLZMA}
+LIBADD+=	lzma
 
 LINKS+=	${BINDIR}/${PROG} ${BINDIR}/xzgrep \
 	${BINDIR}/${PROG} ${BINDIR}/xzegrep \
@@ -58,8 +56,7 @@ CFLAGS+= -DWITHOUT_LZMA
 .endif
 
 .if ${MK_BZIP2_SUPPORT} != "no"
-LDADD+=	-lbz2
-DPADD+=	${LIBBZ2}
+LIBADD+=	bz2
 
 .if ${MK_BSD_GREP} == "yes"
 LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
@@ -75,8 +72,7 @@ CFLAGS+= -DWITHOUT_BZIP2
 
 .if ${MK_GNU_GREP_COMPAT} != "no"
 CFLAGS+= -I${DESTDIR}/usr/include/gnu
-LDADD+=	-lgnuregex
-DPADD+=	${LIBGNUREGEX}
+LIBADD+=	gnuregex
 .endif
 
 .if ${MK_NLS} != "no"

Modified: head/usr.bin/gzip/Makefile
==============================================================================
--- head/usr.bin/gzip/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/gzip/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -6,12 +6,10 @@
 PROG=		gzip
 MAN=		gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
 
-DPADD=		${LIBZ} ${LIBLZMA}
-LDADD=		-lz -llzma
+LIBADD=		z lzma
 
 .if ${MK_BZIP2_SUPPORT} != "no"
-DPADD+=		${LIBBZ2}
-LDADD+=		-lbz2
+LIBADD+=	bz2
 .else
 CFLAGS+=	-DNO_BZIP2_SUPPORT
 .endif

Modified: head/usr.bin/host/Makefile
==============================================================================
--- head/usr.bin/host/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/host/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -15,8 +15,6 @@ host.1: ldns-host.1
 		(rm -rf ${.TARGET} ; false)
 
 CFLAGS+=	-I${LDNSDIR}
-DPADD+=		${LIBLDNS} ${LIBCRYPTO}
-LDADD+=		${LDLDNS} -lcrypto
-USEPRIVATELIB=	ldns
+LIBADD=		ldns
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/ipcrm/Makefile
==============================================================================
--- head/usr.bin/ipcrm/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ipcrm/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,8 +2,7 @@
 
 PROG=	ipcrm
 SRCS=	ipcrm.c ipc.c
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 CFLAGS+=-I${.CURDIR}/../ipcs
 .PATH:  ${.CURDIR}/../ipcs
 

Modified: head/usr.bin/ipcs/Makefile
==============================================================================
--- head/usr.bin/ipcs/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ipcs/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,8 +2,7 @@
 
 PROG=	ipcs
 SRCS=	ipcs.c ipc.c
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 
 WARNS?=	1
 

Modified: head/usr.bin/iscsictl/Makefile
==============================================================================
--- head/usr.bin/iscsictl/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/iscsictl/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -6,8 +6,7 @@ CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${.CURDIR}/../../sys/dev/iscsi
 MAN=		iscsictl.8
 
-DPADD=		${LIBCAM} ${LIBUTIL}
-LDADD=		-lcam -lutil
+LIBADD=		cam util
 
 YFLAGS+=	-v
 LFLAGS+=	-i

Modified: head/usr.bin/kdump/Makefile
==============================================================================
--- head/usr.bin/kdump/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/kdump/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -11,12 +11,11 @@ SFX=		32
 
 PROG=		kdump
 SRCS=		kdump_subr.c kdump.c ioctl.c subr.c
-DPSRCS=		kdump_subr.h 
+DPSRCS=		kdump_subr.h
 CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
 
 .if ${MK_CASPER} != "no"
-DPADD+=	${LIBCAPSICUM} ${LIBNV}
-LDADD+=	-lcapsicum -lnv
+LIBADD=	capsicum
 CFLAGS+=-DHAVE_LIBCAPSICUM
 .endif
 

Modified: head/usr.bin/keylogin/Makefile
==============================================================================
--- head/usr.bin/keylogin/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/keylogin/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,8 +2,7 @@
 
 PROG=	keylogin
 
-DPADD=	${LIBRPCSVC}
-LDADD=	-lrpcsvc
+LIBADD=	rpcsvc
 
 WARNS?=	0
 

Modified: head/usr.bin/killall/Makefile
==============================================================================
--- head/usr.bin/killall/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/killall/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	killall
-DPADD=	${LIBJAIL}
-LDADD=	-ljail
+LIBADD=	jail
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/ktrdump/Makefile
==============================================================================
--- head/usr.bin/ktrdump/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ktrdump/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=	ktrdump
-DPADD=	${LIBKVM}
-LDADD=	-lkvm
+LIBADD=	kvm
 MAN=	ktrdump.8
 
 WARNS?=	2

Modified: head/usr.bin/less/Makefile
==============================================================================
--- head/usr.bin/less/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/less/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -8,8 +8,7 @@ SRCS=	main.c screen.c brac.c ch.c charse
 	signal.c tags.c ttyin.c version.c
 SCRIPTS=lesspipe.sh zless.sh
 SCRIPTSNAME_lesspipe.sh=lesspipe.sh
-DPADD=	${LIBTERMCAPW}
-LDADD=	-ltermcapw
+LIBADD=	ncursesw
 LINKS=	${BINDIR}/less ${BINDIR}/more \
 	${BINDIR}/zless ${BINDIR}/bzless \
 	${BINDIR}/zless ${BINDIR}/xzless \

Modified: head/usr.bin/limits/Makefile
==============================================================================
--- head/usr.bin/limits/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/limits/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	limits
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+LIBADD=	util
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/lock/Makefile
==============================================================================
--- head/usr.bin/lock/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/lock/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -4,7 +4,7 @@
 PROG=	lock
 BINOWN=	root
 BINMODE=4555
-DPADD=	${LIBCRYPT}
-LDADD=	-lcrypt
+
+LIBADD=	crypt
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/login/Makefile
==============================================================================
--- head/usr.bin/login/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/login/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -6,16 +6,14 @@
 PROG=	login
 SRCS=	login.c login_fbtab.c
 CFLAGS+=-DLOGALL
-DPADD=	${LIBUTIL} ${LIBPAM}
-LDADD=	-lutil ${MINUSLPAM}
+LIBADD=	util pam
 
 WARNS?=	5
 
 .if ${MK_AUDIT} != "no"
 SRCS+=	login_audit.c
 CFLAGS+= -DUSE_BSM_AUDIT
-DPADD+=  ${LIBBSM}
-LDADD+=  -lbsm
+LIBADD+=	bsm
 .endif
 
 .if ${MK_SETUID_LOGIN} != "no"

Modified: head/usr.bin/lzmainfo/Makefile
==============================================================================
--- head/usr.bin/lzmainfo/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/lzmainfo/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -16,7 +16,6 @@ CFLAGS+=	-DHAVE_CONFIG_H \
 		-I${LZMALIBDIR} \
 		-I${XZDIR}/common
 
-DPADD=	${LIBLZMA}
-LDADD=	-llzma
+LIBADD=	lzma
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/m4/Makefile
==============================================================================
--- head/usr.bin/m4/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/m4/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -8,8 +8,7 @@
 
 PROG=	m4
 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
-DPADD=	${LIBY} ${LIBL} ${LIBM} ${LIBOHASH}
-LDADD=	-ly -ll -lm ${LDOHASH}
+LIBADD=	y l m ohash
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 

Modified: head/usr.bin/makewhatis/Makefile
==============================================================================
--- head/usr.bin/makewhatis/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/makewhatis/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PROG=		makewhatis
-DPADD=		${LIBZ}
-LDADD=		-lz
+LIBADD=		z
 SCRIPTS=	makewhatis.local.sh
 MAN=		makewhatis.1 makewhatis.local.8
 SCRIPTSDIR=	/usr/libexec

Modified: head/usr.bin/minigzip/Makefile
==============================================================================
--- head/usr.bin/minigzip/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/minigzip/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -7,7 +7,6 @@ PROG=	minigzip
 
 WARNS?=	5
 CFLAGS+=-DUSE_MMAP
-DPADD=	${LIBZ}
-LDADD=	-lz
+LIBADD=	z
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/ministat/Makefile
==============================================================================
--- head/usr.bin/ministat/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ministat/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 PROG=	ministat
-DPADD=	${LIBM}
-LDADD=	-lm
+
+LIBADD=	m
 
 .include <bsd.prog.mk>
 
 test:	${PROG}
-	./${PROG} < ${.CURDIR}/chameleon 
-	./${PROG} ${.CURDIR}/chameleon 
+	./${PROG} < ${.CURDIR}/chameleon
+	./${PROG} ${.CURDIR}/chameleon
 	./${PROG} ${.CURDIR}/iguana ${.CURDIR}/chameleon
 	./${PROG} -c 80 ${.CURDIR}/iguana ${.CURDIR}/chameleon
 	./${PROG} -s -c 80 ${.CURDIR}/chameleon ${.CURDIR}/iguana

Modified: head/usr.bin/mkimg/Makefile
==============================================================================
--- head/usr.bin/mkimg/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/mkimg/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -31,8 +31,7 @@ SRCS+=	\
 
 BINDIR?=/usr/bin
 
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+LIBADD=	util
 
 WARNS?=	6
 

Modified: head/usr.bin/mkulzma/Makefile
==============================================================================
--- head/usr.bin/mkulzma/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/mkulzma/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,7 @@
 
 PROG=	mkulzma
 MAN=	mkulzma.8
-DPADD=	${LIBLZMA}
-LDADD=	-llzma
+
+LIBADD=	lzma
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/mkuzip/Makefile
==============================================================================
--- head/usr.bin/mkuzip/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/mkuzip/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -3,8 +3,6 @@
 PROG=	mkuzip
 MAN=	mkuzip.8
 
-DPADD=	${LIBZ}
-LDADD=	-lz
-
+LIBADD=	z
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/msgs/Makefile
==============================================================================
--- head/usr.bin/msgs/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/msgs/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	msgs
-DPADD=	${LIBTERMCAPW}
-LDADD=	-ltermcapw
+
+LIBADD=	ncursesw
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/nc/Makefile
==============================================================================
--- head/usr.bin/nc/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/nc/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -6,8 +6,7 @@ PROG=	nc
 SRCS=	netcat.c atomicio.c socks.c
 
 CFLAGS+=-DIPSEC
-LDADD=	-lipsec
-DPADD=	${LIBIPSEC}
+LIBADD=	ipsec
 
 WARNS?=	2
 

Modified: head/usr.bin/ncal/Makefile
==============================================================================
--- head/usr.bin/ncal/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/ncal/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -4,8 +4,7 @@
 
 PROG=	ncal
 
-DPADD=	${LIBCALENDAR} ${LIBTERMCAPW}
-LDADD=	-lcalendar -ltermcapw
+LIBADD=	calendar ncursesw
 
 LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1

Modified: head/usr.bin/netstat/Makefile
==============================================================================
--- head/usr.bin/netstat/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/netstat/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -33,13 +33,11 @@ CFLAGS+=-DPF
 
 BINGRP=	kmem
 BINMODE=2555
-DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
-LDADD=	-lkvm -lmemstat -lutil
+LIBADD=	kvm memstat util
 
 .if ${MK_NETGRAPH_SUPPORT} != "no"
 SRCS+=	netgraph.c
-DPADD+=	${LIBNETGRAPH}
-LDADD+=	-lnetgraph
+LIBADD+=	netgraph
 CFLAGS+=-DNETGRAPH
 .endif
 

Modified: head/usr.bin/newgrp/Makefile
==============================================================================
--- head/usr.bin/newgrp/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/newgrp/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PROG=	newgrp
-DPADD=	${LIBCRYPT} ${LIBUTIL}
-LDADD=	-lcrypt -lutil
+
+LIBADD=	crypt util
 
 .if defined(ENABLE_SUID_NEWGRP)
 BINMODE=	4555

Modified: head/usr.bin/newkey/Makefile
==============================================================================
--- head/usr.bin/newkey/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/newkey/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -8,7 +8,6 @@ SRCS=	newkey.c generic.c update.c
 CFLAGS+= -DYP
 .endif
 MAN=	newkey.8
-DPADD=	${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
-LDADD=	-lrpcsvc -lmp -lcrypto
+LIBADD=	rpcsvc mp
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/nfsstat/Makefile
==============================================================================
--- head/usr.bin/nfsstat/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/nfsstat/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -3,8 +3,8 @@
 
 PROG=	nfsstat
 CFLAGS+=-DNFS
-DPADD=  ${LIBKVM}
-LDADD= -lkvm
+
+LIBADD=	kvm
 
 WARNS?=	3
 

Modified: head/usr.bin/opieinfo/Makefile
==============================================================================
--- head/usr.bin/opieinfo/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/opieinfo/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE
 
 WARNS?=	0
 
-DPADD=	${LIBOPIE} ${LIBMD}
-LDADD=	-lopie -lmd
+LIBADD=	opie
 
 BINOWN=	root
 BINMODE=4555

Modified: head/usr.bin/opiekey/Makefile
==============================================================================
--- head/usr.bin/opiekey/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/opiekey/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE
 
 WARNS?=	0
 
-DPADD=	${LIBOPIE} ${LIBMD}
-LDADD=	-lopie -lmd
+LIBADD=	opie
 
 LINKS=	${BINDIR}/opiekey ${BINDIR}/otp-md4
 LINKS+=	${BINDIR}/opiekey ${BINDIR}/otp-md5

Modified: head/usr.bin/opiepasswd/Makefile
==============================================================================
--- head/usr.bin/opiepasswd/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/opiepasswd/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE
 
 WARNS?=	0
 
-DPADD=	${LIBOPIE} ${LIBMD}
-LDADD=	-lopie -lmd
+LIBADD=	opie
 
 BINOWN=	root
 BINMODE=4555

Modified: head/usr.bin/pamtest/Makefile
==============================================================================
--- head/usr.bin/pamtest/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/pamtest/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -5,7 +5,7 @@ OPENPAM=	${.CURDIR}/../../contrib/openpa
 
 PROG= pamtest
 SRCS= pamtest.c
-DPADD= ${LIBPAM}
-LDADD= ${MINUSLPAM}
+
+LIBADD=	pam
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/passwd/Makefile
==============================================================================
--- head/usr.bin/passwd/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/passwd/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -6,8 +6,7 @@
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
-DPADD	 = ${LIBPAM}
-LDADD	 = ${MINUSLPAM}
+LIBADD   = pam
 .if ${MK_NIS} != "no"
 LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1

Modified: head/usr.bin/procstat/Makefile
==============================================================================
--- head/usr.bin/procstat/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/procstat/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -16,7 +16,6 @@ SRCS=	procstat.c		\
 	procstat_threads.c	\
 	procstat_vm.c
 
-LDADD+=	-lutil -lprocstat -lkvm
-DPADD+=	${LIBUTIL} ${LIBPROCSTAT} ${LIBKVM}
+LIBADD+=	util procstat
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/quota/Makefile
==============================================================================
--- head/usr.bin/quota/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/quota/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -5,7 +5,6 @@ PROG=	quota
 BINOWN=	root
 BINMODE=4555
 
-DPADD=	${LIBRPCSVC} ${LIBUTIL}
-LDADD=	-lrpcsvc -lutil
+LIBADD=	rpcsvc util
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/rctl/Makefile
==============================================================================
--- head/usr.bin/rctl/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/rctl/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -3,7 +3,6 @@
 PROG=   rctl
 MAN=	rctl.8
 
-DPADD=	${LIBUTIL}
-LDADD=	-lutil
+LIBADD=	util
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/rup/Makefile
==============================================================================
--- head/usr.bin/rup/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/rup/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -4,7 +4,6 @@ PROG=	rup
 
 WARNS?=	1
 
-DPADD=	${LIBRPCSVC}
-LDADD=	-lrpcsvc
+LIBADD=	rpcsvc
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/rusers/Makefile
==============================================================================
--- head/usr.bin/rusers/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/rusers/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,6 @@
 
 PROG = rusers
 
-DPADD=	${LIBRPCSVC}
-LDADD=	-lrpcsvc
+LIBADD=	rpcsvc
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/script/Makefile
==============================================================================
--- head/usr.bin/script/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/script/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	script
-LDADD=	-lutil
-DPADD=	${LIBUTIL}
+
+LIBADD=	util
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/seq/Makefile
==============================================================================
--- head/usr.bin/seq/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/seq/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	seq
-DPADD=	${LIBM}
-LDADD=	-lm
+
+LIBADD=	m
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/smbutil/Makefile
==============================================================================
--- head/usr.bin/smbutil/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/smbutil/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -3,8 +3,7 @@
 PROG=	smbutil
 SRCS=	smbutil.c dumptree.c login.c lookup.c view.c print.c
 
-DPADD=	${LIBSMB} ${LIBKICONV}
-LDADD=	-lsmb -lkiconv
+LIBADD=	smb kiconv
 
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 CFLAGS+=	-I${CONTRIBDIR}/include

Modified: head/usr.bin/sort/Makefile
==============================================================================
--- head/usr.bin/sort/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/sort/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -13,12 +13,10 @@ CLEANFILES+= sort.1
 
 .if ${MK_SORT_THREADS} != "no"
 CFLAGS+= -DSORT_THREADS
-LDADD= -lpthread -lmd
-DPADD= ${LIBPTHREAD} ${LIBMD}
+LIBADD=	pthread md
 MAN_SUB+= -e 's|%%THREADS%%||g'
 .else
-LDADD= -lmd
-DPADD= ${LIBMD}
+LIBADD=	md
 MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
 .endif
 

Modified: head/usr.bin/split/Makefile
==============================================================================
--- head/usr.bin/split/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/split/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	split
-LDADD=	-lutil
-DPADD=	${LIBUTIL}
+
+LIBADD=	util
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/su/Makefile
==============================================================================
--- head/usr.bin/su/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/su/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -7,13 +7,11 @@ PROG=	su
 
 WARNS?=	5
 
-DPADD=	${LIBUTIL} ${LIBPAM}
-LDADD=	-lutil ${MINUSLPAM}
+LIBADD=	util pam
 
 .if ${MK_AUDIT} != "no"
 CFLAGS+= -DUSE_BSM_AUDIT
-DPADD+=  ${LIBBSM}
-LDADD+=  -lbsm
+LIBADD+=	bsm
 .endif
 
 BINOWN=	root

Modified: head/usr.bin/systat/Makefile
==============================================================================
--- head/usr.bin/systat/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/systat/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -16,7 +16,6 @@ CFLAGS+= -DINET6
 
 WARNS?=	0
 
-DPADD=	${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
-LDADD=	-lncursesw -lm -ldevstat -lkvm
+LIBADD=	ncursesw m devstat kvm
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/tabs/Makefile
==============================================================================
--- head/usr.bin/tabs/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/tabs/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	tabs
-DPADD=	${LIBTERMCAPW}
-LDADD=	-ltermcapw
+
+LIBADD=	ncursesw
 
 .include <bsd.prog.mk>

Modified: head/usr.bin/talk/Makefile
==============================================================================
--- head/usr.bin/talk/Makefile	Tue Nov 25 14:28:15 2014	(r275041)
+++ head/usr.bin/talk/Makefile	Tue Nov 25 14:29:10 2014	(r275042)
@@ -4,7 +4,7 @@

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411251429.sAPETBfX090723>