Update for the app and for the SlackBuild as well

1 files changed, 91 insertions, 87 deletions

diff --git a/libsndfile/build/libsndfile.SlackBuild b/libsndfile/build/libsndfile.SlackBuild
index 8011fbbc..65396475 100755
--- a/libsndfile/build/libsndfile.SlackBuild
+++ b/libsndfile/build/libsndfile.SlackBuild
@@ -1,20 +1,23 @@
 #!/bin/sh
-# Copyright (c) 2006 Eric Hameleers <alien@slackware.com>
+# $Id$
 # Distributed under the terms of the GNU General Public License, Version 2
+# Copyright (c) 2006 Eric Hameleers <alien@slackware.com>
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
 # ===========================
 # By:        Eric Hameleers <alien@slackware.com>
 # For:       libsndfile
-# Descr:     library for working with sound samples.
+# Descr:     library for working with sound samples
 # URL:       http://www.mega-nerd.com/libsndfile/
 # Needs:     
 # Changelog:
 # 1.0.14-1:   03/mrt/2006 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+# 1.0.17-1:   17/Dec/2006 by Eric Hameleers <alien@slackware.com>
+#            * Update, also for a rework of the SlackBuild
 # 
-# Run 'sh SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh libsndfile.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
@@ -22,34 +25,51 @@
 
 # --- INIT ---
 # Set initial variables:
-CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
 
 PRGNAM=libsndfile
-VERSION=1.0.14
+VERSION=${VERSION:-1.0.17}
 ARCH=${ARCH:-i486}
-BUILD=1
+BUILD=${BUILD:-1}
 
 DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
 
-# If you have more source files, list them here as SOURCE[1], SOURCE[2], etc.
-# If you know the URL for a source file, you can put that into the SRCURL[]
-# variable, and the SlackBuild script will try to download it for you.
+# Where do we look for sources?
+CWD=`pwd`
+SRCDIR=`dirname $0`
+[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
 
-SOURCE[0]="${PRGNAM}-${VERSION}.tar.gz"
-SRCURL[0]="http://www.mega-nerd.com/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
+# Place to build (TMP) package (PKG) and output (OUTPUT) the program:
+TMP=${TMP:-/tmp/build}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+# Input URL: http://www.mega-nerd.com/libsndfile/libsndfile-1.0.17.tar.gz
+SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="http://www.mega-nerd.com/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
+# Exit the script on errors:
+set -e
+trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
+# Catch unitialized variables:
+set -u
+P1=${1:-1}
+
+# Slackware 11 and up need other option (gcc > 3.3.x)
+if [ `gcc -dumpversion | tr -d  '.' |cut -c 1-2` -gt 33 ]; then
+  MOPT=tune
+else
+  MOPT=cpu
+fi
+
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  i486)      SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   s390)      SLKCFLAGS="-O2"
@@ -66,37 +86,47 @@ case "$ARCH" in
              ;;
 esac
 
-PKG=$TMP/package-$PRGNAM
-
 if [ ! -d $TMP/tmp-$PRGNAM ]; then
   mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$1" != "--oldbuild" ]; then
+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
+
 
 # --- SOURCE FILE AVAILABILITY ---
 
