1 files changed, 29 insertions, 9 deletions
diff --git a/system/rar/rar.SlackBuild b/system/rar/rar.SlackBuild
index 8bde217f04..969affb30c 100644
--- a/system/rar/rar.SlackBuild
+++ b/system/rar/rar.SlackBuild
@@ -3,9 +3,13 @@
 # Slackware build script for rar
 # Written by Steven Pledger <piratesmack@ymail.com>
 
+# Modifed for new rar version with x64 support by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com
+# rev 3: updated to rar 3.9.1, added option to install unrar -steven
+# rev 4: updated to rar 3.9.2
+
 PRGNAM=rar
-VERSION=${VERSION:-3.9.b2}
-ARCH=i386
+VERSION=${VERSION:-3.9.2}
+ARCH=${ARCH:-i386}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -14,30 +18,46 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Since the tarball also contains an unrar binary,
+# I've added an option to include it in the package.
+UNRAR=${UNRAR:-no}
+
 set -e
 
+if [ "$ARCH" = "x86_64" ]; then
+   LIBDIRSUFFIX="64"
+   x64FIX="x64-"
+else
+   ARCH=i386
+   LIBDIRSUFFIX=""
+fi 
+
 rm -rf $TMP/$PRGNAM $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/${PRGNAM}linux-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}linux-$x64FIX$VERSION.tar.gz
 cd $PRGNAM
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 mkdir -p $PKG/usr/bin
-install -m 755 rar $PKG/usr/bin
+install -m 0755 rar $PKG/usr/bin
+
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+install -m 0755 default.sfx $PKG/usr/lib${LIBDIRSUFFIX}
 
-mkdir -p $PKG/usr/lib
-install -m 755 default.sfx $PKG/usr/lib
+if [ "$UNRAR" = "yes" ]; then
+  install -m 0755 unrar $PKG/usr/bin
+fi
 
 mkdir -p $PKG/etc
 cat rarfiles.lst > $PKG/etc/rarfiles.lst.new
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-     xargs strip --strip-unneeded 2> /dev/null
+     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
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -51,4 +71,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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}