[pkgsrc/trunk]: pkgsrc/databases Apply patch from David A. Holland in PR pkg/...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/531ff51edd53
branches:  trunk
changeset: 500169:531ff51edd53
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Oct 03 14:24:29 2005 +0000

description:
Apply patch from David A. Holland in PR pkg/31435 to honor rc.conf
values for mysql_user, mysql_group and mysql_datadir options.

Bump PKGREVISION.

diffstat:

 databases/mysql-server/Makefile         |  3 ++-
 databases/mysql-server/files/mysqld.sh  |  8 ++++----
 databases/mysql4-server/Makefile        |  4 ++--
 databases/mysql4-server/files/mysqld.sh |  8 ++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diffs (73 lines):

diff -r 503fc6dcca53 -r 531ff51edd53 databases/mysql-server/Makefile
--- a/databases/mysql-server/Makefile   Mon Oct 03 14:24:11 2005 +0000
+++ b/databases/mysql-server/Makefile   Mon Oct 03 14:24:29 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2005/08/23 11:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.66 2005/10/03 14:24:29 xtraeme Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
+PKGREVISION=           1
 SVR4_PKGNAME=          mysqs
 COMMENT=               MySQL 4, a free SQL database (server)
 
diff -r 503fc6dcca53 -r 531ff51edd53 databases/mysql-server/files/mysqld.sh
--- a/databases/mysql-server/files/mysqld.sh    Mon Oct 03 14:24:11 2005 +0000
+++ b/databases/mysql-server/files/mysqld.sh    Mon Oct 03 14:24:29 2005 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.3 2004/10/28 01:08:15 xtraeme Exp $
+# $NetBSD: mysqld.sh,v 1.4 2005/10/03 14:24:29 xtraeme Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -24,9 +24,9 @@
 rcvar=${name}
 command="@PREFIX@/bin/mysqld_safe"
 procname="@PREFIX@/libexec/${name}"
-mysqld_user="@MYSQL_USER@"
-mysqld_group="@MYSQL_GROUP@"
-mysqld_datadir="@MYSQL_DATADIR@"
+: ${mysqld_user=@MYSQL_USER@}
+: ${mysqld_group=@MYSQL_GROUP@}
+: ${mysqld_datadir=@MYSQL_DATADIR@}
 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
 
 extra_commands="initdb"
diff -r 503fc6dcca53 -r 531ff51edd53 databases/mysql4-server/Makefile
--- a/databases/mysql4-server/Makefile  Mon Oct 03 14:24:11 2005 +0000
+++ b/databases/mysql4-server/Makefile  Mon Oct 03 14:24:29 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2005/08/23 11:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/10/03 14:24:30 xtraeme Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-server-/}
-#PKGREVISION=          1
+PKGREVISION=           1
 SVR4_PKGNAME=          mysqs
 COMMENT=               MySQL 4, a free SQL database (server)
 
diff -r 503fc6dcca53 -r 531ff51edd53 databases/mysql4-server/files/mysqld.sh
--- a/databases/mysql4-server/files/mysqld.sh   Mon Oct 03 14:24:11 2005 +0000
+++ b/databases/mysql4-server/files/mysqld.sh   Mon Oct 03 14:24:29 2005 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: mysqld.sh,v 1.2 2004/07/21 17:45:13 jlam Exp $
+# $NetBSD: mysqld.sh,v 1.3 2005/10/03 14:24:30 xtraeme Exp $
 #
 # PROVIDE: mysqld
 # REQUIRE: DAEMON LOGIN mountall
@@ -24,9 +24,9 @@
 rcvar=${name}
 command="@PREFIX@/bin/mysqld_safe"
 procname="@PREFIX@/libexec/${name}"
-mysqld_user="@MYSQL_USER@"
-mysqld_group="@MYSQL_GROUP@"
-mysqld_datadir="@MYSQL_DATADIR@"
+: ${mysqld_user:=@MYSQL_USER@}
+: ${mysqld_group:=@MYSQL_GROUP@}
+: ${mysqld_datadir=@MYSQL_DATADIR@}
 pidfile="${mysqld_datadir}/`@HOSTNAME_CMD@`.pid"
 
 extra_commands="initdb"