5 files changed, 32 insertions, 24 deletions
diff --git a/office/leafpad/README b/office/leafpad/README
index 3a0dcc6f5cd3c..e5886c8ee24f6 100644
--- a/office/leafpad/README
+++ b/office/leafpad/README
@@ -3,6 +3,5 @@ focuses on keeping weight down to a minimum, only the most essential features
 are implemented in the editor. Leafpad is simple to use, is easily compiled, 
 requires few libraries, and starts up quickly.
 
-NOTE: leafpad has an optional dependency of libgnomeprint & libgnomeprintui
+NOTE: leafpad has optional dependencies of libgnomeprint & libgnomeprintui,
 both of which are available on SlackBuilds.org.
-
diff --git a/office/leafpad/doinst.sh b/office/leafpad/doinst.sh
index 6af9811528b00..f39d8d4dfa88a 100644
--- a/office/leafpad/doinst.sh
+++ b/office/leafpad/doinst.sh
@@ -1,4 +1,3 @@
-if [ -x usr/bin/update-desktop-database ]; then
-    usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+    /usr/bin/update-desktop-database -q usr/share/applications
 fi
-
diff --git a/office/leafpad/leafpad.SlackBuild b/office/leafpad/leafpad.SlackBuild
index 831592fa1998b..365c03896da83 100644
--- a/office/leafpad/leafpad.SlackBuild
+++ b/office/leafpad/leafpad.SlackBuild
@@ -1,52 +1,62 @@
 #!/bin/sh
 
 # Slackware build script for leafpad
-# Written by Grigorios Bouzakis (grbzks@gmail.com)
 
-# Slightly modified by the SlackBuilds.org project
-set -e
+# Written by Grigorios Bouzakis (grbzks@gmail.com)
 
 PRGNAM=leafpad
-VERSION=0.8.11
+VERSION=${VERSION:-0.8.16}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+   SLKCFLAGS="-O2 -fPIC"
 fi
 
+DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README"
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-chooser 
+  --enable-chooser \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/leafpad/leafpad.info b/office/leafpad/leafpad.info
index ee3b6a69ac78a..99d6990fd3198 100644
--- a/office/leafpad/leafpad.info
+++ b/office/leafpad/leafpad.info
@@ -1,8 +1,8 @@
 PRGNAM="leafpad"
-VERSION="0.8.11"
+VERSION="0.8.16"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
-DOWNLOAD="http://savannah.nongnu.org/download/leafpad/leafpad-0.8.11.tar.gz"
-MD5SUM="9eef86c3dafe3274c3a06166bd29d1c0"
+DOWNLOAD="http://savannah.nongnu.org/download/leafpad/leafpad-0.8.16.tar.gz"
+MD5SUM="65c17a9ed866b059856b5513f5eaae17"
 MAINTAINER="Grigorios Bouzakis"
 EMAIL="grbzks@gmail.com"
-APPROVED="BP{k}"
+APPROVED="rworkman"
diff --git a/office/leafpad/slack-desc b/office/leafpad/slack-desc
index 7f72083cb8bb3..d10e41a80431f 100644
--- a/office/leafpad/slack-desc
+++ b/office/leafpad/slack-desc
@@ -7,13 +7,13 @@
 
        |-----handy-ruler------------------------------------------------------|
 leafpad: leafpad (A notepad clone for GTK+ 2.0)
-leafpad:
+leafpad: 
 leafpad: Leafpad is a simple GTK+ text editor that emphasizes simplicity. 
 leafpad: As development focuses on keeping weight down to a minimum, 
 leafpad: only the most essential features are implemented in the editor. 
 leafpad: Leafpad is simple to use, it's easily compiled, requires few 
 leafpad: libraries, and starts up quickly.
-leafpad:
+leafpad: 
 leafpad: Homepage: http://tarot.freeshell.org/leafpad/
-leafpad:
-leafpad:
+leafpad: 
+leafpad: