86 files changed, 135 insertions, 139 deletions

diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
index e6ad01b84b0e..a56fe69f9614 100644
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -611,7 +611,7 @@ proxydeps_suggest_uses() {
 	elif [ ${pkg} = "devel/readline" ]; then
 		warn "you need USES+=readline"
 	# ssl
-	elif [ ${pkg} = "security/openssl" -o ${pkg} = "security/openssl-devel" \
+	elif [ ${pkg} = "security/openssl" -o ${pkg} = "security/openssl111" \
 	  -o ${pkg} = "security/libressl" -o ${pkg} = "security/libressl-devel" \
 	  ]; then
 		warn "you need USES=ssl"
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index 941467a18de1..4e5d48099d8c 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -10,7 +10,7 @@
 #
 # DEFAULT_VERSIONS+=	ssl=<openssl variant>
 #
-# Variants being base, openssl, openssl-devel, openssl111, libressl, and libressl-devel.
+# Variants being base, openssl, openssl111, libressl, and libressl-devel.
 #
 # The Makefile sets these variables:
 # OPENSSLBASE		- "/usr" or ${LOCALBASE}
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 38197e1d1ea3..0a55c65cdd73 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -88,7 +88,7 @@ PYTHON3_DEFAULT?=	3.6
 RUBY_DEFAULT?=		2.4
 # Possible values: 4.6, 4.7, 4.8
 SAMBA_DEFAULT?=		4.7
-# Possible values: base, openssl, openssl-devel, openssl111, libressl, libressl-devel
+# Possible values: base, openssl, openssl111, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
diff --git a/audio/cpp-xmms2/Makefile b/audio/cpp-xmms2/Makefile
index 0ffff50ca2ff..3f3d8c3f0e2d 100644
--- a/audio/cpp-xmms2/Makefile
+++ b/audio/cpp-xmms2/Makefile
@@ -16,7 +16,7 @@ USES=		ssl
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/audio/p5-xmms2/Makefile b/audio/p5-xmms2/Makefile
index 3e4bd300efc6..70b88ad4767a 100644
--- a/audio/p5-xmms2/Makefile
+++ b/audio/p5-xmms2/Makefile
@@ -14,7 +14,7 @@ MASTERDIR=	${.CURDIR}/../xmms2
 
 USES=		perl5 ssl
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/audio/py-xmms2/Makefile b/audio/py-xmms2/Makefile
index 526d9d17e0a2..7697b1c2c549 100644
--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -17,7 +17,7 @@ MASTERDIR=	${.CURDIR}/../xmms2
 USES=		python:2.7 ssl
 USE_PYTHON=	flavors
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index a5d3757db21c..8fd451f7c02c 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Music file player for Apple Airport Express
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	bin/raop_play:No such file or directory
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	bin/raop_play:No such file or directory
 
 LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 		libfltk.so:x11-toolkits/fltk \
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index 1a439d3cf18c..6a500b99ee93 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -14,8 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=		fails to compile: fatal error: byteswap.h file not found
 BROKEN_armv6=		fails to compile: fatal error: byteswap.h file not found
-BROKEN_SSL=		openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	configure: error: could not find libcrypto
+BROKEN_SSL=		openssl111
+BROKEN_SSL_REASON_openssl111=	configure: error: could not find libcrypto
 
 LIB_DEPENDS=	libconfig.so:devel/libconfig \
 		libprotobuf-c.so:devel/protobuf-c
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 4cd93fc1114d..1300001a9ea9 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Benchmarking tool for Web proxies
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	configure: error: OpenSSL libraries and/or directories were not found in /usr/local
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	configure: error: OpenSSL libraries and/or directories were not found in /usr/local
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index cea9bd530cb0..2fbc8ea2ce54 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -16,8 +16,8 @@ LICENSE_NAME=	American Radio Relay League, Inc. All rights reserved.
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	member access into incomplete type 'EVP_PKEY' (aka 'evp_pkey_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'EVP_PKEY' (aka 'evp_pkey_st')
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index ff59ee31c993..27123cb6259d 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -17,8 +17,8 @@ BROKEN_aarch64=		fails to build: error: cast from pointer to smaller type loses
 BROKEN_armv6=		fails to build: error: Not supported ARM architecture
 BROKEN_armv7=		fails to build: error: invalid operand for instruction
 BROKEN_mips64=		fails to link: undefined reference to __sync_add_and_fetch_4
-BROKEN_SSL=		openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	member access into incomplete type 'SSL_CIPHER' (aka 'ssl_cipher_st')
+BROKEN_SSL=		openssl111
+BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'SSL_CIPHER' (aka 'ssl_cipher_st')
 
 RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 95f8e5c4c80f..c5712beb8a35 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Synchronous multi-master replication engine
 
 LICENSE=	GPLv2
 
-BROKEN_SSL=		openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	check that SSL devel headers are installed and usable
+BROKEN_SSL=		openssl111
+BROKEN_SSL_REASON_openssl111=	check that SSL devel headers are installed and usable
 BROKEN_aarch64=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
 BROKEN_armv6=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
 BROKEN_armv7=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
diff --git a/databases/mongodb32-tools/Makefile b/databases/mongodb32-tools/Makefile
index e3589291686a..33c2586dccc7 100644
--- a/databases/mongodb32-tools/Makefile
+++ b/databases/mongodb32-tools/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Tools for MongoDB
 
 LICENSE=	APACHE20
 
-BROKEN_SSL=	openssl-devel libressl libressl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
+BROKEN_SSL=	openssl111 libressl libressl-devel
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
 BROKEN_SSL_REASON_libressl=	could not determine kind of name for C.EVP_sha
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
 
diff --git a/databases/mongodb32/Makefile b/databases/mongodb32/Makefile
index eb7d8d2a29d6..f61f5a1830fc 100644
--- a/databases/mongodb32/Makefile
+++ b/databases/mongodb32/Makefile
@@ -18,8 +18,8 @@ COMMENT=	Distributed document-oriented "NoSQL" database
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st')
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
diff --git a/databases/mongodb34-tools/Makefile b/databases/mongodb34-tools/Makefile
index ad9a1a1dc314..c0d45bbbbf4b 100644
--- a/databases/mongodb34-tools/Makefile
+++ b/databases/mongodb34-tools/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Tools for MongoDB
 
 LICENSE=	APACHE20
 
-BROKEN_SSL=	openssl-devel libressl libressl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
+BROKEN_SSL=	openssl111 libressl libressl-devel
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
 BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
 
diff --git a/databases/mongodb34/Makefile b/databases/mongodb34/Makefile
index a60dfbaf5395..109564f3b5ab 100644
--- a/databases/mongodb34/Makefile
+++ b/databases/mongodb34/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Distributed document-oriented "NoSQL" database
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	no member named 'SSLv2_method' in the global namespace
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	no member named 'SSLv2_method' in the global namespace
 ONLY_FOR_ARCHS=	amd64 aarch64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 and aarch64 (i386 deprecated in v3)"
 
diff --git a/databases/mongodb36-tools/Makefile b/databases/mongodb36-tools/Makefile
index 7ac98f5e281d..5dab6545f5b0 100644
--- a/databases/mongodb36-tools/Makefile
+++ b/databases/mongodb36-tools/Makefile
@@ -12,8 +12,8 @@ LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
-BROKEN_SSL=	openssl-devel libressl libressl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
+BROKEN_SSL=	openssl111 libressl libressl-devel
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
 BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
 
diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
index 4497e7f6eb61..1ebcfa4eded7 100644
--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -13,8 +13,8 @@ COMMENT=	MySQL database connector for C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
 
 USES=		cmake:outsource compiler:features mysql ssl
 CMAKE_ARGS+=	-DOPENSSL_INCLUDE_DIR="${OPENSSLINC}"
diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
index 6ca3362811ef..f1acfa1f506f 100644
--- a/databases/mysqlwsrep56-server/Makefile
+++ b/databases/mysqlwsrep56-server/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS=	bash:shells/bash \
 		socat:net/socat
 LIB_DEPENDS=	libevent.so:devel/libevent liblz4.so:archivers/liblz4
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	incomplete definition of type 'struct dh_st'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct dh_st'
 
 DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index 6d30e9ad5c45..98e6736c8938 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Lightweight connection pooler for PostgreSQL
 
 LICENSE=	BSD2CLAUSE
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'X509_STORE_CTX' (aka 'struct x509_store_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'X509_STORE_CTX' (aka 'struct x509_store_ctx_st')
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:textproc/gsed
diff --git a/databases/pgpool-II-35/Makefile b/databases/pgpool-II-35/Makefile
index b66d29359169..f035d712a85b 100644
--- a/databases/pgpool-II-35/Makefile
+++ b/databases/pgpool-II-35/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Connection pool server for PostgreSQL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	library 'ssl' is required for OpenSSL
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	library 'ssl' is required for OpenSSL
 
 PORTSCOUT=	limit:^3.5.[0-9]*
 
diff --git a/databases/pgpool-II-36/Makefile b/databases/pgpool-II-36/Makefile
index 589b37972061..a66350f7461f 100644
--- a/databases/pgpool-II-36/Makefile
+++ b/databases/pgpool-II-36/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Connection pool server for PostgreSQL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	library 'ssl' is required for OpenSSL
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	library 'ssl' is required for OpenSSL
 
 PORTSCOUT=	limit:^3.6.[0-9]*
 
diff --git a/databases/pgpool-II-37/Makefile b/databases/pgpool-II-37/Makefile
index eb5a3adc11f3..48b8ac8a80c9 100644
--- a/databases/pgpool-II-37/Makefile
+++ b/databases/pgpool-II-37/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Connection pool server for PostgreSQL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	library 'ssl' is required for OpenSSL
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	library 'ssl' is required for OpenSSL
 
 PORTSCOUT=	limit:^3.7.[0-9]*
 
diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile
index 365912a927e7..3f17755091e3 100644
--- a/databases/pgpool/Makefile
+++ b/databases/pgpool/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Connection pool server for PostgreSQL
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	library 'ssl' is required for OpenSSL
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	library 'ssl' is required for OpenSSL
 
 PORTSCOUT=	limit:^3.4.[0-9]*
 
diff --git a/devel/dcmtk/Makefile b/devel/dcmtk/Makefile
index cf66633d10d0..bf69b9360315 100644
--- a/devel/dcmtk/Makefile
+++ b/devel/dcmtk/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNA
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Toolkit to work with DICOM objects
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	use of undeclared identifier 'TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	use of undeclared identifier 'TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA'
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libpng.so:graphics/png
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index 44d974aa66e9..4bdd82c98fc6 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Grassroots DICOM library
 
 LICENSE=	BSD3CLAUSE
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'X509_STORE_CTX' (aka 'x509_store_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'X509_STORE_CTX' (aka 'x509_store_ctx_st')
 
 LIB_DEPENDS=	libopenjpeg.so:graphics/openjpeg15 \
 		libexpat.so:textproc/expat2
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 07776eef129e..7ea2cc5d0b39 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -14,8 +14,8 @@ COMMENT=	HTTP/2-based RPC framework
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	use of undeclared identifier 'SSL_get0_next_proto_negotiated'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	use of undeclared identifier 'SSL_get0_next_proto_negotiated'
 
 BUILD_DEPENDS=	go:lang/go \
 		yasm:devel/yasm
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index 7b0781567126..42df4b1e0222 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	APACHE20
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'HMAC_CTX' (aka 'hmac_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'HMAC_CTX' (aka 'hmac_ctx_st')
 
 BUILD_DEPENDS=	gmake:devel/gmake \
 		gsed:textproc/gsed
diff --git a/devel/hadoop2/Makefile b/devel/hadoop2/Makefile
index d55d86c3e9ce..99553d983a34 100644
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -24,8 +24,8 @@ COMMENT=	Apache Map/Reduce framework
 
 LICENSE=	APACHE20
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	incomplete definition of type 'struct evp_cipher_ctx_st'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct evp_cipher_ctx_st'
 
 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
 		cmake:devel/cmake \
diff --git a/devel/libopkele/Makefile b/devel/libopkele/Makefile
index 0a9d9d09aa22..18bd270fb326 100644
--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtidy.so:www/tidy-lib \
 		libxslt.so:textproc/libxslt
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	member access into incomplete type 'DH' (aka 'dh_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'DH' (aka 'dh_st')
 
 USES=		gmake libtool localbase:ldflags pathfix \
 		pkgconfig ssl
diff --git a/devel/mongo-cxx-driver/Makefile b/devel/mongo-cxx-driver/Makefile
index f905e1c7fdfe..3121eff273e6 100644
--- a/devel/mongo-cxx-driver/Makefile
+++ b/devel/mongo-cxx-driver/Makefile
@@ -13,8 +13,8 @@ COMMENT=	MongoDB Legacy C++ Driver
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/APACHE-2.0.txt
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	use of undeclared identifier 'BIO_s_file_internal'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	use of undeclared identifier 'BIO_s_file_internal'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 4be8f7ca10b2..1d311823242b 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Robust high performance CORBA ORB for C++ and Python
 
 LICENSE=	GPLv2
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	member access into incomplete type 'DH' (aka 'dh_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'DH' (aka 'dh_st')
 
 CONFLICTS=	omniORB41-4.1.*
 PLIST_SUB+=	SONUM=2
diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index 284e03e2701f..dd57d39dec65 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -16,8 +16,8 @@ COMMENT=	C++ libraries with a network/internet focus (full version)
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	field has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	field has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
 
 CONFLICTS=	poco-[0-9]*
 
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index dfb803bea908..b145c06e099d 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Cross platform C++ library, used by OPAL
 
 LICENSE=	MPL10
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	use of undeclared identifier 'BIO_s_file_internal'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	use of undeclared identifier 'BIO_s_file_internal'
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
diff --git a/devel/staf/Makefile b/devel/staf/Makefile
index c967328be7ce..cd9b417d3e64 100644
--- a/devel/staf/Makefile
+++ b/devel/staf/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Software Testing Automation Framework
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/LICENSE.htm
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st')
 
 WRKSRC=		${WRKDIR}/src
 WRKSRC_SUBDIR=	${PORTNAME}
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index 701ea8262817..b85d59ca6e19 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo
 
 BROKEN_powerpc64=	fails to compile: undefined reference to std::__throw_out_of_range_fmt
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	'configure: error: "Error: libcrypto required."'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	'configure: error: "Error: libcrypto required."'
 
 USES=			autoreconf pkgconfig gmake compiler:c++11-lang \
 			libtool pathfix ssl
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 14fe03fda2a4..d35f03dcfd9c 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	GNU/gnu-arch \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Original arch source control management CLI written in C
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	incomplete definition of type 'struct X509_name_entry_st'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct X509_name_entry_st'
 
 BUILD_DEPENDS=	gpatch:devel/patch \
 		gdiff:textproc/diffutils \
diff --git a/dns/credns/Makefile b/dns/credns/Makefile
index 7a0d140350b7..1a26fab78f73 100644
--- a/dns/credns/Makefile
+++ b/dns/credns/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Verifier performing validation in the DNS notify/transfer-chain
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USE_RC_SUBR=	credns
 
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index e137d6337ae5..34417701485e 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -101,7 +101,7 @@ INSTALL_TARGET=	install-lib install-h install-config
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDANETAUSAGE} && ${SSL_DEFAULT} != openssl-devel
+.if ${PORT_OPTIONS:MDANETAUSAGE} && ${SSL_DEFAULT} != openssl111
 BROKEN=		this option requires openssl >= 1.1.0
 .endif
 
diff --git a/dns/validns/Makefile b/dns/validns/Makefile
index 6d213cde8f71..aecdda5eb3a3 100644
--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High performance DNS/DNSSEC zone validator
 
 LICENSE=	BSD2CLAUSE
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 LIB_DEPENDS=	libJudy.so:devel/judy
 
diff --git a/irc/bip/Makefile b/irc/bip/Makefile
index f5be486e6732..a87d1b02d8ba 100644
--- a/irc/bip/Makefile
+++ b/irc/bip/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple IRC proxy with SSL support
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index d71404f4d7f7..c89d81feb3dd 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -45,7 +45,7 @@ OPTIONS_EXCLUDE+=	DTRACE
 
 OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
 
-OPENSSL_VARS=	BROKEN_SSL=openssl-devel openssl111
+OPENSSL_VARS=	BROKEN_SSL=openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 449a79e62c15..56fd3e990630 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -45,7 +45,7 @@ OPTIONS_EXCLUDE+=	DTRACE
 
 OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
 
-OPENSSL_VARS=	BROKEN_SSL=openssl-devel openssl111
+OPENSSL_VARS=	BROKEN_SSL=openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index 8f21a9e8e2cc..76d32085b397 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -64,7 +64,7 @@ OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 
-OPENSSL_VARS=	BROKEN_SSL=openssl-devel openssl111
+OPENSSL_VARS=	BROKEN_SSL=openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile
index 548b9896bf34..2a3a5f83501e 100644
--- a/lang/erlang-runtime18/Makefile
+++ b/lang/erlang-runtime18/Makefile
@@ -65,7 +65,7 @@ OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 
-OPENSSL_VARS=	BROKEN_SSL=openssl-devel openssl111
+OPENSSL_VARS=	BROKEN_SSL=openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile
index 97195c06af99..871663fad053 100644
--- a/lang/erlang-runtime19/Makefile
+++ b/lang/erlang-runtime19/Makefile
@@ -69,7 +69,7 @@ OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 
-OPENSSL_VARS=	BROKEN_SSL=openssl-devel
+OPENSSL_VARS=	BROKEN_SSL=openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile
index 17198bf013b2..eb740ab959ff 100644
--- a/lang/erlang-runtime20/Makefile
+++ b/lang/erlang-runtime20/Makefile
@@ -72,7 +72,7 @@ OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 
-OPENSSL_VARS=	BROKEN_SSL=openssl-devel
+OPENSSL_VARS=	BROKEN_SSL=openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile
index dc4610028e67..6ca3774c77d4 100644
--- a/lang/erlang-runtime21/Makefile
+++ b/lang/erlang-runtime21/Makefile
@@ -66,7 +66,7 @@ OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 
-OPENSSL_VARS=	BROKEN_SSL=openssl-devel
+OPENSSL_VARS=	BROKEN_SSL=openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index b13c41d2cb24..6befd6326e24 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -12,8 +12,8 @@ LICENSE=	BSD3CLAUSE
 
 BROKEN_powerpc64=	fails to build: g++48: not found
 BROKEN_sparc64=		does not link on sparc64
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	error: member access into incomplete type 'X509' (aka 'x509_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	error: member access into incomplete type 'X509' (aka 'x509_st')
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext
index 14ea40a5a5f1..fcd276191a21 100644
--- a/lang/php56/Makefile.ext
+++ b/lang/php56/Makefile.ext
@@ -527,8 +527,8 @@ USES+=	mysql
 
 .include <bsd.port.pre.mk>
 
-.if ${PHP_MODNAME} == "openssl" && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=		Does not build with openssl-devel
+.if ${PHP_MODNAME} == "openssl" && ${SSL_DEFAULT:Mopenssl111}
+BROKEN=		Does not build with openssl111
 .endif
 
 .if ${PHP_MODNAME} == "gd"
diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index 02fb48cdea55..765e81a4760b 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Interpreted object-oriented programming language
 
 LICENSE=	PSFL
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
 PATHFIX_MAKEFILEIN=	Makefile.pre.in
diff --git a/lang/ruby23/Makefile b/lang/ruby23/Makefile
index e3cfded2f93d..cddc14eefa2b 100644
--- a/lang/ruby23/Makefile
+++ b/lang/ruby23/Makefile
@@ -18,8 +18,8 @@ LICENSE_COMB=	dual
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=does not detect and buid the openssl*.rb bits
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=does not detect and buid the openssl*.rb bits
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
 BUILD_DEPENDS=	libffi>=0:devel/libffi
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 74ac9878e06e..1bd887ecbd08 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Library for posting electronic mail
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USES=		gmake libtool tar:bzip2
 GNU_CONFIGURE=	yes
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 61dab7f3a51f..ce68cc7d9be6 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error
 
 LICENSE=	BSD2CLAUSE
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USE_RC_SUBR?=	obspamd obspamlogd
 USES=		ssl
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index c2c2f25d897d..100335a7f9bd 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Extendable SNMP implementation
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 LIB_DEPENDS=	libpkg.so:ports-mgmt/pkg
 
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index c434e2de577f..e0b56c3b8144 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -48,8 +48,8 @@ LUA_MAKE_ARGS=		USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NA
 MAKE_ARGS+=	USE_REGPARM=1
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=		Does not build with openssl-devel
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl111}
+BROKEN=		Does not build with openssl111
 .endif
 
 post-build:
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 0810dce884d1..a9f50fc65975 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -46,8 +46,8 @@ LUA_MAKE_ARGS=		USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NA
 MAKE_ARGS+=     USE_REGPARM=1
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=         Does not build with openssl-devel
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl111}
+BROKEN=         Does not build with openssl111
 .endif
 
 post-build:
diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile
index 42c08d664e89..3d42db9f2ef6 100644
--- a/net/haproxy17/Makefile
+++ b/net/haproxy17/Makefile
@@ -50,8 +50,8 @@ LUA_MAKE_ARGS=		USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NA
 MAKE_ARGS+=	USE_REGPARM=1
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=		Does not build with openssl-devel
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl111}
+BROKEN=		Does not build with openssl111
 .endif
 
 post-build:
diff --git a/net/libsrtp/Makefile b/net/libsrtp/Makefile
index 418cedbbe18e..8188d71ebecb 100644
--- a/net/libsrtp/Makefile
+++ b/net/libsrtp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Secure RTP (SRTP) Reference Implementation
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 PORTSCOUT=	limit:^1\.
 
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index be077d832790..6a8ea90b5c03 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Multi-link PPP daemon based on netgraph(4)
 
 LICENSE=	BSD3CLAUSE
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 BROKEN_SSL_REASON_openss-devel=	needs libfetch(3) linked with system libssl
 
 OPTIONS_DEFINE=	DOCS NG_IPACCT
diff --git a/net/nuster/Makefile b/net/nuster/Makefile
index 430381e636b5..e96c56e39b63 100644
--- a/net/nuster/Makefile
+++ b/net/nuster/Makefile
@@ -53,8 +53,8 @@ PORTEXAMPLES=	*
 MAKE_ARGS+=	USE_REGPARM=1
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=	Does not build with openssl-devel
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl111}
+BROKEN=	Does not build with openssl111
 .endif
 
 post-build:
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile
index 5b3e356b8e2f..c13d6a8e3340 100644
--- a/net/qt4-network/Makefile
+++ b/net/qt4-network/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Qt network module
 LICENSE=	GPLv3 LGPL21 LGPL3 GFDL
 LICENSE_COMB=	dual
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	error: member access into incomplete type 'RSA' (aka 'rsa_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	error: member access into incomplete type 'RSA' (aka 'rsa_st')
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
index f1f210feeca2..9432c6eb1503 100644
--- a/net/qt5-network/Makefile
+++ b/net/qt5-network/Makefile
@@ -8,8 +8,8 @@ PKGNAMEPREFIX=	qt5-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt network module
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	error: member access into incomplete type 'X509' (aka 'x509_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	error: member access into incomplete type 'X509' (aka 'x509_st')
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index f9a5aedceceb..87f83f529074 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 DEPRECATED=		No longer supported by upline
 EXPIRATION_DATE=	2021-09-30
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 0e85cdc29cfc..d9c8490ca44d 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ENV+=	openssl_LIBS="-L${OPENSSLLIB} -lcrypto" openssl_CFLAGS=-I${OPENS
 
 CPE_PRODUCT=	xml_security_for_c\+\+
 CPE_VENDOR=	apache
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	field has incomplete type HMAC_CTX (aka hmac_ctx_st)
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	field has incomplete type HMAC_CTX (aka hmac_ctx_st)
 
 .include <bsd.port.mk>
diff --git a/security/botan2/Makefile b/security/botan2/Makefile
index ea312b7c9d5b..0d3b6bcd9dd5 100644
--- a/security/botan2/Makefile
+++ b/security/botan2/Makefile
@@ -41,7 +41,7 @@ SQLITE3_CONFIGURE_WITH=	sqlite3
 
 SSL_USES=		ssl
 SSL_CONFIGURE_WITH=	openssl
-SSL_VARS=		BROKEN_SSL=	openssl-devel
+SSL_VARS=		BROKEN_SSL=	openssl111
 
 .include <bsd.port.options.mk>
 
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 5441e59f321e..02a656c5f81f 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Various sniffing utilities for penetration testing
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	incomplete definition of type 'struct rsa_st'
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct rsa_st'
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:net/libnids
 LIB_DEPENDS=	libnet.so:net/libnet
diff --git a/security/john/Makefile b/security/john/Makefile
index dad0ff52392f..4602b445fe5d 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Featureful Unix password cracker
 
 LICENSE=	GPLv2
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
diff --git a/security/krb5-114/Makefile b/security/krb5-114/Makefile
index 5105001951da..ee0818b62878 100644
--- a/security/krb5-114/Makefile
+++ b/security/krb5-114/Makefile
@@ -23,8 +23,8 @@ EXPIRATION_DATE=	2018-12-31
 
 BROKEN_FreeBSD_12=	Fails to build after import of openssl111
 BROKEN_FreeBSD_13=	Fails to build after import of openssl111
-BROKEN_SSL=		openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	 OpenSSL >= 1.1.0 unsupported.
+BROKEN_SSL=		openssl111
+BROKEN_SSL_REASON_openssl111=	 OpenSSL >= 1.1.0 unsupported.
 
 
 CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[35]-[0-9]* \
diff --git a/security/libssh/Makefile b/security/libssh/Makefile
index cb1169e8d96a..89d772731652 100644
--- a/security/libssh/Makefile
+++ b/security/libssh/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Library implementing the SSH1 and SSH2 protocol
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	error: variable has incomplete type 'EVP_MD_CTX' (aka 'struct evp_md_ctx_st')
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	error: variable has incomplete type 'EVP_MD_CTX' (aka 'struct evp_md_ctx_st')
 
 OPTIONS_DEFINE=	SSH1 STATIC
 OPTIONS_RADIO=	CRYPTO
diff --git a/security/luasec/Makefile b/security/luasec/Makefile
index 34f148c7aff6..dd04223710ae 100644
--- a/security/luasec/Makefile
+++ b/security/luasec/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lua binding for the OpenSSL library to provide TLS/SSL communication
 
 LICENSE=	MIT
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	brunoos
diff --git a/security/openca-tools-forked/Makefile b/security/openca-tools-forked/Makefile
index 4f9473649bf2..3f8e8c4cad37 100644
--- a/security/openca-tools-forked/Makefile
+++ b/security/openca-tools-forked/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Tools to deal with SCEP and PKCS7 messages
 
 LICENSE=	APACHE20
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USES=		gmake perl5 ssl
 
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 945c4678350f..1ed65712d5a9 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -26,8 +26,8 @@ CONFIGURE_ARGS=		--prefix=${PREFIX} --with-md5-passwords \
 
 ETCOLD=			${PREFIX}/etc
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	error: OpenSSL >= 1.1.0 is not yet supported
+BROKEN_SSL=	openssl111
+BROKEN_SSL_REASON_openssl111=	error: OpenSSL >= 1.1.0 is not yet supported
 
 FLAVORS=			default hpn
 default_CONFLICTS_INSTALL=	openssl-portable-hpn
diff --git a/security/p5-Crypt-OpenSSL-CA/Makefile b/security/p5-Crypt-OpenSSL-CA/Makefile
index 55eaf1dd1548..6cd04f1bbe65 100644
--- a/security/p5-Crypt-OpenSSL-CA/Makefile
+++ b/security/p5-Crypt-OpenSSL-CA/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	p5-Convert-ASN1>=0.02:converters/p5-Convert-ASN1 \
 TEST_DEPENDS=	p5-Test-Group>=0:devel/p5-Test-Group \
 		p5-Test-Taint>=0:devel/p5-Test-Taint
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USES=		perl5 ssl
 USE_PERL5=	modbuild
diff --git a/security/p5-Crypt-OpenSSL-ECDSA/Makefile b/security/p5-Crypt-OpenSSL-ECDSA/Makefile
index a4929ef6409d..bd067528ea96 100644
--- a/security/p5-Crypt-OpenSSL-ECDSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-ECDSA/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 
 BROKEN_FreeBSD_12=	unknown type name 'ECDSA_METHOD'; did you mean 'DSA_METHOD'?
 BROKEN_FreeBSD_13=	unknown type name 'ECDSA_METHOD'; did you mean 'DSA_METHOD'?
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Crypt-OpenSSL-EC>=0.05:security/p5-Crypt-OpenSSL-EC
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index 8b48ca4aa763..487057189455 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl based trustcenter for PKI: universal server building block
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	bash:shells/bash \
diff --git a/security/pam_ssh_agent_auth/Makefile b/security/pam_ssh_agent_auth/Makefile
index 773182d36e24..be545ee5d145 100644
--- a/security/pam_ssh_agent_auth/Makefile
+++ b/security/pam_ssh_agent_auth/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/pamsshagentauth/${PORTNAME}/v${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PAM module which permits authentication via ssh-agent
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 BROKEN_mips64=		fails to compile: ed25519-donna-portable.h:85:4: Need a uint128_t implementation!
 BROKEN_powerpc64=	fails to compile: ed25519-donna-portable.h: warning: ALIGN redefined
 
diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile
index b13e16ab5dc4..15f7aba327ed 100644
--- a/security/softhsm2/Makefile
+++ b/security/softhsm2/Makefile
@@ -52,11 +52,7 @@ CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl
 
 .include <bsd.port.options.mk>
 
-.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl-devel}
-CONFIGURE_ARGS+=	--disable-gost
-.endif
-
-.if ${SSL_DEFAULT:Mopenssl-devel}
+.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl111}
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 
diff --git a/security/sslscan/Makefile b/security/sslscan/Makefile
index e3468390208a..594684fa77c2 100644
--- a/security/sslscan/Makefile
+++ b/security/sslscan/Makefile
@@ -30,8 +30,8 @@ UNSAFESSL_ALL_TARGET=	sslscan
 
 .include <bsd.port.pre.mk>
 
-.if empty(PORT_OPTIONS:MUNSAFESSL) && ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=		Does not build with openssl-devel
+.if empty(PORT_OPTIONS:MUNSAFESSL) && ${SSL_DEFAULT:Mopenssl111}
+BROKEN=		Does not build with openssl111
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index 3baf5780b796..f9d2bf29c8f0 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -132,8 +132,8 @@ MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=		Does not build with openssl-devel
+.if ${SSL_DEFAULT:Mopenssl111}
+BROKEN=		Does not build with openssl111
 .endif
 
 .if ${readline_ARGS} == "port"
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index b0f24f7d2538..c0e7fb2acdbc 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -13,7 +13,7 @@ COMMENT=	CLI to manage IPMI systems
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 USES=		cpe tar:bzip2 gmake readline ssl
 CPE_VENDOR=	sun
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index d4022e1d6c51..74ae3e8bc442 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Converts HTML to PDF and/or PostScript
 
 LICENSE=	GPLv2
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
diff --git a/www/node/Makefile b/www/node/Makefile
index a52da0b1e8b1..d8e9af2d5f34 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -66,8 +66,8 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
 
-.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl-devel
-IGNORE=		node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl-devel to /etc/make.conf or enable BUNDLED_SSL option
+.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl111
+IGNORE=		node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf or enable BUNDLED_SSL option
 .endif
 
 .if !empty(SSL_DEFAULT:Mlibressl*)
diff --git a/www/node10/Makefile b/www/node10/Makefile
index a06cc1b253fc..923165fcafb5 100644
--- a/www/node10/Makefile
+++ b/www/node10/Makefile
@@ -67,8 +67,8 @@ LIB_DEPENDS+=	libcares.so:dns/c-ares\
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
 
-.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl-devel
-IGNORE=		node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl-devel to /etc/make.conf or enable BUNDLED_SSL option
+.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} != openssl111
+IGNORE=		node.js requires openssl 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf or enable BUNDLED_SSL option
 .endif
 
 .if !empty(SSL_DEFAULT:Mlibressl*)
diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 16af2055f3d6..7e5e5f7667ee 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -114,7 +114,7 @@ SSL_CONFIGURE_ON=		--with-openssl=${OPENSSLBASE} \
 				LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \
 				LIBOPENSSL_LIBS="-lcrypto -lssl"
 SSL_USES=			ssl
-SSL_VARS=			BROKEN_SSL=openssl-devel
+SSL_VARS=			BROKEN_SSL=openssl111
 SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
 SSL_CRTD_IMPLIES=		SSL
 STACKTRACES_CONFIGURE_ENABLE=	stacktraces
diff --git a/www/ufdbguard/Makefile b/www/ufdbguard/Makefile
index cf06e4c53ad2..d7615c460a29 100644
--- a/www/ufdbguard/Makefile
+++ b/www/ufdbguard/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=		fails to compile: error: regparm is not valid on this platform
-BROKEN_SSL=	openssl-devel libressl libressl-devel
+BROKEN_SSL=	openssl111 libressl libressl-devel
 
 USES=		perl5 shebangfix ssl
 SHEBANG_FILES=	samples/URLblocked.cgi