1 files changed, 19 insertions, 18 deletions
diff --git a/games/fceux/fceux.SlackBuild b/games/fceux/fceux.SlackBuild
index fe285aac5a..682a580ee7 100644
--- a/games/fceux/fceux.SlackBuild
+++ b/games/fceux/fceux.SlackBuild
@@ -5,7 +5,7 @@
 # Written by M.Dinslage (daedra1980@gmail.com)
 
 PRGNAM=fceux
-VERSION=${VERSION:-2.1.5}
+VERSION=${VERSION:-r2668}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -23,16 +23,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="'-O2', '-march=i486', '-mtune=i686'"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="'-O2', '-march=i686', '-mtune=i686'"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="'-O2', '-fPIC'"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="'-O2'"
   LIBDIRSUFFIX=""
 fi
 
@@ -41,10 +41,9 @@ set -e # Exit on most errors
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.src.tar.bz2
+rm -rf fceu$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.src.tar.?z*
 cd fceu$VERSION
-patch -p1 < $CWD/fceux-2.1.5-underlink.patch
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -52,26 +51,28 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix underlinking and disable debug with a patch
+patch -p1 < $CWD/fceux-r2668.patch
+# Default prefix is /usr, set our CFLAGS
+sed -i \
+  -e "s|/local||" \
+  -e "s|'-Wall'|${SLKCFLAGS}, '-Wall'|" \
+  SConstruct
+
 scons
 
 #Install binary
-mkdir -p $PKG/usr/games
-install -m 0755 bin/fceux $PKG/usr/games
+install -m 0755 -D bin/$PRGNAM $PKG/usr/games/$PRGNAM
 
-#install man pages
+#install the man page
 mkdir -p $PKG/usr/man/man6
-install -m 0644 documentation/fceux.6 $PKG/usr/man/man6
+gzip -c documentation/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-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 \
-  bin/fceux.chm COPYING INSTALL README-SDL TODO-PROJECT \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a documentation/* COPYING *.txt *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 #Add icon and application launcher