ham/svxlink: Updated for version 19.09.2.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 18 insertions, 17 deletions

diff --git a/ham/svxlink/README b/ham/svxlink/README
index 42ccbe502f3e6..c389e243e6e04 100644
--- a/ham/svxlink/README
+++ b/ham/svxlink/README
@@ -13,10 +13,11 @@ The project also includes Qtel, the Qt EchoLink client, is a graphical
 application used to access the EchoLink network.
 
 This release includes a new revision of the SvxReflector application,
-which is meant to be used as a center point to link SvxLink nodes
+which is meant to be used as a center point to link SvxLink nodes 
 together.
 
-You can build only the server by passing QTEL=NO to the script:
+You can build only svxlink server (no Qtel) by passing QTEL=NO to the
+script:
 QTEL=NO ./svxlink.SlackBuild
 
 Opus is an optional (and, based on the audio quality, suggested!)
@@ -25,8 +26,7 @@ dependency available from slackbuilds.org
 You need a "svxlink" user and group:
 
  # groupadd -g 286 svxlink
- # useradd -u 286 -g svxlink \
-     -d /var/spool/svxlink -s /bin/false svxlink
+ # useradd -u 286 -g svxlink -d /var/spool/svxlink -s /bin/false svxlink
 
 The recommended uid/gid is 286, you may want to check
 http://slackbuilds.org/uid_gid.txt for other recommendations.
diff --git a/ham/svxlink/doinst.sh b/ham/svxlink/doinst.sh
index 8a5082b42a85f..afc8fe48331b2 100644
--- a/ham/svxlink/doinst.sh
+++ b/ham/svxlink/doinst.sh
@@ -36,6 +36,7 @@ config etc/svxlink/svxlink.d/ModuleSelCallEnc.conf.new
 config etc/svxlink/svxlink.d/ModulePropagationMonitor.conf.new
 config etc/svxlink/svxlink.d/ModuleMetarInfo.conf.new
 config etc/svxlink/svxlink.d/ModuleParrot.conf.new
+config etc/svxlink/svxlink.d/ModuleTrx.conf.new
 preserve_perms etc/rc.d/rc.svxlink.new
 
 if [ -x /usr/bin/update-desktop-database ]; then
diff --git a/ham/svxlink/svxlink.SlackBuild b/ham/svxlink/svxlink.SlackBuild
index 8dc2402d42e3b..d277a4d09c321 100644
--- a/ham/svxlink/svxlink.SlackBuild
+++ b/ham/svxlink/svxlink.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for svxlink - cmake version
 
-# Copyright 2014-2019, Gustavo Conrad (gus3963 gmail)
+# Copyright 2014-2022, Gustavo Conrad (gus3963 gmail)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=svxlink
-VERSION=${VERSION:-19.09.1}
+VERSION=${VERSION:-19.09.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,14 +38,12 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
 fi
 
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -103,6 +101,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
+#tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 
 # the Github download unpacks several directories, we only need src
@@ -122,16 +121,15 @@ cd build
   cmake \
     $BUILD_QTEL \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONF_INSTALL_DIR=/etc \
     -DLOCAL_STATE_DIR=/var \
+    -DMAN_INSTALL_DIR=/usr/man \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     ..
   make
-  make doc
-  make install DESTDIR=$PKG
-
+  make man install DESTDIR=$PKG
 cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -141,7 +139,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ../COPYRIGHT doc/README* doc/*.txt doc/qteluserdocs/*.pdf doc/qteluserdocs/*.tex \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mv $PKG/usr/share/man $PKG/usr/
+
+# remove unused directories
+rm -r $PKG/usr/share/doc
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/ham/svxlink/svxlink.info b/ham/svxlink/svxlink.info
index 3af822ef197ce..ca77eac18f2a5 100644
--- a/ham/svxlink/svxlink.info
+++ b/ham/svxlink/svxlink.info
@@ -1,8 +1,8 @@
 PRGNAM="svxlink"
-VERSION="19.09.1"
+VERSION="19.09.2"
 HOMEPAGE="http://www.svxlink.org/"
-DOWNLOAD="https://github.com/sm0svx/svxlink/archive/19.09.1/svxlink-19.09.1.tar.gz"
-MD5SUM="e96920b98ef80f07c98648daa8363cf2"
+DOWNLOAD="https://github.com/sm0svx/svxlink/archive/19.09.2/svxlink-19.09.2.tar.gz"
+MD5SUM="2dde4de463be83aa945219231b77888a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gsm"