10 files changed, 11 insertions, 13 deletions

diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index 6ffecc2fdf8c..f93fadbdcc33 100644
--- a/usr.sbin/pkg_install/Makefile
+++ b/usr.sbin/pkg_install/Makefile
@@ -2,7 +2,7 @@
 
 SUBDIR=	lib add create delete info version
 
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DISTRIBUTION=	crypto
 SUBDIR+= sign
 .endif
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 678885211c8e..55c538827a51 100644
--- a/usr.sbin/pkg_install/add/Makefile
+++ b/usr.sbin/pkg_install/add/Makefile
@@ -10,7 +10,7 @@ WARNS?=	2
 DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
 LDADD=	${LIBINSTALL} -lfetch -lmd
 
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DPADD+=	${LIBSSL} ${LIBCRYPTO}
 LDADD+=	-lssl -lcrypto
 .endif
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index 08173e5db996..e6c252b209ac 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -10,7 +10,7 @@ WARNS?=	2
 DPADD=	${LIBINSTALL} ${LIBMD}
 LDADD=	${LIBINSTALL} -lmd
 
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DPADD+=	${LIBSSL} ${LIBCRYPTO}
 LDADD+=	-lssl -lcrypto
 .endif
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index 954e5e62ca85..39bd1f457604 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -10,7 +10,7 @@ WARNS?=	4
 DPADD=	${LIBINSTALL} ${LIBMD}
 LDADD=	${LIBINSTALL} -lmd
 
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DPADD+=	${LIBSSL} ${LIBCRYPTO}
 LDADD+=	-lssl -lcrypto
 .endif
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index d3b16b808963..76f98645bf24 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -10,7 +10,7 @@ WARNS?=	2
 DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
 LDADD=	${LIBINSTALL} -lfetch -lmd
 
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DPADD+=	${LIBSSL} ${LIBCRYPTO}
 LDADD+=	-lssl -lcrypto
 .endif
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
index f18bedfd2a21..8a80e49e5d83 100644
--- a/usr.sbin/pkg_install/version/Makefile
+++ b/usr.sbin/pkg_install/version/Makefile
@@ -10,7 +10,7 @@ WARNS?=	2
 DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
 LDADD=	${LIBINSTALL} -lfetch -lmd
 
-.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
 DPADD+=	${LIBSSL} ${LIBCRYPTO}
 LDADD+=	-lssl -lcrypto
 .endif
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 86a22ab3eb8e..a26d235b54fe 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -15,7 +15,6 @@ NOI4B=		true
 NONAT=		true
 NOKLDLOAD=	true
 NORADIUS=	true
-NOSECURE=	true
 NOSUID=		true
 .endif
 
@@ -70,7 +69,7 @@ CFLAGS+=-DNOSUID
 SRCS+=	id.c
 .endif
 
-.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NOSECURE) || defined(NO_OPENSSL) || defined(NODES)
+.if !exists(${.CURDIR}/../../crypto) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES)
 CFLAGS+=-DNODES
 .else
 DISTRIBUTION=crypto
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index 4432435fa615..7c5f3029d3f9 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}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../crypto) && !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 7411ef3f61e2..3dfd707d5d1e 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -58,9 +58,8 @@ LDADD+=	${LIBSMUTIL} ${LIBSM}
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h
 
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && \
-	!defined(NOSECURE) && !defined(NO_OPENSSL) && \
-	!defined(RELEASE_CRUNCH)
+.if exists(${.CURDIR}/../../crypto) && !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 bb6968a2f0bb..8b1063a8992a 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -39,7 +39,7 @@ CFLAGS+=	-DLBL_ALIGN
 
 DPADD=	${LIBL} ${LIBPCAP}
 LDADD=	-ll -lpcap
-.if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \
+.if exists(../../../crypto) && !defined(NOCRYPT) && \
 	!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 DISTRIBUTION=crypto
 DPADD+= ${LIBCRYPTO}