4 files changed, 17 insertions, 14 deletions
diff --git a/development/Pivy/Pivy.SlackBuild b/development/Pivy/Pivy.SlackBuild
index 1117275175d11..a208059bd0f4c 100644
--- a/development/Pivy/Pivy.SlackBuild
+++ b/development/Pivy/Pivy.SlackBuild
@@ -4,14 +4,21 @@
 
 # Originally written by Aleksandar Samardzic <asamardzic@gmail.com>
 # As of version hg_20100410 maintained by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/04/14
+# Revision date: 2010/07/10
 
 PRGNAM=Pivy
 VERSION=${VERSION:-hg_20100410}
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=${PKG:-$TMP/package-$PRGNAM}
@@ -20,19 +27,18 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCHQUADLET=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  ARCHQUADLET=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  ARCHQUADLET=""
 elif [ "$ARCH" = "arm" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
-  ARCHQUADLET="-gnueabi"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -50,8 +56,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 python setup.py install --root $PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -59,8 +63,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS HACKING LICENSE NEWS README THANKS \
-  docs \
+  AUTHORS HACKING LICENSE NEWS README THANKS docs \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;
diff --git a/development/Pivy/Pivy.info b/development/Pivy/Pivy.info
index 043f7cf22c7d4..7c6eb3b1653a6 100644
--- a/development/Pivy/Pivy.info
+++ b/development/Pivy/Pivy.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/development/Pivy/README b/development/Pivy/README
index 13af559ea2699..656a5c9da5d8f 100644
--- a/development/Pivy/README
+++ b/development/Pivy/README
@@ -10,4 +10,4 @@ Pivy allows:
 
 This script is tested using the Mercurial snapshot from 2010/04/10.
 
-Pivy requires Coin, available on SlackBuilds.org.
+This requires Coin.
diff --git a/development/Pivy/slack-desc b/development/Pivy/slack-desc
index 5a7539595a1d3..84263b69c9006 100644
--- a/development/Pivy/slack-desc
+++ b/development/Pivy/slack-desc
@@ -10,7 +10,7 @@ Pivy: Pivy (a Coin binding for Python)
 Pivy:
 Pivy: Pivy is an extension to the Python programming language,
 Pivy: wrapping Coin C++ scene graph library for usage from Python.
-Pivy: 
+Pivy:
 Pivy: Homepage: http://pivy.coin3d.org/
 Pivy:
 Pivy: