diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-12-20 08:57:57 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-12-20 08:57:57 +0000 |
| commit | 87c875c2635c7c35e58ef68bddc4d6d1d489a220 (patch) | |
| tree | ece6ae545836a078349a76c1dc7015441a4c3715 /databases/mysql51-server | |
| parent | a171fc31852c8451b38e07cb92237d1f62598174 (diff) | |
Fix startup script and bump PORTREVISION.
PR: ports/153296 [1]
Submitted by: Steve Wills <steve@mouf.net> [1], dougb
Lesson learned: Two identical PRs don't make a good patch.
Notes
Notes:
svn path=/head/; revision=266631
Diffstat (limited to 'databases/mysql51-server')
| -rw-r--r-- | databases/mysql51-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mysql51-server/files/mysql-server.sh.in | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index ab0251bcf805..d6d063cf056e 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mysql PORTVERSION= 5.1.54 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.1 diff --git a/databases/mysql51-server/files/mysql-server.sh.in b/databases/mysql51-server/files/mysql-server.sh.in index 76c9e9d4fa2d..f5aab77782c1 100644 --- a/databases/mysql51-server/files/mysql-server.sh.in +++ b/databases/mysql51-server/files/mysql-server.sh.in @@ -32,13 +32,12 @@ 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_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=${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" |