Upgrade to 2.31.2 - Slackware 13.1 is up to date luckily

1 files changed, 32 insertions, 21 deletions

diff --git a/libsoup/build/libsoup.SlackBuild b/libsoup/build/libsoup.SlackBuild
index be30dbfe..f57678bd 100755
--- a/libsoup/build/libsoup.SlackBuild
+++ b/libsoup/build/libsoup.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright (c) 2009 Eric Hameleers, Eindhoven, NL
+# Copyright (c) 2009,2010 Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -35,6 +35,8 @@
 # 2.27.5-1:   20/sep/2009 by Eric Hameleers <alien@slackware.com>
 #             * Update (newer versions do not build on Slackware 13.0 because
 #               those require glib2 >= 2.21.3).
+# 2.31.2-1:   01/jun/2010 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh libsoup.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -45,8 +47,7 @@
 # Set initial variables:
 
 PRGNAM=libsoup
-VERSION=${VERSION:-2.27.5}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-2.31.2}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -68,28 +69,39 @@ SRCURL="http://ftp.gnome.org/pub/GNOME/sources/${PRGNAM}/$(echo $VERSION | cut -
 ## --- 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"
              ;;
+  *)         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
@@ -134,7 +146,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 .
 
 echo Building ...
 LDFLAGS="$SLKLDFLAGS" \
@@ -159,11 +171,7 @@ make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cat $SRCDIR/$(basename $0) | sed \
-  -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \
-  -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \
-  -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \
-  > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $SRCDIR/$(basename $0) > $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 {} \;
 
@@ -192,3 +200,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_}
+