Updated for the new clamav release

1 files changed, 13 insertions, 33 deletions

diff --git a/clamav/build/clamav.SlackBuild b/clamav/build/clamav.SlackBuild
index 3ecc41f1..4521d750 100755
--- a/clamav/build/clamav.SlackBuild
+++ b/clamav/build/clamav.SlackBuild
@@ -85,6 +85,8 @@
 #            * Rew release.
 # 0.90.2-1:  16/apr/2007 by Eric Hameleers
 #            * Rew release.
+# 0.91.1-1:  23/jul/2007 by Eric Hameleers
+#            * Rew release.
 # 
 # Run 'sh clamav.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -96,8 +98,8 @@
 # Set initial variables:
 
 PRGNAM=clamav
-VERSION=${VERSION:-0.90.2}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-"0.91.1"}
+ARCH=${ARCH:-"i486"}
 BUILD=${BUILD:-1}
 
 # Read "README.slackware" for compatibility with amavisd-new
@@ -110,9 +112,9 @@ SRCDIR=`dirname $0`
 [ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-TMP=${TMP:-/tmp/build}
+TMP=${TMP:-"/tmp/build"}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+OUTPUT=${OUTPUT:-"/tmp"}
 
 # Exit the script on errors:
 set -e
@@ -156,27 +158,11 @@ case "$ARCH" in
              ;;
 esac
 
-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 [ "$PKG" = "" -o "$PKG" = "/" ] ; then
-  echo "Please provide a sane value for the variable 'PKG'."
-  exit 1
-elif [ ! -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/* # By default we remove the remnants of previous build
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents
+mkdir -p $OUTPUT  # place for the package to be saved
 
 # --- SOURCE FILE AVAILABILITY ---
 
@@ -256,7 +242,7 @@ cd -
 # Install all the needed stuff to the package dir
 #
 # Use installwatch if available:
-if `which installwatch  > /dev/null 2>&1`; then
+if $(which installwatch  > /dev/null 2>&1); then
   installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
 else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
@@ -278,12 +264,8 @@ chown root:root $PKG/etc/rc.d/rc.clamav.new
 chmod 754 $PKG/etc/rc.d/rc.clamav.new
 
 # --- POST-INSTALL SCRIPT ---
-#
-#
-# --- Fabricate the 'doinst.sh' script: ------
 
 mkdir -p $PKG/install
-
 cat <<EOINS > $PKG/install/doinst.sh
 # Handle the incoming configuration files:
 config() {
@@ -374,9 +356,8 @@ if [ -f $SRCDIR/doinst.sh ]; then
 fi
 
 
-# --- BUILDING ---
-
 # Build the package:
+
 cd $PKG
 makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
@@ -387,7 +368,6 @@ cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/$PRGNAM-$VERSION-$ARCH
 
 # --- CLEANUP ---
 
-# Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG