From 1a952ad77681425b8e23c27e69f2efce9ab381e9 Mon Sep 17 00:00:00 2001
From: Mahdi Mokhtari <mmokhi@FreeBSD.org>
Date: Thu, 8 Feb 2018 12:45:56 +0000
Subject: [PATCH] databases/mysql57-server: Fix rc-script ${name}_limits
 conflict for post-r328331 base This is port of r461217

---
 databases/mysql80-server/Makefile              | 1 +
 databases/mysql80-server/files/mysql-server.in | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 980830c48e6a..78d3c80a93c1 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=		mysql
 PORTVERSION=		8.0.2
+PORTREVISION?=		1
 DISTVERSIONSUFFIX?=	-dmr
 CATEGORIES=		databases ipv6
 MASTER_SITES=		MYSQL/MySQL-8.0
diff --git a/databases/mysql80-server/files/mysql-server.in b/databases/mysql80-server/files/mysql-server.in
index 7b86d4e2e047..9f3305aae79e 100644
--- a/databases/mysql80-server/files/mysql-server.in
+++ b/databases/mysql80-server/files/mysql-server.in
@@ -47,6 +47,9 @@ fi
 if [ ! -z "${mysql_optfile}" ]; then
 mysql_extra="--defaults-extra-file=${mysql_optfile}"
 fi
+if [ "${mysql_limits}" = "NO" ]; then
+mysql_limits=""
+fi
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
@@ -70,7 +73,7 @@ mysql_prestart()
 	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 		mysql_create_auth_tables || return 1
 	fi
-	if checkyesno mysql_limits; then
+	if [ -z "$mysql_limits" ] || checkyesno mysql_limits; then
 		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
 	else
 		return 0