Updated to 0.116.2

1 files changed, 60 insertions, 80 deletions

diff --git a/jack/build/jack.SlackBuild b/jack/build/jack.SlackBuild
index cddafbee..2b73a9e5 100755
--- a/jack/build/jack.SlackBuild
+++ b/jack/build/jack.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2007-2008 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2007-2009  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -28,14 +28,16 @@
 # For:       jack
 # Descr:     low-latency audio server
 # URL:       http://jackaudio.org/
-# Needs:     
+# Needs:     libsndfile
 # Changelog:
 # 0.103.0-1: 24/Jun/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
 # 0.109.2-1: 01/Mar/2008 by Eric Hameleers <alien@slackware.com>
 #            * Update.
+# 0.116.2-1: 22/sep/2009 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
-# Run 'sh jack.SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh jack.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
@@ -44,16 +46,16 @@
 # Set initial variables:
 
 PRGNAM=jack
-VERSION=${VERSION:-0.109.2}
+VERSION=${VERSION:-0.116.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:" -j4 "}
+TAG=${TAG:-"alien"}
 
 DOCS="AUTHORS COPYING* README TODO"
 
 # Where do we look for sources?
-CWD=`pwd`
-SRCDIR=`dirname $0`
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
@@ -61,7 +63,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-audio-connection-kit-${VERSION}.tar.gz"
-SRCURL="http://downloads.sourceforge.net/${PRGNAM}it/${PRGNAM}-audio-connection-kit-${VERSION}.tar.gz"
+SRCURL="http://jackaudio.org/downloads/${PRGNAM}-audio-connection-kit-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -74,18 +76,8 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 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 -m${MOPT}=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   s390)      SLKCFLAGS="-O2"
@@ -97,33 +89,32 @@ case "$ARCH" in
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
 esac
 
 # Create working directories:
+mkdir -p $OUTPUT          # place for the package to be saved
 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
+mkdir -p $PKG             # place for the package to be built
+rm -rf $PKG/*             # always erase old package's contents
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
+rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
+                          # remove old log files
 
 # Source file availability:
 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`"
+    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/I$(basename $SOURCE)"
+    echo "Source 'IIIII$(basename ${SOURCE})' not available yet..."
+    echo "Will download file to $(dirname $SOURCE)"
     wget -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
+      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."
+    echo "File '$(basename ${SOURCE})' not available... aborting the build."
     exit 1
   fi
 fi
@@ -140,48 +131,37 @@ echo "|| $PRGNAM-$VERSION"
 echo "++"
 
 cd $TMP/tmp-$PRGNAM
-
 echo "Extracting the source archive(s) for $PRGNAM..."
-if `file ${SOURCE} | grep -q ": bzip2"`; then
-  tar -xjvf ${SOURCE}
-elif `file ${SOURCE} | grep -q ": gzip"`; then
-  tar -xzvf ${SOURCE}
-fi
-mv ${PRGNAM}-audio-connection-kit-${VERSION} ${PRGNAM}-${VERSION}
-cd ${PRGNAM}-${VERSION}
+tar -xvf ${SOURCE}
+cd ${PRGNAM}-audio-connection-kit-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
  
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --datarootdir=/usr \
-            --datadir=/usr/share \
-            --enable-shared \
-            --enable-static \
-            --enable-optimization-by-compiler \
-            --disable-portaudio \
-            --with-default-tmpdir=/dev/shm \
-            --program-prefix="" \
-            --program-suffix="" \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-# the above has '--disable-portaudio' because we want the reverse:
-# - add support for jack in portaudio
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --with-html-dir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-shared \
+  --enable-static \
+  --enable-optimization-by-compiler \
+  --disable-portaudio \
+  --with-default-tmpdir=/dev/shm \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  # the above has '--disable-portaudio' because we want the reverse:
+  # - add support for jack in portaudio
 
-# Install all the needed stuff to the package dir
-# 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 $OUTPUT/install-${PRGNAM}.log
-fi
+make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Remove html API cruft:
 rm -rf $PKG/usr/share
@@ -203,18 +183,23 @@ EOINS
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+cat $SRCDIR/$(basename $0) | sed \
+  -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \
+  -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \
+  -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \
+  > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+  for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ). gz $i.gz ; rm $i ; done
 fi
 
-# Strip binaries:
-cd $PKG
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-cd -
+# Strip binaries (if any):
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Add a package description:
 mkdir -p $PKG/install
@@ -228,17 +213,12 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
+  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 fi
 
-# Clean up the extra stuff:
-if [ "$P1" = "--cleanup" ]; then
-  rm -rf $TMP/tmp-$PRGNAM
-  rm -rf $PKG
-fi