Index: databases/mysql56-server/Makefile
===================================================================
--- databases/mysql56-server/Makefile
+++ databases/mysql56-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.6.35
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server
Index: databases/mysql56-server/files/mysql-server.in
===================================================================
--- databases/mysql56-server/files/mysql-server.in
+++ databases/mysql56-server/files/mysql-server.in
@@ -37,10 +37,12 @@
 : ${mysql_limits="NO"}
 : ${mysql_dbdir="%%MY_DBDIR%%"}
 : ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-else
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
+if [ -z ${mysql_optfile} ]; then
+    if [ -f "${mysql_dbdir}/my.cnf" ]; then
+        : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+    else
+        : ${mysql_optfile="${mysql_confdir}/my.cnf"}
+    fi
 fi
 
 mysql_user="mysql"