system/usbview: Updated for version 2.0.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 45 insertions, 17 deletions

diff --git a/system/usbview/README b/system/usbview/README
index 575f346f1f..320d094104 100644
--- a/system/usbview/README
+++ b/system/usbview/README
@@ -2,3 +2,10 @@ USBView is a GTK program that displays the topography of the devices that are
 plugged into the USB bus on a Linux machine.  It also displays information on
 each of the devices.  This can be useful to determine if a device is working
 properly or not.
+
+For this program to be useful, you will need to mount the debug filesystem
+(debugfs).  Add this line to your /etc/fstab:
+
+  debugfs /sys/kernel/debug debugfs noauto 0 0
+
+Now a simple `mount debugfs` will make the USB info available to USBView.
diff --git a/system/usbview/slack-desc b/system/usbview/slack-desc
index 1722e1707b..3197e1b8a1 100644
--- a/system/usbview/slack-desc
+++ b/system/usbview/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 usbview: USBView (GTK program that displays the topography of USB devices)
diff --git a/system/usbview/usbview.SlackBuild b/system/usbview/usbview.SlackBuild
index 2129f21a70..41b866b066 100644
--- a/system/usbview/usbview.SlackBuild
+++ b/system/usbview/usbview.SlackBuild
@@ -1,19 +1,36 @@
 #!/bin/sh
 
 # Slackware build script for usbview
-# Written by Kyle Guinn <elyk03@gmail.com>
 
-PRGNAM="usbview"
-VERSION="1.0"
+# Copyright 2013 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=usbview
+VERSION=${VERSION:-2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -23,6 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -49,21 +68,23 @@ chown -R root:root .
 chmod -R u+w,go+r-w,a-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 \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/usbview/usbview.info b/system/usbview/usbview.info
index ffac33c931..31d64ccf2c 100644
--- a/system/usbview/usbview.info
+++ b/system/usbview/usbview.info
@@ -1,8 +1,8 @@
 PRGNAM="usbview"
-VERSION="1.0"
+VERSION="2.0"
 HOMEPAGE="http://www.kroah.com/linux/usb/"
-DOWNLOAD="http://downloads.sourceforge.net/usbview/usbview-1.0.tar.gz"
-MD5SUM="2ac1bdae03a858b965e895b211a75ad7"
+DOWNLOAD="http://www.kroah.com/linux/usb/usbview-2.0.tar.gz"
+MD5SUM="565f2e79f3924d14ab5b4d8aced557e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""