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.

gnu/usr.bin/perl/suidperl/Makefile

@@ -7,9 +7,8 @@ NOMAN=	true
 CFLAGS+=-I${PERL5SRC} -I${.OBJDIR} -DIAMSUID
 SRCS=	perlmain.c sperl.c config.h
 NOSHARED= no
-DYNALOADER= lib/auto/DynaLoader/DynaLoader.a
-DPADD=	${DYNALOADER} ${LIBPERL} ${LIBM} ${LIBCRYPT} ${LIBMD}
-LDADD=	${DYNALOADER} -lperl -lm -lcrypt -lmd
+DPADD=	lib/auto/DynaLoader/DynaLoader.a ${LIBPERL} ${LIBM} ${LIBCRYPT}
+LDADD=	lib/auto/DynaLoader/DynaLoader.a -lperl -lm -lcrypt
 BINOWN=	root
 BINMODE=4511
 LINKS=	${BINDIR}/${PROG} ${BINDIR}/sperl5.00503

gnu/usr.bin/perl/x2p/a2pl/Makefile

@@ -4,7 +4,7 @@
 
 PROG=	a2p
 CFLAGS+=-I${PERL5SRC}/x2p -I${.OBJDIR} -I${.OBJDIR}/temp
-LDFLAGS+=-lperl -lm -lcrypt -lmd
+LDFLAGS+=-lperl -lm -lcrypt
 SRCS=	a2p.c hash.c str.c util.c walk.c config.h
 
 CLEANDIRS+=	temp

libexec/makekey/Makefile

@@ -4,7 +4,7 @@
 PROG=	makekey
 MAN8=	makekey.8
 
-DPADD+= ${LIBCRYPT} ${LIBMD}
-LDADD+= -lcrypt -lmd
+DPADD+= ${LIBCRYPT}
+LDADD+= -lcrypt
 
 .include <bsd.prog.mk>

libexec/uucpd/Makefile

@@ -3,6 +3,6 @@
 
 PROG=	uucpd
 MAN8=	uucpd.8
-LDADD=  -lcrypt -lutil -lmd
-DPADD=  ${LIBCRYPT} ${LIBUTIL} ${LIBMD}
+LDADD=  -lcrypt -lutil
+DPADD=  ${LIBCRYPT} ${LIBUTIL}
 .include <bsd.prog.mk>

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}
 

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>

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

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
 

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

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

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

usr.sbin/pw/Makefile

@@ -10,8 +10,8 @@ MAN8=	pw.8
 
 #RND=	-DUSE_MD5RAND
 CFLAGS+= -W -Wall $(CDB) $(RND)
-LDADD=	-lcrypt -lmd
-DPADD=	${LIBCRYPT} ${LIBMD}
+LDADD=	-lcrypt
+DPADD=	${LIBCRYPT}
 
 BINMODE=0555
 

usr.sbin/rpc.yppasswdd/Makefile

@@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw -I${.CURDIR}/../../usr.sbin/ypserv \
 	 -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.bin/chpass \
 	 -I${.CURDIR} -I.
 
-DPADD=	${LIBRPCSVC} ${LIBCRYPT} ${LIBMD}
-LDADD=	-lrpcsvc -lcrypt -lmd
+DPADD=	${LIBRPCSVC} ${LIBCRYPT}
+LDADD=	-lrpcsvc -lcrypt
 
 CLEANFILES= ${GENSRCS}