summaryrefslogtreecommitdiffstats
path: root/databases/mysql60-server
diff options
context:
space:
mode:
authordirk <dirk@FreeBSD.org>2002-11-10 20:24:24 +0000
committerdirk <dirk@FreeBSD.org>2002-11-10 20:24:24 +0000
commitf57c71b1ef568c1b83c4a908b941a12c8dfed1b2 (patch)
treebe86fee7c25818b7ace400a2676a3214498a0ae4 /databases/mysql60-server
parente30bda0e8f25a992849c40794c820066b6cf526e (diff)
downloadFreeBSD-ports-f57c71b1ef568c1b83c4a908b941a12c8dfed1b2.zip
FreeBSD-ports-f57c71b1ef568c1b83c4a908b941a12c8dfed1b2.tar.gz
Only kill mysqld we started. Don't kill all mysqld.
Submitted by: sobomax (modified by me a bit)
Diffstat (limited to 'databases/mysql60-server')
-rw-r--r--databases/mysql60-server/Makefile4
-rw-r--r--databases/mysql60-server/files/mysql-server.sh11
2 files changed, 11 insertions, 4 deletions
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index fa666ae..5011bb8 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-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/mysql60-server/files/mysql-server.sh b/databases/mysql60-server/files/mysql-server.sh
index 6cc4f30..f22cbd0 100644
--- a/databases/mysql60-server/files/mysql-server.sh
+++ b/databases/mysql60-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 ""
OpenPOWER on IntegriCloud