network/ntop: Updated for version 4.0.1.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

1 files changed, 11 insertions, 16 deletions

diff --git a/network/ntop/ntop.SlackBuild b/network/ntop/ntop.SlackBuild
index e996b4c038..dc3e2c341b 100644
--- a/network/ntop/ntop.SlackBuild
+++ b/network/ntop/ntop.SlackBuild
@@ -22,22 +22,21 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Copyright 2009 (ntop version >= 3.3.10) Niels Horn <niels.horn@gmail.com>
+# Maintained as of version >= 3.3.10 by Niels Horn <niels.horn@gmail.com>
+# revision date: 2010/08/23
 
 PRGNAM=ntop
-VERSION=3.3.10
+VERSION=4.0.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 NTOPUSER=${NTOPUSER:-ntop}
 NTOPGROUP=${NTOPGROUP:-ntop}
 
-# 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
@@ -89,12 +88,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# The ntop configure / make routine automatically downloads & installs
-# lua and GeoIP (even when already present on your machine), so we'll
-# patch this to just warn & exit if the packages are not found.
+# Patch Makefile so we won't do automatic downloads
 patch -p1 < $CWD/no_downloads.patch
 
-# Since ntop calls their ./configure from autogen.sh anything passed onto 
+# Since ntop calls their ./configure from autogen.sh anything passed onto
 # autogen.sh (ie $@) is passed off as command line arguments to configure.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -116,10 +113,8 @@ 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
 
 # Bug in ntop source:: http://tinyurl.com/2wf7ou . This should at some point
 # be dealt with upstream. For now fix this in $PKG :)
@@ -127,16 +122,16 @@ if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/plugins ]; then
     rmdir -v $PKG/usr/lib${LIBDIRSUFFIX}/plugins
 fi
 
-mkdir -p $PKG/etc/logrotate.d $PKG/etc/rc.d 
+mkdir -p $PKG/etc/logrotate.d $PKG/etc/rc.d
 install -m 0644 $CWD/$PRGNAM.logrotate $PKG/etc/logrotate.d/$PRGNAM.new
 sed -e "s%@NTOPUSER@%$NTOPUSER%" -e "s%@NTOPGROUP@%$NTOPGROUP%" \
   $CWD/rc.ntop > $PKG/etc/rc.d/rc.ntop.new
 chmod 0755 $PKG/etc/rc.d/rc.ntop.new
 
-# Change the permissions on ntops homedir so we can write logs 
+# Change the permissions on ntops homedir so we can write logs
 chown -R $NTOPUSER:$NTOPGROUP $PKG/var/lib/$PRGNAM
 
-# Copy *all* documentation over (docs/ is not included in make install for 
+# Copy *all* documentation over (docs/ is not included in make install for
 # some arkane reason. Rename some docs to prevent them copying over each other.
 for FILE in {README,INSTALL}; do mv docs/$FILE docs/$FILE.docs ; done
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -144,7 +139,7 @@ cp -a AUTHORS CONTENTS COPYING ChangeLog INSTALL MANIFESTO NEWS PORTING \
   README SUPPORT_NTOP.txt THANKS ntop.html ntop.txt docs/* NetFlow www \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE 
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc