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

15 files changed, 30 insertions, 32 deletions

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 \