system/monit: Updated for version 5.0

5 files changed, 36 insertions, 32 deletions

diff --git a/system/monit/README b/system/monit/README
index 72db6efd13e91..d18d41dfc25c3 100644
--- a/system/monit/README
+++ b/system/monit/README
@@ -1,6 +1,3 @@
-monit - Unix System Management
-
-Monit is a utility for managing and monitoring processes,
-files, directories and devices on a Unix system. Monit conducts
-automatic maintenance and repair and can execute meaningful causal
-actions in error situations.
+Monit is a utility for managing and monitoring processes, files, directories,
+and devices on a Unix system. Monit conducts automatic maintenance and repair 
+and can execute meaningful causal actions in error situations.
diff --git a/system/monit/doinst.sh b/system/monit/doinst.sh
index 0899c24df5d28..1a24db5994b1a 100644
--- a/system/monit/doinst.sh
+++ b/system/monit/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
diff --git a/system/monit/monit.SlackBuild b/system/monit/monit.SlackBuild
index 73c4f5beacbef..cb06292f4f2c0 100644
--- a/system/monit/monit.SlackBuild
+++ b/system/monit/monit.SlackBuild
@@ -23,9 +23,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monit
-VERSION=4.9
+VERSION=5.0
 ARCH=${ARCH:-i486}	
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -37,14 +37,18 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -53,10 +57,18 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
-  || exit 1 
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
+
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.monit > $PKG/etc/rc.d/rc.monit.new
+chmod 0755 $PKG/etc/rc.d/rc.monit.new
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 if [ -d $PKG/usr/man ]; then
 ( cd $PKG/usr/man
@@ -66,15 +78,12 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES.txt CONTRIBUTORS COPYING doc FAQ.txt LICENSE PLATAFORMS \
-  README README.ssl STATUS UPGRADE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES.txt CONTRIBUTORS COPYING FAQ.txt LICENSE PACKAGES PLATFORMS \
+  README* doc/*  $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-mkdir -p $PKG/etc/rc.d
-cat $CWD/rc.monit > $PKG/etc/rc.d/rc.monit.new
-
 cd $PKG
 /sbin/makepkg -c n -l y -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/system/monit/monit.info b/system/monit/monit.info
index b1e4048404af0..298a0b28cee44 100644
--- a/system/monit/monit.info
+++ b/system/monit/monit.info
@@ -1,8 +1,8 @@
 PRGNAM="monit"
-VERSION="4.9"
-HOMEPAGE="http://www.tildeslash.com/monit/index.php"
-DOWNLOAD="http://www.tildeslash.com/monit/dist/monit-4.9.tar.gz"
-MD5SUM="bcbaab776a54d1e34e3a057c925de9ca"
+VERSION="5.0"
+HOMEPAGE="http://mmonit.com/monit/"
+DOWNLOAD="http://mmonit.com/monit/dist/monit-5.0.tar.gz"
+MD5SUM="61e13c0c6f5ad396e12a7692135d8737"
 MAINTAINER="Ricardson Williams"
 EMAIL="ricardsonwilliams@yahoo.com.br"
 APPROVED="rworkman"
diff --git a/system/monit/slack-desc b/system/monit/slack-desc
index 72580408c8ec9..78a8134b806ff 100644
--- a/system/monit/slack-desc
+++ b/system/monit/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-     |-----handy-ruler------------------------------------------------------|
+     |-----handy-ruler-------------------------------------------------------|
 monit: monit (Unix System Management)
-monit: 
+monit:
 monit: Monit is a utility for managing and monitoring processes,
 monit: files, directories and devices on a Unix system. Monit conducts
 monit: automatic maintenance and repair and can execute meaningful causal
 monit: actions in error situations.
-monit:  
-monit: Homepage: http://www.tildeslash.com/monit/index.php 
-monit:  
-monit:   
-monit: 
+monit:
+monit: Homepage: http://mmonit.com/monit/ 
+monit:
+monit:
+monit: