From d47567c8d251fd5693c347a28d137dca88500e1b Mon Sep 17 00:00:00 2001
From: Marco Cecchetti <mrc.ildp@gmail.com>
Date: Thu, 13 May 2010 00:20:18 +0200
Subject: academic/orsa: Updated for version 0.7.0

---
 academic/orsa/README          |  4 +---
 academic/orsa/orsa.SlackBuild | 34 +++++++++++++++++++---------------
 academic/orsa/orsa.info       |  4 +++-
 3 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'academic/orsa')

diff --git a/academic/orsa/README b/academic/orsa/README
index eeb23562a7..1e69af8788 100644
--- a/academic/orsa/README
+++ b/academic/orsa/README
@@ -1,8 +1,6 @@
-ORSA (Orbit Reconstruction, Simulation and Analysis)
-
 ORSA is an interactive tool for scientific grade Celestial Mechanics 
 computations.  Asteroids, comets, artificial satellites, Solar and 
 extra-Solar planetary systems can be accurately reproduced, simulated, 
 and analyzed.  This does not support Close approaches tool.
  
-This requires gsl, cln, ginac, and openmpi. 
+This requires gsl, cln, and ginac, as well as qt3 from /extra/kde3-compat/.
diff --git a/academic/orsa/orsa.SlackBuild b/academic/orsa/orsa.SlackBuild
index 4c7bd220f2..e2d4563d33 100644
--- a/academic/orsa/orsa.SlackBuild
+++ b/academic/orsa/orsa.SlackBuild
@@ -1,13 +1,11 @@
 #!/bin/sh
-
 # Slackware build script for orsa 
-
 # Written by Marco Cecchetti <mrc.ildp@gmail.com>
 
 PRGNAM=${PRGNAM:-orsa}
 VERSION=${VERSION:-0.7.0}
 ARCH=${ARCH:-i486}	
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -17,10 +15,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -29,7 +30,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -45,21 +46,24 @@ patch -p1 < $CWD/orsa.patch
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --enable-shared \
- --with-mpi \
- --build=$ARCH-slackware-linux
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --disable-static \
+  --enable-shared \
+  --with-mpi \
+  --with-qt-dir=/opt/kde3/lib${LIBDIRSUFFIX}/qt3 \
+  --build=$ARCH-slackware-linux
  
- make
- make install DESTDIR=$PKG
+make
+make install DESTDIR=$PKG
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -72,4 +76,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/orsa/orsa.info b/academic/orsa/orsa.info
index 6a459e1130..ae33943662 100644
--- a/academic/orsa/orsa.info
+++ b/academic/orsa/orsa.info
@@ -1,8 +1,10 @@
 PRGNAM="orsa"
 VERSION="0.7.0"
 HOMEPAGE="http://orsa.sourceforge.net/"
-DOWNLOAD="http://prdownloads.sourceforge.net/orsa/orsa-0.7.0.tar.gz"
+DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/o/orsa/orsa_0.7.0.orig.tar.gz"
 MD5SUM="16c86f3aa73920631f9768d8c70cce70"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Marco Cecchetti"
 EMAIL="mrc.ildp@gmail.com"
 APPROVED="rworkman"
-- 
cgit v1.2.3