3 files changed, 44 insertions, 37 deletions
diff --git a/network/psi-plus/README b/network/psi-plus/README
index 0990030d70..d3b8765a6e 100644
--- a/network/psi-plus/README
+++ b/network/psi-plus/README
@@ -3,22 +3,14 @@ Development branch of Psi XMPP client by psi-dev@conference.jabber.ru
 NOTE This is intended for advanced users and developers.
 NOTE This can coexist with the stable psi package.
 
-In 2009 a Psi fork named Psi+ was started. Project purposes are: implementation
-of new features, writing of patches and plugins for transferring them to
-upstream. As of 2017 the most of active Psi+ developers have become official
-Psi developers, but Psi+ still has a number of unique features. From developers
-point of view Psi+ is just a development branch of Psi IM client which is
-hosted at separate git repositories and for which rolling release development
-model is used.
+In 2009 a Psi fork named Psi+ was started. Project purposes are:
+implementation of new features, writing of patches and plugins for
+transferring them to upstream. As of 2017 the most of active Psi+
+developers have become official Psi developers, but Psi+ still has a
+number of unique features. From developers point of view Psi+ is just a
+development branch of Psi IM client which is hosted at separate git
+repositories and for which rolling release development model is used.
 
-LATEST COMMIT INFO
-
-Current version of Psi+ is 1.4.409
-
-It is based on:
-* psi: dc3e59ec
-* patches: 770f144
-* plugins: 8792bc3
-* resources: d623f57
-
-https://github.com/psi-plus/psi-plus-snapshots/commit/272f39
+Warning: This SlackBuild requires network access when it runs, meaning
+it downloads files from the Internet with root access. You should
+decide for yourself whether or not you think this is a good idea.
diff --git a/network/psi-plus/psi-plus.SlackBuild b/network/psi-plus/psi-plus.SlackBuild
index 3173557869..5afe5acb2a 100644
--- a/network/psi-plus/psi-plus.SlackBuild
+++ b/network/psi-plus/psi-plus.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for psi-plus
 
@@ -23,10 +23,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=psi-plus
-VERSION=${VERSION:-1.4.650}
+VERSION=${VERSION:-1.5.1600}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,8 +39,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/$TAG}
+# 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}
 
@@ -70,20 +80,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./configure \
-  --prefix=/usr \
-  --qtdir=/usr/lib$LIBDIRSUFFIX/qt5
-
-QMAKE_CFLAGS="$SLKCFLAGS" \
-QMAKE_CXXFLAGS="$SLKCFLAGS" \
-make
-make install INSTALL_ROOT=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUNDLED_USRSCTP=ON \
+    -DBUNDLED_QCA=ON \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 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 CHANGELOG COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -91,4 +106,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/psi-plus/psi-plus.info b/network/psi-plus/psi-plus.info
index 0c31126783..1183d57ba6 100644
--- a/network/psi-plus/psi-plus.info
+++ b/network/psi-plus/psi-plus.info
@@ -1,10 +1,10 @@
 PRGNAM="psi-plus"
-VERSION="1.4.650"
+VERSION="1.5.1600"
 HOMEPAGE="https://psi-plus.com"
-DOWNLOAD="https://github.com/psi-plus/psi-plus-snapshots/archive/1.4.650/psi-plus-snapshots-1.4.650.tar.gz"
-MD5SUM="c54d2143149d5dd112445072da67cded"
+DOWNLOAD="https://github.com/psi-plus/psi-plus-snapshots/archive/1.5.1600/psi-plus-snapshots-1.5.1600.tar.gz"
+MD5SUM="0ec48977544d9f69375b946b2a012505"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qca-qt5"
-MAINTAINER="Dave Woodfall"
+REQUIRES=""
+MAINTAINER="D Woodfall"
 EMAIL="dave@slackbuilds.org"