From d9056de419721cbaa0bf043639bcd312aabaaa25 Mon Sep 17 00:00:00 2001
From: hollywoodb <hollywoodb@fastmail.fm>
Date: Wed, 12 May 2010 17:42:06 +0200
Subject: libraries/pygame: Updated for version 1.7.1

---
 libraries/pygame/pygame.SlackBuild | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

(limited to 'libraries/pygame/pygame.SlackBuild')

diff --git a/libraries/pygame/pygame.SlackBuild b/libraries/pygame/pygame.SlackBuild
index 82c1a6a1a2..b50d9b3885 100644
--- a/libraries/pygame/pygame.SlackBuild
+++ b/libraries/pygame/pygame.SlackBuild
@@ -6,7 +6,7 @@
 NAME=pygame
 VERSION=1.7.1
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -16,28 +16,25 @@ OUTPUT=${OUTPUT:-/tmp}
 
 SRCVERSION=${VERSION}release
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-fi
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $NAME-$SRCVERSION 
-tar -xzvf $CWD/$NAME-$SRCVERSION.tar.gz || exit 1
+tar xvf $CWD/$NAME-$SRCVERSION.tar.?z* || exit 1
 cd $NAME-$SRCVERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-python config.py || exit 1
+# Python programs use the CFLAGS specified used by python itself
+python -u config.py || exit 1
+python setup.py install --root=$PKG
 
-# Let's build the installable tarball, but we'll wait just a bit
-# to extract it into $PKG
-python setup.py bdist || exit 1
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
 cp -a PKG-INFO WHATSNEW install.html readme.txt docs/* examples \
@@ -47,11 +44,5 @@ cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Let's extract the installable tarball now into $PKG
-# Since we're in the right place, strip everything and build the package
 cd $PKG
-tar xzf $TMP/$NAME-$SRCVERSION/dist/$NAME-$SRCVERSION.linux-i686.tar.gz || exit 1
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
 /sbin/makepkg -l y -c n -p $OUTPUT/$NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
-- 
cgit v1.2.3