D46059.id141218.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46059.id141218.diff
View Options

	diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh
	--- a/Mk/Scripts/qa.sh
	+++ b/Mk/Scripts/qa.sh
	@@ -624,6 +624,8 @@
	warn "you need USES+=readline"
	# ssl
	elif [ ${pkg} = "security/openssl" -o ${pkg} = "security/openssl111" \
	+ -o ${pkg} = "security/openssl31" -o ${pkg} = "security/openssl32" \
	+ -o ${pkg} = "security/openssl33" \
	-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
	--- a/Mk/Uses/ssl.mk
	+++ b/Mk/Uses/ssl.mk
	@@ -8,8 +8,8 @@
	#
	# DEFAULT_VERSIONS+= ssl=<openssl variant>
	#
	-# Variants being base, openssl, openssl30, openssl31, openssl32,
	-# openssl-quictls, libressl, and libressl-devel.
	+# Variants being base, openssl, openssl111, openssl31, openssl32,
	+# openssl33, 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
	--- a/Mk/bsd.default-versions.mk
	+++ b/Mk/bsd.default-versions.mk
	@@ -146,7 +146,7 @@
	RUST_DEFAULT?= rust
	# Possible values: 4.16, 4.19
	SAMBA_DEFAULT?= 4.16
	-# Possible values: base, openssl, openssl111, openssl31, openssl32, libressl, libressl-devel
	+# Possible values: base, openssl, openssl111, openssl31, openssl32, openssl33, 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.