View | Details | Raw Unified | Return to bug 209512 | Differences between
and this patch

Collapse All | Expand All

(-)UPDATING (+9 lines)
Lines 5-10 Link Here
5
You should get into the habit of checking this file for changes each time
5
You should get into the habit of checking this file for changes each time
6
you update your ports collection, before attempting any port upgrades.
6
you update your ports collection, before attempting any port upgrades.
7
7
8
20160517:
9
  AFFECTS: users of databases/mysql57-(server|client)
10
  AUTHOR: rootservice@gmail.com
11
12
  Please keep in mind that the default location for my.cnf has been changed
13
  to "/usr/local/etc/mysql/my.cnf". If you do not want to move your existing
14
  my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf
15
  to the location of your my.cnf before (re)starting MySQL.
16
8
20160511:
17
20160511:
9
  AFFECTS: Users of audio/clementine-player
18
  AFFECTS: Users of audio/clementine-player
10
  AUTHOR: sbruno@FreeBSD.org
19
  AUTHOR: sbruno@FreeBSD.org
(-)databases/mysql57-server/Makefile (-2 lines)
Lines 51-58 Link Here
51
		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
51
		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
52
		-DINSTALL_SHAREDIR="share" \
52
		-DINSTALL_SHAREDIR="share" \
53
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
53
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
54
		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
55
		-DSYSCONFDIR="${ETCDIR}" \
56
		-DWITH_BOOST="${WRKSRC}/boost" \
54
		-DWITH_BOOST="${WRKSRC}/boost" \
57
		-DWITH_EDITLINE=system \
55
		-DWITH_EDITLINE=system \
58
		-DWITH_LIBEVENT=system \
56
		-DWITH_LIBEVENT=system \
(-)databases/mysql57-server/files/mysql-server.in (-4 / +12 lines)
Lines 62-73 Link Here
62
62
63
mysql_prestart()
63
mysql_prestart()
64
{
64
{
65
	if [ -f "/usr/local/etc/my.cnf" ]; then
66
		echo ""
67
		echo "Please keep in mind that the default location for my.cnf has been changed"
68
		echo "to \"/usr/local/etc/mysql/my.cnf\". If you do not want to move your existing"
69
		echo "my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf"
70
		echo "to the location of your my.cnf before (re)starting MySQL."
71
		echo ""
72
	fi
65
	if [ -f "${mysql_dbdir}/my.cnf" ]; then
73
	if [ -f "${mysql_dbdir}/my.cnf" ]; then
66
		echo ""
74
		echo ""
67
		echo "Please keep in mind that the default location for my.cnf will be changed"
75
		echo "Please keep in mind that the default location for my.cnf has been changed"
68
		echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\" in the near"
76
		echo "to \"/usr/local/etc/mysql/my.cnf\". If you do not want to move your existing"
69
		echo "future.  If you do not want to move your my.cnf to the new location then"
77
		echo "my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf"
70
		echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."
78
		echo "to the location of your my.cnf before (re)starting MySQL."
71
		echo ""
79
		echo ""
72
	fi
80
	fi
73
81
(-)databases/mysql57-server/pkg-message (-4 / +4 lines)
Lines 11-19 Link Here
11
11
12
*****************************************************************************
12
*****************************************************************************
13
13
14
Please keep in mind that the default location for my.cnf will be changed
14
Please keep in mind that the default location for my.cnf has been changed
15
from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near
15
to "/usr/local/etc/mysql/my.cnf". If you do not want to move your existing
16
future.  If you do not want to move your my.cnf to the new location then
16
my.cnf to the new location, you must set "mysql_optfile" in /etc/rc.conf
17
you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
17
to the location of your my.cnf before (re)starting MySQL.
18
18
19
*****************************************************************************
19
*****************************************************************************
(-)databases/mysql57-server/pkg-plist (-2 / +2 lines)
Lines 153-159 Link Here
153
%%DATADIR%%/swedish/errmsg.sys
153
%%DATADIR%%/swedish/errmsg.sys
154
%%DATADIR%%/ukrainian/errmsg.sys
154
%%DATADIR%%/ukrainian/errmsg.sys
155
%%DATADIR%%/uninstall_rewriter.sql
155
%%DATADIR%%/uninstall_rewriter.sql
156
@sample(root,wheel,0640) %%ETCDIR%%/my.cnf.sample
156
@sample(root,wheel,0644) etc/mysql/my.cnf.sample
157
@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
157
@dir(mysql,mysql,0750) etc/mysql/keyring
158
@dir(mysql,mysql,0750) %%MY_SECDIR%%
158
@dir(mysql,mysql,0750) %%MY_SECDIR%%
159
@dir(mysql,mysql,0750) %%MY_TMPDIR%%
159
@dir(mysql,mysql,0750) %%MY_TMPDIR%%

Return to bug 209512