From 59e7a4e775955c82ed79796a7d990616fab068f9 Mon Sep 17 00:00:00 2001
From: Michales Michaloudes <korgie@gmail.com>
Date: Sat, 27 Aug 2016 00:04:00 +0100
Subject: network/nethogs: Updated for version 0.8.5.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 network/nethogs/nethogs.SlackBuild | 48 +++++++++++++++++---------------------
 network/nethogs/nethogs.info       |  8 +++----
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/network/nethogs/nethogs.SlackBuild b/network/nethogs/nethogs.SlackBuild
index a0e225d969..1d13788f35 100644
--- a/network/nethogs/nethogs.SlackBuild
+++ b/network/nethogs/nethogs.SlackBuild
@@ -7,13 +7,13 @@
 # sed in SLKCFLAGS and removed template left-overs.
 
 PRGNAM=nethogs
-VERSION=0.8.0
+VERSION=0.8.5
 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
@@ -26,8 +26,8 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -44,42 +44,36 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvzf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-
-# Delete some useless label (halts the compiler)
-sed -i -e '/TODO/d' -e '/default\:/d' decpcap.c
-
-# Modify the Makefile
-sed -i -e 's:/usr/share/man/:/usr/man/:' Makefile
-
-# make temp directories
-mkdir -p $PKG/usr/bin
-mkdir -p $PKG/usr/doc
-mkdir -p $PKG/usr/man/man8
-
 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+if [ "$ARCH" = "x86_64" ]; then
+  sed -i -e 's#\$(PREFIX)/lib#\$(PREFIX)/lib64#' src/MakeLib.mk
+fi
+
+# fix script to determine version with tail
+sed -i -e 's/+2/+2 -/' ./determineVersion.sh
 
-make \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-# was working with 0.6.0 version
-# make install DESTDIR=$PKG
+make PREFIX="/usr"
+make PREFIX="/usr" libnethogs
 
-install -s -m 755 nethogs $PKG/usr/bin/
-install -m 644 nethogs.8 $PKG/usr/man/man8/
+make PREFIX="/usr" DESTDIR=$PKG install
+make PREFIX="/usr" DESTDIR=$PKG install_lib
 
+# move man file to proper place
+mv $PKG/usr/share/man $PKG/usr/man
+rm -rf $PKG/usr/share
 gzip -9 $PKG/usr/man/man8/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $TMP/$PRGNAM-$VERSION/
-cp -a DESIGN Changelog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a DESIGN Changelog INSTALL README.* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/nethogs/nethogs.info b/network/nethogs/nethogs.info
index fae22f6593..cd4b591ee4 100644
--- a/network/nethogs/nethogs.info
+++ b/network/nethogs/nethogs.info
@@ -1,8 +1,8 @@
 PRGNAM="nethogs"
-VERSION="0.8.0"
-HOMEPAGE="http://nethogs.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/sourceforge/nethogs/nethogs-0.8.0.tar.gz"
-MD5SUM="d6fb12b46e80a50c9b9f91dd48e2b234"
+VERSION="0.8.5"
+HOMEPAGE="https://github.com/raboof/nethogs"
+DOWNLOAD="https://github.com/raboof/nethogs/archive/v0.8.5/nethogs-0.8.5.tar.gz"
+MD5SUM="002fd7227d8ed2a8b0fcb0a1b44731bf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3