5 files changed, 53 insertions, 26 deletions
diff --git a/network/dillo/README b/network/dillo/README
index 5d4725b929..e90e142ddb 100644
--- a/network/dillo/README
+++ b/network/dillo/README
@@ -1,5 +1,13 @@
-Dillo is a multi-platform graphical web browser known for its speed
-and small footprint.  It is written in C and C++ and is based on FLTK.
-
-HTTPS and SSL support is built into this but is only at *alpha* stage. It can
-be commented out in the dillo.SlackBuild file if you wish.
+Dillo is a fast and small graphical web browser with the following
+features:
+Multi-platform, running on Linux, BSD, MacOS, Windows (via Cygwin),
+and even Atari.
+Written in C and C++ with few dependencies.
+Implements its own real-time rendering engine.
+Low memory usage and fast rendering, even with large pages.
+Uses the fast and bloat-free FLTK GUI library.
+Support for HTTP, HTTPS, FTP and local files.
+Extensible with plugins written in any language (see the list of
+plugins).
+Is free software licensed with the GPLv3.
+Does *NOT* support JavaScript.
diff --git a/network/dillo/dillo.SlackBuild b/network/dillo/dillo.SlackBuild
index cee153a1b1..2e1589f596 100644
--- a/network/dillo/dillo.SlackBuild
+++ b/network/dillo/dillo.SlackBuild
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for dillo. It has NOT been tested on x86_64.
+# Slackware build script for dillo web browser.
 
 # Copyright 2012 John B  TN, USA
 # This was only successful with the help of ErikHanson@slackbuilds.org and
 # B Watson who e-mailed me his patch/idea for the fltk and fltk-13 problem
+# I was having during the 3.0.5 build.
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,26 +26,35 @@
 #  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=dillo
-VERSION=${VERSION:-3.0.5}
+VERSION=${VERSION:-3.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
 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"
@@ -71,13 +82,15 @@ 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 {} \;
 
-#https and ssl are in the alpha stage, but if you don't want to try and use it
-#just delete or comment out --enable-ssl
+autoreconf -fi
 
+# Dillo looks for openssl first, then tls. Both are still in alpha
+# stage but work to a degree and are better than nothing.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --enable-ssl \
+  --enable-openssl \
+  --enable-tls \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
@@ -97,7 +110,7 @@ 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 README AUTHORS INSTALL COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -105,4 +118,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/dillo/dillo.info b/network/dillo/dillo.info
index f1ab0ad06c..ab11e672ad 100644
--- a/network/dillo/dillo.info
+++ b/network/dillo/dillo.info
@@ -1,8 +1,8 @@
 PRGNAM="dillo"
-VERSION="3.0.5"
-HOMEPAGE="https://www.dillo.org/"
-DOWNLOAD="https://www.dillo.org/download/dillo-3.0.5.tar.bz2"
-MD5SUM="554aad93b6107bba696f4da022c41561"
+VERSION="3.1.0"
+HOMEPAGE="https://dillo-browser.github.io/"
+DOWNLOAD="https://github.com/dillo-browser/dillo/releases/download/v3.1.0/dillo-3.1.0.tar.bz2"
+MD5SUM="54e09a5282edc4fa59ff99720461fc57"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/network/dillo/doinst.sh b/network/dillo/doinst.sh
index 0d18ec2ded..a189943dd8 100644
--- a/network/dillo/doinst.sh
+++ b/network/dillo/doinst.sh
@@ -19,3 +19,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/network/dillo/slack-desc b/network/dillo/slack-desc
index 74d7f3befc..443a5c371d 100644
--- a/network/dillo/slack-desc
+++ b/network/dillo/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 dillo: dillo (dillo web browser)
 dillo:
-dillo: Dillo is a multi-platform graphical web browser known
-dillo: for its speed and small footprint.  It is written in C and
-dillo: C++ and is based on FLTK.  Dillo is free software made
-dillo: available under the terms of the GNU GPLv3.
+dillo: Dillo is a multi-platform graphical web browser, known for its
+dillo: its speed and small footprint, that is developed with a focus
+dillo: on personal security and privacy. It is built with the FLTK 1.3
+dillo: GUI toolkit. Dillo is free GPL-3.0 licensed software.
 dillo:
-dillo: Homepage: http://www.dillo.org
+dillo: Homepage: https://dillo-browser.github.io/
 dillo:
 dillo:
 dillo: