Index: mysql56-server/Makefile
===================================================================
--- mysql56-server/Makefile	(.../ports-dev/databases)	(working copy)
+++ mysql56-server/Makefile	(.../ports-dev-copy/databases)	(working copy)
@@ -14,6 +14,17 @@
 SLAVEDIRS=	databases/mysql56-client
 USES=		cmake shebangfix
 
+OPTIONS_RADIO=		SSL ZLIB
+OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
+OPTIONS_RADIO_ZLIB=	BUNDLED_ZLIB SYSTEM_ZLIB
+OPTIONS_DEFAULT+=	OPENSSL SYSTEM_ZLIB
+NO_OPTIONS_SORT=	yes
+
+BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
+WITHOUT_SSL_DESC=	No SSL/TLS support
+BUNDLED_ZLIB_DESC=	Use bundled ZLib
+SYSTEM_ZLIB_DESC=	Use system ZLib
+
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
@@ -30,7 +41,9 @@
 		-DINSTALL_SQLBENCHDIR="share/mysql" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_EDITLINE=system \
-		-DWITH_LIBWRAP=1
+		-DWITH_LIBWRAP=1 \
+		-DINSTALL_LAYOUT=STANDALONE \
+		-DWITH_INNODB_EXTRA_DEBUG=0
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
@@ -38,6 +51,12 @@
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
+BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
+OPENSSL_USE=		OPENSSL=yes
+WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
+BUNDLED_ZLIB_CMAKE_ON=	-DWITH_ZLIB=bundled
+SYSTEM_ZLIB_CMAKE_ON=	-DWITH_ZLIB=system
+
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USE_MYSQL=	yes
@@ -64,7 +83,11 @@
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 .else
-USES+=		libedit
+USES+=			libedit
+LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+
+CMAKE_ARGS+=		-DWITH_EDITLINE=system \
+			-DWITH_LIBEVENT=system
 .endif
 
 post-patch: