From b55ec19dd530faf3d417ffb9c6549bec5961a5d9 Mon Sep 17 00:00:00 2001
From: Kyle Guinn
Date: Sun, 4 Dec 2016 13:54:38 -0600
Subject: academic/xoscope: Updated for version 2.2.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>
---
 academic/xoscope/xoscope.SlackBuild | 15 ++++++++-------
 academic/xoscope/xoscope.info       |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/academic/xoscope/xoscope.SlackBuild b/academic/xoscope/xoscope.SlackBuild
index 6e14803515..b0f9ff77e8 100644
--- a/academic/xoscope/xoscope.SlackBuild
+++ b/academic/xoscope/xoscope.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xoscope
 
-# Copyright 2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2015-2016 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xoscope
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.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
@@ -45,6 +45,9 @@ DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO* hardware"
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -67,7 +70,6 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
-CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -77,14 +79,13 @@ CFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-dependency-tracking \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  CFLAGS="$SLKCFLAGS" \
 
 make
 make check
 make install-strip DESTDIR=$PKG
 
-install -D -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-
 find $PKG/usr/man -type f -exec gzip -9 {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/academic/xoscope/xoscope.info b/academic/xoscope/xoscope.info
index 3384cdeada..7583dc5f8f 100644
--- a/academic/xoscope/xoscope.info
+++ b/academic/xoscope/xoscope.info
@@ -1,8 +1,8 @@
 PRGNAM="xoscope"
-VERSION="2.1"
+VERSION="2.2"
 HOMEPAGE="http://xoscope.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/xoscope/xoscope-2.1.tar.gz"
-MD5SUM="a8b792ebca861eddc5967b255936a6bc"
+DOWNLOAD="http://downloads.sourceforge.net/xoscope/xoscope-2.2.tar.gz"
+MD5SUM="468ff79d38b5645f9033b564091bfecd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gtkdatabox"
-- 
cgit v1.2.3