7 files changed, 89 insertions, 38 deletions
diff --git a/games/advancemame/README b/games/advancemame/README
index 630ee8e007..cd890b787c 100644
--- a/games/advancemame/README
+++ b/games/advancemame/README
@@ -3,3 +3,8 @@ Advancemame (Multi Arcade Machine Emulator)
 Advancemame is a derivative of the well known "mame" emulator.
 It works easily on linux, with joystick support, fullscreen
 support, and more "out of the box."
+
+Optional dependency: SDL2. By default, advancemame is built with
+SDL-1.2. If SDL-2.0 is installed, advancemame will autodetect it and use
+it instead. If you have SDL2 installed, but want to build advancemame
+with SDL-1.2, set SDL2=no in the script's environment.
diff --git a/games/advancemame/advancemame.SlackBuild b/games/advancemame/advancemame.SlackBuild
index 426bd5814c..15c934599b 100644
--- a/games/advancemame/advancemame.SlackBuild
+++ b/games/advancemame/advancemame.SlackBuild
@@ -2,16 +2,29 @@
 
 # Slackware build script for "advancemame"
 
-# Written by seb (sebastien.serre33@laposte.net)
+# Originally written by seb (email removed)
+
+# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# had no license, modified version released under the WTFPL. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# 20170211 bkw:
+# - Take over maintenance
+# - Update for v3.2
+# - i486 => i586
+# - install man pages to section 6, since this is a game
+# - major script cleanup/simplification (use 'make install')
+# - add .desktop, icon, doinst
+# - document optional SDL2 dep, add SDL2 env var to control it
 
 PRGNAM=advancemame
-VERSION=0.106.0
+VERSION=${VERSION:-3.2}
 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
@@ -22,12 +35,10 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOC="BUILD COPYING HISTORY RELEASE README $CWD/$PRGNAM.SlackBuild"
-
 set -e
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,46 +64,70 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "${SDL2:-yes}" != "yes" ]; then
+   SDL2OPT="--enable-sdl --disable-sdl2"
+fi
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  $SDL2OPT \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --bindir=/usr/games \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
 
-/usr/bin/ginstall -d -m 755 $PKG/usr/games
-/usr/bin/ginstall -d -m 755 $PKG/usr/share/advance
-/usr/bin/ginstall -d -m 755 $PKG/usr/doc/$PRGNAM-$VERSION
-/usr/bin/ginstall -d -m 755 $PKG/usr/man/man1
-/usr/bin/ginstall -d -m 755 $PKG/usr/share/advance/{rom,sample,artwork,image,crc}
-/usr/bin/ginstall -m 755 obj/mame/linux/blend/advmame $PKG/usr/games
-/usr/bin/ginstall -m 755 obj/cfg/linux/blend/advcfg $PKG/usr/games
-/usr/bin/ginstall -m 755 obj/v/linux/blend/advv $PKG/usr/games
-/usr/bin/ginstall -m 755 obj/s/linux/blend/advs $PKG/usr/games
-/usr/bin/ginstall -m 755 obj/k/linux/blend/advk $PKG/usr/games
-/usr/bin/ginstall -m 755 obj/j/linux/blend/advj $PKG/usr/games
-/usr/bin/ginstall -m 755 obj/m/linux/blend/advm $PKG/usr/games
-/usr/bin/ginstall -m 644 ./support/*.dat $PKG/usr/share/advance
-/usr/bin/ginstall -m 644 ./doc/{*.html,*.txt} $PKG/usr/doc/$PRGNAM-$VERSION
-/usr/bin/ginstall -m 644 $DOC $PKG/usr/doc/$PRGNAM-$VERSION
-/usr/bin/ginstall -m 644 ./doc/*.1 $PKG/usr/man/man1
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( 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
-)
+# Please don't remove the -j1 from the make install command. Without it,
+# the directories don't always get created before files are installed
+# into them, resulting in a mess.
+make -j1 install prefix=$PKG/usr bindir=$PKG/usr/games docdir=$PKGDOC
+
+# Binaries are installed stripped. Man pages are in the wrong section!
+mv $PKG/usr/man/man1 $PKG/usr/man/man6
+sed -i '/^\.TH.* 1$/s,1$,6,' $PKG/usr/man/man6/*.1
+rename .1 .6 $PKG/usr/man/man6/*.1
+gzip -9 $PKG/usr/man/man6/*.6
+
+# This one works better as a symlink:
+rm -f $PKG/usr/man/man6/advmess.6.gz
+ln -s advmame.6.gz $PKG/usr/man/man6/advmess.6.gz
+
+# Easier to fix this after the fact than hack it to work right:
+mv $PKGDOC/advance/* $PKGDOC
+rmdir $PKGDOC/advance
+
+# HISTORY, README, RELEASE are identical to history.txt, readme.txt,
+# release.txt which are already installed, but the license doesn't have
+# a lowercase.txt equivalent:
+cp -a COPYING $PKGDOC
+
+# Icon is a resized version of contrib/logo/megaman.png, which is the
+# same as the Windows icon.
+mkdir -p $PKG/usr/share/pixmaps
+cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+
+# .desktop file written by SlackBuild author.
+mkdir -p $PKG/usr/share/applications
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+
+# see if we were built with SDL2.
+if ldd $PKG/usr/games/advmame | grep -q SDL2; then
+  SDLVER="2.0"
+else
+  SDLVER="1.2"
+fi
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@SDLVER@,$SDLVER,g" $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.${PKGTYPE:-tgz}
diff --git a/games/advancemame/advancemame.desktop b/games/advancemame/advancemame.desktop
new file mode 100644
index 0000000000..1ce0ba00f0
--- /dev/null
+++ b/games/advancemame/advancemame.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=AdvanceMAME
+Comment=Arcade Game Emulator
+Exec=/usr/games/advmenu
+Icon=advancemame
+Terminal=false
+Type=Application
+Categories=Game;Emulator;
diff --git a/games/advancemame/advancemame.info b/games/advancemame/advancemame.info
index 4533522245..356d9dd8c1 100644
--- a/games/advancemame/advancemame.info
+++ b/games/advancemame/advancemame.info
@@ -1,10 +1,10 @@
 PRGNAM="advancemame"
-VERSION="0.106.0"
+VERSION="3.2"
 HOMEPAGE="http://advancemame.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/advancemame/advancemame-0.106.0.tar.gz"
-MD5SUM="aa097a4a9046124e17aa83a215e454ea"
+DOWNLOAD="https://github.com/amadvance/advancemame/releases/download/v3.2/advancemame-3.2.tar.gz"
+MD5SUM="9f24b27dfefdfe220f15094b10ccb02f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="seb"
-EMAIL="sebastien.serre33@laposte.net"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/games/advancemame/advancemame.png b/games/advancemame/advancemame.png
new file mode 100644
index 0000000000..276f910d86
--- /dev/null
+++ b/games/advancemame/advancemame.png
diff --git a/games/advancemame/doinst.sh b/games/advancemame/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/advancemame/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/advancemame/slack-desc b/games/advancemame/slack-desc
index 4bfe87c23f..a1c08b3606 100644
--- a/games/advancemame/slack-desc
+++ b/games/advancemame/slack-desc
@@ -14,6 +14,6 @@ advancemame: support, and more "out of the box."
 advancemame:
 advancemame: Homepage: http://advancemame.sourceforge.net/
 advancemame:
-advancemame:
+advancemame: This package was built for SDL @SDLVER@.
 advancemame:
 advancemame: