Updated for Slackware 13.1

1 files changed, 44 insertions, 36 deletions

diff --git a/yasm/build/yasm.SlackBuild b/yasm/build/yasm.SlackBuild
index 35fce80c..5c92d10e 100755
--- a/yasm/build/yasm.SlackBuild
+++ b/yasm/build/yasm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2008,2009  Eric Hameleers <alien@slackware.com>
+# Copyright (c) 2008,2009,2010  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -36,6 +36,9 @@
 #             * Update.
 # 0.8.0-1:    12/may/2009 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 0.8.0-2:    30/may/2010 by Eric Hameleers <alien@slackware.com>
+#             * Rebuild for Slackware 13.1 (not moving to 1.0.0 because
+#               webm project reports bugs caused by that version).
 # 
 # Run 'sh yasm.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -45,8 +48,7 @@
 
 PRGNAM=yasm
 VERSION=${VERSION:-0.8.0}
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING GNU_* NEWS README *.txt"
@@ -70,37 +72,47 @@ SRCURL="http://www.tortall.net/projects/${PRGNAM}/releases/${PRGNAM}-${VERSION}.
 ## --- 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}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 case "$ARCH" in
   i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  s390)      SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
-  powerpc)   SLKCFLAGS="-O2"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   x86_64)    SLKCFLAGS="-O2 -fPIC"
              SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
              ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
+  *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
 esac
 
+# 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}
+
+# Save old umask and set to 0022:
+_UMASK_=$(umask)
+umask 0022
+
 # Create working directories:
 mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 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
@@ -137,7 +149,7 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a+X-s .
 
 if [ "$ENABLE_PYTHON" = "YES" ]; then
   PYTHONSTUFF="--enable-python --enable-python-bindings"
@@ -149,26 +161,19 @@ echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
-            --libdir=/usr/lib${LIBDIRSUFFIX} \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --mandir=/usr/man \
-            ${PYTHONSTUFF} \
-            --program-prefix= \
-            --program-suffix= \
-            --build=$ARCH-slackware-linux \
-            2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  ${PYTHONSTUFF} \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$ARCH-slackware-linux \
+  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 documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -202,3 +207,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 
+# Restore the original umask:
+umask ${_UMASK_}
+