1 files changed, 22 insertions, 13 deletions
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