5 files changed, 16 insertions, 44 deletions
diff --git a/games/astromenace/astromenace.SlackBuild b/games/astromenace/astromenace.SlackBuild
index 90b1d6466854a..1f7fdec59d1bf 100644
--- a/games/astromenace/astromenace.SlackBuild
+++ b/games/astromenace/astromenace.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for AstroMenace
 
-# Copyright 2014-2016  Dimitris Zlatanidis  Orestiada, Greece
+# Copyright 2014-2018  Dimitris Zlatanidis  Orestiada, Greece
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SRCNAM=astromenace-src
-PRGNAM=$(echo $SRCNAM | cut -c1-11)
-VERSION=${VERSION:-1.3.2}
-BUILD=${BUILD:-3}
+PRGNAM=astromenace
+VERSION=${VERSION:-1.4.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf AstroMenace
-tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
-cd AstroMenace
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,13 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix freetype2 header path
-patch -p1 < $CWD/ft2_path.patch
-
-mkdir -p build
-  cmake ./ # create Makefile
-  make     # build game
-  ./AstroMenace --pack --rawdata=./RAW_VFS_DATA # create game data
+cmake ./ # create Makefile
+make     # build game
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -84,18 +78,17 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir -p $PKG/usr/share/games/$PRGNAM $PKG/usr/bin
 
 # copy game data
-cp -rf RAW_VFS_DATA $PKG/usr/share/games/$PRGNAM
 cp -a gamedata.vfs $PKG/usr/share/games/$PRGNAM
 
 # install executables
-install -D -m0755 AstroMenace $PKG/usr/share/games/$PRGNAM
+install -D -m0755 $PRGNAM $PKG/usr/share/games/$PRGNAM
 install -D -m0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/usr/share/applications
-install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+install -D -m644 share/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/share/pixmaps/
-install -D -m644 $PRGNAM\_128.png $PKG/usr/share/pixmaps/$PRGNAM.png
+install -D -m644 share/$PRGNAM\_128.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/astromenace/astromenace.desktop b/games/astromenace/astromenace.desktop
deleted file mode 100644
index 090124a77dd92..0000000000000
--- a/games/astromenace/astromenace.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=AstroMenace
-Name[he]= AstroMenace
-Comment=Space shooter
-Exec=astromenace
-Icon=astromenace
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;
-GenericName=Game
diff --git a/games/astromenace/astromenace.info b/games/astromenace/astromenace.info
index b2d4e8886a5b8..2fe9abbdc7b57 100644
--- a/games/astromenace/astromenace.info
+++ b/games/astromenace/astromenace.info
@@ -1,8 +1,8 @@
 PRGNAM="astromenace"
-VERSION="1.3.2"
+VERSION="1.4.0"
 HOMEPAGE="https://www.viewizard.com/"
-DOWNLOAD="http://downloads.sourceforge.net/project/openastromenace/1.3.2/astromenace-src-1.3.2.tar.bz2"
-MD5SUM="a1481ca7cf498773fddc16a3b41c9b9b"
+DOWNLOAD="https://github.com/viewizard/astromenace/archive/v1.4.0/astromenace-1.4.0.tar.gz"
+MD5SUM="150e5d2aa6610c7ea23216edbcd03b6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="freealut"
diff --git a/games/astromenace/astromenace.sh b/games/astromenace/astromenace.sh
index 4b082a6a626c9..c6b65facdbc8f 100644
--- a/games/astromenace/astromenace.sh
+++ b/games/astromenace/astromenace.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /usr/share/games/astromenace
-./AstroMenace
+./astromenace
diff --git a/games/astromenace/ft2_path.patch b/games/astromenace/ft2_path.patch
deleted file mode 100644
index ecae574d4ce9f..0000000000000
--- a/games/astromenace/ft2_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- AstroMenace/CMakeLists.orig.txt	2015-09-25 05:48:58.014083691 +0300
-+++ AstroMenace/CMakeLists.txt	2015-09-25 05:59:11.322416282 +0300
-@@ -192,7 +192,7 @@
- ELSE(FREETYPE_LIBRARY)
- 	MESSAGE(FATAL_ERROR "freetype not found")
- ENDIF(FREETYPE_LIBRARY)
--FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
-+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 /usr/include/freetype2/config/ftheader.h
- 	HINTS
- 	$ENV{FREETYPE_DIR}/include/freetype2
- 	PATHS