Update to 3.23.59 snapshot:

- Switch to rcNG
- Add the possibility to specify the database directory in rc.conf
- Move database creation from post-install stage into startup script

4 files changed, 74 insertions, 39 deletions

diff --git a/databases/mysql323-server/files/mysql-server.sh b/databases/mysql323-server/files/mysql-server.sh
deleted file mode 100644
index 6a5acb39a962..000000000000
--- a/databases/mysql323-server/files/mysql-server.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-DB_DIR=%%DB_DIR%%
-PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid
-
-case "$1" in
-	start)
-		if [ -x %%PREFIX%%/bin/safe_mysqld ]; then
-			/usr/bin/limits -U mysql \
-			%%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null &
-			echo -n ' mysqld'
-		fi
-		;;
-	stop)
-		if [ -f ${PIDFILE} ]; then
-			/bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld'
-		else
-			echo "mysql-server isn't running"
-		fi
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/databases/mysql323-server/files/mysql-server.sh.in b/databases/mysql323-server/files/mysql-server.sh.in
new file mode 100644
index 000000000000..d13f1af14de0
--- /dev/null
+++ b/databases/mysql323-server/files/mysql-server.sh.in
@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: mysql
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# 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.
+# mysql_dbdir (str):	Default to "/var/db/mysql"
+#			Base database directory.
+#
+
+. %%RC_SUBR%%
+
+name="mysql"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+: ${mysql_limits="NO"}
+: ${mysql_dbdir="/var/db/mysql"}
+
+mysql_user="mysql"
+mysql_limits_args="-e -U ${mysql_user}"
+pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
+command="%%PREFIX%%/bin/safe_mysqld"
+command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
+mysql_install_db_args="--ldata=${mysql_dbdir}"
+
+mysql_create_auth_tables()
+{
+	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>&1
+        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
+}
+
+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
+}
+
+run_rc_command "$1"
diff --git a/databases/mysql323-server/files/patch-man::Makefile.in b/databases/mysql323-server/files/patch-man::Makefile.in
index ce45c659d000..9ce6d7e4a837 100644
--- a/databases/mysql323-server/files/patch-man::Makefile.in
+++ b/databases/mysql323-server/files/patch-man::Makefile.in
@@ -1,13 +1,13 @@
---- man/Makefile.in.orig	Thu Sep 11 13:49:30 2003
-+++ man/Makefile.in	Sun Feb 29 12:05:54 2004
-@@ -188,9 +188,7 @@
+--- man/Makefile.in.orig	Tue Mar  1 05:31:24 2005
++++ man/Makefile.in	Tue Mar 15 12:55:49 2005
+@@ -266,9 +266,7 @@
+ target_vendor = @target_vendor@
  thread_dirs = @thread_dirs@
  uname_prog = @uname_prog@
- 
 -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
 -		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
 -		perror.1 replace.1 safe_mysqld.1
 +man_MANS =
  
- 
  EXTRA_DIST = $(man_MANS)
+ all: all-am
diff --git a/databases/mysql323-server/files/patch-scripts::Makefile.in b/databases/mysql323-server/files/patch-scripts::Makefile.in
index 8e18b201ea5b..567359e28571 100644
--- a/databases/mysql323-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql323-server/files/patch-scripts::Makefile.in
@@ -1,9 +1,9 @@
---- scripts/Makefile.in.orig	Thu Sep 11 13:49:32 2003
-+++ scripts/Makefile.in	Sun Feb 29 12:11:38 2004
-@@ -187,19 +187,7 @@
+--- scripts/Makefile.in.orig	Tue Mar  1 05:31:27 2005
++++ scripts/Makefile.in	Tue Mar 15 12:58:38 2005
+@@ -268,20 +268,7 @@
+ target_vendor = @target_vendor@
  thread_dirs = @thread_dirs@
  uname_prog = @uname_prog@
- 
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
@@ -16,12 +16,13 @@
 -			mysql_find_rows \
 -			mysqlhotcopy \
 -			mysqldumpslow \
--			mysqld_multi
+-			mysqld_multi \
+-			make_win_src_distribution
 +bin_SCRIPTS =
  
- 
  EXTRA_SCRIPTS = make_binary_distribution.sh \
-@@ -353,7 +341,7 @@
+ 			make_win_src_distribution.sh \
+@@ -451,7 +438,7 @@
  uninstall: uninstall-am
  
  install-am: all-am