svn commit: r472290 - in head/databases/mysqlwsrep57-server: . files
Vasil Dimov
vd at FreeBSD.org
Wed Jun 13 06:23:30 UTC 2018
Author: vd
Date: Wed Jun 13 06:23:29 2018
New Revision: 472290
URL: https://svnweb.freebsd.org/changeset/ports/472290
Log:
databases/mysqlwsrep57-server: Fix ${name}_limits clash
PR: 227233
Submitted by: 0mp
Modified:
head/databases/mysqlwsrep57-server/Makefile
head/databases/mysqlwsrep57-server/files/mysql-server.in
Modified: head/databases/mysqlwsrep57-server/Makefile
==============================================================================
--- head/databases/mysqlwsrep57-server/Makefile Wed Jun 13 06:23:07 2018 (r472289)
+++ head/databases/mysqlwsrep57-server/Makefile Wed Jun 13 06:23:29 2018 (r472290)
@@ -5,6 +5,7 @@ PORTNAME= mysqlwsrep
PORTVERSION?= 5.7.21
DISTVERSIONPREFIX?= wsrep_
DISTVERSIONSUFFIX?= -25.14
+PORTREVISION?= 1
CATEGORIES= databases ipv6
MASTER_SITES+= SF/boost/boost/1.59.0:boost
PKGNAMESUFFIX= 57-server
@@ -162,6 +163,14 @@ PERFSCHM_SUB_LIST+= PERFSCHEMRC=""
PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
FEDERATED_SUB_LIST+= FEDER="--federated"
FEDERATED_SUB_LIST_OFF+=FEDER=""
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+.endif
.include <bsd.port.pre.mk>
Modified: head/databases/mysqlwsrep57-server/files/mysql-server.in
==============================================================================
--- head/databases/mysqlwsrep57-server/files/mysql-server.in Wed Jun 13 06:23:07 2018 (r472289)
+++ head/databases/mysqlwsrep57-server/files/mysql-server.in Wed Jun 13 06:23:29 2018 (r472290)
@@ -11,9 +11,9 @@
# Add the following line to /etc/rc.conf to enable mysql:
# mysql_enable (bool): Set to "NO" by default.
# Set it to "YES" to enable MySQL.
-# mysql_limits (bool): Set to "NO" by default.
-# Set it to yes to run `limits -e -U mysql`
-# just before mysql starts.
+%%LEGACY_LIMITS%%# mysql_limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%# just before mysql starts.
# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
# Base database directory.
# mysql_confdir (str): Default to "%%ETCDIR%%"
@@ -36,7 +36,7 @@ rcvar=mysql_enable
load_rc_config $name
: ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
: ${mysql_dbdir="%%MY_DBDIR%%"}
: ${mysql_confdir="%%ETCDIR%%"}
if [ -f "${mysql_confdir}/my.cnf" ]; then
@@ -49,7 +49,7 @@ mysql_extra="--defaults-extra-file=${mysql_optfile}"
fi
mysql_user="mysql"
-mysql_limits_args="-e -U ${mysql_user}"
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
: ${hostname:=`/bin/hostname`}
pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
command="/usr/sbin/daemon"
@@ -84,11 +84,12 @@ mysql_prestart()
if [ ! -d "${mysql_dbdir}/mysql/." ]; then
mysql_create_auth_tables || return 1
fi
- if checkyesno mysql_limits; then
- eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
- else
- return 0
- fi
+%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
}
mysql_poststart()
More information about the svn-ports-all
mailing list