games/neverball: Updated for version 1.5.1

3 files changed, 25 insertions, 19 deletions

diff --git a/games/neverball/doinst.sh b/games/neverball/doinst.sh
index 5525db8a53..1f8ff67ded 100644
--- a/games/neverball/doinst.sh
+++ b/games/neverball/doinst.sh
@@ -1,5 +1,5 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
@@ -7,3 +7,4 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
diff --git a/games/neverball/neverball.SlackBuild b/games/neverball/neverball.SlackBuild
index b59a87ba06..d84f06cd21 100644
--- a/games/neverball/neverball.SlackBuild
+++ b/games/neverball/neverball.SlackBuild
@@ -36,17 +36,20 @@ 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
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
 cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 find . \
@@ -67,8 +70,10 @@ cp -a mapc $PRGNAM $BONUS $PKG/usr/bin || exit 1
 cp -a data $PKG/usr/share/$PRGNAM || exit 1
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd dist
@@ -87,22 +92,20 @@ cp -a CHANGES COPYING README doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/{applications,icons/hicolor/{16x16,24x24,32x32,48x48,64x64,128x128,256x256,512x512,scalable}/apps}
 ( cd dist
-  cp -a $PRGNAM.desktop.in $PKG/usr/share/applications/$PRGNAM.desktop
-  cp -a $BONUS.desktop.in $PKG/usr/share/applications/$BONUS.desktop
-  cp -a ${PRGNAM}_replay.png $PKG/usr/share/icons/hicolor/48x48/apps/${PRGNAM}_replay.png
-  cp -a neverlogos.svg $PKG/usr/share/icons/hicolor/scalable/apps/neverlogos.svg
   for i in $PRGNAM $BONUS ; do
-    cp -a ${i}_16.png $PKG/usr/share/icons/hicolor/16x16/apps/$i.png
-    cp -a ${i}_24.png $PKG/usr/share/icons/hicolor/24x24/apps/$i.png
-    cp -a ${i}_32.png $PKG/usr/share/icons/hicolor/32x32/apps/$i.png
-    cp -a ${i}_48.png $PKG/usr/share/icons/hicolor/48x48/apps/$i.png
-    cp -a ${i}_64.png $PKG/usr/share/icons/hicolor/64x64/apps/$i.png
-    cp -a ${i}_128.png $PKG/usr/share/icons/hicolor/128x128/apps/$i.png
-    cp -a ${i}_256.png $PKG/usr/share/icons/hicolor/256x256/apps/$i.png
-    cp -a ${i}_512.png $PKG/usr/share/icons/hicolor/512x512/apps/$i.png
+    install -D -m 0644  ${i}.desktop.in $PKG/usr/share/applications/${i}.desktop
+    install -D -m 0644  ${i}_16.png $PKG/usr/share/icons/hicolor/16x16/apps/$i.png
+    install -D -m 0644  ${i}_24.png $PKG/usr/share/icons/hicolor/24x24/apps/$i.png
+    install -D -m 0644  ${i}_32.png $PKG/usr/share/icons/hicolor/32x32/apps/$i.png
+    install -D -m 0644  ${i}_48.png $PKG/usr/share/icons/hicolor/48x48/apps/$i.png
+    install -D -m 0644  ${i}_64.png $PKG/usr/share/icons/hicolor/64x64/apps/$i.png
+    install -D -m 0644  ${i}_128.png $PKG/usr/share/icons/hicolor/128x128/apps/$i.png
+    install -D -m 0644  ${i}_256.png $PKG/usr/share/icons/hicolor/256x256/apps/$i.png
+    install -D -m 0644  ${i}_512.png $PKG/usr/share/icons/hicolor/512x512/apps/$i.png
   done
+  cp -a ${PRGNAM}_replay.png $PKG/usr/share/icons/hicolor/48x48/apps/${PRGNAM}_replay.png
+  cp -a neverlogos.svg $PKG/usr/share/icons/hicolor/scalable/apps/neverlogos.svg
 )
 
 mkdir -p $PKG/install
@@ -110,4 +113,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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/neverball/neverball.info b/games/neverball/neverball.info
index 09f3f31760..cdfa076ea6 100644
--- a/games/neverball/neverball.info
+++ b/games/neverball/neverball.info
@@ -2,7 +2,9 @@ PRGNAM="neverball"
 VERSION="1.5.1"
 HOMEPAGE="http://icculus.org/neverball/"
 DOWNLOAD="http://icculus.org/neverball/neverball-1.5.1.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="d58740e8a2808a41400191ab01b19ad4"
+MD5SUM_x86_64=""
 MAINTAINER="Frank Caraballo"
 EMAIL="<fecaraballo{at}gmail{dot}com>"
 APPROVED="dsomero"