4 files changed, 33 insertions, 24 deletions
diff --git a/system/emelfm2/README b/system/emelfm2/README
index 7fbbfdf88aaed..74ee58612dc2c 100644
--- a/system/emelfm2/README
+++ b/system/emelfm2/README
@@ -1,6 +1,10 @@
 emelFM2 is a file manager for UNIX-like operating systems.  It uses
-a simple and efficient interface pioneered by Norton Commander in 
+a simple and efficient interface pioneered by Norton Commander in
 the 1980's.  It features a two pane window located side-by-side
-to show the contents of the selected filesystem directories, and  
+to show the contents of the selected filesystem directories, and
 a third pane at the bottom that shows the output of commands.
-  
+
+This build includes support for the gamin file-alteration
+monitoring system that is part of a default full Slackware install.
+Users can disable gamin by removing 'GAMIN=1' from the 'make install'
+line of the SlackBuild.
diff --git a/system/emelfm2/emelfm2.SlackBuild b/system/emelfm2/emelfm2.SlackBuild
index 7a8ace971e999..15d471102f4b1 100644
--- a/system/emelfm2/emelfm2.SlackBuild
+++ b/system/emelfm2/emelfm2.SlackBuild
@@ -4,11 +4,12 @@
 # Written by Chess Griffin <chess at chessgriffin dot com>
 
 PRGNAM=emelfm2		
-VERSION=0.3.2		
+VERSION=0.3.6		
 ARCH=${ARCH:-i486}	
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`		
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}	
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}	
@@ -21,31 +22,27 @@ fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP 
+cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
 cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make DOCS_VERSION=1 PREFIX=$PKG/usr || exit 1
-make install DOCS_VERSION=1 PREFIX=$PKG/usr || exit 1
-
-# Fix the icon path in the desktop file
-sed -i s#'Icon=emelfm2/emelfm2_48.png'#'Icon=/usr/share/pixmaps/emelfm2/emelfm2_48.png'# \
-  $PKG/usr/share/applications/emelfm2.desktop || exit 1
+make DOCS_VERSION=1 PREFIX=/usr || exit 1
+make install DOCS_VERSION=1 USE_LATEST=1 USE_GAMIN=1 PREFIX=$PKG/usr || exit 1
 
-find $PKG | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find $PKG | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
 
 mkdir -p $PKG/usr/man/man1
-bzcat $PKG/usr/share/man/man1/emelfm2.1.bz2 | gzip -9 \
-  > $PKG/usr/man/man1/emelfm2.1.gz
+bzcat $PKG/usr/share/man/man1/emelfm2.1.bz2 | gzip -9c > $PKG/usr/man/man1/emelfm2.1.gz
 rm -rf $PKG/usr/share/man
 
 mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/$PRGNAM-$VERSION $PKG/usr/doc
-rm -rf $PKG/usr/share/doc
+mv $PKG/usr/share/doc $PKG/usr
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/emelfm2/emelfm2.info b/system/emelfm2/emelfm2.info
index 8f047969ae575..91ece0a956dac 100644
--- a/system/emelfm2/emelfm2.info
+++ b/system/emelfm2/emelfm2.info
@@ -1,8 +1,8 @@
 PRGNAM="emelfm2"
-VERSION="0.3.2"
+VERSION="0.3.6"
 HOMEPAGE="http://www.emelfm2.net"
-DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.3.2.tar.gz"
-MD5SUM="8862daeec1fd8b433e6810511c058e75"
+DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.3.6.tar.gz"
+MD5SUM="cc00361a117e48823bf5bd7da5d729e0"
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/system/emelfm2/slack-desc b/system/emelfm2/slack-desc
index ae283f723ced8..a7d36a456d730 100644
--- a/system/emelfm2/slack-desc
+++ b/system/emelfm2/slack-desc
@@ -1,4 +1,12 @@
-emelfm2: emelFM2 File Manager
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+emelfm2: emelfm2  (emelFM2 File Manager)
 emelfm2:      
 emelfm2: emelFM2 is a file manager for UNIX-like operating systems.  It uses
 emelfm2: a simple and efficient interface pioneered by Norton Commander in