diff --git a/games/neverball/base_config.h.diff b/games/neverball/base_config.h.diff new file mode 100644 index 0000000000..ba72ac40d6 --- /dev/null +++ b/games/neverball/base_config.h.diff @@ -0,0 +1,11 @@ +--- share/base_config.h.orig 2009-04-27 13:07:14.738222152 -0700 ++++ share/base_config.h 2009-04-27 13:09:08.065322026 -0700 +@@ -30,7 +30,7 @@ + #endif + + #ifndef CONFIG_DATA +-#define CONFIG_DATA "./data" /* Game data directory */ ++#define CONFIG_DATA "/usr/share/neverball/data" /* Game data directory */ + #endif + + #ifndef CONFIG_LOCALE diff --git a/games/neverball/config.h.diff b/games/neverball/config.h.diff deleted file mode 100644 index 5212b74e0b..0000000000 --- a/games/neverball/config.h.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- share/config.h.orig 2004-07-21 14:35:21.000000000 -0700 -+++ share/config.h 2006-10-07 10:55:38.000000000 -0700 -@@ -20,7 +20,7 @@ - - /*---------------------------------------------------------------------------*/ - --#define CONFIG_DATA "./data" -+#define CONFIG_DATA "/usr/share/neverball/data" - #define CONFIG_USER ".neverball" - - /* diff --git a/games/neverball/doinst.sh b/games/neverball/doinst.sh index 854e20633d..5525db8a53 100644 --- a/games/neverball/doinst.sh +++ b/games/neverball/doinst.sh @@ -1,3 +1,9 @@ -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 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-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 3ba75f40ea..b59a87ba06 100644 --- a/games/neverball/neverball.SlackBuild +++ b/games/neverball/neverball.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Neverball -# Copyright 2007-2008 Frank Caraballo +# Copyright 2007-2009 Frank Caraballo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=neverball BONUS=neverputt -VERSION=1.4.0 +VERSION=${VERSION:-1.5.1} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -34,8 +34,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="CHANGES COPYING README" - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then @@ -48,9 +46,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 cd $PRGNAM-$VERSION || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -58,38 +55,59 @@ find . \ \( -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: -patch -p0 < $CWD/config.h.diff || exit 1 +# Apply base_config.h.diff patch: +patch -p0 < $CWD/base_config.h.diff || 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 +mkdir -p $PKG/usr/{bin,share/$PRGNAM} +cp -a mapc $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 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) +( cd dist + install -D -m 0644 mapc.1 $PKG/usr/man/man1/mapc.1 + install -D -m 0644 $PRGNAM.6 $PKG/usr/man/man6/$PRGNAM.6 + install -D -m 0644 $BONUS.6 $PKG/usr/man/man6/$BONUS.6 +) + +( cd $PKG/usr/man + find . -type f -exec gzip -9 {} \; + for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +) + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES COPYING README doc/* \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -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/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 + done +) mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh 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 diff --git a/games/neverball/neverball.desktop b/games/neverball/neverball.desktop deleted file mode 100644 index c0053b5828..0000000000 --- a/games/neverball/neverball.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Neverball -GenericName=Puzzle & Action Game -Exec=neverball -Terminal=false -Type=Application -Categories=Application;Game;ActionGame -Icon=/usr/share/pixmaps/neverball.png -StartupNotify=false diff --git a/games/neverball/neverball.info b/games/neverball/neverball.info index 5c903e2ee1..09f3f31760 100644 --- a/games/neverball/neverball.info +++ b/games/neverball/neverball.info @@ -1,8 +1,8 @@ PRGNAM="neverball" -VERSION="1.4.0" +VERSION="1.5.1" HOMEPAGE="http://icculus.org/neverball/" -DOWNLOAD="http://icculus.org/neverball/neverball-1.4.0.tar.gz" -MD5SUM="a6cd860f1c2b7d8cecbcfc05ff228ef0" +DOWNLOAD="http://icculus.org/neverball/neverball-1.5.1.tar.gz" +MD5SUM="d58740e8a2808a41400191ab01b19ad4" MAINTAINER="Frank Caraballo" EMAIL="" -APPROVED="David Somero" \ No newline at end of file +APPROVED="dsomero" diff --git a/games/neverball/neverputt.desktop b/games/neverball/neverputt.desktop deleted file mode 100644 index ffb3aed0f9..0000000000 --- a/games/neverball/neverputt.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Neverputt -GenericName=Miniature Golf Game -Exec=neverputt -Terminal=false -Type=Application -Categories=Application;Game;ActionGame -Icon=/usr/share/pixmaps/neverputt.png -StartupNotify=false diff --git a/games/neverball/slack-desc b/games/neverball/slack-desc index 3ec859a9c7..5eb38597ce 100644 --- a/games/neverball/slack-desc +++ b/games/neverball/slack-desc @@ -1,11 +1,11 @@ # HOW TO EDIT THIS FILE: # The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| neverball: Neverball (Puzzle & Action Game) neverball: neverball: Tilt the floor to roll a ball through an obstacle course before