Update to 0.9.8

1 files changed, 14 insertions, 9 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index d7133fd5..559a97c0 100755
--- a/handbrake/build/handbrake.SlackBuild
+++ b/handbrake/build/handbrake.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2009,2010,2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -47,9 +47,11 @@
 #               XFCE menu. This package no longer depends on webkitgtk.
 # 0.9.6-1:    13/apr/2012 by Eric Hameleers <alien@slackware.com>
 #             * New release.
+# 0.9.8-1:    31/aug/2012 by Eric Hameleers <alien@slackware.com>
+#             * New release.
 # 
 # Run 'sh handbrake.SlackBuild' to build a Slackware package.
-# The package (.tgz) and .txt file as well as build logs are created in /tmp .
+# The package (.txz) and .txt file as well as build logs are created in /tmp .
 # Install it using 'installpkg'. 
 #
 # -----------------------------------------------------------------------------
@@ -57,7 +59,7 @@
 # Set initial variables:
 
 PRGNAM=handbrake
-VERSION=${VERSION:-0.9.6}
+VERSION=${VERSION:-0.9.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -238,20 +240,23 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
     echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
     # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
     [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
+    if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
     if ! [ "x${SRCURL[$i]}" == "x" ]; then
       echo "Will download file to $(dirname $SOURCE[$i])"
-      if ! $(wget -nv -T 20 -O ${SOURCE[$i]} ${SRCURL[$i]}); then
-        echo "Downloading '$(basename ${SOURCE[$i]})' failed.. aborting the build."
+      wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
+        echo "Fail to download '$(basename ${SOURCE[$i]})'. Aborting the build."
         mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
         exit 1
       fi
     else
       # Try if we have a SVN/CVS download routine for ${SOURCE[$i]}
       echo "Will checkout sources to $(dirname $SOURCE[$i])"
-      src_checkout $i "${SOURCE[$i]}"
+      src_checkout $i "${SOURCE[$i]}" \
+        2>&1 > $OUTPUT/checkout-$(basename ${SOURCE[$i]}).log
     fi
     if [ ! -f "${SOURCE[$i]}" -o ! -s "${SOURCE[$i]}" ]; then
-      echo "File '$(basename ${SOURCE[$i]})' not available.. aborting the build."
+      echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
       exit 1
     fi
   fi
@@ -391,9 +396,9 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 if [ -f $PKG/install/slack-required ]; then