svn commit: r461218 - in head/databases/mysql57-server: . files

[Mahdi Mokhtari]

Author: mmokhi
Date: Thu Feb  8 12:45:25 2018
New Revision: 461218
URL: https://svnweb.freebsd.org/changeset/ports/461218

Log:
  databases/mysql57-server: Fix rc-script ${name}_limits conflict for post-r328331 base
  This is port of r461217

Modified:
  head/databases/mysql57-server/Makefile
  head/databases/mysql57-server/files/mysql-server.in

Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile	Thu Feb  8 12:42:42 2018	(r461217)
+++ head/databases/mysql57-server/Makefile	Thu Feb  8 12:45:25 2018	(r461218)
@@ -3,6 +3,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	5.7.21
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.7
 PKGNAMESUFFIX?=	57-server

Modified: head/databases/mysql57-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql57-server/files/mysql-server.in	Thu Feb  8 12:42:42 2018	(r461217)
+++ head/databases/mysql57-server/files/mysql-server.in	Thu Feb  8 12:45:25 2018	(r461218)
@@ -47,7 +47,11 @@ 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}"
 : ${hostname:=`/bin/hostname`}
@@ -70,7 +74,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