2 files changed, 12 insertions, 10 deletions
diff --git a/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild b/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild
index 9e9c7f57105fa..b64a9d61b3f2f 100644
--- a/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild
+++ b/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild
@@ -4,18 +4,19 @@
 # Written by powtrix (@gmail.com)
 
 PRGNAM=par2cmdline-tbb
-VERSION=0.4_tbb_20100203
-BUILD=${BUILD:-2}
+VERSION=0.4_20100203
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 DIRNAME=$(echo $PRGNAM | tr -d "\-tbb")
-SRCVERSION=$(echo $VERSION | tr _ -)
+SRCVERSION=$(echo $VERSION | sed s,_,-tbb-,)
+# 0.4-tbb-20100203
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i686 ;; # atm i486 fails to build
     arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m) ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -66,18 +67,19 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
+aclocal && automake # fixes the aclocal version
 make
 sed -i 's/ln -f/ln -sf/g' Makefile # make symbolic links instead of hard links
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$DIRNAME-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL PORTING README{,_FIRST.txt} ROADMAP \
-  $PKG/usr/doc/$DIRNAME-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$DIRNAME-$VERSION/$PRGNAM.SlackBuild
+  $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/$DIRNAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/par2cmdline-tbb/par2cmdline-tbb.info b/misc/par2cmdline-tbb/par2cmdline-tbb.info
index e69b8d5d99e07..6e7f36d31fa2f 100644
--- a/misc/par2cmdline-tbb/par2cmdline-tbb.info
+++ b/misc/par2cmdline-tbb/par2cmdline-tbb.info
@@ -1,5 +1,5 @@
 PRGNAM="par2cmdline-tbb"
-VERSION="0.4_tbb_20100203"
+VERSION="0.4_20100203"
 HOMEPAGE="http://chuchusoft.com/par2_tbb/"
 DOWNLOAD="http://chuchusoft.com/par2_tbb/par2cmdline-0.4-tbb-20100203.tar.gz"
 MD5SUM="b1052a08c3c6eac8a7a0605addb161e7"