From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 24 17:28:02 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6B2B16EB;
 Wed, 24 Apr 2013 17:28:02 +0000 (UTC)
 (envelope-from crees@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5C61A11F8;
 Wed, 24 Apr 2013 17:28:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OHS2PO036669;
 Wed, 24 Apr 2013 17:28:02 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OHS19t036662;
 Wed, 24 Apr 2013 17:28:01 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201304241728.r3OHS19t036662@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Wed, 24 Apr 2013 17:28:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316456 - in head/databases: mysql41-server/files
 mysql50-server/files mysql51-server/files mysql55-server/files
 mysql56-server/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Apr 2013 17:28:02 -0000

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"