system/unrar: Updated for version 3.9.7

5 files changed, 174 insertions, 19 deletions

diff --git a/system/unrar/README b/system/unrar/README
index b830c04f4cd1..5d49d899e7c6 100644
--- a/system/unrar/README
+++ b/system/unrar/README
@@ -1,2 +1,2 @@
-WinRAR is a powerful archive manager. Unrar is an opensource subset
+WinRAR is a powerful archive manager.  Unrar is an opensource subset
 of RAR from rarlab that can uncompress RAR images.
diff --git a/system/unrar/unrar.1 b/system/unrar/unrar.1
new file mode 100644
index 000000000000..359a73746cf7
--- /dev/null
+++ b/system/unrar/unrar.1
@@ -0,0 +1,155 @@
+.TH UNRAR "1" "December 2009" "unrar " "User Commands"
+.SH NAME
+unrar \- manual page for unrar 
+.SH SYNOPSIS
+.B unrar
+\fI<command> -<switch 1> -<switch N> <archive> <files\fR...\fI>\fR
+.SH DESCRIPTION
+UNRAR 3.91 freeware      Copyright (c) 1993-2009 Alexander Roshal
+.IP
+<@listfiles...> <path_to_extract\e>
+.PP
+<Commands>
+.TP
+.BR e
+Extract files to current directory
+.TP
+.BR l[t,b]
+List archive [technical, bare]
+.TP
+.BR p
+Print file to stdout
+.TP
+.BR t
+Test archive files
+.TP
+.BR v[t,b]
+Verbosely list archive [technical,bare]
+.TP
+.BR x
+Extract files with full path
+.PP
+<Switches>
+.TP
+.BR -
+Stop switches scanning
+.TP
+.BR ad
+Append archive name to destination path
+.TP
+.BR ai
+Ignore file attributes
+.TP
+.BR ap<path>
+Set path inside archive
+.TP
+.BR c-
+Disable comments show
+.TP
+.BR cfg-
+Disable read configuration
+.TP
+.BR cl
+Convert names to lower case
+.TP
+.BR cu
+Convert names to upper case
+.TP
+.BR dh
+Open shared files
+.TP
+.BR ep
+Exclude paths from names
+.TP
+.BR ep3
+Expand paths to full including the drive letter
+.TP
+.BR f
+Freshen files
+.TP
+.BR id[c,d,p,q]
+Disable messages
+.TP
+.BR ierr
+Send all messages to stderr
+.TP
+.BR inul
+Disable all messages
+.TP
+.BR kb
+Keep broken extracted files
+.TP
+.BR n<file>
+Include only specified file
+.TP
+.BR n@
+Read file names to include from stdin
+.TP
+.BR n@<list>
+Include files in specified list file
+.TP
+.BR o+
+Overwrite existing files
+.TP
+.BR o-
+Do not overwrite existing files
+.TP
+.BR or
+Rename files automatically
+.TP
+.BR ow
+Save or restore file owner and group
+.TP
+.BR p[password]
+Set password
+.TP
+.BR p-
+Do not query password
+.TP
+.BR r
+Recurse subdirectories
+.TP
+.BR sl<size>
+Process files with size less than specified
+.TP
+.BR sm<size>
+Process files with size more than specified
+.TP
+.BR ta<date>
+Process files modified after <date> in YYYYMMDDHHMMSS format
+.TP
+.BR tb<date>
+Process files modified before <date> in YYYYMMDDHHMMSS format
+.TP
+.BR tn<time>
+Process files newer than <time>
+.TP
+.BR to<time>
+Process files older than <time>
+.TP
+.BR ts<m,c,a>[N]
+Save or restore file time (modification, creation, access)
+.TP
+.BR u
+Update files
+.TP
+.BR v
+List all volumes
+.TP
+.BR ver[n]
+File version control
+.TP
+.BR vp
+Pause before each volume
+.TP
+.BR x<file>
+Exclude specified file
+.TP
+.BR x@
+Read file names to exclude from stdin
+.TP
+.BR x@<list>
+Exclude files in specified list file
+.TP
+.BR y
+Assume Yes on all queries
diff --git a/system/unrar/unrar.1.gz b/system/unrar/unrar.1.gz
deleted file mode 100644
index 0de94e5f7961..000000000000
--- a/system/unrar/unrar.1.gz
+++ /dev/null
diff --git a/system/unrar/unrar.SlackBuild b/system/unrar/unrar.SlackBuild
index 2b52b39b7004..c71997f359bb 100644
--- a/system/unrar/unrar.SlackBuild
+++ b/system/unrar/unrar.SlackBuild
@@ -25,7 +25,7 @@
 # Updated by Andrew Brouwers
 
 PRGNAM=unrar
-VERSION=3.8.5
+VERSION=3.9.7
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -48,36 +48,34 @@ case "$ARCH" in
              ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             ;;
 esac
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP 
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}src-$VERSION.tar.gz || exit 1
-mv $PRGNAM $PRGNAM-$VERSION || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}src-$VERSION.tar.gz
+cd $PRGNAM
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-sed -i "s/-O2/$CFLAGS/" makefile.unix
-make -f makefile.unix || exit 1
+make CXXFLAGS="$SLKCFLAGS" -f makefile.unix
 
-install -D -m 755 unrar $PKG/usr/bin/unrar || exit 1
+install -D -m 755 unrar $PKG/usr/bin/unrar
 strip --strip-unneeded $PKG/usr/bin/unrar
 
-install -D -m 644 $CWD/unrar.1.gz $PKG/usr/man/man1/unrar.1.gz || exit 1
+mkdir -p $PKG/usr/man/man1
+gzip -9c $CWD/unrar.1 > $PKG/usr/man/man1/unrar.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 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}
diff --git a/system/unrar/unrar.info b/system/unrar/unrar.info
index 317a1394543a..59211abbf12d 100644
--- a/system/unrar/unrar.info
+++ b/system/unrar/unrar.info
@@ -1,8 +1,10 @@
 PRGNAM="unrar"
-VERSION="3.8.5"
+VERSION="3.9.7"
 HOMEPAGE="http://www.rarlab.com"
-DOWNLOAD="http://www.rarlab.com/rar/unrarsrc-3.8.5.tar.gz"
-MD5SUM="875688e6a144a3f75d2a6a0da3e43f8b"
-MAINTAINER="Niklas 'Nille' Åkerström"
+DOWNLOAD="http://www.rarlab.com/rar/unrarsrc-3.9.7.tar.gz"
+MD5SUM="3222f3e6a8c1b79b4f60086d2af3727a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="nille.kungen[AT]gmail.com"
 APPROVED="michiel"