From 3a09db98e4bfcad6b6a4c35c45c3fb341c1b9b8d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Tigeot?= <ftigeot@wolfpond.org>
Date: Sun, 20 Apr 2014 20:54:29 +0200
Subject: [PATCH] Revert "Add missing libraries to some program Makefiles"

This reverts commit 35617968ec499b8b149c69bdcacfb952b81264bc.

* It turns out the above referenced changes were not necessary; other
  /lib fixes made the link issue go away.

* This commit should fix issue #2661
---
 sbin/atm/atm/Makefile         | 4 ++--
 sbin/atm/fore_dnld/Makefile   | 4 ++--
 sbin/atm/ilmid/Makefile       | 4 ++--
 sbin/iscontrol/Makefile       | 4 ++--
 secure/usr.sbin/sshd/Makefile | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile
index 07b48c997e..00605f0a35 100644
--- a/sbin/atm/atm/Makefile
+++ b/sbin/atm/atm/Makefile
@@ -34,7 +34,7 @@ SRCS=	atm.c atm_fore200.c atm_eni.c atm_inet.c atm_print.c \
 MAN=	atm.8
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
-LDADD+=		-latm -lmd
-DPADD+=		 ${LIBATM} ${LIBMD}
+LDADD+=		-latm
+DPADD+=		 ${LIBATM}
 
 .include <bsd.prog.mk>
diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile
index fae59d081e..989b83dc81 100644
--- a/sbin/atm/fore_dnld/Makefile
+++ b/sbin/atm/fore_dnld/Makefile
@@ -33,7 +33,7 @@ MAN=	fore_dnld.8
 SRCS=	fore_dnld.c pca200e.c
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
-LDADD+=		-latm -lmd
-DPADD+=		${LIBATM} ${LIBMD}
+LDADD+=		-latm
+DPADD+=		${LIBATM}
 
 .include <bsd.prog.mk>
diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile
index cc60fd1660..3b0924df0a 100644
--- a/sbin/atm/ilmid/Makefile
+++ b/sbin/atm/ilmid/Makefile
@@ -32,7 +32,7 @@ PROG=	ilmid
 MAN=	ilmid.8
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
-LDADD+=		-latm -lmd
-DPADD+=		${LIBATM} ${LIBMD}
+LDADD+=		-latm
+DPADD+=		${LIBATM}
 
 .include <bsd.prog.mk>
diff --git a/sbin/iscontrol/Makefile b/sbin/iscontrol/Makefile
index 6805e49e6c..c9b606e855 100644
--- a/sbin/iscontrol/Makefile
+++ b/sbin/iscontrol/Makefile
@@ -2,8 +2,8 @@
 
 SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c
 PROG= iscontrol
-DPADD= ${LIBCAM} ${LIBMD} ${LIBSBUF}
-LDADD= -lcam -lmd -lsbuf
+DPADD= ${LIBCAM} ${LIBMD}
+LDADD= -lcam -lmd
 
 CFLAGS += -I${.CURDIR}/../../sys/dev/disk/iscsi/initiator
 #CFLAGS += -g -DDEBUG
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index e4f64d729a..4521afac9d 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -32,8 +32,8 @@ CFLAGS+=-DCUSTOM_SYS_AUTH_PASSWD
 CFLAGS+=-DUSE_PAM -DHAVE_SECURITY_PAM_APPL_H \
 	-DHAVE_PAM_GETENVLIST -DHAVE_PAM_PUTENV
 
-LDADD+=	-lopie -lmd
-DPADD+=	${LIBOPIE} ${LIBMD}
+LDADD+=	-lopie
+DPADD+=	${LIBOPIE}
 
 .if defined(X11BASE)
 CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
-- 
2.41.0