From 743cc6d00297660ac72c8a7b391b0048d5699479 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Thu, 5 Feb 2004 22:44:25 +0000
Subject: Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

---
 usr.bin/atm/sscop/Makefile    | 4 ++--
 usr.bin/doscmd/Makefile       | 5 +++--
 usr.bin/enigma/Makefile       | 4 ++--
 usr.bin/file/Makefile         | 4 ++--
 usr.bin/ftp/Makefile          | 4 ++--
 usr.bin/ipcs/Makefile         | 4 ++--
 usr.bin/minigzip/Makefile     | 4 ++--
 usr.bin/ncal/Makefile         | 4 ++--
 usr.bin/usbhidaction/Makefile | 4 ++--
 usr.bin/vi/Makefile           | 4 ++--
 usr.bin/xlint/lint1/Makefile  | 4 ++--
 11 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'usr.bin')

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
 
-- 
cgit v1.1