svn commit: r316456 - in head/databases: mysql41-server/files mysql50-server/files mysql51-server/files mysql55-server/files mysql56-server/files

[Chris Rees]

Author: crees
Date: Wed Apr 24 17:28:01 2013
New Revision: 316456
URL: http://svnweb.freebsd.org/changeset/ports/316456

Log:
  Very slight speedup on rc file parsing; use hostname variable in preference
  to calling /bin/hostname if available
  
  Approved by:	ale (maintainer)

Modified:
  head/databases/mysql41-server/files/mysql-server.in
  head/databases/mysql50-server/files/mysql-server.in
  head/databases/mysql51-server/files/mysql-server.in
  head/databases/mysql55-server/files/mysql-server.in
  head/databases/mysql56-server/files/mysql-server.in

Modified: head/databases/mysql41-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql41-server/files/mysql-server.in	Wed Apr 24 17:19:42 2013	(r316455)
+++ head/databases/mysql41-server/files/mysql-server.in	Wed Apr 24 17:28:01 2013	(r316456)
@@ -33,7 +33,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile="${mysql_dbdir}/`/bin/hostname`.pid"
+: ${hostname:=`/bin/hostname`}
+pidfile="${mysql_dbdir}/${hostname}.pid"
 command="%%PREFIX%%/bin/mysqld_safe"
 command_args="--defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} > /dev/null 2>&1 &"
 procname="%%PREFIX%%/libexec/mysqld"

Modified: head/databases/mysql50-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql50-server/files/mysql-server.in	Wed Apr 24 17:19:42 2013	(r316455)
+++ head/databases/mysql50-server/files/mysql-server.in	Wed Apr 24 17:28:01 2013	(r316456)
@@ -38,7 +38,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --socket=${mysql_socket} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"

Modified: head/databases/mysql51-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql51-server/files/mysql-server.in	Wed Apr 24 17:19:42 2013	(r316455)
+++ head/databases/mysql51-server/files/mysql-server.in	Wed Apr 24 17:28:01 2013	(r316456)
@@ -35,7 +35,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"

Modified: head/databases/mysql55-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql55-server/files/mysql-server.in	Wed Apr 24 17:19:42 2013	(r316455)
+++ head/databases/mysql55-server/files/mysql-server.in	Wed Apr 24 17:28:01 2013	(r316456)
@@ -38,7 +38,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"

Modified: head/databases/mysql56-server/files/mysql-server.in
==============================================================================
--- head/databases/mysql56-server/files/mysql-server.in	Wed Apr 24 17:19:42 2013	(r316455)
+++ head/databases/mysql56-server/files/mysql-server.in	Wed Apr 24 17:28:01 2013	(r316456)
@@ -38,7 +38,8 @@ load_rc_config $name
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
 command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
 procname="%%PREFIX%%/libexec/mysqld"