Don't check for the existance of src/crypto/ for building items that

may contain crypto. The days of ITAR paranoia are over, and the simple
macro tests that remain are sufficient.

9 files changed, 9 insertions, 11 deletions

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 6bc9343..eb82c39 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -5,7 +5,7 @@ SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
 
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DISTRIBUTION=crypto
 CFLAGS+=-DDES
 WARNS?=	2
diff --git a/games/factor/Makefile b/games/factor/Makefile
index ffeae9c..573d735 100644
--- a/games/factor/Makefile
+++ b/games/factor/Makefile
@@ -5,7 +5,7 @@ PROG=	factor
 SRCS=	factor.c pr_tbl.c
 CFLAGS+=-I${.CURDIR}/../primes
 
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 CFLAGS+=-DHAVE_OPENSSL
 LDADD+=	-lcrypto
 DPADD+=	${LIBCRYPTO}
diff --git a/lib/Makefile b/lib/Makefile
index 383ce01..44c1f6a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -94,7 +94,7 @@ _libthr=	libthr
 _libdisk=	libdisk
 .endif
 
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 _libmp=		libmp
 .endif
 
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 52febe4..310c39f 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -248,7 +248,7 @@ SUBDIR+=ncplist \
 	smbutil
 .endif
 
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 SUBDIR+=chkey newkey
 .endif
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index d84a1e5..5dda3ce 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -225,7 +225,7 @@ SUBDIR+=boot98cfg
 SUBDIR+=ofwdump
 .endif
 
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 SUBDIR+=keyserv
 .endif
 
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 5e625b6..0cd4857 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -70,7 +70,7 @@ CFLAGS+=-DNOSUID
 SRCS+=	id.c
 .endif
 
-.if !exists(${.CURDIR}/../../crypto) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES)
+.if defined(NOCRYPT) || defined(NO_OPENSSL)
 CFLAGS+=-DNODES
 .else
 DISTRIBUTION=crypto
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index 7c5f3029..c0719a9 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -30,7 +30,7 @@ DPADD+=	${LIBPCAP}
 LDADD+=	-lpcap
 
 # MS-CHAP support.  Requires the DES library.
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 DISTRIBUTION=crypto
 CFLAGS+= -DCHAPMS
 SRCS+=	chap_ms.c
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index d868d34..26b2082 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -57,8 +57,7 @@ LDADD+=	${LIBSMUTIL} ${LIBSM}
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h
 
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && \
-	!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 # STARTTLS support
 DISTRIBUTION=	crypto
 CFLAGS+=	-DSTARTTLS -D_FFR_TLS_1
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 8b1063a..a5ce197 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -39,8 +39,7 @@ CFLAGS+=	-DLBL_ALIGN
 
 DPADD=	${LIBL} ${LIBPCAP}
 LDADD=	-ll -lpcap
-.if exists(../../../crypto) && !defined(NOCRYPT) && \
-	!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 DISTRIBUTION=crypto
 DPADD+= ${LIBCRYPTO}
 LDADD+= -lcrypto