-for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
-  if ! [ -f ${CWD}/${SOURCE[$i]} ]; then
-    if ! [ "${SRCURL[$i]}" = "" ]; then
-      echo "Source '${SOURCE[$i]}' not available yet... will download now:"
-      wget -nv -O "${CWD}/${SOURCE[$i]}" "${SRCURL[$i]}"
-      if [ $? -ne 0 ]; then
-        echo "Downloading '${SOURCE[$i]}' failed... aborting the build."
-        exit 1
-      fi
-    else
-      echo "File '${SOURCE[$i]}' not available... aborting the build."
+if ! [ -f ${SOURCE} ]; then
+  if ! [ "x${SRCURL}" == "x" ]; then
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`"
+    echo "Source '`basename ${SOURCE}`' not available yet..."
+    echo "Will download file to `dirname $SOURCE`"
+    wget -nv -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 ]; then
+      echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
+      mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
     fi
+  else
+    echo "File '`basename ${SOURCE}`' not available... aborting the build."
+    exit 1
   fi
-done
+fi
 
-if [ "$1" == "--download" ]; then
+if [ "$P1" == "--download" ]; then
   echo "Download complete."
   exit 0
 fi
@@ -107,25 +137,11 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-# Safety net 8-)
-if [ "$PKG" = "" -o "$PKG" = "/" ] ; then
-  cat <<-EOT
-	Your script sucks!!!
-	You were about to delete the contents of your computer's hard disk!
-	Please provide a value for the variable 'PKG'.
-	EOT
-  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
-
 cd $PKG
 
 # Explode the package framework:
-if [ -f $CWD/_$PRGNAM.tar.gz ]; then
-  explodepkg $CWD/_$PRGNAM.tar.gz
+if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
+  explodepkg $SRCDIR/_$PRGNAM.tar.gz
 fi
 
 cd $TMP/tmp-$PRGNAM
@@ -134,21 +150,16 @@ cd $TMP/tmp-$PRGNAM
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
 echo "Extracting the source archive(s) for $PRGNAM..."
-for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
-  if `file $CWD/${SOURCE[$i]} | grep -q ": bzip2"`; then
-    tar -xjvf $CWD/${SOURCE[$i]}
-  elif `file $CWD/${SOURCE[$i]} | grep -qi ": zip"`; then
-    unzip $CWD/${SOURCE[$i]}
-  elif `file $CWD/${SOURCE[$i]} | grep -qi ": 7-zip"`; then
-    7za -x $CWD/${SOURCE[$i]}
-  else
-    tar -xzvf $CWD/${SOURCE[$i]}
-  fi
-done
+if `file ${SOURCE} | grep -q ": bzip2"`; then
+  tar -xjvf ${SOURCE}
+else
+  tar -xzvf ${SOURCE}
+fi
 cd ${PRGNAM}-${VERSION}
 
 chown -R root.root *
 find . -perm 777 -exec chmod 755 {} \;
+find . -perm 666 -exec chmod 644 {} \;
 
 
 # --- BUILDING ---
@@ -163,28 +174,28 @@ CFLAGS="$SLKCFLAGS" \
             --sysconfdir=/etc \
             --disable-static \
             --program-prefix="" \
-	    --program-suffix="" \
+            --program-suffix="" \
             $ARCH-slackware-linux \
-            2>&1 | tee $CWD/configure-${PRGNAM}.log
-make 2>&1 | tee $CWD/make-${PRGNAM}.log
+            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 #
 # Install all the needed stuff to the package dir
 #
-# Use installwatch if available:
-which installwatch > /dev/null 2>&1
-if [ $? == 0 ]; then
-  installwatch -o $CWD/install-${PRGNAM}.log make DESTDIR=$PKG install
+# Use installwatch if available, to produce a logfile of the installation
+# process that is more easily readable:
+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 $CWD/install-${PRGNAM}.log
+  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
 
+
 # --- DOCUMENTATION ---
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 mv $PKG/usr/share/doc/libsndfile1-dev/html \
       $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
@@ -192,9 +203,10 @@ chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 # Move incorrectly installed man pages, if any
 [ -d $PKG/usr/share/man ] && \
-  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share
+  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true
 # Compress the man page(s)
-[ -d $PKG/usr/man ] && find $PKG/usr/man -type f -exec gzip -9f {} \;
+[ -d $PKG/usr/man ] && \
+  find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
 # Strip binaries
 ( cd $PKG
@@ -206,19 +218,14 @@ chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 # --- OWNERSHIP, RIGHTS ---
 
 chmod -R o-w $PKG
-for BD in $PKG/usr/{,s}bin $PKG/{,s}bin $PKG/usr/X11R6/bin $PKG/opt/kde/bin ;
-do [ -d $BD ] && chown root:bin $BD/* ; done
 
 
 # --- PACKAGE DESCRIPTION ---
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
-  cat $CWD/doinst.sh > $PKG/install/doinst.sh
-fi
-if [ -f $CWD/slack-requires ]; then
-  cat $CWD/slack-requires > $PKG/install/slack-requires
+cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+if [ -f $SRCDIR/doinst.sh ]; then
+  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
 fi
 
 
@@ -226,19 +233,16 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
-  2>&1 | tee $CWD/makepkg-${PRGNAM}.log
-(cd $TMP && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
-if [ -f $PKG/install/slack-requires ]; then
-  cat $PKG/install/slack-requires > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
-fi
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
+  2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+(cd $OUTPUT && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
 
 
 # --- CLEANUP ---
 
 # Clean up the extra stuff:
-if [ "$1" = "--cleanup" ]; then
+if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM
   rm -rf $PKG
 fi