5 files changed, 11 insertions, 57 deletions
diff --git a/misc/par2cmdline-tbb/README b/misc/par2cmdline-tbb/README
index 6707db4f92cd9..285699ccb08e5 100644
--- a/misc/par2cmdline-tbb/README
+++ b/misc/par2cmdline-tbb/README
@@ -1,4 +1,4 @@
-par2cmdline with Intel Thread Building Blocks 2.0
+par2cmdline 0.4 with Intel Threading Building Blocks
 
 This is a concurrent (multithreaded) version of par2cmdline 0.4, a utility
 to create and repair data files using Reed Solomon coding. par2 parity 
diff --git a/misc/par2cmdline-tbb/memory.patch b/misc/par2cmdline-tbb/memory.patch
deleted file mode 100644
index 4592daeb3d0b2..0000000000000
--- a/misc/par2cmdline-tbb/memory.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nru par2cmdline-0.4-tbb-20100203.bad/commandline.cpp par2cmdline-0.4-tbb-20100203/commandline.cpp
---- par2cmdline-0.4-tbb-20100203.bad/commandline.cpp	2009-02-03 03:13:53.000000000 -0200
-+++ par2cmdline-0.4-tbb-20100203/commandline.cpp	2012-01-16 22:20:31.364121046 -0200
-@@ -24,6 +24,7 @@
- //  Copyright (c) 2007 Intel Corp.
- 
- #include "par2cmdline.h"
-+#include <memory>
- 
- #if __APPLE__
-   #include <sys/types.h>
-diff -Nru par2cmdline-0.4-tbb-20100203.bad/par2cmdline.cpp par2cmdline-0.4-tbb-20100203/par2cmdline.cpp
---- par2cmdline-0.4-tbb-20100203.bad/par2cmdline.cpp	2009-02-03 03:14:52.000000000 -0200
-+++ par2cmdline-0.4-tbb-20100203/par2cmdline.cpp	2012-01-16 22:20:04.448120187 -0200
-@@ -24,6 +24,7 @@
- //  Copyright (c) 2007 Intel Corp.
- 
- #include "par2cmdline.h"
-+#include <memory>
- 
- #ifdef _MSC_VER
- #ifdef _DEBUG
-diff -Nru par2cmdline-0.4-tbb-20100203.bad/par2creator.cpp par2cmdline-0.4-tbb-20100203/par2creator.cpp
---- par2cmdline-0.4-tbb-20100203.bad/par2creator.cpp	2008-10-09 10:37:56.000000000 -0300
-+++ par2cmdline-0.4-tbb-20100203/par2creator.cpp	2012-01-16 22:21:30.151122853 -0200
-@@ -30,6 +30,7 @@
- //  par2cmdline-0.4-tbb is available at http://chuchusoft.com/par2_tbb
- 
- #include "par2cmdline.h"
-+#include <memory>
- 
- #if WANT_CONCURRENT
-   #if CONCURRENT_PIPELINE
-diff -Nru par2cmdline-0.4-tbb-20100203.bad/par2repairer.cpp par2cmdline-0.4-tbb-20100203/par2repairer.cpp
---- par2cmdline-0.4-tbb-20100203.bad/par2repairer.cpp	2009-02-03 03:14:42.000000000 -0200
-+++ par2cmdline-0.4-tbb-20100203/par2repairer.cpp	2012-01-16 22:21:15.992122418 -0200
-@@ -30,6 +30,7 @@
- //  par2cmdline-0.4-tbb is available at http://chuchusoft.com/par2_tbb
- 
- #include "par2cmdline.h"
-+#include <memory>
- 
- //static unsigned gti;
- //static tbb::atomic<unsigned> gti;
diff --git a/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild b/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild
index b6a5062574ab4..17d2e6ad5284d 100644
--- a/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild
+++ b/misc/par2cmdline-tbb/par2cmdline-tbb.SlackBuild
@@ -4,17 +4,17 @@
 # Written by powtrix (@gmail.com)
 
 PRGNAM=par2cmdline-tbb
-VERSION=0.4_20100203
-BUILD=${BUILD:-3}
+VERSION=0.4_20141125
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DIRNAME=$(echo $PRGNAM | tr -d "\-tbb")
+DIRVERSION=$(echo $VERSION | awk -F_ '{print $1}')
 SRCVERSION=$(echo $VERSION | sed s,_,-tbb-,)
-# 0.4-tbb-20100203
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i686 ;; # atm i486 fails to build
+    i?86) ARCH=i686 ;; # i486 fails to build, it isn't multithread
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,10 +44,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $DIRNAME-$SRCVERSION
+rm -rf $DIRNAME-$DIRVERSION
 tar xvf $CWD/$DIRNAME-$SRCVERSION.tar.gz
-patch -p0 -i $CWD/memory.patch
-cd $TMP/$DIRNAME-$SRCVERSION
+cd $TMP/$DIRNAME-$DIRVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -67,7 +66,6 @@ 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
diff --git a/misc/par2cmdline-tbb/par2cmdline-tbb.info b/misc/par2cmdline-tbb/par2cmdline-tbb.info
index 6e7f36d31fa2f..c008a9249c6be 100644
--- a/misc/par2cmdline-tbb/par2cmdline-tbb.info
+++ b/misc/par2cmdline-tbb/par2cmdline-tbb.info
@@ -1,8 +1,8 @@
 PRGNAM="par2cmdline-tbb"
-VERSION="0.4_20100203"
+VERSION="0.4_20141125"
 HOMEPAGE="http://chuchusoft.com/par2_tbb/"
-DOWNLOAD="http://chuchusoft.com/par2_tbb/par2cmdline-0.4-tbb-20100203.tar.gz"
-MD5SUM="b1052a08c3c6eac8a7a0605addb161e7"
+DOWNLOAD="http://chuchusoft.com/par2_tbb/par2cmdline-0.4-tbb-20141125.tar.gz"
+MD5SUM="18fb0f866e4105bdf98883bd068529fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="tbb"
diff --git a/misc/par2cmdline-tbb/slack-desc b/misc/par2cmdline-tbb/slack-desc
index 6ace5d15523ed..a93d240b18431 100644
--- a/misc/par2cmdline-tbb/slack-desc
+++ b/misc/par2cmdline-tbb/slack-desc
@@ -14,6 +14,6 @@ par2cmdline-tbb: coding. par2 parity archives are commonly used on Usenet
 par2cmdline-tbb: postings to allow corrupted postings to be repaired instead
 par2cmdline-tbb: of needing the original poster to repost the corrupted file(s).
 par2cmdline-tbb: This version has been modified to utilise the Intel Threading
-par2cmdline-tbb: Building Blocks 2.2 library.
+par2cmdline-tbb: Building Blocks library.
 par2cmdline-tbb:
 par2cmdline-tbb: Home page: http://chuchusoft.com/par2_tbb/index.html