3 files changed, 27 insertions, 17 deletions
diff --git a/audio/speex/slack-desc b/audio/speex/slack-desc
index 4186abd7abfc..795a23dc0fed 100644
--- a/audio/speex/slack-desc
+++ b/audio/speex/slack-desc
@@ -1,4 +1,5 @@
      |-----handy-ruler------------------------------------------------------|
+speex: Speex (an audio compression format designed for speech)
 speex:
 speex: Speex is an Open Source/Free Software  patent-free audio compression
 speex: format designed for speech. The Speex Project aims to lower the
@@ -9,4 +10,3 @@ speex: that are not present in most other codecs. Finally, Speex is part of
 speex: the GNU  Project and is available under the revised BSD license.
 speex:
 speex: Homepage:  http://www.speex.org/
-speex:
diff --git a/audio/speex/speex.SlackBuild b/audio/speex/speex.SlackBuild
index 8e1745154731..301b25e500e6 100644
--- a/audio/speex/speex.SlackBuild
+++ b/audio/speex/speex.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for speex
+
 # Copyright (c) 2007  Alex Lysenka <me@alkos333.net>
 # All rights reserved.
 #
@@ -10,13 +11,6 @@
 #
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following disclaimer
-#   in the documentation and/or other materials provided with the
-#   distribution.
-# * Neither the name of the {company} nor the names of its
-#   contributors may be used to endorse or promote products derived from
-#   this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -34,7 +28,7 @@
 PRGNAM=speex
 VERSION=1.2rc1
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$( pwd )
@@ -44,10 +38,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"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -56,7 +53,7 @@ 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 .
@@ -65,17 +62,30 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
-  --docdir=/usr/doc/$PRGNAM-$VERSION
+  --build=$ARCH-slackware-linux
 
 make 
-make install-strip DESTDIR=$PKG
+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
+)
 
-mv $PKG/usr/share/man $PKG/usr
-gzip -9 $PKG/usr/man/man?/*
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
 
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chown root:root {} \; -exec chmod 644 {} \;
 
diff --git a/audio/speex/speex.info b/audio/speex/speex.info
index 062b3b4195cf..43ab0c2ed45e 100644
--- a/audio/speex/speex.info
+++ b/audio/speex/speex.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://downloads.us.xiph.org/releases/speex/speex-1.2rc1.tar.gz"
 MD5SUM="c4438b22c08e5811ff10e2b06ee9b9ae"
 MAINTAINER="alkos333"
 EMAIL="me@alkos333.net"
-APPROVED="dsomero"
+APPROVED="dsomero,rworkman"