1 files changed, 38 insertions, 22 deletions
diff --git a/games/egoboo/egoboo.SlackBuild b/games/egoboo/egoboo.SlackBuild
index d5ee00e6df3e..6f7fbdd1dce3 100644
--- a/games/egoboo/egoboo.SlackBuild
+++ b/games/egoboo/egoboo.SlackBuild
@@ -6,13 +6,13 @@
 # Maintained by Erik Hanson <erik@slackbuilds.org>
 
 PRGNAM=egoboo
-VERSION=${VERSION:-2.7.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.8.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -23,8 +23,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -43,27 +43,45 @@ cd $PRGNAM-$VERSION
 find . -type f -exec chmod -x {} \;
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
-
-# Fix end-of-line encoding in *.txt, prefix location in wrapper script.
-sed -i 's/\r//g' *.txt doc/*.txt
-sed -i 's|${HOME}/.local|/usr|' game/$PRGNAM.sh
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Fix whatever this problem is
-sed -i 's/-lGLU/-lGLU -lm/' game/Makefile.unix
+sed -i 's/-lGLU/-lGLU -lm/' src/game/Makefile
+
+sed -i -e 's/\[COLOR_DEPTH\] : "32"/\[COLOR_DEPTH\] : "24"/g' \
+       -e 's/\[Z_DEPTH\] : "32"/\[Z_DEPTH\] : "24"/g' \
+       -e 's/\[OUTPUT_BUFFER_SIZE\] : "2548/\[OUTPUT_BUFFER_SIZE\] : "2048/g' \
+       setup.txt
+
+
+# fix data paths
+sed -i -e 's#egoboo-2.x#egoboo#g' \
+       -e 's#share/games#share#g' \
+       -e 's#etc#share#g' \
+       -e 's#games#bin#g' \
+       src/game/platform/file_linux.c
+
+# fix linking
+sed -i -e 's#-lenet#-lenet -lm#g' src/game/Makefile
+
+# fix keyboard bug
+zcat $CWD/keyboard_directions.patch | patch -p1 --binary
+
+cd src
+make all
+cd ..
 
-# Compile and install program.
-make -C game -f Makefile.unix OPT="$SLKCFLAGS -Wall" PREFIX=/usr
-make -C game -f Makefile.unix PREFIX=$PKG/usr install
+mkdir -p $PKG/usr/bin
+install -Dm755 src/game/egoboo-2.x $PKG/usr/bin/egoboo
 
 # Copy data.
 mkdir -p $PKG/usr/share/$PRGNAM
-cp -rf controls.txt setup.txt basicdat/ modules/ players/ $PKG/usr/share/$PRGNAM/
+cp -rf controls.txt setup.txt basicdat/ modules/ $PKG/usr/share/$PRGNAM/
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 # Install icon and desktop files
@@ -71,9 +89,7 @@ install -D -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  *.txt doc/* License.pdf README.Linux \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt doc/*.txt doc/*.pdf license* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install