academic/xoscope: Updated for version 2.1.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>

5 files changed, 44 insertions, 23 deletions

diff --git a/academic/xoscope/README b/academic/xoscope/README
index 419f8579e5ac6..0f1c14e952628 100644
--- a/academic/xoscope/README
+++ b/academic/xoscope/README
@@ -2,8 +2,7 @@ xoscope is a digital real-time oscilloscope.  It graphically displays
 signal amplitude or bit logic as a function of time.  Signals may be
 displayed, saved, recalled, and manipulated by math functions.
 
-Signal input devices currently include /dev/dsp, EsounD,
-ProbeScope/OsziFOX, Bitscope, and COMEDI.
+Signal input devices currently include ALSA, ESD, and COMEDI.
 
 If you use your sound card as the input, consider building this buffer
 circuit to protect it from overvoltage:
diff --git a/academic/xoscope/doinst.sh b/academic/xoscope/doinst.sh
new file mode 100644
index 0000000000000..12009358229b8
--- /dev/null
+++ b/academic/xoscope/doinst.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/academic/xoscope/slack-desc b/academic/xoscope/slack-desc
index 1456886b85f48..6f14d720f5933 100644
--- a/academic/xoscope/slack-desc
+++ b/academic/xoscope/slack-desc
@@ -11,8 +11,8 @@ xoscope:
 xoscope: xoscope is a digital real-time oscilloscope.  It graphically displays
 xoscope: signal amplitude or bit logic as a function of time.  Signals may be
 xoscope: displayed, saved, recalled, and manipulated by math functions.  Signal
-xoscope: input devices currently include /dev/dsp, EsounD, ProbeScope/OsziFOX,
-xoscope: Bitscope, and COMEDI.
+xoscope: input devices currently include ALSA, ESD, and COMEDI.
+xoscope:
 xoscope:
 xoscope:
 xoscope:
diff --git a/academic/xoscope/xoscope.SlackBuild b/academic/xoscope/xoscope.SlackBuild
index eeecdc1755aef..6e14803515803 100644
--- a/academic/xoscope/xoscope.SlackBuild
+++ b/academic/xoscope/xoscope.SlackBuild
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for xoscope
-# Written by Kyle Guinn <elyk03@gmail.com>
+
+# Copyright 2015 Kyle Guinn <elyk03@gmail.com>, USA
+# 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=xoscope
-VERSION=${VERSION:-2.0}
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -21,7 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO*"
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO* hardware"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -43,34 +62,30 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Allow DEPRECATED functions or build fails on gtk+2-2.24.3.
-sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' gtkdatabox-0.6.0.0/gtk/Makefile.am
-autoreconf
+chmod -R u+w,go-w,a+rX-st .
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-dependency-tracking \
   --build=$ARCH-slackware-linux
 
 make
+make check
 make install-strip DESTDIR=$PKG
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+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
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -78,6 +93,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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/academic/xoscope/xoscope.info b/academic/xoscope/xoscope.info
index b516865b03532..3384cdeadaf11 100644
--- a/academic/xoscope/xoscope.info
+++ b/academic/xoscope/xoscope.info
@@ -1,10 +1,10 @@
 PRGNAM="xoscope"
-VERSION="2.0"
+VERSION="2.1"
 HOMEPAGE="http://xoscope.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/xoscope/xoscope-2.0.tgz"
-MD5SUM="f1430ccee4ee0f6f478c2cd209549741"
+DOWNLOAD="http://downloads.sourceforge.net/xoscope/xoscope-2.1.tar.gz"
+MD5SUM="a8b792ebca861eddc5967b255936a6bc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="gtkdatabox"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"