Replaced exists() tests with two equivalent defined().

LIBDIR is defined in bsd.own.mk but sys.mk no longer
includes bsd.own.mk as of revision 1.60.

6 files changed, 6 insertions, 6 deletions

diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 923f367a02c9..95230b01e152 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -7,7 +7,7 @@ CFLAGS+=-DBINDIR=${BINDIR}
 WARNS=	0
 WFORMAT=0
 
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
 DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO}
 CFLAGS+=-DCRYPT -DHAVE_CONFIG_H \
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index 4aabe190ba6d..8f09c8b68f6b 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -29,7 +29,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -DHAVE_CONFIG_H \
 DPADD+=	${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
 LDADD+=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
 
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT
 LDADD+=	-lkrb -lcrypto -lcom_err
 DPADD+=	${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR}
diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index bb47aac96837..1148d8fd73d3 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -22,7 +22,7 @@ SRCS=	itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c
 MAN=	dump.8
 MLINKS+=dump.8 rdump.8
 
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
 DPADD=	${LIBKRB} ${LIBCRYPTO}
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index bd84cf584f9f..72043a1c3c2c 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -12,7 +12,7 @@ MAN=	restore.8
 MLINKS+=restore.8 rrestore.8
 .PATH:	${.CURDIR}/../dump
 
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4)
+.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 .PATH:	${.CURDIR}/../../crypto/kerberosIV/appl/bsd
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
 DPADD+=	${LIBKRB} ${LIBCRYPTO}
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index c8573f6e8500..898aff2c6959 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -10,7 +10,7 @@ BINOWN=	root
 BINMODE=4555
 INSTALLFLAGS=-fschg
 
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
+.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
 DPADD=	${LIBUTIL} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index e365a8107c1e..87691870e70c 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -5,7 +5,7 @@ PROG=	rsh
 SRCS=	rsh.c
 CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 
-.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
+.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
 SRCS+=	krcmd.c kcmd.c rcmd_util.c
 CFLAGS+=-DKERBEROS -DCRYPT -DHAVE_CONFIG_H \
 	-I${.CURDIR}/../rlogin -I${.CURDIR} -I- \