4 files changed, 62 insertions, 74 deletions
diff --git a/development/swi-prolog/README b/development/swi-prolog/README
index ecd0b46689..b0bf817e1b 100644
--- a/development/swi-prolog/README
+++ b/development/swi-prolog/README
@@ -3,7 +3,8 @@ started in 1987 and has been driven by real-world applications.
 SWI-Prolog is widely used in research, education, and commercial
 applications.
 
-swi-prolog is build without BerkeleyDB support at the moment
-(too experimental and won't build) and without GMP support.
-If you want GMP support with swiprolog run the script with
-  GMP=yes ./swi-prolog.SlackBuild
+Optional dependencies:
+  * qt5 (for swipl-win GUI)
+  * jdk or openjdk (for JPL Prolog/Java interface)
+  * uuid, libedit (for Prolog bindings to these libraries -
+    libedit is NOT needed to get history editing in swipl)
diff --git a/development/swi-prolog/slack-desc b/development/swi-prolog/slack-desc
index fab6fc725c..fb8b2dce77 100644
--- a/development/swi-prolog/slack-desc
+++ b/development/swi-prolog/slack-desc
@@ -13,7 +13,7 @@ swi-prolog: development started in 1987 and has been driven by real-world
 swi-prolog: applications. SWI-Prolog is widely used in research, education,
 swi-prolog: and commercial applications.
 swi-prolog:
-swi-prolog: Homepage: http://www.swi-prolog.org/
+swi-prolog: Homepage: https://www.swi-prolog.org/
 swi-prolog:
 swi-prolog:
 swi-prolog:
diff --git a/development/swi-prolog/swi-prolog.SlackBuild b/development/swi-prolog/swi-prolog.SlackBuild
index 4df1f0196a..0ffc6dc4de 100644
--- a/development/swi-prolog/swi-prolog.SlackBuild
+++ b/development/swi-prolog/swi-prolog.SlackBuild
@@ -1,34 +1,49 @@
 #!/bin/sh
-# Slackware build script for swi prolog
-# written by Florian Kanngiesser (florian.kanngiesser@googlemail.com)
+
+# Slackware build script for swi-prolog
+
+# Copyright 2020 Nick Smallbone <nick@smallbone.se>, Gothenburg, Sweden
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=swi-prolog
-VERSION=${VERSION:-6.2.4}
+VERSION=${VERSION:-8.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=pl
+SRCNAM=swipl
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# GMP requires gmplib.
-if [ "${GMP:-no}" = "no" ]; then
-    SETGMP="out"
-fi
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -51,67 +66,39 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -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 {} \;
 
-# Build with default options: In future hopefully we can build with BerkeleyDB
-# support (--with-db).
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --mandir=/usr/man \
-  --with$SETGMP-gmp \
-  --build=$ARCH-slackware-linux
-make all
-make install DESTDIR=$PKG
-cd packages
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --with-cpp \
-  --with-clib \
-  --with-odbc \
-  --with-table \
-  --with-xpce \
-  --with-sgml \
-  --with-RDF \
-  --with-semweb \
-  --with-http \
-  --with-chr \
-  --with-clpqr \
-  --with-nlp \
-  --with-ssl \
-  --with-tipc \
-  --with-pldoc \
-  --with-plunit \
-  --with-zlib \
-  --with-R \
-  --with-protobufs \
-  --with-PDT \
-  --with-utf8proc \
-  --with-archive \
-  --without-jpl
-make all
-make install DESTDIR=$PKG
-cd -
+# Compatibility with 14.2's version of CMake
+sed -i 's/NATIVE_COMMAND/UNIX_COMMAND/g' packages/odbc/cmake/FindODBC.cmake
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DSWIPL_INSTALL_MANPAGES=man/man1 \
+    -DINSTALL_DOCUMENTATION=1 \
+    ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING INSTALL README* VERSION demo ReleaseNotes \
+  LICENSE INSTALL VERSION customize \
   $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s ../../lib/$SRCNAM/doc/Manual $PKG/usr/doc/$PRGNAM-$VERSION/manual
+ln -s ../../lib/$SRCNAM/doc/packages $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s ../../lib/$SRCNAM/demo $PKG/usr/doc/$PRGNAM-$VERSION
+ln -s ../../lib/$SRCNAM/README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/swi-prolog/swi-prolog.info b/development/swi-prolog/swi-prolog.info
index c6f66f0717..279e7bddb2 100644
--- a/development/swi-prolog/swi-prolog.info
+++ b/development/swi-prolog/swi-prolog.info
@@ -1,10 +1,10 @@
 PRGNAM="swi-prolog"
-VERSION="6.2.4"
+VERSION="8.0.3"
 HOMEPAGE="http://www.swi-prolog.org/"
-DOWNLOAD="http://www.swi-prolog.org/download/stable/src/pl-6.2.4.tar.gz"
-MD5SUM="0764f857e9f58d1c86fe60fca3a7992b"
+DOWNLOAD="http://www.swi-prolog.org/download/stable/src/swipl-8.0.3.tar.gz"
+MD5SUM="84a42c3f0ea50448d59bad4db3a3a362"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Florian Kanngiesser"
-EMAIL="florian.kanngiesser@googlemail.com"
+MAINTAINER="Nick Smallbone"
+EMAIL="nick@smallbone.se"