Attachment #192225 for bug #227228

Lines 3-9 Link Here

(-)databases/mysql55-server/Makefile (-1 / +8 lines)
3		3
4	PORTNAME?= mysql	4	PORTNAME?= mysql
5	PORTVERSION= 5.5.59	5	PORTVERSION= 5.5.59
6	PORTREVISION?= 0	6	PORTREVISION?= 1
7	CATEGORIES= databases ipv6	7	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.5	8	MASTER_SITES= MYSQL/MySQL-5.5
9	PKGNAMESUFFIX?= 55-server	9	PKGNAMESUFFIX?= 55-server
Lines 50-55 SHEBANG_FILES= scripts/.pl scripts/*.sh Link Here
50		50
51	.include <bsd.port.options.mk>	51	.include <bsd.port.options.mk>
52		52
		53	.if ${OPSYS} != FreeBSD \|\| ${OSVERSION} < 1101514 \|\| \
		54	${OSVERSION} >= 1200000 && ${OSVERSION} < 1200057
		55	SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
		56	.else
		57	SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
		58	.endif
		59
53	.if ${PORT_OPTIONS:MSSL}	60	.if ${PORT_OPTIONS:MSSL}
54	CMAKE_ARGS+= -DWITH_SSL=bundled	61	CMAKE_ARGS+= -DWITH_SSL=bundled
55	.endif	62	.endif




# 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.
%%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.

load_rc_config $name

: ${mysql_enable="NO"}
%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
: ${mysql_dbdir="/var/db/mysql"}
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}

mysql_user="mysql"
%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
: ${hostname:=`/bin/hostname`}
pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
command="/usr/sbin/daemon"

	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
		mysql_create_auth_tables || return 1
	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()

Return to bug 227228

Lines 11-19 Link Here

(-)databases/mysql55-server/files/mysql-server.in (-10 / +11 lines)
11	# Add the following line to /etc/rc.conf to enable mysql:	11	# Add the following line to /etc/rc.conf to enable mysql:
12	# mysql_enable (bool): Set to "NO" by default.	12	# mysql_enable (bool): Set to "NO" by default.
13	# Set it to "YES" to enable MySQL.	13	# Set it to "YES" to enable MySQL.
14	# mysql_limits (bool): Set to "NO" by default.	14	%%LEGACY_LIMITS%%# mysql_limits (bool): Set to "NO" by default.
15	# Set it to yes to run `limits -e -U mysql`	15	%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
16	# just before mysql starts.	16	%%LEGACY_LIMITS%%# just before mysql starts.
17	# mysql_dbdir (str): Default to "/var/db/mysql"	17	# mysql_dbdir (str): Default to "/var/db/mysql"
18	# Base database directory.	18	# Base database directory.
19	# mysql_optfile (str): Server-specific option file.	19	# mysql_optfile (str): Server-specific option file.
Lines 32-43 rcvar=mysql_enable Link Here
32	load_rc_config $name	32	load_rc_config $name
33		33
34	: ${mysql_enable="NO"}	34	: ${mysql_enable="NO"}
35	: ${mysql_limits="NO"}	35	%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
36	: ${mysql_dbdir="/var/db/mysql"}	36	: ${mysql_dbdir="/var/db/mysql"}
37	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}	37	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
38		38
39	mysql_user="mysql"	39	mysql_user="mysql"
40	mysql_limits_args="-e -U ${mysql_user}"	40	%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
41	: ${hostname:=`/bin/hostname`}	41	: ${hostname:=`/bin/hostname`}
42	pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}	42	pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
43	command="/usr/sbin/daemon"	43	command="/usr/sbin/daemon"
Lines 59-69 mysql_prestart() Link Here
59	if [ ! -d "${mysql_dbdir}/mysql/." ]; then	59	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
60	mysql_create_auth_tables \|\| return 1	60	mysql_create_auth_tables \|\| return 1
61	fi	61	fi
62	if checkyesno mysql_limits; then	62	%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
63	eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null	63	%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
64	else	64	%%LEGACY_LIMITS%% else
65	return 0	65	%%LEGACY_LIMITS%% return 0
66	fi	66	%%LEGACY_LIMITS%% fi
		67	%%MODERN_LIMITS%% return 0
67	}	68	}
68		69
69	mysql_poststart()	70	mysql_poststart()