7 files changed, 9 insertions, 9 deletions

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)