From b7adb663d1e93714c096de64dedaeb3e81309ea3 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 14 Dec 2018 09:34:59 +0000
Subject: Move the BROKEN_SSL/IGNORE_SSL at a place where a value of base
 actually works.

---
 Mk/Uses/ssl.mk | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'Mk')

diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index 07697ba6b48f..2de01295cb3b 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -41,6 +41,26 @@ _SSL_BUILD_DEP=	1
 _SSL_RUN_DEP=	1
 .endif
 
+.if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}}
+.  if defined(BROKEN_SSL_REASON_${SSL_DEFAULT})
+BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON_${SSL_DEFAULT}}
+.  elif defined(BROKEN_SSL_REASON)
+BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON}
+.  else
+BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
+.  endif
+.endif
+
+.if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}}
+.  if defined(IGNORE_SSL_REASON_${SSL_DEFAULT})
+IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON_${SSL_DEFAULT}}
+.  elif defined(IGNORE_SSL_REASON)
+IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON}
+.  else
+IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
+.  endif
+.endif
+
 .if ${SSL_DEFAULT} == base
 OPENSSLBASE=		/usr
 OPENSSLDIR?=		/etc/ssl
@@ -77,26 +97,6 @@ OPENSSL_PORT=		security/${SSL_DEFAULT}
 .error You are using an unsupported SSL provider ${SSL_DEFAULT}
 .  endif
 
-.  if defined(BROKEN_SSL) && ${BROKEN_SSL:M${SSL_DEFAULT}}
-.    if defined(BROKEN_SSL_REASON_${SSL_DEFAULT})
-BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON_${SSL_DEFAULT}}
-.    elif defined(BROKEN_SSL_REASON)
-BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${BROKEN_SSL_REASON}
-.    else
-BROKEN=	does not build with DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
-.    endif
-.  endif
-
-.  if defined(IGNORE_SSL) && ${IGNORE_SSL:M${SSL_DEFAULT}}
-.    if defined(IGNORE_SSL_REASON_${SSL_DEFAULT})
-IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON_${SSL_DEFAULT}}
-.    elif defined(IGNORE_SSL_REASON)
-IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}: ${IGNORE_SSL_REASON}
-.    else
-IGNORE=	not compatible DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT}
-.    endif
-.  endif
-
 OPENSSLDIR?=		${OPENSSLBASE}/openssl
 .  if defined(_SSL_BUILD_DEP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
-- 
cgit