network/etherape: Updated for version 0.9.10.

4 files changed, 42 insertions, 39 deletions

diff --git a/network/etherape/README b/network/etherape/README
index 7b31d21730f0..ec1e28c206c3 100644
--- a/network/etherape/README
+++ b/network/etherape/README
@@ -1,17 +1,14 @@
 EtherApe is a graphical network monitor modeled after etherman. Featuring
 Ethernet, IP, TCP, FDDI and Token Ring modes, it displays network activity
-graphically. Hosts and links change in size with traffic. Color coded protocols
-display. 
+graphically. Hosts and links change in size with traffic. Color coded
+protocols display.
 
-It supports Ethernet, FDDI, Token Ring, ISDN, PPP and SLIP devices. It can
-filter traffic to be shown, and can read traffic from a file as well as live
-from the network.
+It supports Ethernet, FDDI, Token Ring, ISDN, PPP and SLIP devices. It
+can filter traffic to be shown, and can read traffic from a file as well
+as live from the network.
 
-To set the kdesu su wrapper when called from the GUI desktop pass KDESU=yes to
-the SlackBuild. This is not the default option, but if not enabled etherape 
-will not monitor the ports if not called by root. 
+To set the kdesu su wrapper when called from the GUI desktop pass
+KDESU=yes to the SlackBuild. This is not the default option, but if not
+enabled etherape will not monitor the ports if not called by root.
 
-EtherApe requires libgnomeui. It is available from slackbuilds.org.
-
-Scrollkeeper is disabled by this SlackBuild. If you want to enable it, the 
-comments in the SlackBuild can be helpful.
+EtherApe requires libgnomeui.
diff --git a/network/etherape/etherape.SlackBuild b/network/etherape/etherape.SlackBuild
index 2bc0859c25e6..cbdbb5e12ae3 100644
--- a/network/etherape/etherape.SlackBuild
+++ b/network/etherape/etherape.SlackBuild
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for etherape
-# Chris Abela 2010.03.23
+
+# Copyright 2011  Chris Abela, Malta
+# 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=etherape
-VERSION=${VERSION:-0.9.9}
+VERSION=${VERSION:-0.9.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -34,7 +53,7 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -49,18 +68,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# scrollkeeper is disabled.
-# If you want it enabled, remove the --disable-scrollkeeper
-#
-# then Install rarian before running this script.
-# rarian is available from slackbuilds.org.
-#
-# Then you will need to:
-#   cd /usr
-#   ln -s doc/rarian-0.8.1/librarian share/librarian
-#
-# Then run this script
-
+# scrollkeeper was replaced by rarian, so it is disabled
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -80,15 +88,13 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog FAQ INSTALL NEWS OVERVIEW \
-  README README.bugs README.help README.thanks TODO \
+  ABOUT-NLS AUTHORS COPYING ChangeLog FAQ \
+  INSTALL NEWS OVERVIEW README README* TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -97,7 +103,7 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-# IMO, this might have some security issues, use with care!
+# This might have some security issues, use with care!
 if [ "$KDESU" = yes ] ;then
   sed -i 's/Exec=etherape/Exec=kdesu etherape/' \
   usr/share/applications/etherape.desktop
diff --git a/network/etherape/etherape.info b/network/etherape/etherape.info
index 82b7950ca248..1d24bb6a6881 100644
--- a/network/etherape/etherape.info
+++ b/network/etherape/etherape.info
@@ -1,10 +1,10 @@
 PRGNAM="etherape"
-VERSION="0.9.9"
+VERSION="0.9.10"
 HOMEPAGE="http://etherape.sourceforge.net/"
-DOWNLOAD="http://heanet.dl.sourceforge.net/project/etherape/etherape/0.9.9/etherape-0.9.9.tar.gz"
-MD5SUM="5ac4d386284fe8ed31860656cdfefb45"
+DOWNLOAD="http://heanet.dl.sourceforge.net/project/etherape/etherape/0.9.10/etherape-0.9.10.tar.gz"
+MD5SUM="e763b919b46f94f3cccc72f05d9075bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Chris Abela"
 EMAIL="chris.abela@maltats.com"
-APPROVED="dsomero"
+APPROVED="Niels Horn"
diff --git a/network/etherape/slack-desc b/network/etherape/slack-desc
index 33686937839a..56bf878ae963 100644
--- a/network/etherape/slack-desc
+++ b/network/etherape/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler-----------------------------------------------------|
+        |-----handy-ruler------------------------------------------------------|
 etherape: EtherApe (A graphical network monitor)
 etherape:
 etherape: EtherApe  is  a  graphical  network  monitor  for  Unix modeled after