diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2002-11-10 20:24:24 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2002-11-10 20:24:24 +0000 |
| commit | 9eeffbcbf876a4ee058d8cedfb6ce956696494ee (patch) | |
| tree | b661f0276bcd985ca38c577613997a79e6706e83 /databases/mysql54-server | |
| parent | Add another MD5 sum for ghostscript/eplaser-3.0.4-651.tgz (diff) | |
Only kill mysqld we started. Don't kill all mysqld.
Submitted by: sobomax (modified by me a bit)
Notes
Notes:
svn path=/head/; revision=69844
Diffstat (limited to 'databases/mysql54-server')
| -rw-r--r-- | databases/mysql54-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql54-server/files/mysql-server.sh | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index fa666aeab4b7..5011bb848da1 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= ${MASTERPORTNAME} PORTVERSION= 3.23.53 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \ @@ -136,7 +136,7 @@ post-install: .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh + @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) diff --git a/databases/mysql54-server/files/mysql-server.sh b/databases/mysql54-server/files/mysql-server.sh index 6cc4f30ee2df..f22cbd0c8235 100644 --- a/databases/mysql54-server/files/mysql-server.sh +++ b/databases/mysql54-server/files/mysql-server.sh @@ -1,14 +1,21 @@ #!/bin/sh +DB_DIR=%%DB_DIR%% +PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid + case "$1" in start) if [ -x %%PREFIX%%/bin/safe_mysqld ]; then - %%PREFIX%%/bin/safe_mysqld --user=mysql > /dev/null & + %%PREFIX%%/bin/safe_mysqld --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & echo -n ' mysqld' fi ;; stop) - /usr/bin/killall mysqld > /dev/null 2>&1 && echo -n ' mysqld' + if [ -f ${PIDFILE} ]; then + /bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld' + else + echo "mysql-server isn't running" + fi ;; *) echo "" |