From 2286cbdc0744f5526d4001c7139ab1acbabca8bb Mon Sep 17 00:00:00 2001
From: Paul Liconti <mr.liconti at gmail.com>
Date: Thu, 13 May 2010 00:19:57 +0200
Subject: academic/gcompris: Updated for version 8.4.12

---
 academic/gcompris/README              | 14 ++++++--------
 academic/gcompris/gcompris.SlackBuild |  6 +++++-
 academic/gcompris/gcompris.info       |  4 +++-
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'academic')

diff --git a/academic/gcompris/README b/academic/gcompris/README
index 8447c7a1f9261..0df048a5e34c5 100644
--- a/academic/gcompris/README
+++ b/academic/gcompris/README
@@ -1,9 +1,7 @@
-GCompris is an educational software suite comprising of numerous 
-activities for children aged 2 to 10. Some of the activities are game 
-orientated, but nonetheless still educational.  Currently GCompris 
-offers in excess of 80 activities and more are being developed.
-GCompris currently is translated in more than 40 languages.
-GCompris runs fine on the PC 233MHz with 64MB of memory and 150MB of 
-disk space. Gcompris REQUIRES gnet & pysqlite2 @ slackbuilds.org .
+GCompris is an educational software suite comprising of numerous activities 
+for children aged 2 to 10. Some of the activities are game orientated, but 
+nonetheless still educational.  Currently GCompris offers in excess of 80 
+activities and more are being developed.  GCompris currently is translated 
+in more than 40 languages.  
 
-GCompris requires gnet available at http://slackbuilds.org
+GCompris requires gnet.
diff --git a/academic/gcompris/gcompris.SlackBuild b/academic/gcompris/gcompris.SlackBuild
index a4071ea5c7853..694b4a0dd4964 100644
--- a/academic/gcompris/gcompris.SlackBuild
+++ b/academic/gcompris/gcompris.SlackBuild
@@ -45,10 +45,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 
@@ -72,6 +75,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -107,4 +111,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
\ No newline at end of file
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
\ No newline at end of file
diff --git a/academic/gcompris/gcompris.info b/academic/gcompris/gcompris.info
index 1d7f4ce279672..701baaa1da341 100644
--- a/academic/gcompris/gcompris.info
+++ b/academic/gcompris/gcompris.info
@@ -2,7 +2,9 @@ PRGNAM="gcompris"
 VERSION="8.4.12"
 HOMEPAGE="http://gcompris.net/"
 DOWNLOAD="http://downloads.sourceforge.net/gcompris/gcompris-8.4.12.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="8a1519e71caa0924d5df73faa311eea3"
+MD5SUM_x86_64=""
 MAINTAINER="Paul Liconti"
-EMAIL="" 
+EMAIL="mr.liconti at gmail.com" 
 APPROVED="dsomero"
-- 
cgit v1.2.3