Date: Fri, 17 Dec 2010 12:52:57 -0800 From: Doug Barton <dougb@FreeBSD.org> To: Alex Dupre <ale@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, Toshiya SAITOH <toshiya@saitoh.nu>, Frank Wall <fw@moov.de>, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/databases/mysql51-server Makefile distinfo ports/databases/mysql51-server/files mysql-server.sh.in patch-Makefile.in Message-ID: <4D0BCDA9.9010405@FreeBSD.org> In-Reply-To: <201012160827.oBG8RwYj046807@repoman.freebsd.org> References: <201012160827.oBG8RwYj046807@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------070306040208010008020505 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit This is not a bad change, but it misses assigning $pidfile which will cause rc.subr not to use it at all; and foul up your _poststart method. The attached patch fixes that, and removes the empty _args default assignment which is not necessary. hth, Doug On 12/16/2010 00:27, Alex Dupre wrote: > ale 2010-12-16 08:27:58 UTC > > FreeBSD ports repository > > Modified files: > databases/mysql51-server Makefile distinfo > databases/mysql51-server/files mysql-server.sh.in > patch-Makefile.in > Log: > Update to 5.1.54 release: > - allow custom pid file [1] [2] > > PR: ports/84650 [1], ports/152739 [2] http://www.FreeBSD.org/cgi/query-pr.cgi?pr=84650 > Submitted by: Toshiya SAITOH<toshiya@saitoh.nu> [1], > Frank Wall<fw@moov.de> [2] > > Revision Changes Path > 1.272 +1 -1 ports/databases/mysql51-server/Makefile > 1.131 +2 -2 ports/databases/mysql51-server/distinfo > 1.9 +5 -3 ports/databases/mysql51-server/files/mysql-server.sh.in > 1.27 +4 -5 ports/databases/mysql51-server/files/patch-Makefile.in > > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/mysql51-server/Makefile.diff?&r1=1.271&r2=1.272&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/mysql51-server/distinfo.diff?&r1=1.130&r2=1.131&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/mysql51-server/files/mysql-server.sh.in.diff?&r1=1.8&r2=1.9&f=h > http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/databases/mysql51-server/files/patch-Makefile.in.diff?&r1=1.26&r2=1.27&f=h > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ --------------070306040208010008020505 Content-Type: text/plain; name="mysql-server.sh.in.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="mysql-server.sh.in.diff" Index: mysql-server.sh.in =================================================================== RCS file: /home/pcvs/ports/databases/mysql51-server/files/mysql-server.sh.in,v retrieving revision 1.9 diff -u -r1.9 mysql-server.sh.in --- mysql-server.sh.in 16 Dec 2010 08:27:58 -0000 1.9 +++ mysql-server.sh.in 17 Dec 2010 20:52:26 -0000 @@ -32,13 +32,13 @@ : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} -: ${mysql_pidfile="${mysql_dbdir}/`/bin/hostname`.pid"} -: ${mysql_args=""} + +pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" 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=${mysql_pidfile} ${mysql_args}" +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" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" --------------070306040208010008020505--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D0BCDA9.9010405>