Updated to 0.4.0

1 files changed, 15 insertions, 35 deletions

diff --git a/xfburn/build/xfburn.SlackBuild b/xfburn/build/xfburn.SlackBuild
index de584138..fda25a1e 100755
--- a/xfburn/build/xfburn.SlackBuild
+++ b/xfburn/build/xfburn.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2008 Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2008, 2009 Eric Hameleers, Eindhoven, Netherlands
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -36,8 +36,10 @@
 #             * Update
 # 0.3.2-1:    31/aug/2008 by Eric Hameleers <alien@slackware.com>
 #             * Update
+# 0.4.0-1:    09/jan/2009 by Eric Hameleers <alien@slackware.com>
+#             * Update
 # 
-# Run 'sh xfburn.SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh xfburn.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
 # Install using 'installpkg'. 
 #
@@ -46,7 +48,7 @@
 # Set initial variables:
 
 PRGNAM=xfburn
-VERSION=${VERSION:-0.3.2}
+VERSION=${VERSION:-0.4.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -62,7 +64,6 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-#SRCURL="http://www.xfce.org/~pollux/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
 SRCURL="http://goodies.xfce.org/releases/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
@@ -76,15 +77,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
-  i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
+  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
   s390)      SLKCFLAGS="-O2"
@@ -140,11 +134,7 @@ 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
+tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -163,14 +153,7 @@ CFLAGS="$SLKCFLAGS" \
             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, 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 DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Add this to the doinst.sh:
 ! [ -d $PKG/install ] && mkdir -p $PKG/install
@@ -185,7 +168,11 @@ EOT
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+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 {} \;
 
@@ -196,10 +183,8 @@ if [ -d $PKG/usr/man ]; then
 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 -
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Add a package description:
 mkdir -p $PKG/install
@@ -222,8 +207,3 @@ if [ -f $PKG/install/slack-required ]; then
   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