4 files changed, 28 insertions, 48 deletions
diff --git a/games/vbam/README b/games/vbam/README
index 48ee1b9630746..7d4f664baf606 100644
--- a/games/vbam/README
+++ b/games/vbam/README
@@ -1,12 +1,13 @@
-Our goal is to improve upon VisualBoyAdvance by integrating the best features
-from the various builds floating around. Unfortunately work on the "official"
-project seems to have stalled. Independent developers have added excellent
-features to VBA, but seem to have done so individually. The source codes for
-many of these forks seem to be abandoned, outdated or missing altogether.
-We aim to preserve all of the hard work done by these developers to make the
-already great VisualBoyAdvance even better!
-
-The following options are available:
-GTK=ON will build the GTK GUI. It requires gtkglextmm.
-WX=ON will build the WxWidgets GUI. It requires WxWidgets.
+VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with
+commercial games.
+
+It emulates the Nintendo Game Boy Advance hand held console, in addition to the
+original Game Boy hand held systems and its Super and Color variants.
+
+VBA-M is a continued development of the now inactive VisualBoy Advance project,
+with many improvements from various developments of VBA.
+
+This application is the GTK GUI version of VisualBoyAdvance-M. The name of the
+executable is "gvbam".
+
 FFMPEG=ON will enable recording and playback. It requires FFMPEG.
diff --git a/games/vbam/doinst.sh b/games/vbam/doinst.sh
index 1e7838b341814..3e5691a052b5b 100644
--- a/games/vbam/doinst.sh
+++ b/games/vbam/doinst.sh
@@ -1,16 +1,3 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
@@ -20,6 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
-config etc/vbam.cfg.new
-
diff --git a/games/vbam/vbam.SlackBuild b/games/vbam/vbam.SlackBuild
index ce0a618a8fe03..a37712a0d0f3e 100644
--- a/games/vbam/vbam.SlackBuild
+++ b/games/vbam/vbam.SlackBuild
@@ -22,10 +22,12 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=vbam
-VERSION=r1131
+VERSION=r1138
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCVER=1.8.0.1138
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -59,21 +61,16 @@ fi
 
 set -e
 
-# Set to ON to enable the GTK frontend
-GTK=${GTK:-OFF}
-
-# Set to ON to enable the WxWidgets frontend
-WX=${WX:-OFF}
-
 # Set to ON to enable FFMPEG A/V recording.
 FFMPEG=${FFMPEG:-OFF}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.?z*
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+mkdir -p $PRGNAM-$SRCVER
+cd $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER-src.tar.?z*
 chown -R root:root .
 find . \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
@@ -86,9 +83,9 @@ cmake . \
   -DCMAKE_INSTALL_PREFIX="/usr" \
   -DENABLE_ASM_CORE=${ASM} \
   -DENABLE_ASM_SCALERS=${ASM} \
-  -DENABLE_GTK=${GTK} \
-  -DENABLE_WX=${WX} \
-  -DENABLE_FFMPEG=${FFMPEG}
+  -DENABLE_FFMPEG=${FFMPEG} \
+  -DENABLE_DEBUGGER=OFF \
+  -DENABLE_SDL=OFF
 
 make
 make install DESTDIR=$PKG
@@ -96,10 +93,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mv $PKG/etc/vbam.cfg $PKG/etc/vbam.cfg.new
-
-mkdir -p $PKG/usr/man
-gzip -9c debian/vbam.1 > $PKG/usr/man/vbam.1.gz
+mkdir -p $PKG/usr/man/man1
+gzip -9c debian/gvbam.1 > $PKG/usr/man/man1/gvbam.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/* \
diff --git a/games/vbam/vbam.info b/games/vbam/vbam.info
index ae11e3daaaee0..da4936d9906bd 100644
--- a/games/vbam/vbam.info
+++ b/games/vbam/vbam.info
@@ -1,10 +1,10 @@
 PRGNAM="vbam"
-VERSION="r1131"
+VERSION="r1138"
 HOMEPAGE="http://vba-m.com/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/vbam-r1131-src.tar.xz"
-MD5SUM="aa31f2e92e24c9d52321703908e7a934"
+DOWNLOAD="http://downloads.sourceforge.net/project/vbam/VBA-M%20svn%20r1138/vbam-1.8.0.1138-src.tar.gz"
+MD5SUM="e35153271382bca12c185a7726747073"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SFML"
+REQUIRES="SFML gtkglextmm"
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster [at] gmail [dot] com"