Revert the libcrypt/libmd stuff back to how it was. This should not have

happened as it was working around problems elsewhere (ie: binutils/ld
not doing the right thing according to the ELF design).  libcrypt has
been adjusted to not need the runtime -lmd.  It's still not quite right
(ld is supposed to work damnit) but at least it doesn't impact all the
users of libcrypt in Marcel's cross-build model.

7 files changed, 18 insertions, 19 deletions

diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 7966608..6e26143 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -27,8 +27,8 @@ COPTS+=	-DYP -I. -I${.CURDIR}/../../libexec/ypxfr \
 #Some people need this, uncomment to activate
 #COPTS+= -DRESTRICT_FULLNAME_CHANGE
 
-DPADD=	${LIBRPCSVC} ${LIBCRYPT} ${LIBMD}
-LDADD+=	-lrpcsvc -lcrypt -lmd
+DPADD=	${LIBRPCSVC} ${LIBCRYPT}
+LDADD+=	-lrpcsvc -lcrypt
 
 CLEANFILES= ${GENSRCS}
 
diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile
index 42dbdfc..84c8fd1 100644
--- a/usr.bin/lock/Makefile
+++ b/usr.bin/lock/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	lock
 BINMODE=4555
-DPADD=	${LIBCRYPT} ${LIBMD}
-LDADD=	-lcrypt -lmd
+DPADD=	${LIBCRYPT}
+LDADD=	-lcrypt
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 165387e..2813ccb 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -8,8 +8,8 @@ SRCS=	login.c login_access.c login_fbtab.c
 
 CFLAGS+=-Wall -DLOGIN_ACCESS -DLOGALL
 
-DPADD=	${LIBUTIL} ${LIBCRYPT} ${LIBMD}
-LDADD=	-lutil -lcrypt -lmd
+DPADD=	${LIBUTIL} ${LIBCRYPT}
+LDADD=	-lutil -lcrypt
 
 .if defined(NOPAM)
 CFLAGS+= -DNO_PAM
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 39e3a18..953e534 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -12,8 +12,8 @@ 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} ${LIBMD}
-LDADD=	-lcrypt -lutil -lmd
+DPADD=	${LIBCRYPT} ${LIBUTIL}
+LDADD=	-lcrypt -lutil
 .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../rlogin 
 
@@ -31,8 +31,8 @@ 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} ${LIBRPCSVC} ${LIBUTIL} ${LIBMD}
-LDADD=	-lcrypt -lrpcsvc -lutil -lmd
+DPADD=	${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
+LDADD=	-lcrypt -lrpcsvc -lutil
 .PATH:  ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \
 	${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \
 	${.CURDIR}/../../usr.sbin/rpc.yppasswdd
@@ -87,9 +87,8 @@ SRCS+=	kpasswd_standalone.c
 
 CFLAGS+=	-DKERBEROS
 # XXX not defined: ${LIBKADM}, ${LIBCOM_ERR}
-DPADD=	${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} \
-	${LIBUTIL} ${LIBMD}
-LDADD=	-lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil -lmd
+DPADD=	${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL}
+LDADD=	-lkadm -lkrb -ldes -lcrypt -lrpcsvc -lcom_err -lutil
 DISTRIBUTION=	krb4
 .endif
 
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 6e6439d..97de1da 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -11,13 +11,13 @@ INSTALLFLAGS=-fschg
 
 .if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBMD}
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
 CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
 	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err -lmd
+LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err
 DISTRIBUTION=	krb4
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 .endif
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 4de4bdf..ede91df 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -14,8 +14,8 @@ CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../../crypto/kerberosIV/include \
 	-I${.CURDIR}/../../crypto/kerberosIV/lib/roken \
 	-I${.CURDIR}/../../crypto/kerberosIV/appl/bsd
-DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBMD}
-LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err -lmd
+DPADD=	${LIBUTIL} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lutil -lkrb -ldes -lcrypt -lcom_err
 DISTRIBUTION=	krb4
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 .endif
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index edac507..91ac2a8 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -5,8 +5,8 @@ PROG=	su
 SRCS=	su.c
 
 COPTS+=	-DLOGIN_CAP -DSKEY
-DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBCRYPT} ${LIBMD}
-LDADD=	-lutil -lskey -lcrypt -lmd
+DPADD=	${LIBUTIL} ${LIBSKEY} ${LIBMD} ${LIBCRYPT}
+LDADD=	-lutil -lskey -lmd -lcrypt
 
 .if defined(WHEELSU)
 COPTS+=	-DWHEELSU