summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/perl/suidperl/Makefile5
-rw-r--r--gnu/usr.bin/perl/x2p/a2pl/Makefile2
-rw-r--r--libexec/makekey/Makefile4
-rw-r--r--libexec/uucpd/Makefile4
-rw-r--r--usr.bin/chpass/Makefile4
-rw-r--r--usr.bin/lock/Makefile4
-rw-r--r--usr.bin/login/Makefile4
-rw-r--r--usr.bin/passwd/Makefile13
-rw-r--r--usr.bin/rlogin/Makefile4
-rw-r--r--usr.bin/rsh/Makefile4
-rw-r--r--usr.bin/su/Makefile4
-rw-r--r--usr.sbin/pw/Makefile4
-rw-r--r--usr.sbin/rpc.yppasswdd/Makefile4
13 files changed, 29 insertions, 31 deletions
diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile
index 1fc6ffb..c8d1f45 100644
--- a/gnu/usr.bin/perl/suidperl/Makefile
+++ b/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
diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile
index fdfb44d..e7ad753 100644
--- a/gnu/usr.bin/perl/x2p/a2pl/Makefile
+++ b/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
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index d61df5d..2028c6d 100644
--- a/libexec/makekey/Makefile
+++ b/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>
diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile
index c89c5ea..3aeb623 100644
--- a/libexec/uucpd/Makefile
+++ b/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>
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
diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile
index 02c2957..e6c9fa3 100644
--- a/usr.sbin/pw/Makefile
+++ b/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
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index eb63061..772b5fb 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/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}
OpenPOWER on IntegriCloud