2 files changed, 21 insertions, 13 deletions
diff --git a/games/cubosphere/cubosphere.SlackBuild b/games/cubosphere/cubosphere.SlackBuild
index 91ec22aee0..b78891cd38 100644
--- a/games/cubosphere/cubosphere.SlackBuild
+++ b/games/cubosphere/cubosphere.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=cubosphere
-VERSION=0.04b
+VERSION=${VERSION:-beta0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,10 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_unix_$VERSION.tar.gz
+rm -rf ${PRGNAM}_${VERSION}
+tar xvf $CWD/${PRGNAM}_${VERSION}_linux_src.tar.gz
+cd ${PRGNAM}_${VERSION}
 # Remove unwanted files.
 find . -name "Thumbs.db" -o -name "*~" -exec rm -f {} \;
 chown -R root:root .
@@ -54,22 +53,31 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+cd src
 # Fix Makefile.
-sed -i -e '/^PREFIX/s|=.*|=/usr|' -e '1s|^#||' -e "s| -llualib||" Makefile
+sed -i \
+  -e '/^PREFIX/s|=.*|=/usr|' \
+  -e '1s|^#||' \
+  -e "s|-O3$|$SLKCFLAGS|" \
+  -e "s|^LUALIBS=.*|LUALIBS=-llua|" \
+  -e "s|^LUAINC=.*|LUAINC=-I/usr/include|" \
+  Makefile || exit 1
 
-CFLAGS="$SLKCFLAGS" make
+make
 make install DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
 install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
-convert data/textures/pickup1.jpg -resize 64x64! $PRGNAM.png
+unzip data/data000.zip textures/pickup1.jpg
+convert textures/pickup1.jpg -resize 64x64! $PRGNAM.png
 install -m 0644 $PRGNAM.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a documents/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/cubosphere/cubosphere.info b/games/cubosphere/cubosphere.info
index 4695bbdf4c..057a3302d1 100644
--- a/games/cubosphere/cubosphere.info
+++ b/games/cubosphere/cubosphere.info
@@ -1,8 +1,8 @@
 PRGNAM="cubosphere"
-VERSION="0.04b"
+VERSION="beta0.3"
 HOMEPAGE="http://sourceforge.net/projects/cubosphere/"
-DOWNLOAD="http://downloads.sourceforge.net/cubosphere/cubosphere_unix_0.04b.tar.gz"
-MD5SUM="4d594015196bb546576903f225f3b3c8"
+DOWNLOAD="http://downloads.sourceforge.net/cubosphere/cubosphere_beta0.3_linux_src.tar.gz"
+MD5SUM="4ed44769c09fb559d12a35518564dce4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="lua"