3 files changed, 40 insertions, 36 deletions
diff --git a/system/goaccess/README b/system/goaccess/README
index 563151d147..a21acc4c4a 100644
--- a/system/goaccess/README
+++ b/system/goaccess/README
@@ -1,28 +1,29 @@
-Goaccess is an open source real-time Apache log analyzer and
+Goaccess is an open source real-time Apache log analyser and
 interactive viewer that runs in a terminal in *nix systems.
 It provides fast and valuable HTTP statistics for system
-administrators that require a visual server report on the fly.
+administrators that require a visual server report on the
+fly.
 
 Optional:
 
-GeoIP:
-
-Goaccess now supports two types of GeoIP - legacy and mmdb.
+Goaccess supports two types of GeoIP - legacy and mmdb.
 
 If you want to add GeoIP support, pass either option to the
 slackbuild:
 
 GEOIP=legacy ./goaccess.SlackBuild
-GEOIP=mmdb ./goaccess.SlackBuild
+(Requires GeoIP)
 
-At the moment, mmdb is not on slackbuilds.org.
+GEOIP=mmdb ./goaccess.SlackBuild
+(Requires libmaxminddb)
 
 TokyoCabinet:
 
-Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk B+ Tree
-database.
+Goaccess supports Tokyo Cabinet and Tokyo Cabinet's on-disk
+B+ Tree database.
 
 The options are:
 
 TCB=memhash ./goaccess.SlackBuild
 TCB=btree ./goaccess.SlackBuild
+(Both require tokyocabinet)
diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild
index 58d71e0b97..a246f8b1ef 100644
--- a/system/goaccess/goaccess.SlackBuild
+++ b/system/goaccess/goaccess.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for goaccess
 
-# Copyright David Woodfall <dave@slackbuilds.org>
+# Copyright Dave Woodfall <dave@slackbuilds.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc permissions.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=goaccess
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-1.4.6}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,13 +65,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -n "$GEOIP" ]; then
-    geoip="--enable-geoip=$GEOIP"
-fi
-
-if [ -n "$TCB" ]; then
-    tcb="--enable-tcb=$TCB"
-fi
+geoip="--enable-geoip=${GEOIP:-no}"
+tcb="--enable-tcb=${TCB:-no}"
 
 set -e
 
@@ -73,9 +79,9 @@ cd $PRGNAM-$VERSION
 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 \
+  -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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -95,18 +101,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-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
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-mv $PKG/etc/goaccess.conf $PKG/etc/goaccess.conf.new
+install -D -m644 config/goaccess.conf $PKG/etc/goaccess.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO  $PKG/usr/doc/$PRGNAM-$VERSION
+install -m0644 \
+  AUTHORS COPYING ChangeLog NEWS README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -114,4 +117,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/goaccess/goaccess.info b/system/goaccess/goaccess.info
index dd15d67ac4..5d73c413e5 100644
--- a/system/goaccess/goaccess.info
+++ b/system/goaccess/goaccess.info
@@ -1,10 +1,10 @@
 PRGNAM="goaccess"
-VERSION="1.2"
+VERSION="1.4.6"
 HOMEPAGE="http://goaccess.prosoftcorp.com"
-DOWNLOAD="http://tar.goaccess.io/goaccess-1.2.tar.gz"
-MD5SUM="00f41cf1fb72cfc459984c0fb087333d"
+DOWNLOAD="http://tar.goaccess.io/goaccess-1.4.6.tar.gz"
+MD5SUM="51c5ee93c46bcdceed84bc08eff90338"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="David Woodfall"
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"