cvs commit: ports/databases/mysql51-server Makefile distinfo ports/databases/mysql51-server/files mysql-server.sh.in patch-Makefile.in

[Doug Barton]

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 at saitoh.nu>  [1],
>                    Frank Wall<fw at 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/

-------------- next part --------------
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"