games/xspacewarp: New maintainer, fix URLs.

Signed-off-by: B. Watson <yalhcru@gmail.com>

2 files changed, 26 insertions, 18 deletions

diff --git a/games/xspacewarp/xspacewarp.SlackBuild b/games/xspacewarp/xspacewarp.SlackBuild
index bf31754efabb..5d0621886d12 100644
--- a/games/xspacewarp/xspacewarp.SlackBuild
+++ b/games/xspacewarp/xspacewarp.SlackBuild
@@ -7,8 +7,11 @@
 
 # man-page and app-defaults files by Luis Henrique <lmello.009@gmail.com>
 
+# Formerly maintained by:
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -27,16 +30,25 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+# 20170309 bkw:
+# - take over maintenance
+# - fix download & homepage URLs
+# - i486 => i586
+# - minor tweaks
+# - TODO: re-enable the close button on the window? I don't see a way
+#   to quit the game (nothing mentioned in the 'Orientation', man page,
+#   or README).
+
 PRGNAM=xspacewarp
 VERSION=${VERSION:-1.2b}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=$(echo $VERSION | cut -b -3)
+SRCVER=$(echo $VERSION | cut -b -3)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -47,8 +59,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"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,9 +78,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-$SRCVER
+tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -83,12 +95,10 @@ xmkmf
 make Makefile
 make CDEBUGFLAGS="$SLKCFLAGS -fno-strength-reduce -fno-strict-aliasing" $PRGNAM
 
+strip $PRGNAM
 make install BINDIR=/usr/games DESTDIR=$PKG
 
-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
-
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
@@ -101,9 +111,7 @@ mkdir -p $PKG/usr/man/man6
 cat $CWD/xspacewarp.man | gzip -9 > $PKG/usr/man/man6/xspacewarp.6.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGES INSTALL \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a CHANGES $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/xspacewarp-1.2.README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/xspacewarp/xspacewarp.info b/games/xspacewarp/xspacewarp.info
index 8c6cd69a55a0..b062af376e88 100644
--- a/games/xspacewarp/xspacewarp.info
+++ b/games/xspacewarp/xspacewarp.info
@@ -1,10 +1,10 @@
 PRGNAM="xspacewarp"
 VERSION="1.2b"
-HOMEPAGE="http://ftp.x.org/contrib/games/xspacewarp-1.2.README"
-DOWNLOAD="http://ftp.x.org/contrib/games/xspacewarp-1.2.tar.gz"
+HOMEPAGE="http://ftp.vim.org/windowing/X/contrib/games/xspacewarp-1.2.README"
+DOWNLOAD="http://ftp.vim.org/windowing/X/contrib/games/xspacewarp-1.2.tar.gz"
 MD5SUM="54aa93eb6fd3d7fa396fc47ddf3ffd15"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"