diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2005-10-03 14:24:29 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2005-10-03 14:24:29 +0000 |
| commit | 7f7d2a508f4326b856179cc6a37101ba4ecbeb86 (patch) | |
| tree | 6a10351719d1a46c8e7564449b7a478235d12526 | |
| parent | 1c7a3f2c76efbae935af32d5bde5c850aecadddc (diff) | |
| download | pkgsrc-7f7d2a508f4326b856179cc6a37101ba4ecbeb86.tar.gz | |
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.
| -rw-r--r-- | databases/mysql-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/mysql-server/files/mysqld.sh | 8 | ||||
| -rw-r--r-- | databases/mysql4-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql4-server/files/mysqld.sh | 8 |
4 files changed, 12 insertions, 11 deletions
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index 8b4c5505800..f3ed6ef1ed4 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -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 --git a/databases/mysql-server/files/mysqld.sh b/databases/mysql-server/files/mysqld.sh index 4f684611294..94db98c7e51 100644 --- a/databases/mysql-server/files/mysqld.sh +++ b/databases/mysql-server/files/mysqld.sh @@ -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 @@ name="mysqld" 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 --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index 63ba96c1605..f7c66217a6f 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -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 --git a/databases/mysql4-server/files/mysqld.sh b/databases/mysql4-server/files/mysqld.sh index 17b5d9e857a..ee3222567dd 100644 --- a/databases/mysql4-server/files/mysqld.sh +++ b/databases/mysql4-server/files/mysqld.sh @@ -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 @@ name="mysqld" 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" |