4 files changed, 11 insertions, 10 deletions

diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 02e4730e87fd..ab0251bcf805 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	5.1.53
+PORTVERSION=	5.1.54
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index bb24d94f887f..53b322b850b6 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.1.53.tar.gz) = d68c0db580bb514bb1759d4c69dc71ceb0e3573ac88a1025111bdd8f89e234a4
-SIZE (mysql-5.1.53.tar.gz) = 23871815
+SHA256 (mysql-5.1.54.tar.gz) = 84370fffc4fe277645fb3a5040d153ff567576b664f0663452be077826b7ab1f
+SIZE (mysql-5.1.54.tar.gz) = 23672236
diff --git a/databases/mysql51-server/files/mysql-server.sh.in b/databases/mysql51-server/files/mysql-server.sh.in
index eb7abb96fee3..76c9e9d4fa2d 100644
--- a/databases/mysql51-server/files/mysql-server.sh.in
+++ b/databases/mysql51-server/files/mysql-server.sh.in
@@ -16,6 +16,8 @@
 #			just before mysql starts.
 # mysql_dbdir (str):	Default to "/var/db/mysql"
 #			Base database directory.
+# mysql_pidfile (str):	Custum PID file path and name.
+#			Default to "${mysql_dbdir}/${hostname}.pid".
 # mysql_args (str):	Custom additional arguments to be passed
 #			to mysqld_safe (default empty).
 #
@@ -30,13 +32,13 @@ load_rc_config $name
 : ${mysql_enable="NO"}
 : ${mysql_limits="NO"}
 : ${mysql_dbdir="/var/db/mysql"}
+: ${mysql_pidfile="${mysql_dbdir}/`/bin/hostname`.pid"}
 : ${mysql_args=""}
 
 mysql_user="mysql"
 mysql_limits_args="-e -U ${mysql_user}"
-pidfile="${mysql_dbdir}/`/bin/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}"
+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}"
 procname="%%PREFIX%%/libexec/mysqld"
 start_precmd="${name}_prestart"
 start_postcmd="${name}_poststart"
diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in
index be6dd17b83a2..5d3268b47fb3 100644
--- a/databases/mysql51-server/files/patch-Makefile.in
+++ b/databases/mysql51-server/files/patch-Makefile.in
@@ -1,12 +1,11 @@
---- Makefile.in.orig	2008-01-29 22:44:32.000000000 +0100
-+++ Makefile.in	2008-02-14 08:23:39.000000000 +0100
-@@ -398,14 +398,7 @@
+--- Makefile.in.orig	2010-11-29 11:42:58.000000000 +0100
++++ Makefile.in	2010-12-15 22:56:40.000000000 +0100
+@@ -407,13 +407,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- 			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
+ 			README COPYING CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common scripts \
--			@pstack_dir@ \
 -			@sql_union_dirs@ unittest \
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \