games/nexuiz: Updated for version 2.5.2.

11 files changed, 45 insertions, 33 deletions

diff --git a/games/nexuiz/README b/games/nexuiz/README
index 516cc208a003..c10cd7961efe 100644
--- a/games/nexuiz/README
+++ b/games/nexuiz/README
@@ -4,4 +4,5 @@ open-sourced Quake engine.  Nexuiz is a standalone game that can
 be played locally or over the internet.  It is completely open
 source and actively developed.
 
-Note: The source download is about 660M.
+Note: This SlackBuild just repackages the binaries (no compiling). The
+"source" download is about 900M.
diff --git a/games/nexuiz/doinst.sh b/games/nexuiz/doinst.sh
index 800ab3f267c8..800056659f9e 100644
--- a/games/nexuiz/doinst.sh
+++ b/games/nexuiz/doinst.sh
@@ -2,6 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
   ./usr/bin/update-desktop-database -q usr/share/applications
 fi
 
-if [ -x /usr/bin/update-mime-database ]; then
-  ./usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
+
diff --git a/games/nexuiz/nexuiz-dedicated.i686 b/games/nexuiz/nexuiz-dedicated.i686
index 5130a7d0a6bf..a0f7327978ae 100644
--- a/games/nexuiz/nexuiz-dedicated.i686
+++ b/games/nexuiz/nexuiz-dedicated.i686
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /usr/share/games/nexuiz
-./nexuiz-linux-686-dedicated
+exec ./nexuiz-linux-686-dedicated
diff --git a/games/nexuiz/nexuiz-dedicated.x86_64 b/games/nexuiz/nexuiz-dedicated.x86_64
index cd77c5edf2dc..859abd48542c 100644
--- a/games/nexuiz/nexuiz-dedicated.x86_64
+++ b/games/nexuiz/nexuiz-dedicated.x86_64
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /usr/share/games/nexuiz
-./nexuiz-linux-x86_64-dedicated
+exec ./nexuiz-linux-x86_64-dedicated
diff --git a/games/nexuiz/nexuiz-glx b/games/nexuiz/nexuiz-glx
index 4c9ab3bf9419..6e385459b6b8 100644
--- a/games/nexuiz/nexuiz-glx
+++ b/games/nexuiz/nexuiz-glx
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /usr/share/games/nexuiz
-sh nexuiz-linux-glx.sh
+exec sh nexuiz-linux-glx.sh
diff --git a/games/nexuiz/nexuiz-glx.desktop b/games/nexuiz/nexuiz-glx.desktop
index d91307b08caa..4d0d4f241177 100644
--- a/games/nexuiz/nexuiz-glx.desktop
+++ b/games/nexuiz/nexuiz-glx.desktop
@@ -1,7 +1,5 @@
 [Desktop Entry]
 Type=Application
-Version=2.1
-Encoding=UTF-8
 Name=Nexuiz (GLX)
 Comment=Free first-person shooter game
 Icon=/usr/share/pixmaps/nexuiz.png
diff --git a/games/nexuiz/nexuiz-sdl b/games/nexuiz/nexuiz-sdl
index 929c6ddb399d..7a83d114b1e2 100644
--- a/games/nexuiz/nexuiz-sdl
+++ b/games/nexuiz/nexuiz-sdl
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /usr/share/games/nexuiz
-sh nexuiz-linux-sdl.sh
+exec sh nexuiz-linux-sdl.sh
diff --git a/games/nexuiz/nexuiz-sdl.desktop b/games/nexuiz/nexuiz-sdl.desktop
index e4edb21ffcb0..347ddaafdde5 100644
--- a/games/nexuiz/nexuiz-sdl.desktop
+++ b/games/nexuiz/nexuiz-sdl.desktop
@@ -1,7 +1,5 @@
 [Desktop Entry]
 Type=Application
-Version=2.1
-Encoding=UTF-8
 Name=Nexuiz (SDL)
 Comment=Free first-person shooter game
 Icon=/usr/share/pixmaps/nexuiz.png
diff --git a/games/nexuiz/nexuiz.SlackBuild b/games/nexuiz/nexuiz.SlackBuild
index f8f12ca396a7..8f7192de8df2 100644
--- a/games/nexuiz/nexuiz.SlackBuild
+++ b/games/nexuiz/nexuiz.SlackBuild
@@ -2,6 +2,9 @@
 
 # Slackware build script for Nexuiz
 
+# Now maintained by B. Watson <yalhcru@gmail.com>, please don't bother
+# Chess with questions about this build (bother me instead)
+
 # Copyright 2008-2009 Chess Griffin <chess@chessgriffin.com>
 # All rights reserved.
 #
@@ -23,7 +26,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=nexuiz
-VERSION=${VERSION:-2.5.1}
+VERSION=${VERSION:-2.5.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,21 +39,31 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+  SRCARCH="686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  SRCARCH="686"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  SRCARCH="x86_64"
 fi
 
-set -e # Exit on most errors
+set -e
+
+SRCVER=$( echo $VERSION | tr -d . )
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf Nexuiz
-unzip -o $CWD/nexuiz-251.zip
+
+# All the -x stuff saves us 120MB of space in /tmp, during the build.
+# Why extract the windows and mac binaries, if we're not going to use them?
+unzip -o $CWD/nexuiz-$SRCVER.zip \
+  -x 'Nexuiz/nexuiz-osx-*' '*.exe' '*.dll' 'Nexuiz/Nexuiz-SDL.app/*' \
+     'Nexuiz/Nexuiz.app/*'  'Nexuiz/extra/*'  'Nexuiz/sources/*'
 cd Nexuiz
 chown -R root:root .
 find . \
@@ -59,13 +72,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
-)
-
 install -D -m 0644 $CWD/nexuiz-glx.desktop \
   $PKG/usr/share/applications/nexuiz-glx.desktop
 install -D -m 0644 $CWD/nexuiz-sdl.desktop \
@@ -77,22 +83,24 @@ cp $CWD/*.png $PKG/usr/share/pixmaps
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -R ./Docs/* $PKG/usr/doc/$PRGNAM-$VERSION/
 cp gpl.txt $PKG/usr/doc/$PRGNAM-$VERSION
+# Include server scripts as docs:
+cp -R server $PKG/usr/doc/$PRGNAM-$VERSION/server
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/usr/share/games/nexuiz
 cp -R data $PKG/usr/share/games/nexuiz
+cp -R havoc $PKG/usr/share/games/nexuiz/havoc
 find $PKG/usr/share/games/nexuiz -type f -exec chmod 0644 {} \;
-cp nexuiz-* $PKG/usr/share/games/nexuiz
-rm $PKG/usr/share/games/nexuiz/*.exe
-rm $PKG/usr/share/games/nexuiz/nexuiz-osx-dedicated
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# The binaries are already stripped.
+# Compiled binaries don't belong under /usr/share (saith the FHS), but
+# this isn't worth changing IMO, it would require patching all the run scripts.
+cp nexuiz-linux-$SRCARCH* nexuiz-linux-*.sh $PKG/usr/share/games/nexuiz
 
 chmod 755 $PKG/usr/share/games/nexuiz/*
 
 mkdir -p $PKG/usr/games
+
 # The launchers for the sdl and glx binaries automatically detect 
 # the architecture.  The launchers for the dedicated server do not.
 cp $CWD/nexuiz-glx $PKG/usr/games/
@@ -104,5 +112,9 @@ else
 fi
 chmod 755 $PKG/usr/games/nexuiz*
 
+mkdir -p $PKG/install
+cat $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/nexuiz/nexuiz.info b/games/nexuiz/nexuiz.info
index 433d51e083a8..c6731756c9f9 100644
--- a/games/nexuiz/nexuiz.info
+++ b/games/nexuiz/nexuiz.info
@@ -1,10 +1,10 @@
 PRGNAM="nexuiz"
-VERSION="2.5.1"
+VERSION="2.5.2"
 HOMEPAGE="http://www.alientrap.org/nexuiz"
-DOWNLOAD="http://downloads.sourceforge.net/nexuiz/nexuiz-251.zip"
+DOWNLOAD="http://downloads.sourceforge.net/nexuiz/nexuiz-252.zip"
 DOWNLOAD_x86_64=""
-MD5SUM="8e945f71a922f1f87ab406bafadde93f"
+MD5SUM="d750bc328e58df8492f8d88bdcf818cb"
 MD5SUM_x86_64=""
-MAINTAINER="Chess Griffin"
-EMAIL="chess@chessgriffin.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
 APPROVED="dsomero"
diff --git a/multimedia/vcdimager/vcdimager.SlackBuild b/multimedia/vcdimager/vcdimager.SlackBuild
index 6489096866ab..0f6c0f7a5c2f 100644
--- a/multimedia/vcdimager/vcdimager.SlackBuild
+++ b/multimedia/vcdimager/vcdimager.SlackBuild
@@ -20,7 +20,7 @@ PRGNAM=vcdimager
 VERSION=0.7.23
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-2}
-TAG=${TAG:-SBo}
+TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}