From 65c31e445cfa75941c9566f0789f0c3d92e5e96c Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 26 Nov 2014 08:12:21 +0000
Subject: [PATCH] Convert to LIBADD

---
 release/picobsd/tinyware/login/Makefile  | 6 ++----
 release/picobsd/tinyware/oinit/Makefile  | 2 +-
 release/picobsd/tinyware/passwd/Makefile | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/release/picobsd/tinyware/login/Makefile b/release/picobsd/tinyware/login/Makefile
index 0a39c756ad18..bc6156c8ac51 100644
--- a/release/picobsd/tinyware/login/Makefile
+++ b/release/picobsd/tinyware/login/Makefile
@@ -11,13 +11,11 @@ MAN=	login.1
 
 CFLAGS+=-DLOGALL
 
-DPADD=	${LIBUTIL} ${LIBCRYPT}
-LDADD=	-lutil -lcrypt
+LIBADD=	util crypt
 
 .if ${MK_PAM_SUPPORT} != "no"
 CFLAGS+= -DUSE_PAM
-DPADD+=	${LIBPAM}
-LDADD+=	${MINUSLPAM}
+LIBADD+=	pam
 .endif
 
 BINOWN=	root
diff --git a/release/picobsd/tinyware/oinit/Makefile b/release/picobsd/tinyware/oinit/Makefile
index 74044afa779e..072bbba8a840 100644
--- a/release/picobsd/tinyware/oinit/Makefile
+++ b/release/picobsd/tinyware/oinit/Makefile
@@ -14,7 +14,7 @@ CFLAGS=		-DSH_PATH=\"${SH_PATH}\" -DSH_NAME=\"${SH_NAME}\" \
 #CFLAGS+=	-DOINIT_RC=\"/etc/oinit.rc\"
 
 #LDADD=		-lutil -ledit -ltermcap
-LDADD=-lutil
+LIBADD=	util
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/passwd/Makefile b/release/picobsd/tinyware/passwd/Makefile
index fa603083bcce..806836c4fea3 100644
--- a/release/picobsd/tinyware/passwd/Makefile
+++ b/release/picobsd/tinyware/passwd/Makefile
@@ -11,8 +11,7 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \
 	yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c
 CFLAGS+=-Wall
 
-DPADD=	${LIBCRYPT} ${LIBUTIL}
-LDADD=	-lcrypt -lutil
+LIBADD=	crypt util
 .PATH:  ${.CURDIR}/../../../../usr.bin/chpass \
 #	${.CURDIR}/../../../../usr.sbin/vipw \
 #	${.CURDIR}/../../../../usr.bin/passwd