3 files changed, 19 insertions, 24 deletions
diff --git a/audio/faac/faac.SlackBuild b/audio/faac/faac.SlackBuild
index 4b1787a5ac..a0b687885e 100644
--- a/audio/faac/faac.SlackBuild
+++ b/audio/faac/faac.SlackBuild
@@ -23,11 +23,12 @@
 
 # Thanks to Carpo on LinuxQuestions.org for the tips
 # Thanks to Heinz Wiesinger for the information about faac and libmp4v2
+# Updated to newer version by Niklas 'Nille' Åkerström and also new maintainer.
 
 PRGNAM=faac
-VERSION=1.26
+VERSION=${VERSION:-1.28}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -60,8 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -70,9 +70,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Generate configure script
-./bootstrap
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -81,22 +78,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-shared=yes \
   --enable-static=no \
   --without-mp4v2 \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-if [ -d $PKG/usr/man ]; then
-  (   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
-  )
-fi
+( cd $PKG/usr/man || exit 1
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO docs/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/faac.1
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
@@ -105,3 +100,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+
+if [ "$1" = "--cleanup" ]; then
+  rm -rf $PKG $TMP/$PRGNAM-$VERSION
+fi
diff --git a/audio/faac/faac.info b/audio/faac/faac.info
index 4a0e214db2..3bb92f579c 100644
--- a/audio/faac/faac.info
+++ b/audio/faac/faac.info
@@ -1,8 +1,8 @@
 PRGNAM="faac"
-VERSION="1.26"
+VERSION="1.28"
 HOMEPAGE="http://sourceforge.net/projects/faac"
-DOWNLOAD="http://downloads.sourceforge.net/faac/faac-1.26.tar.gz"
-MD5SUM="1d7c019bd2dbb4f3101b8937ebc59cf6"
-MAINTAINER="Antonio Hernández Blas"
-EMAIL="hba.nihilismus@gmail.com"
+DOWNLOAD="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2"
+MD5SUM="c5dde68840cefe46532089c9392d1df0"
+MAINTAINER="Niklas 'Nille' Åkerström"
+EMAIL="nille.kungen[AT]gmail.com"
 APPROVED="rworkman"
diff --git a/audio/faac/slack-desc b/audio/faac/slack-desc
index 353e0382da..37697d8c7f 100644
--- a/audio/faac/slack-desc
+++ b/audio/faac/slack-desc
@@ -13,7 +13,3 @@ faac: The goal of FAAC is to explore the possibilities of AAC
 faac: and exceed the quality of the currently best MP3 encoders.
 faac:
 faac: Homepage: http://sourceforge.net/projects/faac
-faac:
-faac:
-faac:
-faac: