6 files changed, 56 insertions, 37 deletions
diff --git a/ham/svxlink/README b/ham/svxlink/README
index 2453a8c932..c389e243e6 100644
--- a/ham/svxlink/README
+++ b/ham/svxlink/README
@@ -1,16 +1,23 @@
-The SvxLink project is developing a flexible, general purpose voice
-services system for ham radio use.
-The SvxLink Server consists of a core that handles the connection to
-the transceiver. The core can be configured to act as a repeater
-controller or to operate on a simplex channel. The voice services are
-loaded into the core as plugins.
-The project also includes an EchoLink client GUI application (Qtel).
-
-The biggest news in this release is the initial revision of the
-SvxReflector application. The SvxReflector application is meant to be used
-as a center point to link SvxLink nodes together.
-
-You can build only svxlink server (no Qtel) by passing QTEL=NO to the script:
+The SvxLink Server is a general purpose voice services system,
+which when connected to a transceiver, can act as both an advanced
+repeater system and can also operate on a simplex channel. One could
+call it a radio operating system since it sits between the hardware
+(transceiver) and the applications (modules) and handle basic system
+services as well as input and output.
+
+SvxLink is very extensible and modular. Voice services are implemented
+as modules which are isolated from each other. Modules can be
+implemented in either C++ or TCL.
+
+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 
+together.
+
+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,3 +32,5 @@ The recommended uid/gid is 286, you may want to check
 http://slackbuilds.org/uid_gid.txt for other recommendations.
 
 To run svxlink server you will need the svxlink-sounds package.
+
+You may want to check the rc.svxlink scripts for startup options.
diff --git a/ham/svxlink/doinst.sh b/ham/svxlink/doinst.sh
index 8a5082b42a..afc8fe4833 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/rc.svxlink b/ham/svxlink/rc.svxlink
index 0b50a77f46..b57cc81409 100644
--- a/ham/svxlink/rc.svxlink
+++ b/ham/svxlink/rc.svxlink
@@ -3,8 +3,8 @@
 
 # Start svxlink:
 svxlink_start() {
-  # CMDLINE="/usr/bin/svxlink --daemon --runasuser=svxlink --pidfile=/var/run/svxlink.pid --logfile=/var/log/svxlink"
-  CMDLINE="/usr/bin/svxlink --daemon --runasuser=svxlink --pidfile=/var/run/svxlink.pid"
+  CMDLINE="/usr/bin/svxlink --daemon --runasuser=svxlink --pidfile=/var/run/svxlink.pid --logfile=/var/log/svxlink"
+  # CMDLINE="/usr/bin/svxlink --daemon --runasuser=svxlink --pidfile=/var/run/svxlink.pid"
   echo -n "Starting SvxLink:  $CMDLINE"
   $CMDLINE
   echo
diff --git a/ham/svxlink/slack-desc b/ham/svxlink/slack-desc
index 241ba5b5c8..61c15bfff7 100644
--- a/ham/svxlink/slack-desc
+++ b/ham/svxlink/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 svxlink: svxlink (A general purpose voice services system for ham radio use)
 svxlink:
-svxlink: The SvxLink project is developing a flexible, general purpose voice
-svxlink: services system for ham radio use.
-svxlink: The SvxLink Server consists of a core that handles the connection to
-svxlink: the transceiver. The core can be configured to act as a repeater
-svxlink: controller or to operate on a simplex channel. The voice services are
-svxlink: loaded into the core as plugins.
-svxlink: The project also includes an EchoLink client GUI application (Qtel).
-svxlink: This version includes the initial revision of the SvxReflector.
+svxlink: The SvxLink Server is a general purpose voice services system,
+svxlink: which when connected to a transceiver, can act as both an advanced
+svxlink: repeater system and can also operate on a simplex channel. One could
+svxlink: call it a radio operating system since it sits between the hardware
+svxlink: (transceiver) and the applications (modules) and handle basic system
+svxlink: services as well as input and output.
+svxlink: The project also includes Qtel and SvxReflector.
+svxlink:
 svxlink: Home page: http://www.svxlink.org
diff --git a/ham/svxlink/svxlink.SlackBuild b/ham/svxlink/svxlink.SlackBuild
index 8d043635c1..a1bdbb92be 100644
--- a/ham/svxlink/svxlink.SlackBuild
+++ b/ham/svxlink/svxlink.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for svxlink - cmake version
 
-# Copyright 2014-2015, 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
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=svxlink
-VERSION=${VERSION:-17.12.2}
+VERSION=${VERSION:-19.09.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +38,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}
@@ -93,7 +100,8 @@ 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/$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
 # We will download a larger file but I think it's better this way
@@ -116,12 +124,11 @@ cd build
     -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 \
@@ -131,7 +138,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
@@ -148,4 +157,4 @@ rename .conf .conf.new $PKG/etc/svxlink/*
 rename .conf .conf.new $PKG/etc/svxlink/svxlink.d/*.conf
 
 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/ham/svxlink/svxlink.info b/ham/svxlink/svxlink.info
index 53f3f56bf4..ca77eac18f 100644
--- a/ham/svxlink/svxlink.info
+++ b/ham/svxlink/svxlink.info
@@ -1,10 +1,10 @@
 PRGNAM="svxlink"
-VERSION="17.12.2"
+VERSION="19.09.2"
 HOMEPAGE="http://www.svxlink.org/"
-DOWNLOAD="https://github.com/sm0svx/svxlink/archive/17.12.2.tar.gz"
-MD5SUM="c24950de8048c1cc28891edbb657dec9"
+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 speex"
+REQUIRES="gsm"
 MAINTAINER="Gustavo Conrad"
 EMAIL="gus3963@gmail.com"