3 files changed, 21 insertions, 19 deletions
diff --git a/libraries/libdaemon/libdaemon.SlackBuild b/libraries/libdaemon/libdaemon.SlackBuild
index 881b03a5be..9079ca628b 100644
--- a/libraries/libdaemon/libdaemon.SlackBuild
+++ b/libraries/libdaemon/libdaemon.SlackBuild
@@ -18,9 +18,6 @@
 #   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
-# ---------------------------------------------------------------------------
-
-# Modified by the SlackBuilds.org Project
 
 PRGNAM=libdaemon
 VERSION=0.13
@@ -35,10 +32,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86" ]; then
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -56,6 +56,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -66,12 +67,10 @@ 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 || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-( cd $PKG/usr/man
-  find . -type f -name "*.?" -exec gzip -9 {} \;
+  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
@@ -81,4 +80,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libdaemon/libdaemon.info b/libraries/libdaemon/libdaemon.info
index aa15450705..e72394e1dc 100644
--- a/libraries/libdaemon/libdaemon.info
+++ b/libraries/libdaemon/libdaemon.info
@@ -2,6 +2,9 @@ PRGNAM="libdaemon"
 VERSION="0.13"
 HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
 DOWNLOAD="http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.13.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="ae9113fcd825d5a7f07e5ddccb3c3102"
+MD5SUM_x86_64=""
 MAINTAINER="Rodney Cobb"
 EMAIL="rdc@ktabic.co.uk"
+APPROVED="rworkman,pprkut"
diff --git a/libraries/libdaemon/slack-desc b/libraries/libdaemon/slack-desc
index 90a4dfd821..cd6d8c368f 100644
--- a/libraries/libdaemon/slack-desc
+++ b/libraries/libdaemon/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------------------------------------------------------|
 libdaemon: libdaemon (Unix daemonizing library)
-libdaemon: 
+libdaemon:
 libdaemon: libdaemon is a lightweight C library that eases the
 libdaemon: writing of Unix daemons.
-libdaemon: 
+libdaemon:
 libdaemon: Homepage: http://0pointer.de/lennart/projects/libdaemon/
-libdaemon: 
-libdaemon: 
-libdaemon: 
-libdaemon: 
-libdaemon: 
+libdaemon:
+libdaemon:
+libdaemon:
+libdaemon:
+libdaemon: