diff --git a/games/neverball/Makefile.diff b/games/neverball/Makefile.diff index f9cc96f5a7..dae48cb7f8 100644 --- a/games/neverball/Makefile.diff +++ b/games/neverball/Makefile.diff @@ -1,7 +1,7 @@ -diff -Nur neverball-1.5.4.orig//Makefile neverball-1.5.4/Makefile ---- neverball-1.5.4.orig//Makefile 2012-06-02 00:19:40.340921775 -0400 -+++ neverball-1.5.4/Makefile 2012-06-02 21:54:52.078406763 -0400 -@@ -27,7 +27,7 @@ +diff -Naur neverball-1.6.0.orig/Makefile neverball-1.6.0/Makefile +--- neverball-1.6.0.orig/Makefile 2014-05-21 15:21:43.000000000 +0200 ++++ neverball-1.6.0/Makefile 2015-04-23 04:30:07.093366557 +0200 +@@ -21,7 +21,7 @@ # Paths (packagers might want to set DATADIR and LOCALEDIR) USERDIR := .neverball @@ -9,21 +9,4 @@ diff -Nur neverball-1.5.4.orig//Makefile neverball-1.5.4/Makefile +DATADIR := /usr/share/neverball/data LOCALEDIR := ./locale - ifdef MINGW -@@ -131,14 +131,14 @@ - OGL_LIBS := -framework OpenGL - endif - --BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm - - ifdef DARWIN - BASE_LIBS += -L/opt/local/lib - endif - - ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ -- -lvorbisfile $(OGL_LIBS) -+ -lvorbisfile $(OGL_LIBS) -lX11 - - #------------------------------------------------------------------------------ - + ifeq ($(PLATFORM),mingw) diff --git a/games/neverball/neverball.SlackBuild b/games/neverball/neverball.SlackBuild index adcb0d1aca..c6bb39b7f9 100644 --- a/games/neverball/neverball.SlackBuild +++ b/games/neverball/neverball.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=neverball BONUS=neverputt -VERSION=${VERSION:-1.5.4} +VERSION=${VERSION:-1.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,6 +57,8 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 @@ -99,7 +101,7 @@ cp -a data/ $PKG/usr/share/$PRGNAM || exit 1 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 + install -D -m 0644 neverlogos.svg $PKG/usr/share/icons/hicolor/scalable/apps/neverlogos.svg 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 @@ -112,8 +114,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES COPYING README doc/* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.md README.md doc/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/neverball/neverball.info b/games/neverball/neverball.info index 19cc94ecbe..b98022a093 100644 --- a/games/neverball/neverball.info +++ b/games/neverball/neverball.info @@ -1,10 +1,10 @@ PRGNAM="neverball" -VERSION="1.5.4" +VERSION="1.6.0" HOMEPAGE="http://neverball.org/" -DOWNLOAD="http://neverball.org/neverball-1.5.4.tar.gz" -MD5SUM="c523b0f72c2035831310e821162f7bd7" +DOWNLOAD="http://neverball.org/neverball-1.6.0.tar.gz" +MD5SUM="444ba7838af776d504f3d16950a802eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="physfs" +REQUIRES="physfs SDL2_ttf" MAINTAINER="Brad Hermanson" EMAIL="apeitheo@gmail.com"