4 files changed, 30 insertions, 18 deletions
diff --git a/network/retroshare/README b/network/retroshare/README
index 051d64fea0..34f39d7bb9 100644
--- a/network/retroshare/README
+++ b/network/retroshare/README
@@ -7,6 +7,6 @@ web-of-trust to authenticate peers and OpenSSL to encrypt all
 communication. RetroShare provides filesharing, chat, messages,
 forums and channels.
 
-To build the "Tor Only" version, use the build option "RETROTOR=yes", e.g.
+To build the "Tor Only" version, use the build option "RETROTOR=yes":
 
   RETROTOR=yes ./retroshare.SlackBuild
diff --git a/network/retroshare/retroshare.SlackBuild b/network/retroshare/retroshare.SlackBuild
index 1861c03e25..870b673b28 100644
--- a/network/retroshare/retroshare.SlackBuild
+++ b/network/retroshare/retroshare.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for retroshare
 
@@ -17,12 +17,13 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=retroshare
-VERSION=${VERSION:-0.6.4}
+VERSION=${VERSION:-20220216_3dfcb58}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
-SRCNAM=RetroShare
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -32,7 +33,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,13 +55,14 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
-
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,11 +79,14 @@ fi
 make
 make INSTALL_ROOT=${PKG} install
 
+mkdir -p $PKG/usr/share/retroshare
+mv $PKG/{qss,sounds,stylesheets} $PKG/usr/share/retroshare/
+
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE.txt README.md TODO.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSES README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -82,4 +94,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/network/retroshare/retroshare.info b/network/retroshare/retroshare.info
index 307a748169..65ab2d2f08 100644
--- a/network/retroshare/retroshare.info
+++ b/network/retroshare/retroshare.info
@@ -1,10 +1,10 @@
 PRGNAM="retroshare"
-VERSION="0.6.4"
-HOMEPAGE="http://retroshare.net"
-DOWNLOAD="https://github.com/RetroShare/RetroShare/archive/v0.6.4/RetroShare-0.6.4.tar.gz"
-MD5SUM="392c36bb3171fa26b8702e0a984d5bd6"
+VERSION="20220216_3dfcb58"
+HOMEPAGE="http://retroshare.cc"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/retroshare-20220216_3dfcb58.tar.xz"
+MD5SUM="9e71721b705df11ff3f3c0a0a31493f2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 libmicrohttpd libupnp-legacy speex protobuf sqlcipher"
+REQUIRES="libmicrohttpd miniupnpc protobuf3 sqlcipher"
 MAINTAINER="Alan Aversa"
 EMAIL="aveNOrsa@email.ariSPAMzona.edu"
diff --git a/network/retroshare/slack-desc b/network/retroshare/slack-desc
index 6b69fdd79d..2bcc67a0fb 100644
--- a/network/retroshare/slack-desc
+++ b/network/retroshare/slack-desc
@@ -15,5 +15,5 @@ retroshare: a web-of-trust to authenticate peers and OpenSSL to encrypt all
 retroshare: communication. RetroShare provides filesharing, chat, messages,
 retroshare: forums and channels.
 retroshare:
-retroshare: Project URL: http://retroshare.net
+retroshare: Project URL: http://retroshare.cc
 retroshare: