4 files changed, 12 insertions, 22 deletions
diff --git a/system/monit/doinst.sh b/system/monit/doinst.sh
index 293507cbb1..3cac70a0af 100644
--- a/system/monit/doinst.sh
+++ b/system/monit/doinst.sh
@@ -23,5 +23,5 @@ preserve_perms() {
 }
 
 preserve_perms etc/rc.d/rc.monit.new
-config etc/monit.conf.new
+config etc/monitrc.new
 
diff --git a/system/monit/monit.SlackBuild b/system/monit/monit.SlackBuild
index 8cabf18d1d..060e913316 100644
--- a/system/monit/monit.SlackBuild
+++ b/system/monit/monit.SlackBuild
@@ -24,12 +24,12 @@
 
 PRGNAM=monit
 VERSION=${VERSION:-5.18}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -92,7 +92,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-cp monitrc $PKG/etc/monit.conf.new
+cp monitrc $PKG/etc/monitrc.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING CONTRIBUTORS README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/monit/monit.info b/system/monit/monit.info
index e3c8549752..9882485aef 100644
--- a/system/monit/monit.info
+++ b/system/monit/monit.info
@@ -6,5 +6,5 @@ MD5SUM="a1bfac0fbb83439435f8616200d2364d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ricardson Williams"
-EMAIL="ricardsonwilliams@yahoo.com.br"
+MAINTAINER="Bryan Harris"
+EMAIL="bryanlharris@gmail.com"
diff --git a/system/monit/rc.monit b/system/monit/rc.monit
index f1bd5107f8..b68e373eac 100644
--- a/system/monit/rc.monit
+++ b/system/monit/rc.monit
@@ -7,8 +7,7 @@
 #
 
 ### Default variables
-CONFIG="/etc/monit.conf"
-PIDFILE="/var/run/monit.pid"
+CONFIG="/etc/monitrc"
 
 [ -x /usr/bin/monit ] || exit 1
 [ -r "$CONFIG" ] || exit 1
@@ -19,17 +18,13 @@ desc="Process Monitor"
 
 start() {
   echo "Starting $desc ($prog):  /etc/rc.d/rc.$prog start"
-  $prog -c $CONFIG -p $PIDFILE
+  $prog -c $CONFIG
   return $?
 }
 
 stop() {
   echo "Shutting down $desc ($prog)..."
-  if [ -f $PIDFILE ]; then
-    kill -TERM $(cat $PIDFILE)
-  else
-    killall -TERM $prog
-  fi
+  monit quit
   return $?
 }
 
@@ -45,12 +40,7 @@ reload() {
 }
 
 status() {
-  PIDS=$(pidof $prog)
-  if [ "$PIDS" == "" ]; then
-    echo "$prog is not running!"
-  else
-    echo "$prog is running at pid(s) ${PIDS}."
-  fi
+  monit status
   return $?
 }