games/neverball: Updated for version 1.4.0

3 files changed, 29 insertions, 15 deletions

diff --git a/games/neverball/doinst.sh b/games/neverball/doinst.sh
index 98d466d8b908..854e20633d66 100644
--- a/games/neverball/doinst.sh
+++ b/games/neverball/doinst.sh
@@ -1,3 +1,3 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  ./usr/bin/update-desktop-database -q usr/share/applications
 fi
diff --git a/games/neverball/neverball.SlackBuild b/games/neverball/neverball.SlackBuild
index 8d2eae86a42d..3ba75f40ea6d 100644
--- a/games/neverball/neverball.SlackBuild
+++ b/games/neverball/neverball.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Neverball
 
-# Copyright 2007  Frank Caraballo <fecaraballo[AT]gmail.com>
+# Copyright 2007-2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,37 +28,48 @@ VERSION=1.4.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="CHANGES COPYING README"
+DOCS="CHANGES COPYING README"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.* || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
 cd $PRGNAM-$VERSION || exit 1
+
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 # Apply config.h.diff patch:
-cat $CWD/config.h.diff | patch -p0 --verbose || exit 1
+patch -p0 < $CWD/config.h.diff || exit 1
 
-CFLAGS="$SLKCFLAGS" make || exit 1
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make || exit 1
 
 mkdir -p $PKG/usr/{bin,share/{$PRGNAM,pixmaps}}
 cp -a $PRGNAM $BONUS $PKG/usr/bin || exit 1
 cp -a data $PKG/usr/share/$PRGNAM || exit 1
 cp -a icon/* $PKG/usr/share/pixmaps || exit 1
+find $PKG/usr/share -type f -exec chmod 0644 {} \;
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -66,16 +77,19 @@ cp -a icon/* $PKG/usr/share/pixmaps || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
 mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/$BONUS.desktop > $PKG/usr/share/applications/$BONUS.desktop
 
+find $PKG -type d -depth -exec rmdir {} \; 2>/dev/null
+
+mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/games/neverball/neverball.info b/games/neverball/neverball.info
index 85dbc1825469..5c903e2ee134 100644
--- a/games/neverball/neverball.info
+++ b/games/neverball/neverball.info
@@ -4,5 +4,5 @@ HOMEPAGE="http://icculus.org/neverball/"
 DOWNLOAD="http://icculus.org/neverball/neverball-1.4.0.tar.gz"
 MD5SUM="a6cd860f1c2b7d8cecbcfc05ff228ef0"
 MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo[AT]gmail.com"
-APPROVED="BP{k},elohim"
+EMAIL="<fecaraballo{at}gmail{dot}com>"
+APPROVED="David Somero"
\ No newline at end of file