Update for release 3.7.8

1 files changed, 13 insertions, 22 deletions

diff --git a/unrar/build/unrar.SlackBuild b/unrar/build/unrar.SlackBuild
index 587009dc..c9f7d97c 100755
--- a/unrar/build/unrar.SlackBuild
+++ b/unrar/build/unrar.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2004,2006,2007,2008 Eric Hameleers <alien@slackware.com>
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -37,6 +37,8 @@
 # 3.7.6-1:   30/May/2007 by Eric Hameleers <alien@slackware.com>
 #            * Rebuilt for Slackware 11.0 with a revamped SlackBuild.
 #              Added a man page (obtained from Debian).
+# 3.7.8-1:   01/Jan/2008 by Eric Hameleers <alien@slackware.com>
+#            * New release.
 # 
 # Run 'sh unrar.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -47,7 +49,7 @@
 # Set initial variables:
 
 PRGNAM=unrar
-VERSION=${VERSION:-3.7.6}
+VERSION=${VERSION:-3.7.8}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
@@ -107,24 +109,11 @@ case "$ARCH" in
 esac
 
 # Create working directories:
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$P1" != "--oldbuild" ]; then
-  # If the "--oldbuild" parameter is present, we keep
-  #  the old build files and continue;
-  # By default we remove the remnants of previous build and continue:
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
-
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG  # place for the package to be built
-else
-  rm -rf $PKG/*  # We always erase old package's contents:
-fi
-
-if [ ! -d $OUTPUT ]; then
-  mkdir -p $OUTPUT  # place for the package to be saved
-fi
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # erase old package's contents
+mkdir -p $OUTPUT          # place for the package to be saved
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
@@ -133,7 +122,7 @@ if ! [ -f ${SOURCE} ]; then
     [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`"
     echo "Source '`basename ${SOURCE}`' not available yet..."
     echo "Will download file to `dirname $SOURCE`"
-    wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true
+    wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
@@ -172,6 +161,7 @@ cd ${PRGNAM}-${VERSION}
 
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 make -f makefile.unix unrar lib 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
@@ -182,11 +172,12 @@ cp -a libunrar.so $PKG/usr/lib/
 
 # Add a man page:
 mkdir -p $PKG/usr/man/man1
-gzip -9f $SRCDIR/${PRGNAM}.1 > $PKG/usr/man/man1/${PRGNAM}.1.gz
+gzip -9cf $SRCDIR/${PRGNAM}.1 > $PKG/usr/man/man1/${PRGNAM}.1.gz
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \; || true
 
 # Strip binaries:
 cd $PKG