Index: Makefile
===================================================================
--- Makefile	(revision 408293)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mysql
 PORTVERSION=	5.7.10
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
 PKGNAMESUFFIX?=	57-server
@@ -102,6 +102,15 @@
 PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
 PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
 
+OPTIONS_GROUP+=		FEATURES
+OPTIONS_GROUP_FEATURES=	PERFSCHM
+FEATURES_DESC=		Default features knobs
+PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
+OPTIONS_DEFAULT+=	PERFSCHM
+
+PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
+PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"
+
 .else
 USES+=		readline
 .endif
Index: files/mysql-server.in
===================================================================
--- files/mysql-server.in	(revision 408293)
+++ files/mysql-server.in	(working copy)
@@ -41,7 +41,7 @@
 : ${hostname:=`/bin/hostname`}
 pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} --skip-performance-schema"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} %%PERFSCHEMRC%%"
 procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
Index: pkg-message
===================================================================
--- pkg-message	(revision 408293)
+++ pkg-message	(working copy)
@@ -3,11 +3,8 @@
 Remember to run mysql_upgrade the first time you start the MySQL server
 after an upgrade from an earlier version.
 
-Init. password for first time use of MySQL is saved in $HOME/.mysql_secret
+Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
 ie. when you want to use "mysql -u root -p" first you should see password
 in /root/.mysql_secret
 
-performance_schema feature is set off by default, because of using high RAM.
-if you need it enable it yourself :)
-
 *****************************************************************************