From 1299023b5a26699099096df0ed169df92f867608 Mon Sep 17 00:00:00 2001
From: Niels Horn <niels.horn@gmail.com>
Date: Sun, 11 Jul 2010 03:23:58 -0500
Subject: development/SoQt: Miscellaneous cleanups

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 development/SoQt/README          |  2 +-
 development/SoQt/SoQt.SlackBuild | 38 ++++++++++++++++++++++++--------------
 development/SoQt/SoQt.info       |  2 +-
 development/SoQt/slack-desc      |  8 ++++----
 4 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'development')

diff --git a/development/SoQt/README b/development/SoQt/README
index 0269cee6ce..8ef59804e3 100644
--- a/development/SoQt/README
+++ b/development/SoQt/README
@@ -14,4 +14,4 @@ includes a class-hierarchy of viewer components of varying functionality
 and complexity, with various modes for the end-user to control the
 3D-scene camera interaction.
 
-SoQt requires the Coin library, which is also available at SlackBuilds.org. 
+This requires Coin.
diff --git a/development/SoQt/SoQt.SlackBuild b/development/SoQt/SoQt.SlackBuild
index 0b7408eeba..f18cbb38b7 100644
--- a/development/SoQt/SoQt.SlackBuild
+++ b/development/SoQt/SoQt.SlackBuild
@@ -4,16 +4,21 @@
 
 # Originally written by Aleksandar B. Samardzic (<asamardzic@matf.bg.ac.yu>)
 # Maintained as of version 1.5.0 by Niels Horn <niels.horn@gmail.com>
-# Revision data 2010/04/13
-
-set -e
+# Revision data 2010/07/10
 
 PRGNAM=SoQt
-VERSION=1.5.0
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.5.0}
+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=$TMP/package-$PRGNAM
@@ -35,15 +40,21 @@ elif [ "$ARCH" = "arm" ]; then
   SLKCFLAGS="-O2 -march=armv4t"
   LIBDIRSUFFIX=""
   ARCHQUADLET="-gnueabi"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  ARCHQUADLET=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-chown -R root:root . || true
+chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
@@ -52,7 +63,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --build=$ARCH-slackware-linux$GUEABI
+  --build=$ARCH-slackware-linux$ARCHQUADLET
 
 make
 make install DESTDIR=$PKG
@@ -60,14 +71,13 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS.txt COPYING ChangeLog FAQ INSTALL* LICENSE.GPL \
-  NEWS README*  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS.txt COPYING ChangeLog FAQ INSTALL* LICENSE.GPL NEWS README* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/SoQt/SoQt.info b/development/SoQt/SoQt.info
index d627ad16f5..66216fb74b 100644
--- a/development/SoQt/SoQt.info
+++ b/development/SoQt/SoQt.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/SoQt/slack-desc b/development/SoQt/slack-desc
index ff922e2432..5ca1db45a6 100644
--- a/development/SoQt/slack-desc
+++ b/development/SoQt/slack-desc
@@ -11,9 +11,9 @@ SoQt:
 SoQt: SoQt is a library which provides the glue between Coin
 SoQt: high-level 3D visualization library and Troll Tech's Qt
 SoQt: 2D user interface library.
-SoQt: 
+SoQt:
 SoQt: Homepage: http://www.coin3d.org/lib/soqt/
 SoQt:
-SoQt: 
-SoQt: 
-SoQt: 
+SoQt:
+SoQt:
+SoQt:
-- 
cgit v1.2.3