svn commit: r470324 - in head/databases: percona55-server percona55-server/files percona56-server percona56-server/files

[Florian Smeets]

Author: flo
Date: Fri May 18 19:51:28 2018
New Revision: 470324
URL: https://svnweb.freebsd.org/changeset/ports/470324

Log:
  Fix rc scripts after r328331 in head.
  
  PR:		227234, 227235
  Submitted by:	0mp

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

Modified: head/databases/percona55-server/Makefile
==============================================================================
--- head/databases/percona55-server/Makefile	Fri May 18 19:39:22 2018	(r470323)
+++ head/databases/percona55-server/Makefile	Fri May 18 19:51:28 2018	(r470324)
@@ -2,7 +2,7 @@
 
 PORTNAME?=	percona
 DISTVERSION=	5.5.60-38.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/
 PKGNAMESUFFIX?=	55-server
@@ -86,6 +86,15 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/mysql
+
+.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
+
 .endif
 
 post-patch:

Modified: head/databases/percona55-server/files/mysql-server.in
==============================================================================
--- head/databases/percona55-server/files/mysql-server.in	Fri May 18 19:39:22 2018	(r470323)
+++ head/databases/percona55-server/files/mysql-server.in	Fri May 18 19:51:28 2018	(r470324)
@@ -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 "/var/db/mysql"
 #			Base database directory.
 # mysql_optfile (str):	Server-specific option file.
@@ -32,12 +32,12 @@ rcvar=mysql_enable
 load_rc_config $name
 
 : ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
 : ${mysql_dbdir="/var/db/mysql"}
 : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
 
 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"
@@ -59,11 +59,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()

Modified: head/databases/percona56-server/Makefile
==============================================================================
--- head/databases/percona56-server/Makefile	Fri May 18 19:39:22 2018	(r470323)
+++ head/databases/percona56-server/Makefile	Fri May 18 19:51:28 2018	(r470324)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	percona
 DISTVERSION=	5.6.39-83.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
 PKGNAMESUFFIX?=	56-server
@@ -94,6 +94,14 @@ MANPAGES=	my_print_defaults.1 myisam_ftdump.1 myisamch
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
+
+.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
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/mysql

Modified: head/databases/percona56-server/files/mysql-server.in
==============================================================================
--- head/databases/percona56-server/files/mysql-server.in	Fri May 18 19:39:22 2018	(r470323)
+++ head/databases/percona56-server/files/mysql-server.in	Fri May 18 19:51:28 2018	(r470324)
@@ -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 "/var/db/mysql"
 #			Base database directory.
 # mysql_optfile (str):	Server-specific option file.
@@ -32,12 +32,12 @@ rcvar=mysql_enable
 load_rc_config $name
 
 : ${mysql_enable="NO"}
-: ${mysql_limits="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
 : ${mysql_dbdir="/var/db/mysql"}
 : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
 
 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"
@@ -59,11 +59,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()