--- Makefile.orig	2014-12-19 14:11:18.445103557 +0100
+++ Makefile	2014-12-19 14:38:54.400485246 +0100
@@ -25,12 +25,14 @@
 SHEBANG_FILES=	scripts/*.sh
 NO_OPTIONS_SORT=yes
 
-OPTIONS_DEFINE+=	SSL OPENSSL PORTSSL FASTMTX
-OPTIONS_DEFAULT+=	SSL
+OPTIONS_DEFINE+=	FASTMTX
+OPTIONS_RADIO=		SSL
+OPTIONS_RADIO_SSL=	WITHOUT_SSL BUNDLED_SSL OPENSSL
+OPTIONS_DEFAULT+=	OPENSSL
 
 FASTMTX_DESC=	Replace mutexes with spinlocks
-OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
-PORTSSL_DESC=	Use OpenSSL from port (requires OPENSSL to be set)
+WITHOUT_SSL_DESC=	No SSL/TLS support
+BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
 
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
@@ -77,26 +79,18 @@
 CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
 .endif
 
-.if ${PORT_OPTIONS:MSSL}
-.if exists(${LOCALBASE}/include/openssl/opensslv.h)
-.  if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL}
-IGNORE=	security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl
-.  endif
-.endif
+
 .if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
-.if !${PORT_OPTIONS:MPORTSSL}
-WITH_OPENSSL_BASE=	yes
-.else
-WITH_OPENSSL_PORT=	yes
-.endif
 CMAKE_ARGS+=	-DWITH_SSL=yes
-.else
+.elif ${PORT_OPTIONS:MBUNDLED_SSL}
 CMAKE_ARGS+=	-DWITH_SSL=bundled
-.endif
+.elif ${PORT_OPTIONS:MWITHOUT_SSL}
+CMAKE_FLAGS+=	-DWITH_SSL=no
 .else
 CMAKE_FLAGS+=	-DWITH_SSL=no
 .endif
+
 .if ${PORT_OPTIONS:MFASTMTX}
 CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
 .endif