[pkgsrc/trunk]: pkgsrc/databases/mysql4-server Update from version 4.1.22nb2 ...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8c2b8d222a4
branches:  trunk
changeset: 553968:a8c2b8d222a4
user:      he <he%pkgsrc.org@localhost>
date:      Thu Feb 05 13:46:36 2009 +0000

description:
Update from version 4.1.22nb2 to 4.1.22nb3.

One minor change to the rc.d script:

 o Postpone setting pidfile to after /etc/rc.conf has been consulted,
   so that a non-default setting of mysqld_datadir takes effect.
   Without this, mysqld will not start with a non-default mysqld_datadir.
   Should fix PR#30636.

diffstat:

 databases/mysql4-server/Makefile        |  4 ++--
 databases/mysql4-server/files/mysqld.sh |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r c035ba122144 -r a8c2b8d222a4 databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile  Thu Feb 05 13:45:28 2009 +0000
+++ b/databases/mysql4-server/Makefile  Thu Feb 05 13:46:36 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2008/03/26 13:27:16 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2009/02/05 13:46:36 he Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
 SVR4_PKGNAME=          mysqs
-PKGREVISION=           2
+PKGREVISION=           3
 COMMENT=               MySQL 4, a free SQL database (server)
 
 CONFLICTS=             {mysql-server-[0-9]*,mysql3-server-[0-9]*}
diff -r c035ba122144 -r a8c2b8d222a4 databases/mysql4-server/files/mysqld.sh
--- a/databases/mysql4-server/files/mysqld.sh   Thu Feb 05 13:45:28 2009 +0000
+++ b/databases/mysql4-server/files/mysqld.sh   Thu Feb 05 13:46:36 2009 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.6 2008/03/26 13:22:00 wiz Exp $
+# $NetBSD: mysqld.sh,v 1.7 2009/02/05 13:46:36 he Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -27,7 +27,6 @@
 : ${mysqld_user:=@MYSQL_USER@}
 : ${mysqld_group:=@MYSQL_GROUP@}
 : ${mysqld_datadir:=@MYSQL_DATADIR@}
-pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
 
 extra_commands="initdb"
 initdb_cmd="mysqld_initdb"
@@ -80,11 +79,13 @@
 
 if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
        load_rc_config $name
+       pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
        run_rc_command "$1"
 else
        if [ -f /etc/rc.conf ]; then
                . /etc/rc.conf
        fi
+       pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
        case "$1" in
        initdb)
                eval ${initdb_cmd}