aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2004-12-21 10:16:04 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2004-12-21 10:16:04 +0000
commita216173556ede5d21d5157db945767a08201aae1 (patch)
tree39f12b382ddd99639a5d2e7415eefaadf4ff8ef9
parent83c7ade90a32f8aaff4de282b9fc2493076a54b9 (diff)
downloadsrc-a216173556ede5d21d5157db945767a08201aae1.tar.gz
src-a216173556ede5d21d5157db945767a08201aae1.zip
NOCRYPT -> NO_CRYPT
Notes
Notes: svn path=/head/; revision=139113
-rw-r--r--Makefile.inc122
-rw-r--r--bin/ed/Makefile2
-rw-r--r--etc/Makefile2
-rw-r--r--games/factor/Makefile2
-rw-r--r--gnu/usr.bin/cvs/cvs/Makefile2
-rw-r--r--lib/Makefile2
-rw-r--r--lib/bind/config.mk4
-rw-r--r--lib/libcrypt/Makefile2
-rw-r--r--lib/libfetch/Makefile2
-rw-r--r--lib/libpam/modules/modules.inc4
-rw-r--r--lib/libradius/Makefile2
-rw-r--r--lib/libtelnet/Makefile2
-rw-r--r--libexec/telnetd/Makefile2
-rw-r--r--rescue/rescue/Makefile2
-rw-r--r--secure/Makefile10
-rw-r--r--share/examples/etc/make.conf2
-rw-r--r--share/man/Makefile2
-rw-r--r--share/man/man5/make.conf.52
-rw-r--r--share/mk/bsd.compat.mk1
-rw-r--r--share/mk/bsd.libnames.mk4
-rw-r--r--sys/modules/Makefile2
-rw-r--r--sys/modules/netgraph/Makefile2
-rw-r--r--usr.bin/Makefile2
-rw-r--r--usr.bin/fetch/Makefile2
-rw-r--r--usr.bin/telnet/Makefile2
-rw-r--r--usr.sbin/Makefile4
-rw-r--r--usr.sbin/ntp/Makefile.inc2
-rw-r--r--usr.sbin/ntp/ntp-keygen/Makefile2
-rw-r--r--usr.sbin/ntp/ntpd/Makefile2
-rw-r--r--usr.sbin/pkg_install/Makefile2
-rw-r--r--usr.sbin/pkg_install/Makefile.inc2
-rw-r--r--usr.sbin/ppp/Makefile2
-rw-r--r--usr.sbin/pppd/Makefile2
-rw-r--r--usr.sbin/sendmail/Makefile2
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile2
35 files changed, 53 insertions, 52 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6d1ddeb22dd3..d5f33e959d37 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -7,7 +7,7 @@
# -DNO_RESCUE do not build rescue binaries
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
# -DNOCLEAN do not clean at all
-# -DNOCRYPT will prevent building of crypt versions
+# -DNO_CRYPT will prevent building of crypt versions
# -DNO_MAN do not build the manual pages
# -DNO_PROFILE do not build profiled libraries
# -DNOGAMES do not go into games subdir
@@ -49,14 +49,14 @@ SUBDIR= share/info include lib libexec bin
SUBDIR+=games
.endif
SUBDIR+=gnu
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
SUBDIR+=kerberos5
.endif
.if !defined(NO_RESCUE)
SUBDIR+=rescue
.endif
SUBDIR+=sbin
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
SUBDIR+=secure
.endif
.if !defined(NOSHARE)
@@ -393,7 +393,7 @@ build32:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${LIB32TMP}/usr/include >/dev/null
ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
.for _t in obj depend all
cd ${.CURDIR}/kerberos5/tools; \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} ${_t}
@@ -406,11 +406,11 @@ build32:
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
cd ${.CURDIR}/gnu/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
cd ${.CURDIR}/secure/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
cd ${.CURDIR}/kerberos5/lib; \
${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
.endif
@@ -434,7 +434,7 @@ install32:
mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree
cd ${.CURDIR}/lib; ${LIB32MAKE} install
cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
.endif
cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
@@ -880,7 +880,7 @@ _aicasm= sys/modules/aic7xxx/aicasm
_share= share/syscons/scrnmaps
.endif
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
_kerberos5_tools= kerberos5/tools
.endif
@@ -994,7 +994,7 @@ _prebuild_libs=
_generic_libs= gnu/lib
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
_prebuild_libs+= kerberos5/lib/libasn1
_prebuild_libs+= kerberos5/lib/libgssapi
_prebuild_libs+= kerberos5/lib/libkrb5
@@ -1021,7 +1021,7 @@ _prebuild_libs+= lib/libpthread
_generic_libs+= lib
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
.if !defined(NO_OPENSSL)
_prebuild_libs+= secure/lib/libcrypto secure/lib/libssl
lib/libradius__L: secure/lib/libssl__L
@@ -1039,7 +1039,7 @@ secure/lib/libssh__L: kerberos5/lib/libgssapi__L kerberos5/lib/libkrb5__L \
_generic_libs+= secure/lib
.endif
-.if defined(NOCRYPT) || defined(NO_OPENSSL)
+.if defined(NO_CRYPT) || defined(NO_OPENSSL)
lib/libradius__L: lib/libmd__L
.endif
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 608d1cdca6d8..9e6afd7db37a 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 !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
CFLAGS+=-DDES
WARNS?= 2
DPADD= ${LIBCRYPTO}
diff --git a/etc/Makefile b/etc/Makefile
index 04c4233e8806..ee5bfaaeedd0 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -23,7 +23,7 @@ BIN1= amd.map apmd.conf auth.conf \
BIN1+= printcap
.endif
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
.if !defined(NO_OPENSSH)
SSH= ${.CURDIR}/../crypto/openssh/ssh_config \
${.CURDIR}/../crypto/openssh/sshd_config \
diff --git a/games/factor/Makefile b/games/factor/Makefile
index fa21ca52c2f5..f8d5328f9df5 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 !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
CFLAGS+=-DHAVE_OPENSSL
LDADD= -lcrypto
DPADD= ${LIBCRYPTO}
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index fcdc75408aff..94e3f9636b62 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -33,7 +33,7 @@ CFLAGS+= -I${.CURDIR} -I../lib -DHAVE_CONFIG_H -I${CVSDIR}/src \
DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
-.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NOCRYPT)
+.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NO_CRYPT)
CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION
LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}
diff --git a/lib/Makefile b/lib/Makefile
index eebbb1bc7645..e063fbc54cbf 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -82,7 +82,7 @@ _libsmdb= libsmdb
_libsmutil= libsmutil
.endif
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
_libmp= libmp
.endif
diff --git a/lib/bind/config.mk b/lib/bind/config.mk
index 970400bc5e99..70e60a6f70a5 100644
--- a/lib/bind/config.mk
+++ b/lib/bind/config.mk
@@ -34,7 +34,7 @@ CFLAGS+= -DWANT_IPV6
.endif
# Enable crypto if available
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
CFLAGS+= -DOPENSSL
.endif
@@ -91,7 +91,7 @@ BIND_LDADD= ${BIND_DPADD}
.endif
# Link against crypto library
-.if !defined(NOCRYPT)
+.if !defined(NO_CRYPT)
CRYPTO_DPADD= ${LIBCRYPTO}
CRYPTO_LDADD= -lcrypto
.endif
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 67438d87213d..20e660fb59d6 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -15,7 +15,7 @@ MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil
# Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && !defined(NOCRYPT)
+.if exists(${.CURDIR}/../../secure/lib/libcrypt) && !defined(NO_CRYPT)
.PATH: ${.CURDIR}/../../secure/lib/libcrypt
SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 3f9ca1c618c1..d247593c1360 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -9,7 +9,7 @@ INCS= fetch.h
MAN= fetch.3
CLEANFILES= ftperr.h httperr.h
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
CFLAGS+= -DWITH_SSL
DPADD= ${LIBSSL} ${LIBCRYPTO}
LDADD= -lssl -lcrypto
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index 9858c58c45f9..c721075d3e67 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -8,7 +8,7 @@ MODULES += pam_exec
MODULES += pam_ftpusers
MODULES += pam_group
MODULES += pam_guest
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
MODULES += pam_krb5
MODULES += pam_ksu
.endif
@@ -24,7 +24,7 @@ MODULES += pam_rhosts
MODULES += pam_rootok
MODULES += pam_securetty
MODULES += pam_self
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
MODULES += pam_ssh
.endif
MODULES += pam_tacplus
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index 0f2eb88bbd6a..61eef25f82e9 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -31,7 +31,7 @@ CFLAGS+= -Wall
SHLIB_MAJOR= 1
MAN= libradius.3 radius.conf.5
-.if defined(NOCRYPT) || defined(NO_OPENSSL)
+.if defined(NO_CRYPT) || defined(NO_OPENSSL)
DPADD= ${LIBMD}
LDADD= -lmd
.else
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 544f21c880be..38f73a420af9 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -14,7 +14,7 @@ CFLAGS+= -I${TELNETDIR}
WARNS?= 0
.if !defined(RELEASE_CRUNCH)
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA
.if !defined(NO_KERBEROS)
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 8b6ebf81d272..293ecdcc9cb8 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -29,7 +29,7 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
LDADD= -lutil -ltermcap ${LIBTELNET}
.if !defined(RELEASE_CRUNCH)
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
SRCS+= authenc.c
CFLAGS+= -DAUTHENTICATION -DENCRYPTION
DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM}
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index dd0eb58360f5..362512749ee5 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -68,7 +68,7 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
ed expr getfacl hostname kenv kill ln ls mkdir mv pax ps pwd \
realpath rm rmdir setfacl sh stty sync test
CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
CRUNCH_LIBS+= -lcrypto
.endif
diff --git a/secure/Makefile b/secure/Makefile
index 0ac35f2841b7..c6d2ff41e345 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -26,11 +26,11 @@ secure:
insecure:
.for entry in ${SPROGS}
cd ${.CURDIR}/../${entry}; \
- ${MAKE} -DNOCRYPT cleandir; \
- ${MAKE} -DNOCRYPT obj; \
- ${MAKE} -DNOCRYPT depend; \
- ${MAKE} -DNOCRYPT all; \
- ${MAKE} -DNOCRYPT install
+ ${MAKE} -DNO_CRYPT cleandir; \
+ ${MAKE} -DNO_CRYPT obj; \
+ ${MAKE} -DNO_CRYPT depend; \
+ ${MAKE} -DNO_CRYPT all; \
+ ${MAKE} -DNO_CRYPT install
.endfor
.include <bsd.subdir.mk>
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 1347c87b83b4..827bc27c6f9f 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -110,7 +110,7 @@
#NO_AUTHPF= # do not build and install authpf (setuid/gid)
#NO_BLUETOOTH= # do not build Bluetooth related stuff
#NO_BOOT= # do not build boot blocks and loader
-#NOCRYPT= # do not build any crypto code
+#NO_CRYPT= # do not build any crypto code
#NO_CVS= # do not build CVS
#NO_CXX= # do not build C++ and friends
#NO_DYNAMICROOT= # do not link /bin and /sbin dynamically
diff --git a/share/man/Makefile b/share/man/Makefile
index 2175d0e97699..e0686354ca6c 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -8,7 +8,7 @@ MAKEWHATIS?= makewhatis
makedb:
${MAKEWHATIS} ${DESTDIR}${BINDIR}/man
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
${MAKEWHATIS} ${DESTDIR}${BINDIR}/openssl/man
.endif
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index ca57277a3daa..04afb73572c0 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -535,7 +535,7 @@ Set this to run
.Dq Li "${MAKE} clean"
instead of
.Dq Li "${MAKE} cleandir" .
-.It Va NOCRYPT
+.It Va NO_CRYPT
.Pq Vt bool
Set to not build any crypto code.
.It Va NOGAMES
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index fb4c7e95f3c9..80fc0627befb 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -3,6 +3,7 @@
.if !defined(BURN_BRIDGES)
.for oldnew in \
NOATM:NO_ATM \
+ NOCRYPT:NO_CRYPT \
NODOCCOMPRESS:NO_DOCCOMPRESS \
NOEXTRADEPEND:NO_EXTRADEPEND \
NOFSCHG:NO_FSCHG \
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index dbe2c7d2ac33..9ca32d513070 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -91,7 +91,7 @@ LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a
LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a
MINUSLPAM= -lpam
.if defined(LDFLAGS) && !empty(LDFLAGS:M-static)
-.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
LIBPAM+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
${LIBROKEN} ${LIBCOM_ERR}
MINUSLPAM+= -lkrb5 -lasn1 -lcrypto -lcrypt -lroken -lcom_err
@@ -100,7 +100,7 @@ LIBPAM+= ${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \
${LIBUTIL} ${LIBOPIE} ${LIBMD}
MINUSLPAM+= -lradius -ltacplus -lcrypt \
-lutil -lopie -lmd
-.if !defined(NO_OPENSSH) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_OPENSSH) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
LIBPAM+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
MINUSLPAM+= -lssh -lcrypto -lcrypt
.endif
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 6846b6e8b79d..0a2c32f7f03c 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -267,7 +267,7 @@ _syscons= syscons
_ufs= ufs
.endif
-.if !defined(NOCRYPT) || defined(ALL_MODULES)
+.if !defined(NO_CRYPT) || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
_crypto= crypto
_cryptodev= cryptodev
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index b68cdff43d75..ac4eb39676f5 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -45,7 +45,7 @@ SUBDIR= async \
_bluetooth= bluetooth
.endif
-.if !defined(NOCRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c)
+.if !defined(NO_CRYPT) && exists(${.CURDIR}/../../crypto/rc4/rc4.c)
_mppc= mppc
.endif
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 0f6bb9c5b167..8a7b310ef058 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -245,7 +245,7 @@ _nsupdate= nsupdate
_bluetooth= bluetooth
.endif
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
_chkey= chkey
_newkey= newkey
.endif
diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile
index 7b92352453f0..68115a7fdcb4 100644
--- a/usr.bin/fetch/Makefile
+++ b/usr.bin/fetch/Makefile
@@ -5,7 +5,7 @@ CSTD?= c99
WARNS?= 6
DPADD= ${LIBFETCH}
LDADD= -lfetch
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
.endif
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 687f4907091a..1394379b73a9 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -31,7 +31,7 @@ CFLAGS+= -DHAS_CGETENT
.endif
.if !defined(RELEASE_CRUNCH)
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
SRCS+= authenc.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC
DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 39ab303756db..162fb975f1e7 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -193,7 +193,7 @@ _atm= atm
.endif
.if !defined(NO_BIND)
-.if !defined(NO_BIND_DNSSEC) && !defined(NOCRYPT)
+.if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT)
_dnssec-keygen= dnssec-keygen
_dnssec-signzone= dnssec-signzone
.endif
@@ -211,7 +211,7 @@ _rndc-confgen= rndc-confgen
_bluetooth= bluetooth
.endif
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
_keyserv= keyserv
.endif
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index 4b931a878bc9..845d28ac55cb 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -8,7 +8,7 @@ NTPDEFS= -DSYS_FREEBSD
# -DMX4200 -DNMEA -DBOEDER
CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
CFLAGS+= -DOPENSSL
.endif
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 540c85173df6..f3fa451add00 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -12,7 +12,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
DPADD= ${LIBNTP}
LDADD= ${LIBNTP}
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DPADD+= ${LIBMD} ${LIBCRYPTO}
LDADD+= -lmd -lcrypto
.endif
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index c906583038b6..5b3fdba2d17b 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -31,7 +31,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD}
LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
.endif
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index ee4019b83749..e74b5dca6a3a 100644
--- a/usr.sbin/pkg_install/Makefile
+++ b/usr.sbin/pkg_install/Makefile
@@ -2,7 +2,7 @@
SUBDIR= lib add create delete info ${_sign} version
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
_sign= sign
.endif
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index 89c259340944..46518b9c2aa5 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -6,7 +6,7 @@ LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a
LIBINSTALL= ${.CURDIR}/../lib/libinstall.a
.endif
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && \
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && \
defined(LDADD) && ${LDADD:M-lfetch} != ""
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 9b0ad5788e77..370d057600ff 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -72,7 +72,7 @@ CFLAGS+=-DNOSUID
SRCS+= id.c
.endif
-.if defined(RELEASE_CRUNCH) || defined(NOCRYPT) || defined(NO_OPENSSL)
+.if defined(RELEASE_CRUNCH) || defined(NO_CRYPT) || defined(NO_OPENSSL)
CFLAGS+=-DNODES
.else
SRCS+= chap_ms.c mppe.c
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index e2f4bd888c43..c7b617442ecb 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 !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
CFLAGS+= -DCHAPMS
SRCS+= chap_ms.c
LDADD+= -lcrypto
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 4226a7241e08..4b2dc7250513 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -63,7 +63,7 @@ LDADD+= ${LIBSMUTIL} ${LIBSM}
SRCS+= sm_os.h
CLEANFILES+=sm_os.h
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
# STARTTLS support
CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL
DPADD+= ${LIBSSL} ${LIBCRYPTO}
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 1117f17a0458..95d743132b48 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -42,7 +42,7 @@ CFLAGS+= -DLBL_ALIGN
DPADD= ${LIBL} ${LIBPCAP}
LDADD= -ll -lpcap
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H