autu: Update to 5.02-1

2 files changed, 17 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbe1b4be7834..d2e3e41bdd80 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri May 19 23:07:37 UTC 2017
+# Sat Dec 15 23:12:23 UTC 2018
 pkgbase = sflowtool
 	pkgdesc = CLI utility and scripts for analyzing sFlow data
-	pkgver = 3.41
+	pkgver = 5.02
 	pkgrel = 1
 	url = http://www.inmon.com/technology/sflowTools.php
 	arch = i686
@@ -10,10 +10,10 @@ pkgbase = sflowtool
 	license = custom
 	makedepends = automake
 	optdepends = perl: scripts support
-	source = sflowtool-3.41.tar.gz::https://github.com/sflow/sflowtool/archive/v3.41.tar.gz
+	source = sflowtool-5.02.tar.gz::https://github.com/sflow/sflowtool/archive/v5.02.tar.gz
 	source = http://www.inmon.com/bin/sflowutils.tar.gz
 	source = LICENSE
-	sha256sums = 66e5bc56709798906c136f5b725e85628a7eea91e9958c7a597eedb4e2a58f08
+	sha256sums = ef78ad4d5ceeca280e35fe0734acf3925c0a3c630bbdf1433faf44c5fa3d3d4a
 	sha256sums = 45f6a0f96bdb6a1780694b9a4ef9bbd2fd719b9f7f3355c6af1427631b311d56
 	sha256sums = 863b86b7a4fc7632cfc3f9ead7e76f6e7751aca8b64030ff97b3b46f991c6482
 
diff --git a/PKGBUILD b/PKGBUILD
index c74e50d5154a..b4062d129d2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 set -u
 pkgname='sflowtool'
-pkgver='3.41'
+pkgver='5.02'
 pkgrel='1'
 pkgdesc='CLI utility and scripts for analyzing sFlow data'
 arch=('i686' 'x86_64')
@@ -19,27 +19,23 @@ source=("${pkgname}-${pkgver}.tar.gz::${_giturl}/archive/v${pkgver}.tar.gz"
         #"http://www.inmon.com/bin/${pkgname}-${pkgver}.tar.gz"
         'http://www.inmon.com/bin/sflowutils.tar.gz'
         'LICENSE')
-sha256sums=('66e5bc56709798906c136f5b725e85628a7eea91e9958c7a597eedb4e2a58f08'
+sha256sums=('ef78ad4d5ceeca280e35fe0734acf3925c0a3c630bbdf1433faf44c5fa3d3d4a'
             '45f6a0f96bdb6a1780694b9a4ef9bbd2fd719b9f7f3355c6af1427631b311d56'
             '863b86b7a4fc7632cfc3f9ead7e76f6e7751aca8b64030ff97b3b46f991c6482')
 
-prepare() {
-  set -u
-  cd "${pkgname}-${pkgver}"
-  sed -i -e 's:^#!/bin/awk:#!/usr/bin/awk:g' '../utils/ipTrafficMatrix' '../utils/ipTopTalkers'
-  if [ ! -s 'configure' ]; then
-    aclocal
-    autoconf
-    automake --add-missing
-  fi
-  ./configure --prefix='/usr' --mandir='/usr/share/man'
-  set +u
-}
-
 build() {
   set -u
   cd "${pkgname}-${pkgver}"
-  make -s -j1 # not big enough for nproc
+  if [ ! -s 'Makefile' ]; then
+    sed -e 's:^#!/bin/awk:#!/usr/bin/awk:g' -i '../utils/ipTrafficMatrix' '../utils/ipTopTalkers'
+    if [ ! -s 'configure' ]; then
+      aclocal
+      autoconf
+      automake --add-missing
+    fi
+    ./configure --prefix='/usr' --mandir='/usr/share/man'
+  fi
+  make -s
   set +u
 }
 
@@ -51,21 +47,8 @@ package(){
   cp -pR "${srcdir}/utils" "${srcdir}/contrib" "${pkgdir}/usr/share/${pkgname}/"
   install -Dpm644 "${srcdir}/README" -t "${pkgdir}/usr/share/${pkgname}/"
   install -Dpm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-  sed -i -e 's:\r::g' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  sed -e 's:\r::g' -i "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   set +u
-  # Ensure there are no forbidden paths. Place at the end of package() and comment out as you find or need exceptions. (git-aurcheck)
-  ! test -d "${pkgdir}/bin" || { echo "Line ${LINENO} Forbidden: /bin"; false; }
-  ! test -d "${pkgdir}/sbin" || { echo "Line ${LINENO} Forbidden: /sbin"; false; }
-  ! test -d "${pkgdir}/lib" || { echo "Line ${LINENO} Forbidden: /lib"; false; }
-  ! test -d "${pkgdir}/share" || { echo "Line ${LINENO} Forbidden: /share"; false; }
-  ! test -d "${pkgdir}/usr/sbin" || { echo "Line ${LINENO} Forbidden: /usr/sbin"; false; }
-  ! test -d "${pkgdir}/usr/local" || { echo "Line ${LINENO} Forbidden: /usr/local"; false; }
-  ! grep -lr "/sbin" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /sbin"; false; }
-  ! grep -lr "/usr/tmp" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /usr/tmp"; false; }
-  # Don't know how to fix these.
-  #! grep -lr "/usr/local" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /usr/local"; false; }
-  # The one left is related to the above problem
-  #! pcre2grep -Ilr "(?<!usr)/bin" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: /bin"; false; }
 }
 
 set +u