Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

47 files changed, 94 insertions, 95 deletions

diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index bce1e6a..9653422 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -14,8 +14,8 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} y.tab.h
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.  
 
-DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
-LDADD+= -ll -ledit -ltermcap
+DPADD= ${LIBL} ${LIBEDIT} ${LIBTERMCAP}
+LDADD= -ll -ledit -ltermcap
 
 LFLAGS= -8	# 8-bit lex scanner for arithmetic
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
diff --git a/games/factor/Makefile b/games/factor/Makefile
index 573d735..fa21ca5 100644
--- a/games/factor/Makefile
+++ b/games/factor/Makefile
@@ -7,8 +7,8 @@ CFLAGS+=-I${.CURDIR}/../primes
 
 .if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 CFLAGS+=-DHAVE_OPENSSL
-LDADD+=	-lcrypto
-DPADD+=	${LIBCRYPTO}
+LDADD=	-lcrypto
+DPADD=	${LIBCRYPTO}
 .endif
 
 MAN=	factor.6
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 705a3e0..179fa18 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -17,8 +17,8 @@ EXAMPLES= Makefile check1.c check2.c check3.c dselect.c fselect.c \
 
 CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE
 
-LDADD+= -lncurses
-DPADD+= ${LIBNCURSES}
+LDADD=	-lncurses
+DPADD=	${LIBNCURSES}
 
 .if !defined(NOHTML)
 afterinstall:
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 6f9e287..4b53209 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -18,8 +18,8 @@ CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR}
 CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated
 #LDFLAGS+=	-Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map
 
-LDADD+=		-lm
-DPADD+=		${LIBM}
+LDADD=		-lm
+DPADD=		${LIBM}
 
 # libstdc++ sources (libstdc++/src/Makefile.in, do not reorder)
 SRCS+= bitset.cc codecvt.cc complex_io.cc concept-inst.cc ctype.cc \
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index c1a57b2..fa58603 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -14,7 +14,7 @@ NOMAN=	1
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index f187a7b..045d33f 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -10,8 +10,8 @@ NOMAN=	1
 
 CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\"
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 cplus-dem+%DIKED.c: cplus-dem.c
 	sed -e 's/^xmalloc[ 	]/_DONT_xmalloc /g' \
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 3dbc859..b4fe47f 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -16,7 +16,7 @@ MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 98cdc81..6d8d08d 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -12,8 +12,8 @@ NOSHARED?=yes
 
 CFLAGS+= -I.
 
-DPADD+=	${LIBCC_INT} 
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT} 
+LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # C parser
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index d4ecd8c..9d9e598 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -12,8 +12,8 @@ NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.
 
-DPADD+=	${LIBCC_INT} 
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT} 
+LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # objc parser
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 883bfdb..ca6743c 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -17,8 +17,8 @@ NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 
-DPADD+=	${LIBCC_INT} 
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT} 
+LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # C++ parser
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index eb0bc72..662f03e 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -11,8 +11,8 @@ BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED?=yes
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # C parser
diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile
index 7fe6877..4132e23 100644
--- a/gnu/usr.bin/cc/collect2/Makefile
+++ b/gnu/usr.bin/cc/collect2/Makefile
@@ -8,7 +8,7 @@ PROG=	collect2
 SRCS=	collect2.c cp-demangle.c cplus-dem.c tlink.c
 NOMAN=
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 12be88f..f8e52f3 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -11,8 +11,8 @@ SRCS=	gcc.c cppspec.c
 CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 CLEANFILES= cpp.1
 
diff --git a/gnu/usr.bin/cc/cpp0/Makefile b/gnu/usr.bin/cc/cpp0/Makefile
index eb0bc72..662f03e 100644
--- a/gnu/usr.bin/cc/cpp0/Makefile
+++ b/gnu/usr.bin/cc/cpp0/Makefile
@@ -11,8 +11,8 @@ BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED?=yes
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # C parser
diff --git a/gnu/usr.bin/cc/tradcpp0/Makefile b/gnu/usr.bin/cc/tradcpp0/Makefile
index 3ec8968..8d35090 100644
--- a/gnu/usr.bin/cc/tradcpp0/Makefile
+++ b/gnu/usr.bin/cc/tradcpp0/Makefile
@@ -9,8 +9,8 @@ SRCS=	tradcpp.c tradcif+%DIKED.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 
-DPADD+=	${LIBCC_INT}
-LDADD+=	${LIBCC_INT}
+DPADD=	${LIBCC_INT}
+LDADD=	${LIBCC_INT}
 
 tradcif+%DIKED.c: tradcif.c
 	sed -e "s/malloc/xmalloc/g" \
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index ce71f92..205a474 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -27,8 +27,8 @@ SRCS=	add.c admin.c annotate.c buffer.c \
 CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H \
 	 -I${CVSDIR}/src -I${CVSDIR}/lib -I${CVSDIR}/diff -I.
 
-DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
-LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+DPADD=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
+LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
 .if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index b5dfeb3..c30dff7 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -7,7 +7,7 @@ PROG=   dialog
 
 CFLAGS+= -Wall -Wstrict-prototypes
 
-DPADD+= $(LIBDIALOG) $(LIBNCURSES)
-LDADD+= -ldialog -lncurses
+DPADD=	$(LIBDIALOG) $(LIBNCURSES)
+LDADD=	-ldialog -lncurses
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index be853a2..a61dc88 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -15,7 +15,7 @@ CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
 
 SUBDIR+=doc
 
-DPADD+=	${LIBGNUREGEX}
-LDADD+=	-lgnuregex
+DPADD=	${LIBGNUREGEX}
+LDADD=	-lgnuregex
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index 9c4224c..79e616e 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -11,10 +11,8 @@ LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
 	${BINDIR}/grep ${BINDIR}/fgrep
 MLINKS=	grep.1 egrep.1 grep.1 fgrep.1
 
-DPADD+=	${LIBGNUREGEX}
-DPADD+=	${LIBBZ2}
-LDADD+=	-lgnuregex
-LDADD+=	-lbz2
+DPADD=	${LIBGNUREGEX} ${LIBBZ2}
+LDADD=	-lgnuregex -lbz2
 
 LINKS+=	${BINDIR}/grep ${BINDIR}/bzgrep \
 	${BINDIR}/grep ${BINDIR}/bzegrep \
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index 7ce059f..89d1ef4 100644
--- a/lib/libatm/Makefile
+++ b/lib/libatm/Makefile
@@ -28,8 +28,8 @@ SHLIBDIR?= /lib
 SRCS=	atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c
 INCS=	libatm.h
 
-LDADD+=	-lmd
-DPADD+=	${LIBMD}
+LDADD=	-lmd
+DPADD=	${LIBMD}
 WARNS?=	6
 
 .include <bsd.lib.mk>
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 8ea04df..92be69d 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -5,8 +5,8 @@ SHLIBDIR?=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
 INCS=		camlib.h
 
-DPADD+=		${LIBSBUF}
-LDADD+=		-lsbuf
+DPADD=		${LIBSBUF}
+LDADD=		-lsbuf
 
 MAN=		cam.3 cam_cdbparse.3
 
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index cf3ac5e..11368f8 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -7,8 +7,8 @@ SHLIB_MAJOR= 4
 SRCS=	devstat.c
 INCS=	devstat.h
 
-DPADD+=	${LIBKVM}
-LDADD+=	-lkvm
+DPADD=	${LIBKVM}
+LDADD=	-lkvm
 
 MAN=	devstat.3
 
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 20e61b2..2a8cabe 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -26,8 +26,8 @@ CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \
 ACCESSFILE?=	\"/etc/opieaccess\"
 CFLAGS+=	-DINSECURE_OVERRIDE -DPATH_ACCESS_FILE=${ACCESSFILE}
 
-LDADD+=	-lmd
-DPADD+=	${LIBMD}
+LDADD=	-lmd
+DPADD=	${LIBMD}
 
 MAN=	${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5
 
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index 708a19c..f2a7668 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -28,8 +28,8 @@ LIB=		radius
 SRCS=		radlib.c
 INCS=		radlib.h radlib_vs.h
 CFLAGS+=	-Wall
-DPADD+=		${LIBMD}
-LDADD+=		-lmd
+DPADD=		${LIBMD}
+LDADD=		-lmd
 SHLIB_MAJOR=	1
 MAN=		libradius.3 radius.conf.5
 
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 13da2e2..58cbcf3 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -28,8 +28,8 @@ LIB=		tacplus
 SRCS=		taclib.c
 INCS=		taclib.h
 CFLAGS+=	-Wall
-DPADD+=		${LIBMD}
-LDADD+=		-lmd
+DPADD=		${LIBMD}
+LDADD=		-lmd
 SHLIB_MAJOR=	1
 MAN=		libtacplus.3 tacplus.conf.5
 
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index b2be2e1..d09f812 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -4,7 +4,7 @@
 PROG=	makekey
 MAN=	makekey.8
 
-DPADD+= ${LIBCRYPT}
-LDADD+= -lcrypt
+DPADD=	${LIBCRYPT}
+LDADD=	-lcrypt
 
 .include <bsd.prog.mk>
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 5e1591b..d205e27 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -8,8 +8,8 @@ SRCS=	fsdb.c fsdbutil.c \
 	dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
 CFLAGS+= -I${.CURDIR}/../fsck_ffs
-LDADD+= -ledit -ltermcap
-DPADD+=	${LIBEDIT} ${LIBTERMCAP}
+LDADD=	-ledit -ltermcap
+DPADD=	${LIBEDIT} ${LIBTERMCAP}
 .PATH:	${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
 
 .include <bsd.prog.mk>
diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile
index 3522128..56187d7 100644
--- a/sbin/md5/Makefile
+++ b/sbin/md5/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	md5
 
-LDADD+=	-lmd
-DPADD+= ${LIBMD}
+LDADD=	-lmd
+DPADD=	${LIBMD}
 
 .include <bsd.prog.mk>
diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile
index 9d8d27b..9cdac62 100644
--- a/sbin/rcorder/Makefile
+++ b/sbin/rcorder/Makefile
@@ -5,8 +5,8 @@ PROG=   rcorder
 SRCS=   ealloc.c hash.c rcorder.c
 MAN=	rcorder.8
 
-LDADD+=	-lutil
-DPADD+=	${LIBUTIL}
+LDADD=	-lutil
+DPADD=	${LIBUTIL}
 
 WARNS=	0
 # XXX hack for make's hash.[ch]
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 1b6a664..34c8e55 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -5,8 +5,8 @@ PROG=   routed
 SRCS=   if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c
 MAN=   routed.8
 SUBDIR= rtquery
-LDADD+= -lmd
-DPADD+= ${LIBMD}
+LDADD=	-lmd
+DPADD=	${LIBMD}
 #COPTS= -g -DDEBUG -W -Wall -Wcast-align -Wcast-qual -Winline -Wpointer-arith -Wnested-externs -Wwrite-strings -Wunused
 WARNS=	0
 
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index 61a2511..1b553a3 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -4,8 +4,8 @@
 
 PROG=	rtquery
 MAN=	rtquery.8
-LDADD+=	-lmd
-DPADD+=	${LIBMD}
+LDADD=	-lmd
+DPADD=	${LIBMD}
 #COPTS=	-g -DDEBUG -W -Wall -Wcast-align -Wcast-qual -Winline -Wpointer-arith -Wnested-externs -Wwrite-strings -Wunused
 WARNS=	0
 
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index 6a112d0..b6bf897 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -5,8 +5,8 @@ SRCS=   sftp-common.c sftp-server.c
 MAN=	sftp-server.8
 CFLAGS+=-I${SSHDIR}
 
-DPADD+=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
-LDADD+=	-lssh -lcrypt -lcrypto -lz
+DPADD=	${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ}
+LDADD=	-lssh -lcrypt -lcrypto -lz
 
 .include <bsd.prog.mk>
 
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index fe222fe..b078a4c 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -12,8 +12,8 @@ GENHDRS=	aicasm_gram.h aicasm_macro_gram.h
 
 SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
 CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
-DPADD+=	${LIBL}
-LDADD+=	-ll
+DPADD=	${LIBL}
+LDADD=	-ll
 
 # Correct path for kernel builds
 # Don't rely on the kernel's .depend file
diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile
index 48138ec..25d1b77 100644
--- a/usr.bin/atm/sscop/Makefile
+++ b/usr.bin/atm/sscop/Makefile
@@ -9,7 +9,7 @@ SRCS=	common.c sscop_main.c
 WARNS?=	6
 CFLAGS+= -I${CONTRIB}
 
-DPADD+=	${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
-LDADD+= ${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
+DPADD=	${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
+LDADD=	${LIBISC} ${LIBNETGRAPH} ${LIBNGATM}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index 4f5591d..facebb8 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -23,8 +23,9 @@ EXEMODE=	${NOBINMODE}
 
 .if !defined(NO_X) && exists(${XINCDIR}/X11/X.h) && exists(${XLIBDIR}/libX11.a)
 CFLAGS+=	-I${XINCDIR}
-LDADD+=		-L${XLIBDIR} -lX11
-DPADD+=		${XLIBDIR}/libX11.a
+LDFLAGS=	-L${XLIBDIR}
+LDADD=		-lX11
+DPADD=		${XLIBDIR}/libX11.a
 .else
 CFLAGS+=	-DNO_X
 .endif
diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile
index 800aa42..32a670b 100644
--- a/usr.bin/enigma/Makefile
+++ b/usr.bin/enigma/Makefile
@@ -5,7 +5,7 @@ PROG=	enigma
 LINKS=	${BINDIR}/enigma ${BINDIR}/crypt
 MLINKS=	enigma.1 crypt.1
 
-DPADD+=	${LIBCRYPT}
-LDADD+=	-lcrypt
+DPADD=	${LIBCRYPT}
+LDADD=	-lcrypt
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 0b9658a..d84d1a8 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -33,8 +33,8 @@ MAGICPATH=	/usr/share/misc
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR} -I${SRCDIR}
 
-LDADD+=	-lz
-DPADD+=	${LIBZ}
+LDADD=	-lz
+DPADD=	${LIBZ}
 
 CLEANFILES+=	magic magic.mgc magic.mime.mgc magic.mime.PITA
 
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 1518dc5..25d30d4 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -14,8 +14,8 @@ SRCS=	cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c progressbar.c \
 	ruserpass.c util.c
 
 CFLAGS+=-I${.CURDIR} -I${LUKEMFTP} -DINET6
-LDADD+=	-ledit -ltermcap -lutil
-DPADD+=	${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
+LDADD=	-ledit -ltermcap -lutil
+DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
 
 LINKS=	${BINDIR}/ftp ${BINDIR}/pftp \
 	${BINDIR}/ftp ${BINDIR}/gate-ftp
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 5f631dd..af76777 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	ipcs
-DPADD+=	${LIBKVM}
-LDADD+=	-lkvm
+DPADD=	${LIBKVM}
+LDADD=	-lkvm
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index edc5d85..226ba76 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PROG=	minigzip
-LDADD+=	-lz
-DPADD+=	${LIBZ}
+LDADD=	-lz
+DPADD=	${LIBZ}
 .PATH:	${.CURDIR}/../../lib/libz
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index a282ce8..1669027 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -3,8 +3,8 @@
 PROG=	ncal
 SRCS=	ncal.c
 
-DPADD+=	${LIBCALENDAR}
-LDADD+=	-lcalendar
+DPADD=	${LIBCALENDAR}
+LDADD=	-lcalendar
 
 LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1
diff --git a/usr.bin/usbhidaction/Makefile b/usr.bin/usbhidaction/Makefile
index 8f5a6b5..2c43b9d 100644
--- a/usr.bin/usbhidaction/Makefile
+++ b/usr.bin/usbhidaction/Makefile
@@ -4,7 +4,7 @@
 PROG=	usbhidaction
 SRCS=	usbhidaction.c
 
-LDADD+=	-lusbhid
-DPADD+=	${LIBUSBHID}
+LDADD=	-lusbhid
+DPADD=	${LIBUSBHID}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index ed88ac0..982f71b 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -40,8 +40,8 @@ PLLINKS= pl_PL
 
 CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/include
 
-DPADD+=		${LIBNCURSES}
-LDADD+=		-lncurses
+DPADD=		${LIBNCURSES}
+LDADD=		-lncurses
 
 CLEANFILES+=${EX}
 
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 679ef48..b7f78c5 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -7,8 +7,8 @@ SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
 MAN=	lint.7
 CLEANFILES= lint.7
 
-LDADD+=	-ll -lm
-DPADD+=	${LIBL} ${LIBM}
+LDADD=	-ll -lm
+DPADD=	${LIBL} ${LIBM}
 CFLAGS+= -I. -I${.CURDIR}
 LINTFLAGS=-aehpz
 
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile
index dabd539..482b955 100644
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@@ -9,8 +9,8 @@ MOUNTDIR=	${.CURDIR}/../../sbin/mount
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 CFLAGS+=	-DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include
 
-LDADD+= -lsmb
-DPADD+= ${LIBSMB}
+LDADD=	-lsmb
+DPADD=	${LIBSMB}
 
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv (see the -E option).
diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile
index 31fbc7f..c3702c8 100644
--- a/usr.sbin/pnpinfo/Makefile
+++ b/usr.sbin/pnpinfo/Makefile
@@ -13,7 +13,7 @@ CFLAGS+= -DPC98
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
-LDADD+=	-lio
+LDADD=	-lio
 DPADD=  ${LIBIO}
 .endif
 
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 96abfba..028fda5 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -7,8 +7,8 @@ PROG=	syslogd
 MAN=	syslog.conf.5 syslogd.8
 SRCS=	syslogd.c ttymsg.c
 
-DPADD+=	${LIBUTIL}
-LDADD+=	-lutil
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
 WARNS?=	1
 CFLAGS+=-DINET6 -I${.CURDIR}/../../usr.bin/wall