1 files changed, 14 insertions, 10 deletions
diff --git a/multimedia/flvtool2/flvtool2.SlackBuild b/multimedia/flvtool2/flvtool2.SlackBuild
index ca5a006d746f..eb699aaf83e9 100644
--- a/multimedia/flvtool2/flvtool2.SlackBuild
+++ b/multimedia/flvtool2/flvtool2.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for flvtool2
 # Home Page http://rubyforge.org/projects/flvtool2/
 
-# Copyright (c) 2008, Nishant Limbachia (nishant@mnspace.net)
+# Copyright (c) 2008-2009, Nishant Limbachia, Hoffman Est, IL, USA (nishant@mnspace.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is 
@@ -38,26 +38,29 @@ 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
 
-rm -fr $TMP/$PRGNAM-$VERSION $PKG
+rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
-cd $TMP/$PRGNAM-$VERSION
-chown -R root.root .
+cd $PRGNAM-$VERSION
+chown -R root:root .
 find . \
-  \( -perm 664 -o -perm 666 -o -perm 600 -o -perm 440 -o -perm 444 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-find . \
-  \( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
-  -exec chmod 755 {} \;
+ \( -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 {} \;
 
 ruby setup.rb config
 ruby setup.rb setup 
@@ -65,9 +68,10 @@ ruby setup.rb install --prefix=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG LICENSE README examples/tags.xml $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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}