games/jag: Updated for version 0.3.3

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

4 files changed, 64 insertions, 54 deletions

diff --git a/games/jag/README b/games/jag/README
index ff3cd6edd9..b01afcf95a 100644
--- a/games/jag/README
+++ b/games/jag/README
@@ -3,3 +3,10 @@ It is free and opensource.
 
 There is also an optional level editor that can be installed.
 To install the editor pass JAG_EDITOR="yes" to the slackbuild.
+
+  # JAG_EDITOR="yes" ./jag.SlackBuild
+
+Note: To install Qt5 version of jag pass QT5GUI="yes" to the
+slackbuild.
+
+  # QT5GUI="yes" ./jag.SlackBuild
diff --git a/games/jag/jag.SlackBuild b/games/jag/jag.SlackBuild
index f2e444e15a..330b683037 100644
--- a/games/jag/jag.SlackBuild
+++ b/games/jag/jag.SlackBuild
@@ -2,16 +2,34 @@
 
 # Slackware build script for jag
 
-# Written by Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2009-2017 Larry Hajali <larryhaja[at]gmail[dot]com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=jag
-VERSION=${VERSION:-0.3.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.3.3}
+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,8 +40,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"
@@ -41,52 +59,48 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-src
-unzip $CWD/$PRGNAM-$VERSION-src.zip
-unzip $CWD/$PRGNAM-$VERSION-data.zip
-mv $PRGNAM-$VERSION-data/data $PRGNAM-$VERSION-src
-cd $PRGNAM-$VERSION-src
-# Correct permissions on all files/folders.
-find . -type f -exec chmod 0644 '{}' \;
-find . -type d -exec chmod 0755 '{}' \;
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Fix directory locations.
-sed -i \
-  -e 's|/usr/local/bin|/usr/games|g' \
-  -e 's|/usr/local/games|/usr/share|g' \
-  Game.pro main.cpp editor/editor.pro
-
-qmake LIBS+=-lX11 -o Makefile Game.pro
-make \
-  CFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)" \
-  CXXFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)"
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+if [ "${QT5GUI:-no}" == "yes" ]; then
+  qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    -o Makefile Game.pro
+else
+  qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    -o Makefile Game.pro
+fi
+
+make
 make install INSTALL_ROOT=$PKG
 
-# Install the optional level editor.
+# Install the optional level editor. Default is no.
 if [ "${JAG_EDITOR:-no}" == "yes" ]; then
   cd editor
-    qmake -o Makefile editor.pro
-    make \
-      CFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)" \
-      CXXFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)"
+    sed -i 's|/usr/local/bin|/usr/games|g' editor.pro
+    # Editor doesn't compile under Qt5 yet.
+    #qmake-qt5 QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+    #  QT+="uitools" -o Makefile editor.pro
+    qmake QMAKE_CFLAGS+="$SLKCFLAGS" QMAKE_CXXFLAGS+="$SLKCFLAGS" \
+      -o Makefile editor.pro
+
+    make
     make install INSTALL_ROOT=$PKG
   cd ..
 fi
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
-install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 for i in 16 22 32 48 64 128; do
-  convert images/icon256.png -resize ${i}x${i}! ${PRGNAM}${i}.png
-  install -D -m 0644 ${PRGNAM}${i}.png \
+  convert icon.ico -resize ${i}x${i}! ${PRGNAM}${i}.png
+  install -D -m 0644 ${PRGNAM}${i}-0.png \
     $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
 done
 if [ "${JAG_EDITOR:-no}" == "yes" ]; then
diff --git a/games/jag/jag.desktop b/games/jag/jag.desktop
deleted file mode 100644
index 46e6b264d6..0000000000
--- a/games/jag/jag.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Jag
-Comment=JAG is an arcade-puzzle 2D game.
-Exec=jag
-Icon=jag
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;
diff --git a/games/jag/jag.info b/games/jag/jag.info
index 455f3e2cf1..c3d648c2cb 100644
--- a/games/jag/jag.info
+++ b/games/jag/jag.info
@@ -1,10 +1,8 @@
 PRGNAM="jag"
-VERSION="0.3.2"
-HOMEPAGE="http://jag.xlabsoft.com/index.php"
-DOWNLOAD="ftp://ftp.openbsd.org/ports/distfiles/jag-0.3.2-src.zip \
-          ftp://ftp.uk.freebsd.org/pub/OpenBSD/distfiles/jag-0.3.2-data.zip"
-MD5SUM="ed4313f2cf57cfc130700e8d91365faa \
-        21a1a36f348f866a0a43cb1a8adf4e2f"
+VERSION="0.3.3"
+HOMEPAGE="https://github.com/LibreGames/jag"
+DOWNLOAD="https://github.com/LibreGames/jag/archive/0.3.3/jag-0.3.3.tar.gz"
+MD5SUM="99f51f69c0c97a5f283bd249665f68be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""